backup

Assets/Plugins/Alipay/IOS/AlipaySDK.framework.meta

@@ -1,25 +0,0 @@
-fileFormatVersion: 2
-guid: 786969225a8dc4e0eb4e00a91e7e1501
-folderAsset: yes
-timeCreated: 1502698138
-licenseType: Pro
-PluginImporter:
-  serializedVersion: 1
-  iconMap: {}
-  executionOrder: {}
-  isPreloaded: 0
-  isOverridable: 0
-  platformData:
-    Any:
-      enabled: 0
-      settings: {}
-    Editor:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-    iOS:
-      enabled: 1
-      settings: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Script/Manage/FashionShowHttp/AddShowHttp.cs

@@ -13,19 +13,18 @@ public class AddShowHttp
     public static void Test()
     {
         FashionShowData data = new FashionShowData();
-        data.RefererId = "100000";
-        data.ShowName = "Name";
-        data.ShowContent = "Content";
-        data.CloseIDs.Add(0);
-        data.CloseIDs.Add(0);
-        data.CloseIDs.Add(0);
-        data.CloseIDs.Add(0);
-        data.CloseIDs.Add(0);
-        data.CloseIDs.Add(0);
-        data.CloseIDs.Add(0);
-        data.CloseIDs.Add(0);
-        data.CloseIDs.Add(0);
-        Add(data, null, null);
+        data.playerId = 1;
+        data.title = "标题";
+        data.content = "内容";
+        data.head = 0;
+        data.headwear = 0;
+        data.eye = 0;
+        data.mouth = 0;
+        data.top = 0;
+        data.skirt = 0;
+        data.shoe = 0;
+        data.wing = 0;
+        Add(data, ()=> {Debug.Log("Succeed");}, () => { Debug.Log("Failed"); });
     }
 
     public static void Add(FashionShowData data, Action succeedCallback, Action failedCallback)
@@ -34,28 +33,39 @@ public class AddShowHttp
         AddShowHttp.failedCallback = failedCallback;
 
         URLRequestData requestData = new URLRequestData();
-        requestData.Add("u", long.Parse(data.RefererId));
-        requestData.Add("tl", data.ShowName);
-        requestData.Add("ct", data.ShowContent);
-        requestData.Add("hd", data.GetHeadId());
-        requestData.Add("hw", data.GetHeadwearId());
-        requestData.Add("ey", data.GetEyeId());
-        requestData.Add("mo", data.GetMouseId());
-        requestData.Add("cl", data.GetTopId());
-        requestData.Add("sk", data.GetSkirtId());
-        requestData.Add("sh", data.GetShoeId());
-        requestData.Add("wi", data.GetWingId());
+        requestData.Add("u", data.playerId);
+        requestData.Add("tl", data.title);
+        requestData.Add("ct", data.content);
+        requestData.Add("hd", data.head);
+        requestData.Add("hw", data.headwear);
+        requestData.Add("ey", data.eye);
+        requestData.Add("mo", data.mouth);
+        requestData.Add("cl", data.top);
+        requestData.Add("sk", data.skirt);
+        requestData.Add("sh", data.shoe);
+        requestData.Add("wi", data.wing);
 
-        //URLRequest.CreateURLRequest(true, HttpManager.AddShowURL, requestData,
-        //    Callback, URLRequest.Method.POST);
-
-        URLRequest.CreateStrURLRequest(true, HttpManager.AddShowURL, requestData,
+        URLRequest.CreateURLRequest(true, HttpManager.AddShowURL, requestData,
             Callback, URLRequest.Method.POST);
+
+        //URLRequest.CreateStrURLRequest(true, HttpManager.AddShowURL, requestData,
+        //    Callback, URLRequest.Method.POST);
     }
 
     private static void Callback(JsonData data)
     {
-        Debug.Log(data.ToJson());
+        //Debug.Log(data.ToJson());
+        int errorCode = (int) data["error"];
+        if (errorCode == 0)
+        {
+            if (succeedCallback != null)
+                succeedCallback.Invoke();
+        }
+        else
+        {
+            if (failedCallback != null)
+                failedCallback.Invoke();
+        }
     }
 
     private static void Callback(string str)

Assets/Script/Manage/FashionShowHttp/CommentShowHttp.cs

@@ -12,7 +12,7 @@ public class CommentShowHttp
 
     public static void Test()
     {
-        Comment(1000, 1, "comment", null, null);
+        Comment(10000, 1, "comment", null, null);
     }
 
     public static void Comment(long playerId, int showId, string comment, Action succeedCallback, Action failedCallback)

Assets/Script/Manage/FashionShowHttp/DeleteShowHttp.cs

@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using LitJson;
+using UnityEngine;
+
+public class DeleteShowHttp
+{
+    private static Action succeedCallback;
+    private static Action failedCallback;
+
+    public static void Test()
+    {
+        Delete(1, 1, null, null);
+    }
+
+    public static void Delete(long playerId, int showId, Action succeedCallback, Action failedCallback)
+    {
+        DeleteShowHttp.succeedCallback = succeedCallback;
+        DeleteShowHttp.failedCallback = failedCallback;
+
+        URLRequestData requestData = new URLRequestData();
+        requestData.Add("u", playerId);
+        requestData.Add("s", showId);
+
+        //URLRequest.CreateURLRequest(true, HttpManager.AddShowURL, requestData,
+        //    Callback, URLRequest.Method.POST);
+
+        URLRequest.CreateStrURLRequest(true, HttpManager.DeleteShowURL, requestData,
+            Callback, URLRequest.Method.POST);
+    }
+
+    private static void Callback(JsonData data)
+    {
+        Debug.Log(data.ToJson());
+    }
+
+    private static void Callback(string str)
+    {
+        Debug.Log(str);
+    }
+}

