Explorar el Código

修改服务器接口

jet hace 8 años
padre
commit
e838fd85a0

+ 1 - 1
Assets/Resource/Prefab/PrefabUI/GroupA.prefab

@@ -1702,7 +1702,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!1 &1689755906866872
 GameObject:
   m_ObjectHideFlags: 1

+ 6 - 4
Assets/Script/Manage/ManaCenter.cs

@@ -681,7 +681,7 @@ public class ManaCenter : Regist
 
 
         ManaServer.ID = ManaData.GetPlayerString("ID");
-
+        ManaServer.SerialNumber = ManaData.GetPlayerString("SerialNumber");
 
         List<string> offlineList = ManaData.GetOfflineConfig();
 
@@ -1007,19 +1007,21 @@ public class ManaCenter : Regist
         }
 
         ManaServer.PackTypeRequest();
-        ManaSocial.UpdatePage(true);
 
         if (ManaServer.Connect)
         {
             if (ManaData.GetPlayerString("ID") == "Default")
             {
                 ManaServer.ID = ManaServer.JsonData["o"].ToString();
+                ManaServer.SerialNumber = ManaServer.JsonData["i"].ToString();
 
                 ManaReso.SetText("L_UserLab", ManaServer.ID);
             }
         }
 
-        
+        ManaSocial.UpdatePage(true);
+
+
         RegistSkill(true);
         RegistIncome();
 
@@ -1051,7 +1053,7 @@ public class ManaCenter : Regist
         ManaReso.SetActive("La_Mask", true);
 
 
-        ManaServer.Download(id, DownloadCallback);
+        ManaServer.DownloadByID(id, DownloadCallback);
     }
     
     public static void DownloadCallback(JsonData jsonData)

+ 1 - 1
Assets/Script/Manage/ManaData.cs

@@ -165,7 +165,7 @@ public class ManaData : Regist
             {
                 DownloadLock = true;
 
-                ManaServer.Download(ManaServer.ID, RecoveXml);
+                ManaServer.DownloadBySerialNumber(ManaServer.SerialNumber, RecoveXml);
             }
         }
     }

+ 29 - 17
Assets/Script/Manage/ManaServer.cs

@@ -121,6 +121,9 @@ public class ManaServer : Regist
     public static string MailXml;
     public static List<MailReward> MailRewardList = new List<MailReward>();
 
+    public static string BaseURL = "https://garden.dashgame.com/index.php/home";
+    public static string NewBaseURL = "https://garden.dashgame.com/index.php/newhome";
+
     #endregion
 
     public void Awake()
@@ -139,11 +142,11 @@ public class ManaServer : Regist
         //URLRequest.CreateStrURLRequest("https://garden.dashgame.com/index.php/home/user/rand", urlData, Debug.Log, URLRequest.Method.POST);
 
 
-        URLRequestData urlData = new URLRequestData();
+        //URLRequestData urlData = new URLRequestData();
 
-        urlData.Add("u", "ytcy9g");
+        //urlData.Add("u", "hsoiv1");
 
-        URLRequest.CreateStrURLRequest("https://garden.dashgame.com/index.php/home/user/load", urlData, Debug.Log, URLRequest.Method.POST);
+        //URLRequest.CreateStrURLRequest("https://garden.dashgame.com/index.php/home/user/load", urlData, Debug.Log, URLRequest.Method.POST);
 
 
         //Login((data => print(data.ToJson())));
@@ -380,7 +383,7 @@ public class ManaServer : Regist
         urlData.Add("u", sendID);
         urlData.Add("t", receiveID);
 
-        URLRequest.CreateStrURLRequest("https://garden.dashgame.com/index.php/home/praise/click", urlData, (data)=> {}, URLRequest.Method.POST);
+        URLRequest.CreateStrURLRequest(BaseURL + "/praise/click", urlData, (data)=> {}, URLRequest.Method.POST);
     }
 
     public static void Target(string userID, string targetID, Action<JsonData> callback)
