liuqilin 7 лет назад
Родитель
Сommit
7e87836884

+ 3 - 2
Assets/Resource/Logo.unity

@@ -445,9 +445,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: f1828554d8ffa12449b221fe29b2c32c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  DebugMode: 0
+  DebugMode: 1
   CatchException: 1
-  DebugModeGo: {fileID: 0}
+  DebugModeGo: {fileID: 1264531325540048, guid: b22fd2d9abc702d43ac62a412537d4e9,
+    type: 2}
 --- !u!4 &1833966245
 Transform:
   m_ObjectHideFlags: 0

+ 20 - 0
Assets/Resource/Prefab/PrefabUI/GroupD.prefab

@@ -3136,6 +3136,7 @@ GameObject:
   - component: {fileID: 222616904213236340}
   - component: {fileID: 114309958873337896}
   - component: {fileID: 225425285044910550}
+  - component: {fileID: 223753421434575590}
   m_Layer: 5
   m_Name: U_LoadingPanel
   m_TagString: Untagged
@@ -10599,6 +10600,25 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1280221168853564}
+--- !u!223 &223753421434575590
+Canvas:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1999869294669664}
+  m_Enabled: 1
+  serializedVersion: 2
+  m_RenderMode: 2
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 1
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 2
+  m_TargetDisplay: 0
 --- !u!224 &224005243110855356
 RectTransform:
   m_ObjectHideFlags: 1

+ 1 - 0
Assets/Script/Manage/ManaCenter.cs

@@ -1175,6 +1175,7 @@ public class ManaCenter : Regist
             DownloadLock = true;
 
             ManaData.SaveXml();
+            PlayerPrefs.SetString("config", "");
         }
         else
         {

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

@@ -106,7 +106,7 @@ public class ManaData : Regist
                                 bytes = File.ReadAllBytes(configPath);
                             }
 