Assets/Script/Manage/FashionShowHttp/DeleteShowHttp.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: be2c430f3033a4341927462af1e0eb6a
+timeCreated: 1522719913
+licenseType: Pro
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Script/Manage/FashionShowHttp/FashionShowData.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: f43047eecfed1694fb4120c972d455c9
+folderAsset: yes
+timeCreated: 1522722320
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Script/Manage/FashionShowHttp/FashionShowData/FashionShowData.cs

@@ -0,0 +1,65 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+public class FashionShowData
+{
+    public long playerId;
+    public string title;
+    public string content;
+    public int head;
+    public int headwear;
+    public int eye;
+    public int mouth;
+    public int top;
+    public int skirt;
+    public int shoe;
+    public int wing;
+
+    public FashionShowData()
+    {
+        
+    }
+
+    public FashionShowData(FashionShowData data)
+    {
+        playerId = data.playerId;
+        title = data.title;
+        content = data.content;
+        head = data.head;
+        headwear = data.headwear;
+        eye = data.eye;
+        mouth = data.mouth;
+        top = data.top;
+        skirt = data.skirt;
+        shoe = data.shoe;
+        wing = data.wing;
+    }
+
+    public void SetCloseIds(List<int> closeIds)
+    {
+        head = closeIds[0];
+        skirt = closeIds[1];
+        shoe = closeIds[2];
+        headwear = closeIds[3];
+        top = closeIds[4];
+        eye = closeIds[5];
+        mouth = closeIds[6];
+        wing = closeIds[7];
+    }
+
+    public List<int> GetCloseIds()
+    {
+        List<int> closeIds = new List<int>();
+        closeIds.Add(head);
+        closeIds.Add(skirt);
+        closeIds.Add(shoe);
+        closeIds.Add(headwear);
+        closeIds.Add(top);
+        closeIds.Add(eye);
+        closeIds.Add(mouth);
+        closeIds.Add(wing);
+        return closeIds;
+    }
+}

Assets/Script/Manage/FashionShowHttp/FashionShowData/FashionShowData.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 24788803fbc80ea44a7130435ef1a841
+timeCreated: 1522722320
+licenseType: Pro
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Script/Manage/FashionShowHttp/FashionShowData/GetFashionShowData.cs

@@ -0,0 +1,76 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using LitJson;
+using UnityEngine;
+
+public class GetFashionShowData : FashionShowData
+{
+    public int showId;
+    public int cuteScore;
+    public int vividScore;
+    public int simpleScore;
+    public int graceScore;
+    public int gloryScore;
+    public int scoreCnt;
+    public int praiseCnt;
+    public bool praised;
+    public string playerNickName;
+
+    public GetFashionShowData()
+    {
+        
+    }
+
+    public GetFashionShowData(JsonData data)
+    {
+        playerId = long.Parse((string) data["user_id"]);
+        title = (string) data["title"];
+        content = (string) data["content"];
+        head = (int)data["head"];
+        headwear = (int)data["headwear"];
+        eye = (int)data["eyes"];
+        mouth = (int)data["mouth"];
+        top = (int)data["clothes"];
+        skirt = (int)data["skirt"];
+        shoe = (int)data["shoes"];
+        wing = (int)data["wing"];
+
+        showId = (int) data["id"];
+        cuteScore = (int) data["score1"];
+        graceScore = (int) data["score2"];
+        vividScore = (int) data["score3"];
+        simpleScore = (int) data["score4"];
+        gloryScore = (int) data["score5"];
+        scoreCnt = (int) data["num_scored"];
+        praiseCnt = (int) data["likes"];
+        praised = ((int) data["liked"]).ToBool();
+        playerNickName = (string)data["nickname"];
+    }
+
+    public float GetCuteRate()
+    {
+        return (float) cuteScore/scoreCnt;
+    }
+
+    public float GetVividRate()
+    {
+        return (float) vividScore/scoreCnt;
+    }
+
+    public float GetSimpleRate()
+    {
+        return (float) simpleScore/scoreCnt;
+    }
+
+    public float GetGloryRate()
+    {
+        return (float) graceScore/scoreCnt;
+    }
+
+    public float GetGraceRate()
+    {
+        return (float) gloryScore/scoreCnt;
+    }
+}

Assets/Script/Manage/FashionShowHttp/FashionShowData/GetFashionShowData.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 01ff815fca65340488f468371419bf07
+timeCreated: 1522722320
+licenseType: Pro
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Script/Manage/FashionShowHttp/RateShowHttp.cs