@@ -390,7 +393,7 @@ public class ManaServer : Regist
         urlData.Add("u", userID);
         urlData.Add("t", targetID);
 
-        URLRequest.CreateURLRequest("https://garden.dashgame.com/index.php/home/praise/target", urlData, data => callback(data), URLRequest.Method.POST);
+        URLRequest.CreateURLRequest(BaseURL + "/praise/target", urlData, data => callback(data), URLRequest.Method.POST);
     }
 
     public static void AddComment(string sendID, string receiveID, string content, CommentType type)
@@ -404,7 +407,7 @@ public class ManaServer : Regist
 
         URLRequest.CreateStrURLRequest
         (
-            "https://garden.dashgame.com/index.php/home/comment/comment",
+            BaseURL + "/comment/comment",
             urlData,
             data =>
             {
@@ -435,7 +438,7 @@ public class ManaServer : Regist
         urlData.Add("p", page);
         urlData.Add("t", type.GetHashCode());
 
-        URLRequest.CreateURLRequest("https://garden.dashgame.com/index.php/home/comment/index", urlData, data => callback(data), URLRequest.Method.POST);
+        URLRequest.CreateURLRequest(BaseURL + "/comment/index", urlData, data => callback(data), URLRequest.Method.POST);
     }
 
 
@@ -445,7 +448,7 @@ public class ManaServer : Regist
 
         URLRequest.CreateURLRequest
         (
-            "https://garden.dashgame.com/index.php/home/index/index",
+            BaseURL + "/index/index",
             urlData,
             data =>
             {
@@ -804,7 +807,7 @@ public class ManaServer : Regist
         urlData.Add("i", id);
         urlData.Add("u", JsonData.Inst_Object["i"].ToJson().Trim('"'));
 
-        URLRequest.CreateStrURLRequest("https://garden.dashgame.com/index.php/home/pay/pay", urlData, callback, URLRequest.Method.POST);
+        URLRequest.CreateStrURLRequest(BaseURL + "/pay/pay", urlData, callback, URLRequest.Method.POST);
     }
 
 
@@ -814,7 +817,7 @@ public class ManaServer : Regist
 
         urlData.Add("u", SystemInfo.deviceUniqueIdentifier);
 
-        URLRequest.CreateURLRequest("https://garden.dashgame.com/index.php/home/user/login", urlData, LoginCallback + callback, URLRequest.Method.POST);
+        URLRequest.CreateURLRequest(NewBaseURL + "/user/login", urlData, LoginCallback + callback, URLRequest.Method.POST);
     }
 
     private static void LoginCallback(JsonData jsonData)
@@ -830,7 +833,6 @@ public class ManaServer : Regist
             Time = DateUtil.GetTime(jsonData["time"].ToJson());
 
             PraiseAmt = int.Parse(jsonData["p"].ToJson().Trim('"'));
-            SerialNumber = jsonData["i"].ToJson().Trim('"');
 
             if (ManaData.DamageLock)
             {
@@ -875,13 +877,14 @@ public class ManaServer : Regist
 
         URLRequestData urlData = new URLRequestData();
         
-        urlData.Add("u", ID);
+        urlData.Add("u", SerialNumber);
 
         ManaData.SavePlayerConfig();
 
         urlData.Add("l", ManaData.PlayerDoc.OuterXml);
 
-        URLRequest.CreateURLRequest("https://garden.dashgame.com/index.php/home/user/save", urlData, SaveCallback, URLRequest.Method.POST);
+        URLRequest.CreateURLRequest(NewBaseURL + "/user/save", urlData, SaveCallback, URLRequest.Method.POST);
+        //URLRequest.CreateStrURLRequest(NewBaseURL + "/user/save", urlData, Debug.Log, URLRequest.Method.POST);
     }
 
     private static void SaveCallback(JsonData jsonData)
@@ -896,16 +899,25 @@ public class ManaServer : Regist
 
         urlData.Add("u", id);
 
-        URLRequest.CreateURLRequest("https://garden.dashgame.com/index.php/home/user/other", urlData, callback, URLRequest.Method.POST);
+        URLRequest.CreateURLRequest(BaseURL + "/user/other", urlData, callback, URLRequest.Method.POST);
     }
 
