千山万水

FGUIProject/assets/Travel/TravelDressupUI.xml

@@ -4,5 +4,8 @@
     <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="442,406"/>
   </displayList>
 </component>

FGUIProject/assets/Travel/TravelUI.xml

@@ -20,7 +20,7 @@
       <gearDisplay controller="c1" pages="2"/>
       <Button title="游历结束"/>
     </component>
-    <text id="n4_wono" name="txtTime" xy="425,1463" pivot="0.5,0" size="230,42" fontSize="30" text="大约5小时后归来">
+    <text id="n4_wono" name="txtTime" xy="425,1463" pivot="0.5,0" size="230,41" fontSize="30" text="大约5小时后归来">
       <gearDisplay controller="c1" pages="1"/>
     </text>
     <component id="n5_wono" name="btnPhoto" src="wono5" fileName="components/Button3.xml" xy="194,1682" size="227,132">

FGUIProject/assets/Travel/components/ComDress.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="148,146">
+  <displayList>
+    <loader id="n1_wono" name="loaDress" xy="0,0" size="148,146"/>
+  </displayList>
+</component>

FGUIProject/assets/Travel/package.xml

@@ -8,15 +8,16 @@
     <component id="wono4" name="Button2.xml" path="/components/"/>
     <component id="wono5" name="Button3.xml" path="/components/"/>
     <component id="wono10e" name="ComTravel.xml" path="/components/"/>
-    <image id="wono6" name="qingyuan.png" path="/"/>
-    <image id="wono7" name="damengdh.png" path="/"/>
-    <image id="wono8" name="jiyuet.png" path="/"/>
-    <image id="wono9" name="moren_huitou.png" path="/"/>
-    <image id="wonoa" name="moren_zhanli.png" path="/"/>
-    <image id="wonob" name="moren_zoulu.png" path="/"/>
-    <image id="wonoc" name="mogaoku_yewan.png" path="/"/>
-    <image id="wonod" name="dayanta.png" path="/"/>
-    <image id="wonoe" name="mogaoku_baitian .png" path="/"/>
+    <image id="wono6" name="qingyuan.png" path="/images/"/>
+    <image id="wono7" name="damengdh.png" path="/images/"/>
+    <image id="wono8" name="jiyuet.png" path="/images/"/>
+    <image id="wono9" name="moren_huitou.png" path="/images/"/>
+    <image id="wonoa" name="moren_zhanli.png" path="/images/"/>
+    <image id="wonob" name="moren_zoulu.png" path="/images/"/>
+    <image id="wonoc" name="mogaoku_yewan.png" path="/images/"/>
+    <image id="wonod" name="dayanta.png" path="/images/"/>
+    <image id="wonoe" name="mogaoku_baitian .png" path="/images/"/>
+    <component id="wonof" name="ComDress.xml" path="/components/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Travel" packageCount="2" genCode="true"/>
 </packageDescription>

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

@@ -83,5 +83,7 @@ namespace GFGGame
         public const string POEM_PHOTO_INFOS_CHANGE = "POEM_PHOTO_INFOS_CHANGE";//相册数据变化
 
         public const string CHANGE_ROLE_NAME = "CHANGE_ROLE_NAME";//修改玩家名称
+
+        public const string TRAVEL_STATE_CHANGE = "TRAVEL_STATE_CHANGE";//游历状态变化
     }
 }

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

@@ -173,5 +173,34 @@ namespace GFGGame
             }
             return false;
         }