-                            if (PlayerPrefs.GetString("config") != Auxiliary.ToString(md5.ComputeHash(bytes)))
+                            if (PlayerPrefs.GetString("config") != "" && PlayerPrefs.GetString("config") != Auxiliary.ToString(md5.ComputeHash(bytes)))
                             {
                                 Debug.LogWarning("Download Archive : MD5 doesn't match");
                                 //ManaDebug.Log("Download Archive");

+ 70 - 136
Assets/Script/Manage/ManaServer.cs

@@ -122,106 +122,35 @@ public class ManaServer : Regist
 
     public void Awake()
     {
-        //URLRequestData urlData = new URLRequestData();
-
-        //urlData.Add("u", "1706202053433942394");
-
-        //URLRequest.CreateStrURLRequest(true, NewBaseURL + "/user/load", urlData, Debug.Log, URLRequest.Method.POST);
-
-
-        //AddComment("1709207727231988804", "1709207727231988804", "你好4", CommentType.Garden);
-        //AddComment("1704251601802555535", "1709207727231988804", "你好1", CommentType.Garden);
-        //AddComment("1706142186026389627", "1709207727231988804", "你好2", CommentType.Garden);
-
-        //URLRequestData urlData = new URLRequestData();
-
-        //urlData.Add("u", "vn9q1k");
-
-        //URLRequest.CreateURLRequest(BaseURL + "/user/load", urlData, (data)=> {Debug.Log(data.ToJson());}, URLRequest.Method.POST);
-
-
-        //URLRequestData urlData = new URLRequestData();
-
-        //urlData.Add("u", "1709207727231988804");
-
-        //URLRequest.CreateStrURLRequest(NewBaseURL + "/user/load", urlData, Debug.Log, URLRequest.Method.POST);
-
-
-        //URLRequestData urlData = new URLRequestData();
-
-        //urlData.Add("u", "ytcy9g");
-
-        //urlData.Add("l", "aaa");
-
-        //URLRequest.CreateStrURLRequest(NewBaseURL + "/user/save", urlData, Debug.Log, URLRequest.Method.POST);
-
-
-        //URLRequestData urlData = new URLRequestData();
-
-        //urlData.Add("u", "vn9q1k");
-
-        //URLRequest.CreateStrURLRequest(BaseURL + "/user/load", urlData, Debug.Log, URLRequest.Method.POST);
-
-
-        //URLRequestData urlData = new URLRequestData();
-
-        //urlData.Add("u", "1709207727231988804 ");
-
-        //URLRequest.CreateURLRequest(NewBaseURL + "/user/load", urlData, data => Debug.LogWarning(data.ToJson()), URLRequest.Method.POST);
-
+        //AddComment("1710224047970878041", "1710065808151506837", "测试", CommentType.Garden);
 
         //URLRequestData urlData = new URLRequestData();
 
-        //urlData.Add("u", "1706142186026389627");
-        //urlData.Add("n", "123");
+        //urlData.Add("u", "jrjl84");
 
-        //URLRequest.CreateStrURLRequest(BaseURL + "/user/nickname", urlData, Debug.Log, URLRequest.Method.POST);
+        //URLRequest.CreateStrURLRequest(true, NewBaseURL + "/user/load", urlData, Debug.LogWarning, URLRequest.Method.POST);
 
         //urlData = new URLRequestData();
 
-        //urlData.Add("u", "2121212121212121");
-        //urlData.Add("n", "123");
+        //urlData.Add("u", "1708014471457405866");
 
-        //URLRequest.CreateStrURLRequest(BaseURL + "/user/nickname", urlData, Debug.Log, URLRequest.Method.POST);
+        //URLRequest.CreateStrURLRequest(true, NewBaseURL + "/user/load", urlData, Debug.Log, URLRequest.Method.POST);
 
 
         //URLRequestData urlData = new URLRequestData();
 
-        //urlData.Add("i", "");
+        //urlData.Add("u", "1710224047970878041");
+        //urlData.Add("u", "1710065808151506837");
 
-        //URLRequest.CreateStrURLRequest("https://garden.dashgame.com/index.php/home/user/rand", urlData, Debug.Log, URLRequest.Method.POST);
+        //URLRequest.CreateStrURLRequest(true, NewBaseURL + "/user/other", urlData, Debug.Log, URLRequest.Method.POST);
 
 
         //URLRequestData urlData = new URLRequestData();
 
-        //urlData.Add("u", "hsoiv1");
-
-        //URLRequest.CreateStrURLRequest("https://garden.dashgame.com/index.php/home/user/load", urlData, Debug.Log, URLRequest.Method.POST);
-
-
-        //Login((data => print(data.ToJson())));
-
-        //Download("ytcy9g",(data)=> { print(data.ToJson()); });
-
-        //Other("1704189794672324513", (data) => { print(data.ToJson()); });
-
-        //for (int i = 0; i < 10; i++)
-        //{
-        //    string str = "";
-
-        //    for (int j = 0; j < 80; j++)
-        //    {
-        //        str += Random.Range(0, 100);
-        //    }
-
-        //    AddComment("1704189794672324513", "1706142186026389627", 1, CommentType.Garden);
-        //}
-
-        //GetComment("123", "0", CommentType.Garden);
-
-        //Praise("1704189794672324513", "1704189794672324513");
+        //urlData.Add("u", "1710224047970878041");
+        //urlData.Add("u", "1710065808151506837");
 
-        //Target("", "1704189794672324513",null);
+        //URLRequest.CreateStrURLRequest(true, NewBaseURL + "/user/load", urlData, Debug.Log, URLRequest.Method.POST);
     }
 
     public void Update()
@@ -361,24 +290,24 @@ public class ManaServer : Regist
     {
         //Debug.Log("A");
         IndexRequest
-            (
-                data =>
-                {
-                    //Debug.Log("B");
-                    URLRequestData urlData = new URLRequestData();
-                    URLRequest.CreateStrURLRequest
-                        (
-                            true,
-                            data["l"][3]["val"].ToString(),
-                            urlData,
-                            notificationXml =>
-                            {
-                                //Debug.Log("C");
-                                NotificationCallback(notificationXml);
-                            }
-                        );
-                }
-            );
+        (
+            data =>
+            {
+                //Debug.Log("B");
+                URLRequestData urlData = new URLRequestData();
+                URLRequest.CreateStrURLRequest
+                (
+                    true,
+                    data["l"][3]["val"].ToString(),
+                    urlData,
+                    notificationXml =>
+                    {
+                        //Debug.Log("C");
+                        NotificationCallback(notificationXml);
+                    }
+                );
+            }
+        );
     }
 
     public static void NotificationCallback(string xml)
@@ -582,13 +511,18 @@ public class ManaServer : Regist
 
     public static void GetComment(string id, string page, CommentType type, Action<JsonData> callback)
     {
+        JsonData defaultData = new JsonData();
+        defaultData["error"] = 0;
+
         if (string.IsNullOrEmpty(id))
         {
+            callback.Invoke(defaultData);
             return;
         }
 
         if (id.ToLower() == "default")
         {
+            callback.Invoke(defaultData);
             return;
         }
 
@@ -667,22 +601,22 @@ public class ManaServer : Regist
         //          "</mail>";
 
         IndexRequest
-            (
-                data =>
-                {
-                    URLRequestData urlData = new URLRequestData();
-                    URLRequest.CreateStrURLRequest
-                        (
-                            true,
-                            data["l"][1]["val"].ToJson().Trim('"'),
-                            urlData,
-                            mailXml =>
-                            {
-                                MailXml = mailXml;
-                            }
-                        );
-                }
-            );
+        (
+            data =>
+            {
+                URLRequestData urlData = new URLRequestData();
+                URLRequest.CreateStrURLRequest
+                (
+                    true,
+                    data["l"][1]["val"].ToJson().Trim('"'),
+                    urlData,
+                    mailXml =>
+                    {
+                        MailXml = mailXml;
+                    }
+                );
+            }
+        );
     }
 
     public static void GetMailReward()
@@ -923,33 +857,33 @@ public class ManaServer : Regist
     public static void PackTypeRequest()
     {
         IndexRequest
-            (
-                data =>
-                {
-                    PackLock = Auxiliary.BoolParse(data["l"][0]["val"].ToJson().Trim('"'), true);
+        (
+            data =>
+            {
+                PackLock = Auxiliary.BoolParse(data["l"][0]["val"].ToJson().Trim('"'), true);
 
-                    if (Application.platform == RuntimePlatform.Android)
-                    {
-                        PackLock = true;
-                    }
+                if (Application.platform == RuntimePlatform.Android)
+                {
+                    PackLock = true;
+                }
 
-                    if (ManaData.PlayerDoc_ != null)
-                    {
-                        ManaData.SavePlayerBool("PackLock", PackLock);
-                    }
+                if (ManaData.PlayerDoc_ != null)
+                {
+                    ManaData.SavePlayerBool("PackLock", PackLock);
                 }
-            );
+            }
+        );
     }
 
     public static void IOSAlipayRequest()
     {
         IndexRequest
-            (
-                data =>
-                {
-                    ManaIAP.UseAlipayOnIOS = Auxiliary.BoolParse(data["l"][2]["val"].ToJson().Trim('"'), false);
-                }
-            );
+        (
+            data =>
+            {
+                ManaIAP.UseAlipayOnIOS = Auxiliary.BoolParse(data["l"][2]["val"].ToJson().Trim('"'), false);
+            }
+        );
     }
 
 
@@ -1054,7 +988,7 @@ public class ManaServer : Regist
     public static void Other(string id, URLRequest.URLRequestJsonCallBackDelegate callback)
     {
         URLRequestData urlData = new URLRequestData();
-        //Debug.LogError(id);
+
         urlData.Add("u", id);
 
         URLRequest.CreateURLRequest(true, NewBaseURL + "/user/other", urlData, callback, URLRequest.Method.POST);

+ 3 - 0
Assets/Script/Manage/ManaSocial.cs

@@ -318,6 +318,7 @@ public class ManaSocial : Regist
                 CommentType.Garden,
                 data =>
                 {
+                    Debug.LogWarning("callback");
                     if (!UpdateLock)
                     {
                         InputCommentData(IsPlayer, data);
@@ -339,6 +340,7 @@ public class ManaSocial : Regist
                 CommentType.Garden,
                 data =>
                 {
+                    Debug.LogWarning("callback");
                     if (!UpdateLock)
                     {
                         InputCommentData(IsPlayer, data);
@@ -390,6 +392,7 @@ public class ManaSocial : Regist
                 CommentType.Garden,
                 data =>
                 {
+                    Debug.LogWarning("callback");
                     if (!ManaVisit.InVisit)
                     {
                         DelayCall.Call(0.5f, () => ManaReso.Get("Q_Tip").TweenBacCG());

+ 3 - 0
第三期.txt

@@ -1,3 +1,6 @@
+用短码下载存档的问题
+
+
 关闭ManaDebug 开启CatchException
 
 切换到远程服务器