@@ -14,7 +14,7 @@ public class RateShowHttp
     {
         ShowRateData data = new ShowRateData();
         data.playerId = 1;
-        data.showId = 1;
+        data.showId = 13;
         data.cuteRate = 1;
         data.graceRate = 1;
         data.vividRate = 1;
@@ -37,8 +37,8 @@ public class RateShowHttp
         requestData.Add("s4", data.simpleRate);
         requestData.Add("s5", data.gloryRate);
 
-        //URLRequest.CreateURLRequest(true, HttpManager.AddShowURL, requestData,
-        //    Callback, URLRequest.Method.POST);
+        URLRequest.CreateURLRequest(true, HttpManager.AddShowURL, requestData,
+            Callback, URLRequest.Method.POST);
 
         URLRequest.CreateStrURLRequest(true, HttpManager.RateShowURL, requestData,
             Callback, URLRequest.Method.POST);

Assets/Script/Manage/FashionShowHttp/ShowListHttp.cs

@@ -7,33 +7,55 @@ using UnityEngine;
 
 public class ShowListHttp
 {
-    private static Action succeedCallback;
+    private static Action<object> succeedCallback;
     private static Action failedCallback;
 
     public static void Test()
     {
-        Get(0, FashionShowType.All, null, null);
+        Get(1, 0, FashionShowType.All, obj => { Debug.Log("Succeed"); }, () => { Debug.Log("Failed"); });
     }
 
-    public static void Get(int page, FashionShowType type, Action succeedCallback, Action failedCallback)
+    public static void Get(long playerId, int page, FashionShowType type, Action<object> succeedCallback, Action failedCallback)
     {
+        //Debug.Log(page);
+
         ShowListHttp.succeedCallback = succeedCallback;
         ShowListHttp.failedCallback = failedCallback;
 
         URLRequestData requestData = new URLRequestData();
+        requestData.Add("u", playerId);
         requestData.Add("p", page);
         requestData.Add("s", type.GetHashCode());
 
-        //URLRequest.CreateURLRequest(true, HttpManager.AddShowURL, requestData,
-        //    Callback, URLRequest.Method.POST);
-
-        URLRequest.CreateStrURLRequest(true, HttpManager.GetShowListURL, requestData,
+        URLRequest.CreateURLRequest(true, HttpManager.GetShowListURL, requestData,
             Callback, URLRequest.Method.POST);
+
+        //URLRequest.CreateStrURLRequest(true, HttpManager.GetShowListURL, requestData,
+        //    Callback, URLRequest.Method.POST);
     }
 
     private static void Callback(JsonData data)
     {
-        Debug.Log(data.ToJson());
+        bool succeed = data.Inst_Object.ContainsKey("list");
+
+        if (succeed == false)
+        {
+            if (failedCallback != null)
+                failedCallback.Invoke();
+        }
+        else
+        {
+            List<GetFashionShowData> showDatas = new List<GetFashionShowData>();
+            JsonData listData = data["list"];
+            for (int i = 0; i < listData.Count; i++)
+            {
+                //Debug.Log(listData[i].ToJson());
+                GetFashionShowData showData = new GetFashionShowData(listData[i]);
+                showDatas.Add(showData);
+            }
+            if (succeedCallback != null)
+                succeedCallback.Invoke(showDatas);
+        }
     }
 
     private static void Callback(string str)

Assets/Script/Manage/FashionShowHttp/UserShowListHttp.cs

@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using LitJson;
+using UnityEngine;
+
+public class UserShowListHttp
+{
+    private static Action succeedCallback;
+    private static Action failedCallback;
+
+    public static void Test()
+    {
+        Get(1, 0, null, null);
+    }
+
+    public static void Get(long playerId, int page, Action succeedCallback, Action failedCallback)
+    {
+        UserShowListHttp.succeedCallback = succeedCallback;
+        UserShowListHttp.failedCallback = failedCallback;
+
+        URLRequestData requestData = new URLRequestData();
+        requestData.Add("u", playerId);
+        requestData.Add("p", page);
+
+        //URLRequest.CreateURLRequest(true, HttpManager.AddShowURL, requestData,
+        //    Callback, URLRequest.Method.POST);
+
+        URLRequest.CreateStrURLRequest(true, HttpManager.GetUserShowListURL, requestData,
+            Callback, URLRequest.Method.POST);
+    }
+
+    private static void Callback(JsonData data)
+    {
+        Debug.Log(data.ToJson());
+    }
+
+    private static void Callback(string str)
+    {
+        Debug.Log(str);
+    }
+}

Assets/Script/Manage/FashionShowHttp/UserShowListHttp.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 1426f30380b4bec499fba88282014ad8
+timeCreated: 1522719913
+licenseType: Pro
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Script/Manage/HttpManager.cs

@@ -177,14 +177,17 @@ public class HttpManager : Regist
     public static string PraiseShowURL = NewBaseURL + "/show/like";
     public static string CommentShowURL = NewBaseURL + "/show/comment";
     public static string GetShowListURL = NewBaseURL + "/show/show_list";
+    public static string GetUserShowListURL = NewBaseURL + "/show/show_list_user";
     public static string GetShowCommentListURL = NewBaseURL + "/show/comment_list";
+    public static string DeleteShowURL = NewBaseURL + "/show/delete";
     public static string ReportMailAddress = "bug@dashgame.com";
 
     #endregion
 
     public void Awake()
     {
-        ShowCommentsHttp.Test();
+        //ShowListHttp.Test();
+        //DeleteShowHttp.Delete(1709207727231988804, 17, null, null);
 
         //URLRequestData urlData = new URLRequestData();
         //urlData.Add("u", "Custom0");
@@ -1717,71 +1720,71 @@ public class HttpManager : Regist
     }
 
 
-    public static void DeleteFashionShowData()
-    {
-        
-    }
-
-    public static void SaveFashionShowData(FashionShowData fashionShowData, Action<FashionShowData> succeedCallback, Action failedCallback)
-    {
-        if (Random.Range(0, 1f) < 0.5f)
-        {
-            DelayCall.Call(1f, () => succeedCallback.Invoke(fashionShowData));
-        }
-        else
-        {
-            DelayCall.Call(1f, failedCallback.Invoke);
-        }
-    }
-
-    public static void GetFashionShowDatas(Action<List<FashionShowData>> succeedCallback, Action failedCallback)
-    {
-        List<FashionShowData> fashionShowDatas = new List<FashionShowData>();
-        for (int i = 0; i < 10; i++)
-        {
-            FashionShowData fashionShowData = new FashionShowData();
-            fashionShowData.ShowName = $"名字{Random.Range(0, 100)}";
-            fashionShowData.ShowContent = $"内容{Random.Range(0, 100)}";
-            if (Random.Range(0f, 1f) < 0.5f)
-            {
-                fashionShowData.CuteRate = "0";
-                fashionShowData.GloryRate = "0";
-                fashionShowData.GraceRate = "0";
-                fashionShowData.SimpleRate = "0";
-                fashionShowData.VividRate = "0";
-            }
-            else
-            {
-                fashionShowData.CuteRate = $"{Random.Range(1f, 5f):F1}";
-                fashionShowData.GloryRate = $"{Random.Range(1f, 5f):F1}";
-                fashionShowData.GraceRate = $"{Random.Range(1f, 5f):F1}";
-                fashionShowData.SimpleRate = $"{Random.Range(1f, 5f):F1}";
-                fashionShowData.VividRate = $"{Random.Range(1f, 5f):F1}";
-            }
-            if (Random.Range(0f, 1f) < 0.5f)
-            {
-                fashionShowData.RefererId = $"推荐人{Random.Range(0, 100)}";
-            }
-            else
-            {
-                fashionShowData.RefererId = NickNameManager.NickName;
-            }
-            fashionShowData.CloseIDs.Add(PlayerManager.CloseIDDictionary["脑壳2"] + Random.Range(-1, 2));
-            fashionShowData.CloseIDs.Add(PlayerManager.CloseIDDictionary["裙子2"] + Random.Range(-1, 2));
-            fashionShowData.CloseIDs.Add(PlayerManager.CloseIDDictionary["鞋子2"] + Random.Range(-1, 2));
-            fashionShowData.CloseIDs.Add(PlayerManager.CloseIDDictionary["头饰品2"] + Random.Range(-1, 2));
-            fashionShowData.CloseIDs.Add(PlayerManager.CloseIDDictionary["上衣2"] + Random.Range(-1, 2));
-            fashionShowData.CloseIDs.Add(PlayerManager.CloseIDDictionary["眼睛2"] + Random.Range(-1, 2));
-            fashionShowData.CloseIDs.Add(PlayerManager.CloseIDDictionary["嘴巴2"] + Random.Range(-1, 2));
-            fashionShowData.CloseIDs.Add(PlayerManager.CloseIDDictionary["Empty"]);
-            fashionShowDatas.Add(fashionShowData);
-        }
-        DelayCall.Call(0.5f, () => succeedCallback.Invoke(fashionShowDatas));
-    }
+    //public static void DeleteFashionShowData()
+    //{
+
+    //}
+
+    //public static void SaveFashionShowData(FashionShowData fashionShowData, Action<FashionShowData> succeedCallback, Action failedCallback)
+    //{
+    //    if (Random.Range(0, 1f) < 0.5f)
+    //    {
+    //        DelayCall.Call(1f, () => succeedCallback.Invoke(fashionShowData));
+    //    }
+    //    else
+    //    {
+    //        DelayCall.Call(1f, failedCallback.Invoke);
+    //    }
+    //}
+
+    //public static void GetFashionShowDatas(Action<List<FashionShowData>> succeedCallback, Action failedCallback)
+    //{
+    //    List<FashionShowData> fashionShowDatas = new List<FashionShowData>();
+    //    for (int i = 0; i < 10; i++)
+    //    {
+    //        FashionShowData fashionShowData = new FashionShowData();
+    //        fashionShowData.ShowName = $"名字{Random.Range(0, 100)}";
+    //        fashionShowData.ShowContent = $"内容{Random.Range(0, 100)}";
+    //        if (Random.Range(0f, 1f) < 0.5f)
+    //        {
+    //            fashionShowData.CuteRate = "0";
+    //            fashionShowData.GloryRate = "0";
+    //            fashionShowData.GraceRate = "0";
+    //            fashionShowData.SimpleRate = "0";
+    //            fashionShowData.VividRate = "0";
+    //        }
+    //        else
+    //        {
+    //            fashionShowData.CuteRate = $"{Random.Range(1f, 5f):F1}";
+    //            fashionShowData.GloryRate = $"{Random.Range(1f, 5f):F1}";
+    //            fashionShowData.GraceRate = $"{Random.Range(1f, 5f):F1}";
+    //            fashionShowData.SimpleRate = $"{Random.Range(1f, 5f):F1}";
+    //            fashionShowData.VividRate = $"{Random.Range(1f, 5f):F1}";
+    //        }
+    //        if (Random.Range(0f, 1f) < 0.5f)
+    //        {
+    //            fashionShowData.RefererId = $"推荐人{Random.Range(0, 100)}";
+    //        }
+    //        else
+    //        {
+    //            fashionShowData.RefererId = NickNameManager.NickName;
+    //        }
+    //        fashionShowData.CloseIDs.Add(PlayerManager.CloseIDDictionary["脑壳2"] + Random.Range(-1, 2));
+    //        fashionShowData.CloseIDs.Add(PlayerManager.CloseIDDictionary["裙子2"] + Random.Range(-1, 2));
+    //        fashionShowData.CloseIDs.Add(PlayerManager.CloseIDDictionary["鞋子2"] + Random.Range(-1, 2));
+    //        fashionShowData.CloseIDs.Add(PlayerManager.CloseIDDictionary["头饰品2"] + Random.Range(-1, 2));
+    //        fashionShowData.CloseIDs.Add(PlayerManager.CloseIDDictionary["上衣2"] + Random.Range(-1, 2));
+    //        fashionShowData.CloseIDs.Add(PlayerManager.CloseIDDictionary["眼睛2"] + Random.Range(-1, 2));
+    //        fashionShowData.CloseIDs.Add(PlayerManager.CloseIDDictionary["嘴巴2"] + Random.Range(-1, 2));
+    //        fashionShowData.CloseIDs.Add(PlayerManager.CloseIDDictionary["Empty"]);
+    //        fashionShowDatas.Add(fashionShowData);
+    //    }
+    //    DelayCall.Call(0.5f, () => succeedCallback.Invoke(fashionShowDatas));
+    //}
 
     public static void PraiseFashionShow(Action succeedCallback, Action failedCallback)
     {
-        
+
     }
 
     public static void UnpraiseFashionShow(Action succeedCallback, Action failedCallback)
@@ -2061,4 +2064,10 @@ public class HttpManager : Regist
         ConfigManager.SaveConfigDocument();
         ConfigManager.SaveConfigDocumentToDisk();
     }
+
+
+    public static long GetPlayerId()
+    {
+        return long.Parse(SerialNumber);
+    }
 }

Assets/Script/Object/Player.cs

@@ -1133,7 +1133,6 @@ public class Player : Regist , IPointerClickHandler
         ids.Add(PlayerManager.CloseIDDictionary[Shoe]);
         ids.Add(PlayerManager.CloseIDDictionary[HeadWear]);
         ids.Add(PlayerManager.CloseIDDictionary[Top]);
-        ids.Add(PlayerManager.CloseIDDictionary[Wing]);
         ids.Add(PlayAnimFlag1 ? PlayerManager.CloseIDDictionary[TempClose] : PlayerManager.CloseIDDictionary[Eye]);
         ids.Add(PlayerManager.CloseIDDictionary[Mouse]);
         ids.Add(PlayerManager.CloseIDDictionary[Wing]);

Assets/Script/Social/FashionShowCloseBox.cs

@@ -12,7 +12,7 @@ public class FashionShowCloseCell
     public Button ShareButton;
     public Button DisplayButton;
     public Player Player;
-    public FashionShowData FashionShowData;
+    public GetFashionShowData FashionShowData;
 
     #endregion
 
@@ -28,10 +28,10 @@ public class FashionShowCloseCell
         DisplayButton.onClick.AddListener(OnDisplayButtonClick);
     }
 