+
+        /// <summary>
+        /// 千山万水-图鉴红点
+        /// </summary>
+        /// <returns></returns>
+        public bool GetTravelGuideRed()
+        {
+            if (TravelDataManager.Instance.ListTravelAreaRewardState == null) return false;
+            for (int i = 0; i < TravelDataManager.Instance.ListTravelAreaRewardState.Count; i++)
+            {
+                if (TravelDataManager.Instance.ListTravelAreaRewardState[i] == ConstBonusStatus.CAN_GET)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+        /// <summary>
+        /// 千山万水-图鉴区域红点
+        /// </summary>
+        /// <param name="areaId"></param>
+        /// <returns></returns>
+        public bool GetTravelGuideAreaRed(int areaId)
+        {
+            if (TravelDataManager.Instance.ListTravelAreaRewardState == null) return false;
+
+            return TravelDataManager.Instance.ListTravelAreaRewardState[areaId - 1] == ConstBonusStatus.CAN_GET;
+
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Travel/UI_ComDress.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_ComDress
+    {
+        public GComponent target;
+        public GLoader m_loaDress;
+        public const string URL = "ui://jitclg1gwonof";
+        public const string PACKAGE_NAME = "Travel";
+        public const string RES_NAME = "ComDress";
+        private static UI_ComDress _proxy;
+
+        public static UI_ComDress Create(GObject gObject = null)
+        {
+            var ui = new UI_ComDress();
+            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_ComDress Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComDress();
+            }
+            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_loaDress = (GLoader)comp.GetChild("loaDress");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaDress = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

@@ -8,6 +8,9 @@ namespace UI.Travel
     {
         public GComponent target;
         public GLoader m_loaBg;
+        public UI_ComDress m_comDress0;
+        public UI_ComDress m_comDress1;
+        public UI_ComDress m_comDress2;
         public const string URL = "ui://jitclg1gwono1";
         public const string PACKAGE_NAME = "Travel";
         public const string RES_NAME = "TravelDressupUI";
@@ -56,10 +59,19 @@ 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"));
         }
         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;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -78,7 +78,6 @@ namespace GFGGame
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
-                    TravelDataManager inst = TravelDataManager.Instance;
 
                     PoemPhotoData photoData = new PoemPhotoData();
                     photoData.PictureId = response.PictureInfo.PictureId;
@@ -92,9 +91,12 @@ namespace GFGGame
                     photoData.PositionIndex = response.PictureInfo.PositionIndex;
                     PoemPhotoDataManager.Instance.Add(photoData, (int)PictureSourceType.WanShuiQianShan);
 
+                    TravelDataManager inst = TravelDataManager.Instance;
                     inst.TravelData.Status = (int)TravelGuideType.NoTravel;
                     inst.ListTravelLoactionCount[inst.TravelData.TravelLocationId - 1] = inst.TravelData.TravelCount;
 
+                    EventAgent.DispatchEvent(ConstMessage.TRAVEL_STATE_CHANGE);
+
                     if (inst.TravelData.TravelCount > 1) return true;//非首次到达该地无需处理图鉴红点
 
                     string location = TravelLoactionCfgArray.Instance.GetCfg(inst.TravelData.TravelLocationId).location;

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

@@ -12,7 +12,7 @@ namespace GFGGame
         private UI_FieldGuideUI _ui;
         private int[] _listBannerDatas = new int[3] { ConstBannerId.ZHAI_XING, ConstBannerId.ZHAI_XING, ConstBannerId.ZHAI_XING };
         private int[] _listGuideDatas = new int[3] { ConstFieldGuideId.SUIT_GUIDE, ConstFieldGuideId.CHAPTER_ITEM, ConstFieldGuideId.TRAVEL_GUIDE };
-        GetRedCall[] actions = new GetRedCall[] { RedDotDataManager.Instance.GetFieldGuideRed, null, null };
+        GetRedCall[] actions = new GetRedCall[] { RedDotDataManager.Instance.GetFieldGuideRed, null, RedDotDataManager.Instance.GetTravelGuideRed };
 
         public override void Dispose()
         {

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

@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using ET;
 using FairyGUI;
 using UI.Travel;
@@ -9,6 +10,8 @@ namespace GFGGame
     {
         private UI_TravelRewardUI _ui;
 
+        private List<int> _travelSuitIds = new List<int>();
+
         public override void Dispose()
         {
             if (_ui != null)
@@ -42,7 +45,7 @@ namespace GFGGame
         protected override void OnHide()
         {
             base.OnHide();
-
+            _travelSuitIds.Clear();
         }
 
         protected override void RemoveEventListener()

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

@@ -28,6 +28,9 @@ namespace GFGGame
             isfullScreen = true;
 
             _ui.m_btnback.onClick.Add(OnBtnBackClick);
+            _ui.m_btnTips.onClick.Add(OnBtnTipsClick);
+            _ui.m_btnGo.onClick.Add(OnBtnGoClick);
+            _ui.m_btnGet.onClick.Add(OnBtnGetClick);
             _ui.m_btnPhoto.onClick.Add(OnBtnPhotoClick);
             _ui.m_btnFieldGuide.onClick.Add(OnBtnFieldGuideClick);
 
@@ -37,12 +40,13 @@ namespace GFGGame
         protected override void AddEventListener()
         {
             base.AddEventListener();
-
+            EventAgent.AddEventListener(ConstMessage.TRAVEL_STATE_CHANGE, UpdateView);
         }
+
         protected override void OnShown()
         {
             base.OnShown();
-
+            UpdateView();
         }
 
         protected override void OnHide()
@@ -54,7 +58,17 @@ namespace GFGGame
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.TRAVEL_STATE_CHANGE, UpdateView);
+        }
 
+        private void UpdateView()
+        {
+            _ui.m_c1.selectedIndex = TravelDataManager.Instance.TravelData.Status;
+            if (_ui.m_c1.selectedIndex == (int)TravelGuideType.Travel)
+            {
+                long endTime = TravelDataManager.Instance.TravelData.CreationTime + TravelDataManager.Instance.TravelData.TravelNeedHour * TimeUtil.SECOND_PER_HOUR;
+                _ui.m_txtTime.text = string.Format("大约{0}后归来", TimeUtil.FormattingTime(TimeHelper.ServerNowSecs), endTime);
+            }
         }
 
         private void OnBtnBackClick()
@@ -62,6 +76,21 @@ namespace GFGGame
             ViewManager.GoBackFrom(typeof(PoemView).FullName);
         }
 
+        private void OnBtnTipsClick()
+        {
+
+        }
+
+        private void OnBtnGoClick()
+        {
+            ViewManager.Show<TravelDressupView>(PictureSourceType.WanShuiQianShan, new object[] { typeof(TravelView).FullName, this.viewData });
+        }
+
+        private void OnBtnGetClick()
+        {
+            ViewManager.Show<TravelRewardView>(PictureSourceType.WanShuiQianShan, new object[] { typeof(TravelView).FullName, this.viewData });
+        }
+
         private void OnBtnPhotoClick()
         {
             ViewManager.Show<PoemPhotoView>(PictureSourceType.WanShuiQianShan, new object[] { typeof(TravelView).FullName, this.viewData });