Browse Source

千山万水

zhaoyang 2 years ago
parent
commit
3da620ea7f

+ 27 - 3
GameClient/Assets/Game/HotUpdate/Data/VO/PoemPhotoData.cs

@@ -26,12 +26,36 @@ namespace GFGGame
         public bool LockingStatus;
 
         /// <summary>
-        /// 照片临时下载路径,出于流量安全,每个下载文件的路径都是限时的,暂限5MIN
+        /// 个人相册_照片临时下载路径,出于流量安全,每个下载文件的路径都是限时的,暂限5MIN
         /// </summary>
         public string PictureTempUrl;
-
+        /// <summary>
+        /// 个人相册_照片数据
+        /// </summary>
         public byte[] Bytes;
+        /// <summary>
+        /// 个人相册_照片资源
+        /// </summary>
+        public NTexture Ntexture;//个人相册数据
+
+
+        /// <summary>
+        /// 万水千山_游历地点id
+        /// </summary>
+        public int TravelLocationId;
+        /// <summary>
+        /// Q版套装位置
+        /// </summary>
+        public int QSuitId;
+        /// <summary>
+        /// Q版套装人物资源下标
+        /// </summary>
+        public int ResourceIndex;
+        /// <summary>
+        /// Q版人物位置下标
+        /// </summary>
+        public int PositionIndex;
+
 
-        public NTexture Ntexture;
     }
 }

+ 7 - 7
GameClient/Assets/Game/HotUpdate/ServerProxy/PoemPhotoSProxy.cs

@@ -29,10 +29,9 @@ namespace GFGGame
                         PoemPhotoData photoData = new PoemPhotoData();
                         photoData.PictureId = response.PictureInfosA[i].PictureId;
                         photoData.CreationTime = response.PictureInfosA[i].CreationTime;
-                        // photoData.ToppingTime = response.PictureInfosA[i].ToppingTime;
                         photoData.ToppingStatus = response.PictureInfosA[i].ToppingStatus;
                         photoData.LockingStatus = response.PictureInfosA[i].LockingStatus;
-                        // photoData.PictureName = response.PictureInfosA[i].PictureName;
+
                         photoData.PictureTempUrl = response.PictureInfosA[i].PictureTempUrl;
                         Timers.inst.StartCoroutine(DownloadFile(photoData));
                         PoemPhotoDataManager.Instance.Add(photoData, (int)PictureSourceType.PersonalAlbum);
@@ -42,12 +41,15 @@ namespace GFGGame
                         PoemPhotoData photoData = new PoemPhotoData();
                         photoData.PictureId = response.PictureInfosB[i].PictureId;
                         photoData.CreationTime = response.PictureInfosB[i].CreationTime;
-                        // photoData.ToppingTime = response.PictureInfosB[i].ToppingTime;
                         photoData.ToppingStatus = response.PictureInfosB[i].ToppingStatus;
                         photoData.LockingStatus = response.PictureInfosB[i].LockingStatus;
-                        // photoData.PictureName = response.PictureInfosB[i].PictureName;
-                        photoData.PictureTempUrl = response.PictureInfosB[i].PictureTempUrl;
+
+                        photoData.TravelLocationId = response.PictureInfosB[i].TravelLocationId;
+                        photoData.QSuitId = response.PictureInfosB[i].TravelLocationId;
+                        photoData.ResourceIndex = response.PictureInfosB[i].TravelSuitResourceIndex;
+                        photoData.PositionIndex = response.PictureInfosB[i].PositionIndex;
                         Timers.inst.StartCoroutine(DownloadFile(photoData));
+
                         PoemPhotoDataManager.Instance.Add(photoData, (int)PictureSourceType.WanShuiQianShan);
                     }
                     return true;
@@ -106,10 +108,8 @@ namespace GFGGame
                     PoemPhotoData photoData = new PoemPhotoData();
                     photoData.PictureId = response.PictureInfo.PictureId;
                     photoData.CreationTime = response.PictureInfo.CreationTime;
-                    // photoData.ToppingTime = response.PictureInfo.ToppingTime;
                     photoData.ToppingStatus = response.PictureInfo.ToppingStatus;
                     photoData.LockingStatus = response.PictureInfo.LockingStatus;
-                    // photoData.PictureName = response.PictureInfo.PictureName;
                     photoData.PictureTempUrl = response.PictureInfo.PictureTempUrl;
                     PoemPhotoDataManager.Instance.Add(photoData, sourceType);
                     EventAgent.DispatchEvent(ConstMessage.POEM_PHOTO_INFOS_CHANGE);

+ 96 - 0
GameClient/Assets/Game/HotUpdate/ServerProxy/TravelSProxy.cs

@@ -0,0 +1,96 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using System.Net;
+using System.Net.Http;
+using ET;
+using FairyGUI;
+using GFGGame;
+using ICSharpCode.SharpZipLib.GZip;
+using UnityEngine;
+using UnityEngine.Networking;
+
+namespace GFGGame
+{
+    public static class TravelSProxy
+    {
+        //获取游历数
+        public static async ETTask<bool> ReqTravelInfo()
+        {
+            S2C_GetTravelGuideData response = null;
+            response = (S2C_GetTravelGuideData)await MessageHelper.SendToServer(new C2S_GetTravelGuideData());
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        //开始游历
+        public static async ETTask<bool> ReqGoTravel(List<int> qSuitIds)
+        {
+            S2C_TravelGuideGo response = null;
+            response = (S2C_TravelGuideGo)await MessageHelper.SendToServer(new C2S_TravelGuideGo() { SuitIds = qSuitIds });
+
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+        //领取游历奖励
+        public static async ETTask<bool> ReqGetTravelReward(int pictureType)
+        {
+            S2C_ReceiveTravelGuideReward response = null;
+            response = (S2C_ReceiveTravelGuideReward)await MessageHelper.SendToServer(new C2S_ReceiveTravelGuideReward() { });
+
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        //获取游历图鉴记录
+        public static async ETTask<bool> ReqTravelGuideInfo(int pictureType)
+        {
+            S2C_GetTravelGuideRecordAll response = null;
+            response = (S2C_GetTravelGuideRecordAll)await MessageHelper.SendToServer(new C2S_GetTravelGuideRecordAll() { });
+
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+        //领取游历图鉴区域奖励
+        public static async ETTask<bool> ReqGetTravelGuideReward(int areaId)
+        {
+            S2C_ReceiveTravelAreaReward response = null;
+            response = (S2C_ReceiveTravelAreaReward)await MessageHelper.SendToServer(new C2S_ReceiveTravelAreaReward() { AreaId = areaId });
+
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/ServerProxy/TravelSProxy.cs.meta

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

BIN
GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes


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