Browse Source

修复-卸载后不能自动恢复存档 修复-签到Bug一个

LiuQilin 8 năm trước cách đây
mục cha
commit
7a3ef630d5

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

@@ -46,6 +46,7 @@ public class Initializer : MonoBehaviour
         gameObject.AddComponent<ManaIAP>();
 
         gameObject.AddScript<Auxiliary>();
+        gameObject.AddScript<ManaData>();
         gameObject.AddScript<ManaReso>();
         gameObject.AddScript<ManaTutorial>();
 

+ 13 - 2
Assets/Script/Manage/ManaCenter.cs

@@ -544,6 +544,18 @@ public class ManaCenter : Regist
                 ManaReso.Get("Ba_Notice").TweenForCG();
             }
         }
+        if (!ManaTutorial.TutorialA && ManaData.GetPlayerBool("QuitFlag") && ManaServer.Connect)
+        {
+            int daySpan = ManaServer.Time.Day - ManaSign.SignTime.Day;
+            int yearSpan = ManaServer.Time.Year - ManaSign.SignTime.Year;
+            int monthSpan = ManaServer.Time.Month - ManaSign.SignTime.Month;
+
+            if (daySpan >= 1 || yearSpan >= 1 || monthSpan >= 1)
+            {
+                ManaReso.Get("B_SignIn").TweenForCG();
+                ManaReso.Get("Bb_SignIn").TweenForCG();
+            }
+        }
     }
 
     public override void Instantiate()
@@ -928,7 +940,6 @@ public class ManaCenter : Regist
             return;
         }
 
-
         if (ManaServer.Connect)
         {
             if (ManaData.GetPlayerString("ID") == "Default")
@@ -954,7 +965,7 @@ public class ManaCenter : Regist
         }
         else
         {
-            if (!ManaTutorial.TutorialA && ManaData.GetPlayerBool("QuitFlag"))
+            if (!ManaTutorial.TutorialA && ManaData.GetPlayerBool("QuitFlag") && ManaServer.Connect)
             {
                 int daySpan = ManaServer.Time.Day - ManaSign.SignTime.Day;
                 int yearSpan = ManaServer.Time.Year - ManaSign.SignTime.Year;

+ 55 - 17
Assets/Script/Manage/ManaData.cs

@@ -10,7 +10,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Security.Cryptography;
 
-public class ManaData
+public class ManaData : Regist
 {
     #region 变量
 
@@ -87,12 +87,13 @@ public class ManaData
 
                             if (PlayerPrefs.GetString("config") != Auxiliary.ToString(md5.ComputeHash(bytes)))
                             {
-                                Debug.LogWarning("Damage");
-                                ManaDebug.Log("Damage");
+                                Debug.LogWarning("Download Archive");
+                                ManaDebug.Log("Download Archive");
 
                                 DamageLock = true;
+                                DownloadLock = false;
 
-                                ManaServer.Download(PlayerPrefs.GetString("id"), RecoveXml);
+                                //ManaServer.Download(PlayerPrefs.GetString("id"), RecoveXml);
 
                                 return null;
                             }
@@ -107,21 +108,15 @@ public class ManaData
 
                     DefaultDoc.LoadXml(textAsset.text);
 
-                    if (!string.IsNullOrEmpty(PlayerPrefs.GetString("id")))
-                    {
-                        Debug.LogWarning("Damage");
-                        ManaDebug.Log("Damage");
+                    Debug.LogWarning("Download Archive");
+                    ManaDebug.Log("Download Archive");
 
-                        DamageLock = true;
+                    DamageLock = true;
+                    DownloadLock = false;
 
-                        ManaServer.Download(PlayerPrefs.GetString("id"), RecoveXml);
+                    //ManaServer.Download(PlayerPrefs.GetString("id"), RecoveXml);
 
-                        return null;
-                    }
-                    else
-                    {
-                        PlayerDoc_ = DefaultDoc;
-                    }
+                    return null;
                 }
             }
 
@@ -133,11 +128,54 @@ public class ManaData
     public static XmlNode PlayerNode_;
     public static XmlDocument PlayerDoc_;
 
+    public static float Timer;
     public static bool DamageLock;
+    public static bool DownloadLock;
     public static XmlDocument DefaultDoc = new XmlDocument();
 
     #endregion
 
+    public void Update()
+    {
+        if (!DownloadLock)
+        {
+            Timer += Time.fixedDeltaTime;
+
+            if (Timer >= 10)
+            {
+                DamageLock = false;
+
+                TextAsset textAsset = ManaReso.Load<TextAsset>("PlayerConfig", Folder.Config);
+
+                PlayerDoc_ = new XmlDocument();
+
+                PlayerDoc_.LoadXml(textAsset.text);
+
+                return;
+            }
+            
+            if (ManaServer.ID != "Default")
+            {
+                DownloadLock = true;
+
+                ManaServer.Download(ManaServer.ID, RecoveXml);
+            }
+        }
+    }
+
+    public override bool RegistImmed()
+    {
+        if (base.RegistImmed())
+        {
+            return true;
+        }
+
+        enabled = true;
+
+        return false;
+    }
+
+
     public static void SaveXml()
     {
         if (Initializer.Complete)
@@ -173,7 +211,7 @@ public class ManaData
             PlayerDoc_ = new XmlDocument();
 
             PlayerDoc_.LoadXml(jsonData["l"].ToString());
-            
+
             SavePlayerInt("Version", int.Parse(DefaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Version").Attributes[0].Value));
         }
         else

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

@@ -118,7 +118,7 @@ public class ManaServer : Regist
     private static void LoginCallback(JsonData jsonData)
     {
         Complete = true;
-
+        
         if (jsonData.Inst_Object.ContainsKey("c"))
         {
             Connect = true;
@@ -129,7 +129,11 @@ public class ManaServer : Regist
             Time = DateUtil.GetTime(jsonData["time"].ToJson());
 
 
-            if (ManaData.PlayerDoc_ != null)
+            if (ManaData.DamageLock)
+            {
+                ID = jsonData["o"].ToString();
+            }
+            else if (ManaData.PlayerDoc_ != null)
             {
                 if (ManaData.GetPlayerString("ID") == "Default")
                 {

+ 1 - 1
Assets/Script/Object/Star.cs

@@ -107,7 +107,7 @@ public class Star : MonoBehaviour, IPointerClickHandler
         }
         else if (forceRight)
         {
-            speedX = speedX;
+            
         }
         else
         {

+ 2 - 2
Assets/Script/Tool/Auxiliary.cs

@@ -120,12 +120,12 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.Escape))
         {
-            
+
         }
 
         if (Input.GetKeyDown(KeyCode.Z))
         {
-            ManaCenter.Coin += Amount.万万亿;
+            //ManaServer.Download("hsoiv1", (data => Debug.Log(data.ToJson())));
         }
 
         if (Input.GetKeyDown(KeyCode.X))

BIN
ProjectSettings/GraphicsSettings.asset


BIN
ProjectSettings/ProjectSettings.asset


+ 7 - 0
ToList.txt

@@ -8,7 +8,14 @@
 
 //打包时重新导入配置
 
+先开启Service再打包
+
 更新版本号
+ 
+
+修复签到的Bug一个
+
+卸载安装时的存档(有网没网 服务器端有存档 服务器端没有存档)
 
 
 监督补上循环特效