-    public void Init(float scale, FashionShowData data)
+    public void Init(float scale, GetFashionShowData data)
     {
         FashionShowData = data;
-        Praised = data.Praised;
+        Praised = data.praised;
         if (Praised)
         {
             PraiseButton.image.color = Lib.Pink;
@@ -40,13 +40,13 @@ public class FashionShowCloseCell
         {
             PraiseButton.image.color = Color.white;
         }
-        PraiseText.text = data.PraisedAmount.ToString();
+        PraiseText.text = data.praiseCnt.ToString();
         DisplayButton.transform.SetActive(true);
         Player = PlayerManager.Instance.GetRawPlayer();
         Player.transform.SetParent(DisplayButton.transform);
         Player.transform.SetSiblingIndex(1);
         Player.transform.localPosition = Vector3.zero;
-        foreach (var closeID in data.CloseIDs)
+        foreach (var closeID in data.GetCloseIds())
         {
             CloseItem closeItem = PlayerManager.CloseItemDictionary[closeID];
             closeItem.ChangeDress(Player, false);
@@ -92,7 +92,7 @@ public class FashionShowCloseCell
     {
         AudioManager.PlayClip(ResourceLabel.BtnClip);
         TweenRoot tween = FashionShowHomePage.HideSidePanel();
-        bool belongSelf = FashionShowData.RefererId == NickNameManager.NickName;
+        bool belongSelf = FashionShowData.playerId == long.Parse(HttpManager.SerialNumber);
         tween.AddEventOnetime(EventType.BackwardFinish, ()=> { FashionShowEditPage.ShowRatePanel(belongSelf, FashionShowData); FashionShowEditPage.LeaveToHomePage = true; });
     }
 }
@@ -171,8 +171,9 @@ public class FashionShowCloseBox : VirtualScrollRectItem
         return UnusedCells.Count > 0;
     }
 
-    public void SetNextCell(FashionShowData data)
+    public void SetNextCell(GetFashionShowData data)
     {
+        Debug.Log(data.showId);
         float scale = UnusedCells.Count == 5 ? 37.5f : 17.5f;
         FashionShowCloseCell cell = UnusedCells.Forward(0, true);
         cell.Init(scale, data);

Assets/Script/Social/FashionShowEditPage.cs

@@ -4,87 +4,6 @@ using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;
 
-public class FashionShowData
-{
-    public int PraisedAmount;
-    public bool Praised;
-    public string RefererId;
-    public string ShowName;
-    public string ShowContent;
-    public string CuteRate;
-    public string GloryRate;
-    public string GraceRate;
-    public string SimpleRate;
-    public string VividRate;
-
-    public List<int> CloseIDs = new List<int>();
-
-    public int GetHeadId()
-    {
-        return CloseIDs[0];
-    }
-
-    public int GetSkirtId()
-    {
-        return CloseIDs[1];
-    }
-
-    public int GetShoeId()
-    {
-        return CloseIDs[2];
-    }
-
-    public int GetHeadwearId()
-    {
-        return CloseIDs[3];
-    }
-
-    public int GetTopId()
-    {
-        return CloseIDs[4];
-    }
-
-    public int GetEyeId()
-    {
-        return CloseIDs[5];
-    }
-
-    public int GetMouseId()
-    {
-        return CloseIDs[6];
-    }
-
-    public int GetWingId()
-    {
-        return CloseIDs[7];
-    }
-
-    public int GetCuteRate()
-    {
-        return int.Parse(CuteRate);
-    }
-
-    public int GetGloryRate()
-    {
-        return int.Parse(GloryRate);
-    }
-
-    public int GetGraceRate()
-    {
-        return int.Parse(GraceRate);
-    }
-
-    public int GetSimpleRate()
-    {
-        return int.Parse(SimpleRate);
-    }
-
-    public int GetVividRate()
-    {
-        return int.Parse(VividRate);
-    }
-}
-
 public class FashionShowEditPage : Regist
 {
     #region Config
@@ -166,7 +85,7 @@ public class FashionShowEditPage : Regist
     private static KV<int, double> TotalCoin;
     private static KV<int, double> TotalDiamond;
     private static TweenRenderer PlayerTween;
-    private static FashionShowData FashionShowData;
+    private static GetFashionShowData FashionShowData;
     private static List<int> CloseIDs = new List<int>();
     //private static List<string> CloseNames = new List<string>();
     private static List<FashionShowCloseItem> CloseItems = new List<FashionShowCloseItem>();
@@ -297,11 +216,11 @@ public class FashionShowEditPage : Regist
     }
 
 
-    public static void ShowEditPanel(FashionShowData data)
+    public static void ShowEditPanel(GetFashionShowData data)
     {
         BelongSelf = true;
         FashionShowData = data;
-        CloseIDs = data.CloseIDs;
+        CloseIDs = data.GetCloseIds();
         //CloseNames = Player.DressIDToDressName(data.CloseIDs); ;
 
         TransitPanel();
@@ -309,11 +228,11 @@ public class FashionShowEditPage : Regist
         EnterEditMode();
     }
 
-    public static void ShowRatePanel(bool belongSelf, FashionShowData data)
+    public static void ShowRatePanel(bool belongSelf, GetFashionShowData data)
     {
         BelongSelf = belongSelf;
         FashionShowData = data;
-        CloseIDs = data.CloseIDs;
+        CloseIDs = data.GetCloseIds();
         //CloseNames = Player.DressIDToDressName(data.CloseIDs); ;
 
         Panel.TweenForVec();
@@ -334,20 +253,20 @@ public class FashionShowEditPage : Regist
         }
         DelayCall.Call(1, () => { DisplayPlayer.ResetDepth(); DisplayPlayer.DisplayInUI(37.5f); });
 
-        float cuteRate = float.Parse(FashionShowData.CuteRate);
-        float gloryRate = float.Parse(FashionShowData.GloryRate);
-        float graceRate = float.Parse(FashionShowData.GraceRate);
-        float simpleRate = float.Parse(FashionShowData.SimpleRate);
-        float vividRate = float.Parse(FashionShowData.VividRate);
+        float cuteRate = FashionShowData.GetCuteRate();
+        float gloryRate = FashionShowData.GetGloryRate();
+        float graceRate = FashionShowData.GetGraceRate();
+        float simpleRate = FashionShowData.GetSimpleRate();
+        float vividRate = FashionShowData.GetVividRate();
         CuteSlider.value = cuteRate == 0 ? 1 : cuteRate;
         GlorySlider.value = cuteRate == 0 ? 1 : gloryRate;
         GraceSlider.value = cuteRate == 0 ? 1 : graceRate;
         SimpleSlider.value = cuteRate == 0 ? 1 : simpleRate;
         VividSlider.value = cuteRate == 0 ? 1 : vividRate;
         ShowRateValue();
-        FashionTitleInputField.text = FashionShowData.ShowName;
-        FashionContentInputField.text = FashionShowData.ShowContent;
-        RecommendTitle.text = Language.GetStr(LanguageLabel.UI__Pg_RecommendTitle).Replace(TransferLabel.Value, FashionShowData.RefererId);
+        FashionTitleInputField.text = FashionShowData.title;
+        FashionContentInputField.text = FashionShowData.content;
+        RecommendTitle.text = Language.GetStr(LanguageLabel.UI__Pg_RecommendTitle).Replace(TransferLabel.Value, FashionShowData.playerNickName);
 
         HideRateButton();
         DisableRatePanel();
@@ -375,11 +294,11 @@ public class FashionShowEditPage : Regist
         GraceSlider.value = 3;
         SimpleSlider.value = 3;
         VividSlider.value = 3;
-        CuteValue.text = FashionShowData.CuteRate == "0" ? "--" : FashionShowData.CuteRate;
-        GloryValue.text = FashionShowData.GloryRate == "0" ? "--" : FashionShowData.GloryRate;
-        GraceValue.text = FashionShowData.GraceRate == "0" ? "--" : FashionShowData.GraceRate;
-        SimpleValue.text = FashionShowData.SimpleRate == "0" ? "--" : FashionShowData.SimpleRate;
-        VividValue.text = FashionShowData.VividRate == "0" ? "--" : FashionShowData.VividRate;
+        CuteValue.text = FashionShowData.cuteScore == 0 ? "--" : FashionShowData.GetCuteRate().ToString("0.0");
+        GloryValue.text = FashionShowData.gloryScore == 0 ? "--" : FashionShowData.GetGloryRate().ToString("0.0");
+        GraceValue.text = FashionShowData.graceScore == 0 ? "--" : FashionShowData.GetGraceRate().ToString("0.0");
+        SimpleValue.text = FashionShowData.simpleScore == 0 ? "--" : FashionShowData.GetSimpleRate().ToString("0.0");
+        VividValue.text = FashionShowData.vividScore == 0 ? "--" : FashionShowData.GetVividRate().ToString("0.0");
     }
 
     private static void TransitPanel()
@@ -571,18 +490,17 @@ public class FashionShowEditPage : Regist
             return;
         }
 
