瀏覽代碼

Merge branch '第三期' of http://git.dashgame.com/gsgundam/garden_client into 第四期

LiuQilin 7 年之前
父節點
當前提交
4e6cb36e9c
共有 3 個文件被更改,包括 12 次插入9 次删除
  1. 3 4
      Assets/Resource/Logo.unity
  2. 2 2
      Assets/Script/Manage/ManaServer.cs
  3. 7 3
      Assets/Script/Manage/ManaVisit.cs

+ 3 - 4
Assets/Resource/Logo.unity

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

+ 2 - 2
Assets/Script/Manage/ManaServer.cs

@@ -131,7 +131,7 @@ public class ManaServer : Regist
 
         //URLRequestData urlData = new URLRequestData();
 
-        //urlData.Add("u", "1710066204207012789");
+        //urlData.Add("u", "1709207727231988804");
 
         //URLRequest.CreateStrURLRequest(true, NewBaseURL + "/user/other", urlData, Debug.Log, URLRequest.Method.POST);
     }
@@ -898,7 +898,7 @@ public class ManaServer : Regist
         if (jsonData.Inst_Object.ContainsKey("c"))
         {
             Connect = true;
-
+            //Debug.Log(jsonData.ToJson());
             JsonData = jsonData;
 
             Time = DateUtil.GetTime(jsonData["time"].ToJson());

+ 7 - 3
Assets/Script/Manage/ManaVisit.cs

@@ -674,7 +674,7 @@ public class ManaVisit : Regist
     public static void SetVisiteePraise(XmlDocument document)
     {
         ManaSocial.PraiseText.text = VisiteePraise.ToString();
-
+        //Debug.Log(VisiteeSerialNumber);
         ManaServer.Target
         (
             ManaServer.SerialNumber,
@@ -856,6 +856,7 @@ public class ManaVisit : Regist
                 data =>
                 {
                     //Debug.LogWarning(data.ToJson());
+                    VisiteeSerialNumber = info;
                     PullArchiveCallback(data, ShowFailPanel, EnterVisiteeGarden);
                 }
             );
@@ -915,10 +916,13 @@ public class ManaVisit : Regist
     public static void EnterVisiteeGarden(JsonData jsonData)
     {
         LoadComplete = true;
-        Debug.Log(jsonData.ToJson());
+        //Debug.Log(jsonData.ToJson());
         XmlStr = jsonData["l"].ToString();
         VisiteePraise = int.Parse(jsonData["p"].ToString());
-        VisiteeSerialNumber = jsonData["i"].ToString();
+        if (jsonData.Inst_Object.ContainsKey("i"))
+        {
+            VisiteeSerialNumber = jsonData["i"].ToString();
+        }
 
         Document = new XmlDocument();
         Document.LoadXml(XmlStr);