-    public static void Download(string id, URLRequest.URLRequestJsonCallBackDelegate callback)
+    public static void DownloadByID(string id, URLRequest.URLRequestJsonCallBackDelegate callback)
     {
         URLRequestData urlData = new URLRequestData();
 
         urlData.Add("u", id);
 
-        URLRequest.CreateURLRequest("https://garden.dashgame.com/index.php/home/user/load", urlData, callback, URLRequest.Method.POST);
+        URLRequest.CreateURLRequest(BaseURL + "/user/load", urlData, callback, URLRequest.Method.POST);
+    }
+
+    public static void DownloadBySerialNumber(string serialNumber, URLRequest.URLRequestJsonCallBackDelegate callback)
+    {
+        URLRequestData urlData = new URLRequestData();
+
+        urlData.Add("u", serialNumber);
+
+        URLRequest.CreateURLRequest(NewBaseURL + "/user/load", urlData, callback, URLRequest.Method.POST);
     }
 
     public static void RandomLoad(URLRequest.URLRequestJsonCallBackDelegate callback)
@@ -914,7 +926,7 @@ public class ManaServer : Regist
 
         urlData.Add("i", "");
 
-        URLRequest.CreateURLRequest("https://garden.dashgame.com/index.php/home/user/rand", urlData, callback, URLRequest.Method.POST);
+        URLRequest.CreateURLRequest(BaseURL + "/user/rand", urlData, callback, URLRequest.Method.POST);
     }
 
 

+ 8 - 17
Assets/Script/Manage/ManaVisit.cs

@@ -10,7 +10,6 @@ using System.Collections.Generic;
 
 public enum ArchiveSource
 {
-    ID,
     Fake,
     Random,
     SerialNumber,
@@ -796,28 +795,20 @@ public class ManaVisit
     {
         //archiveSource = ArchiveSource.Fake;
 
-        if (archiveSource == ArchiveSource.ID)
-        {
-            ManaServer.Download
-            (
-                info,
-                PullArchiveCallback
-            );
-        }
-        else if (archiveSource == ArchiveSource.SerialNumber)
+        if (archiveSource == ArchiveSource.SerialNumber)
         {
             ManaServer.Other
-            (
-                info,
-                PullArchiveCallback
-            );
+                (
+                    info,
+                    PullArchiveCallback
+                );
         }
         else if (archiveSource == ArchiveSource.Random)
         {
             ManaServer.RandomLoad
-            (
-                PullArchiveCallback
-            );
+                (
+                    PullArchiveCallback
+                );
         }
         else
         {

+ 14 - 2
Assets/Script/Object/CommentItem.cs

@@ -1,8 +1,10 @@
-using UnityEngine;
+using System;
+using UnityEngine;
 using UnityEngine.UI;
 
 using System.Collections;
 using System.Collections.Generic;
+using Random = UnityEngine.Random;
 
 public class CommentItem : Regist
 {
@@ -55,7 +57,17 @@ public class CommentItem : Regist
         Content = content;
         SerialNumber = serialNumber;
 
-        Tit.text = "****" + serialNumber.Substring(serialNumber.Length-4);
+        try
+        {
+            Tit.text = "****" + serialNumber.Substring(serialNumber.Length - 4);
+        }
+        catch (Exception)
+        {
+            Tit.text = "****" + Random.Range(1000, 10000);
+
+            Debug.LogWarning("Error " + serialNumber);
+        }
+
         ContentLab.text = content;
     }
 }

+ 1 - 0
ToDoList.txt

@@ -1,3 +1,4 @@
+为什么之前的评论没有出错
 
 ID不区分大小写