-        if (FashionShowData.ShowName == FashionTitleInputField.text && FashionShowData.ShowContent == FashionContentInputField.text)
+        if (FashionShowData.playerNickName == FashionTitleInputField.text && FashionShowData.content == FashionContentInputField.text)
         {
             Bubble.Show(null, Language.GetStr(LanguageLabel.UI__Pg_RepeatData));
             return;
         }
 
         SaveButton.interactable = false;
-        FashionShowData data = new FashionShowData();
-        data.ShowName = FashionTitleInputField.text;
-        data.ShowContent = FashionContentInputField.text;
-        data.RefererId = NickNameManager.NickName;
-        HttpManager.SaveFashionShowData(data, OnSaveSucceedCallback, OnSaveFailedCallback);
+        FashionShowData data = new FashionShowData(FashionShowData);
+        data.title = FashionTitleInputField.text;
+        data.content = FashionContentInputField.text;
+        AddShowHttp.Add(data, OnSaveSucceedCallback, OnSaveFailedCallback);
     }
 
     private static void OnSaveFailedCallback()
@@ -591,10 +509,10 @@ public class FashionShowEditPage : Regist
         Bubble.Show(null, Language.GetStr(LanguageLabel.UI__Pg_SaveFailed));
     }
 
-    private static void OnSaveSucceedCallback(FashionShowData fashionShowData)
+    private static void OnSaveSucceedCallback(/*FashionShowData fashionShowData*/)
     {
-        FashionShowData.ShowName = fashionShowData.ShowName;
-        FashionShowData.ShowContent = fashionShowData.ShowName;
+        //FashionShowData.ShowName = fashionShowData.ShowName;
+        //FashionShowData.ShowContent = fashionShowData.ShowName;
         SaveButton.interactable = true;
         Bubble.Show(null, Language.GetStr(LanguageLabel.UI__Pg_SaveSucceed));
     }
@@ -602,8 +520,8 @@ public class FashionShowEditPage : Regist
     private static void OnResetButtonClick()
     {
         AudioManager.PlayClip(ResourceLabel.BtnClip);
-        FashionTitleInputField.text = FashionShowData.ShowName;
-        FashionContentInputField.text = FashionShowData.ShowContent;
+        FashionTitleInputField.text = FashionShowData.title;
+        FashionContentInputField.text = FashionShowData.content;
     }
 
     private static void OnDeleteButtonClick()
@@ -617,7 +535,9 @@ public class FashionShowEditPage : Regist
             () =>
             {
                 HidePanel();
-                HttpManager.DeleteFashionShowData();
+                long playerId = HttpManager.GetPlayerId();
+                DeleteShowHttp.Delete(playerId, FashionShowData.showId, null, null);
+                //HttpManager.DeleteFashionShowData();
             }
         );
     }
@@ -876,16 +796,17 @@ public class FashionShowEditPage : Regist
     {
         AudioManager.PlayClip(ResourceLabel.BtnClip);
 
-        FashionShowData data = new FashionShowData();
-        data.CuteRate = "0";
-        data.GloryRate = "0";
-        data.GraceRate = "0";
-        data.SimpleRate = "0";
-        data.VividRate = "0";
-        data.ShowName = "";
-        data.ShowContent = "";
-        data.RefererId = NickNameManager.NickName;
-        data.CloseIDs = PlayerManager.Player.GetCurrentChangableDressIDs();
+        GetFashionShowData data = new GetFashionShowData();
+        data.cuteScore = 0;
+        data.gloryScore = 0;
+        data.graceScore = 0;
+        data.simpleScore = 0;
+        data.vividScore = 0;
+        data.title = "";
+        data.content = "";
+        data.playerId = HttpManager.GetPlayerId();
+        List<int> closeIds = PlayerManager.Player.GetCurrentChangableDressIDs();
+        data.SetCloseIds(closeIds);
         ShowEditPanel(data);
     }
 }

Assets/Script/Social/FashionShowHomePage.cs

@@ -6,6 +6,9 @@ public class FashionShowHomePage : Regist
 {
 	#region Config
 
+    private static int currentPage = 0;
+    private static FashionShowType currentType;
+
 	//StartMark-Used by LabelUtility-Do not remove
 	private static Text HomeTabButtonText;
 	private static Text CuteTabButtonText;
@@ -31,20 +34,21 @@ public class FashionShowHomePage : Regist
 
     private static Button CurrentTabButton;
     private static VirtualScrollRectPlus CurrentScrollRect;
-    private static List<FashionShowData> CurrentDatas = new List<FashionShowData>();
+    private static List<GetFashionShowData> CurrentDatas = new List<GetFashionShowData>();
+    private static List<GetFashionShowData> CurrentUnusedDatas = new List<GetFashionShowData>();
 
     private static Button OpenHomePageButton;
     private static Transform Panel;
     private static Transform SidePanel;
     private static List<Button> TabButtons = new List<Button>();
     private static List<VirtualScrollRectPlus> ScrollRects = new List<VirtualScrollRectPlus>();
-    private static List<FashionShowData> HomeDatas = new List<FashionShowData>();
-    private static List<FashionShowData> CuteDatas = new List<FashionShowData>();
-    private static List<FashionShowData> GraceDatas = new List<FashionShowData>();
-    private static List<FashionShowData> VividDatas = new List<FashionShowData>();
-    private static List<FashionShowData> SimpleDatas = new List<FashionShowData>();
-    private static List<FashionShowData> GloryDatas = new List<FashionShowData>();
-    private static List<List<FashionShowData>> TabDatasList = new List<List<FashionShowData>>();
+    private static List<GetFashionShowData> HomeDatas = new List<GetFashionShowData>();
+    private static List<GetFashionShowData> CuteDatas = new List<GetFashionShowData>();
+    private static List<GetFashionShowData> GraceDatas = new List<GetFashionShowData>();
+    private static List<GetFashionShowData> VividDatas = new List<GetFashionShowData>();
+    private static List<GetFashionShowData> SimpleDatas = new List<GetFashionShowData>();
+    private static List<GetFashionShowData> GloryDatas = new List<GetFashionShowData>();
+    private static List<List<GetFashionShowData>> TabDatasList = new List<List<GetFashionShowData>>();
     private static List<FashionShowCloseBox> Boxes = new List<FashionShowCloseBox>();
 
     #endregion
@@ -223,9 +227,15 @@ public class FashionShowHomePage : Regist
     private static void OnTabButtonClick(Button button)
     {
         int index = TabButtons.IndexOf(button);
+
+        currentPage = 0;
+        currentType = (FashionShowType) index;
+
         CurrentTabButton = button;
         CurrentScrollRect = ScrollRects[index];
         CurrentDatas = TabDatasList[index];
+        CurrentUnusedDatas = new List<GetFashionShowData>(CurrentDatas);
+
         AudioManager.PlayClip(ResourceLabel.BtnClip);
         for (int i = 0; i < TabButtons.Count; i++)
         {
@@ -250,7 +260,7 @@ public class FashionShowHomePage : Regist
     private static void RefreshCurrentTabPage()
     {
         if (CurrentScrollRect.content.transform.childCount > 0) return;
-        if (CurrentDatas.Count == 0)
+        if (CurrentUnusedDatas.Count == 0)
         {
             CurrentScrollRect.NextHorizontalPage();
         }
@@ -279,7 +289,8 @@ public class FashionShowHomePage : Regist
 
     private static VirtualScrollRectItem OnGetNextItem(int index)
     {
-        if (CurrentDatas.Count > index)
+        //Debug.Log(CurrentDatas.Count + "  " + index);
+        if (CurrentUnusedDatas.Count > index)
         {
             FashionShowCloseBox closeBox = GetAvailableBox();
             if (closeBox == null)
@@ -287,7 +298,7 @@ public class FashionShowHomePage : Regist
                 closeBox = ResourceManager.Get(FashionShowCloseBoxLabel.FashionShowCloseBox, Folder.UI, false, CurrentScrollRect.content, false, ObjType.FashionShowCloseBox, typeof(FashionShowCloseBox)).GetComponent<FashionShowCloseBox>();
                 Boxes.Add(closeBox);
                 closeBox.Init();
-                closeBox.SetNextCell(CurrentDatas[index]);
+                closeBox.SetNextCell(CurrentUnusedDatas[index]);
                 if (closeBox.HaveUnusedCell())
                 {
                     CurrentScrollRect.NextHorizontalPage();
@@ -296,7 +307,7 @@ public class FashionShowHomePage : Regist
             }
             else
             {
-                closeBox.SetNextCell(CurrentDatas[index]);
+                closeBox.SetNextCell(CurrentUnusedDatas[index]);
                 if (closeBox.HaveUnusedCell())
                 {
                     CurrentScrollRect.NextHorizontalPage();
@@ -306,11 +317,14 @@ public class FashionShowHomePage : Regist
         }
         else
         {
-            List<FashionShowData> fashionShowDatas = CurrentDatas;
-            HttpManager.GetFashionShowDatas
+            List<GetFashionShowData> fashionShowDatas = CurrentDatas;
+            ShowListHttp.Get
             (
-                datas =>
+                HttpManager.GetPlayerId(), currentPage, currentType,
+                obj =>
                 {
+                    currentPage++;
+                    List<GetFashionShowData> datas = (List<GetFashionShowData>) obj;
                     RefreshCurrentTabPage();
                     fashionShowDatas.AddRange(datas);
                 },

Assets/Script/Tool/DashGame/URLRequest.cs

@@ -109,6 +109,7 @@ public class URLRequest : MonoBehaviour
 
 	public static JsonData ParseRecieveJsonData(string data)
 	{
+        //Debug.LogWarning(data);
 		int index = data.IndexOf("{");
 		if(index >= 0)
 		{
@@ -124,7 +125,7 @@ public class URLRequest : MonoBehaviour
 			Debuger.LogException(e);
             //Debug.Log(e.ToString());
             //Debug.Log(data);
-		}
+        }
 		
 		JsonData json = new JsonData();
 	    json["error"] = 0;

Assets/Script/Tool/Test.cs

@@ -15,15 +15,18 @@ public class Test : MonoBehaviour
 
     public void Awake()
     {
-        FilePath = $"{Application.persistentDataPath}/Test.png";
-        if (!File.Exists(FilePath))
-        {
-            File.WriteAllBytes(FilePath, Texture2D.EncodeToPNG());
-        }
-        Text.text = FilePath;
-        ShareSDK = gameObject.AddComponent<ShareSDK>();
-        ShareSDK.Initialize();
-        ShareSDK.shareHandler = ShareCallback;
+        ShowListHttp.Test();
+
+
+        //FilePath = $"{Application.persistentDataPath}/Test.png";
+        //if (!File.Exists(FilePath))
+        //{
+        //    File.WriteAllBytes(FilePath, Texture2D.EncodeToPNG());
+        //}
+        //Text.text = FilePath;
+        //ShareSDK = gameObject.AddComponent<ShareSDK>();
+        //ShareSDK.Initialize();
+        //ShareSDK.shareHandler = ShareCallback;
     }
 
     public static ShareSDK ShareSDK;

第五期.txt

@@ -1,3 +1,5 @@
+上衣1的Offset
+
 进入搭配秀界面蜜蜂动画会死机
 
 角色的鞋子没有Alpha动画(试衣间)