Ver código fonte

修改重玩功能

LiuQilin 7 anos atrás
pai
commit
6e5da1290c

+ 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

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

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

+ 1 - 1
Assets/Resource/XML/PlayerConfig.xml

@@ -1,6 +1,6 @@
 <PlayerConfig>
   <Version value="11" />
-  <ReplayVersion value="0" />
+  <ReplayVersion value="1" />
   
   <ID value="Default" />
   <SerialNumber value="Default" />

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

@@ -714,7 +714,6 @@ public class ManaCenter : Regist
 
     public override void RegistValueA()
     {
-        //Debug.LogWarning(ManaData.GetPlayerInt("ReplayVersion"));
         ManaReso.Get<Graphic>("F_Elf").material = ManaReso.Load<Material>("GrayMat", Folder.UI);
         ManaReso.Get<Graphic>("F_Store").material = ManaReso.Load<Material>("GrayMat", Folder.UI);
         ManaReso.Get<Graphic>("F_Magic").material = ManaReso.Load<Material>("GrayMat", Folder.UI);

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

@@ -113,7 +113,7 @@ public class ManaData : Regist
                                 bytes = File.ReadAllBytes(configPath);
                             }
 
-                            if (PlayerPrefs.GetString(Lib.ConfigPrefs) != "" && PlayerPrefs.GetString("config") != Auxiliary.ToString(md5.ComputeHash(bytes)))
+                            if (PlayerPrefs.GetString(Lib.ConfigPrefs) != "" && PlayerPrefs.GetString(Lib.ConfigPrefs) != Auxiliary.ToString(md5.ComputeHash(bytes)))
                             {
                                 Debug.LogWarning("Download Archive : MD5 doesn't match");
                                 //ManaDebug.Log("Download Archive");
@@ -1446,6 +1446,7 @@ public class ManaData : Regist
 
     public static XmlDocument To11(XmlDocument nativeDoc, XmlDocument defaultDoc)
     {
+        nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Version").Attributes[0].Value = 11.ToString();
         XmlNode xmlNode = defaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("ReplayVersion");
 
         nativeDoc.SelectSingleNode("PlayerConfig").AppendChild(nativeDoc.ImportNode(xmlNode, true));

+ 8 - 1
Assets/Script/Manage/ManaServer.cs

@@ -105,6 +105,7 @@ public class ManaServer : Regist
     public static bool Complete;
     public static bool FirstConnect = true;
 
+    public static int ReplayVersion;
     public static string ID = "Default";
     public static string SerialNumber = "Default";
     public static string ReportContent;
@@ -174,6 +175,11 @@ public class ManaServer : Regist
         return false;
     }
 
+    public override void RegistValueA()
+    {
+        ReplayVersion = ManaData.GetPlayerInt("ReplayVersion");
+    }
+
 
     public static void SetNickName(string nickname, Action succeedCallback, Action failCallback)
     {
@@ -953,13 +959,14 @@ public class ManaServer : Regist
         URLRequestData urlData = new URLRequestData();
         
         urlData.Add("u", SerialNumber);
+        urlData.Add("v", ReplayVersion);
 
         ManaData.SavePlayerConfig();
 
         urlData.Add("l", ManaData.PlayerDoc.OuterXml);
 
         URLRequest.CreateURLRequest(false, NewBaseURL + "/user/save", urlData, SaveCallback, URLRequest.Method.POST);
-        //URLRequest.CreateStrURLRequest(NewBaseURL + "/user/save", urlData, Debug.Log, URLRequest.Method.POST);
+        //URLRequest.CreateStrURLRequest(false, NewBaseURL + "/user/save", urlData, Debug.Log, URLRequest.Method.POST);
     }
 
     private static void SaveCallback(JsonData jsonData)

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

@@ -140,136 +140,136 @@ public class Auxiliary : Regist
 
         //}
 
-        if (Input.GetKeyDown(KeyCode.Space))
-        {
-            Resources.UnloadAsset(ManaReso.Get("U_LoadingPanel"));
-            //foreach (var VARIABLE in ChestMge.PlazaRoomChests)
-            //{
-            //    VARIABLE.ShadowSR.material = UnityFactory.Materials[0];
-            //    VARIABLE.ChestSR.material = UnityFactory.Materials[0];
-            //}
-
-            //ManaSocial.CloseCommentPanel();
-            //Debug.LogWarning(ManaServer.SerialNumber);
-            //SFSManager.GardenSmartFox.EventManager.PlazaRoomEvent.CheckDefaultRoomStatus(1);
-            //ManaReso.Get<VerticalLayoutGroup>("R_Grid").CalculateLayoutInputVertical();
-            //ManaReso.Get<VerticalLayoutGroup>("R_Grid").SetLayoutVertical();
-        }
+        //if (Input.GetKeyDown(KeyCode.Space))
+        //{
+        //    Resources.UnloadAsset(ManaReso.Get("U_LoadingPanel"));
+        //    foreach (var VARIABLE in ChestMge.PlazaRoomChests)
+        //    {
+        //        VARIABLE.ShadowSR.material = UnityFactory.Materials[0];
+        //        VARIABLE.ChestSR.material = UnityFactory.Materials[0];
+        //    }
 
-        if (Input.GetKeyDown(KeyCode.A))
-        {
-            ManaSocial.UpdatePage(true);
-            //PlazaRoomMge.DownloadRoomData(0);
-            //DatabaseManager.GetRoomList(-1);
+        //    ManaSocial.CloseCommentPanel();
+        //    Debug.LogWarning(ManaServer.SerialNumber);
+        //    SFSManager.GardenSmartFox.EventManager.PlazaRoomEvent.CheckDefaultRoomStatus(1);
+        //    ManaReso.Get<VerticalLayoutGroup>("R_Grid").CalculateLayoutInputVertical();
+        //    ManaReso.Get<VerticalLayoutGroup>("R_Grid").SetLayoutVertical();
+        //}
 
-            //ManaServer.NotificationIndex = ManaData.GetPlayerInt("NotificationIndex") + 1;
-            //ManaCenter.OfflineLock = true;
-            //ManaSign.ShowOfflinePanel();
+        //if (Input.GetKeyDown(KeyCode.A))
+        //{
+        //    ManaSocial.UpdatePage(true);
+        //    PlazaRoomMge.DownloadRoomData(0);
+        //    DatabaseManager.GetRoomList(-1);
 
-            //ManaTutorial.EnterC1();
-        }
+        //    ManaServer.NotificationIndex = ManaData.GetPlayerInt("NotificationIndex") + 1;
+        //    ManaCenter.OfflineLock = true;
+        //    ManaSign.ShowOfflinePanel();
 
-        if (Input.GetKeyDown(KeyCode.S))
-        {
-            ManaTutorial.EnterD1();
-        }
+        //    ManaTutorial.EnterC1();
+        //}
 
-        if (Input.GetKeyDown(KeyCode.D))
-        {
-            //SFSManager.GardenSmartFox.PlazaRoomManager.BeginEnterPlazaRoom();
-        }
+        //if (Input.GetKeyDown(KeyCode.S))
+        //{
+        //    ManaTutorial.EnterD1();
+        //}
 
-        if (Input.GetKeyDown(KeyCode.Z))
-        {
-            //byte[] bytes = Encoding.UTF8.GetBytes(ManaData.PlayerDoc.OuterXml);
+        //if (Input.GetKeyDown(KeyCode.D))
+        //{
+        //    SFSManager.GardenSmartFox.PlazaRoomManager.BeginEnterPlazaRoom();
+        //}
 
-            //MD5 md5 = new MD5CryptoServiceProvider();
+        //if (Input.GetKeyDown(KeyCode.Z))
+        //{
+        //    byte[] bytes = Encoding.UTF8.GetBytes(ManaData.PlayerDoc.OuterXml);
 
-            //PlayerPrefs.SetString("config", ToString(md5.ComputeHash(bytes)));
+        //    MD5 md5 = new MD5CryptoServiceProvider();
 
-            ManaCenter.MiniTimer = 0;
+        //    PlayerPrefs.SetString("config", ToString(md5.ComputeHash(bytes)));
 
-            //GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.OnEnterPlazaRoomButton();
-        }
+        //    ManaCenter.MiniTimer = 0;
 
-        if (Input.GetKeyDown(KeyCode.X))
-        {
-            //GardenSmartFoxManager.GardenSmartFox.ExtensionManager.PlazaRoomExtension.SendPublicMessage("123");
+        //    GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.OnEnterPlazaRoomButton();
+        //}
 
-            //ManaPlayer.Player.PlayAnim("newAnimation");
+        //if (Input.GetKeyDown(KeyCode.X))
+        //{
+        //    GardenSmartFoxManager.GardenSmartFox.ExtensionManager.PlazaRoomExtension.SendPublicMessage("123");
 
-            //StartCoroutine(ManaServer.DownloadAllAsset(new List<string>() { "http://or5zgoeui.bkt.clouddn.com/game_icon.png", "https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=3853411417,2245648913&fm=26&gp=0.jpg" }, ManaServer.DownloadAllTexture));
+        //    ManaPlayer.Player.PlayAnim("newAnimation");
 
-            ManaMiniGame.GameTimer = 45;
+        //    StartCoroutine(ManaServer.DownloadAllAsset(new List<string>() { "http://or5zgoeui.bkt.clouddn.com/game_icon.png", "https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=3853411417,2245648913&fm=26&gp=0.jpg" }, ManaServer.DownloadAllTexture));
 
-            //Lottery.TempTypeList = new List<int>();
-            //Lottery.TempValueList = new List<int>();
-            //Lottery.TempLotteryList = new List<Lottery>();
+        //    ManaMiniGame.GameTimer = 45;
 
-            //Lottery.EnterAnimation();
+        //    Lottery.TempTypeList = new List<int>();
+        //    Lottery.TempValueList = new List<int>();
+        //    Lottery.TempLotteryList = new List<Lottery>();
 
-            //ManaReso.Get("Bc_LotteryItem1").TweenForEuler();
-            //ManaReso.Get("Bc_LotteryItem2").TweenForEuler();
-            //ManaReso.Get("Bc_LotteryItem3").TweenForEuler();
-        }
+        //    Lottery.EnterAnimation();
 
-        if (Input.GetKeyDown(KeyCode.C))
-        {
-            //GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.SendExpression(ExpressionID.郁闷);
+        //    ManaReso.Get("Bc_LotteryItem1").TweenForEuler();
+        //    ManaReso.Get("Bc_LotteryItem2").TweenForEuler();
+        //    ManaReso.Get("Bc_LotteryItem3").TweenForEuler();
+        //}
 
-            //SFSObject sfsObject = new SFSObject();
-            //sfsObject.PutInt(DataID.SenderID.GetHashString(), 0);
-            //sfsObject.PutText(DataID.Message.GetHashString(), "123");
+        //if (Input.GetKeyDown(KeyCode.C))
+        //{
+        //    GardenSmartFoxManager.GardenSmartFox.PlazaRoomManager.SendExpression(ExpressionID.郁闷);
 
-            //SFSObject parameter = GardenSmartFox.ConstructCommandParameter(CommandID.ReceivePublicMessage.GetHashCode(), sfsObject, -1);
+        //    SFSObject sfsObject = new SFSObject();
+        //    sfsObject.PutInt(DataID.SenderID.GetHashString(), 0);
+        //    sfsObject.PutText(DataID.Message.GetHashString(), "123");
 
-            //GardenSmartFoxManager.GardenSmartFox.AddRequest(parameter, RequestType.Immediate);
+        //    SFSObject parameter = GardenSmartFox.ConstructCommandParameter(CommandID.ReceivePublicMessage.GetHashCode(), sfsObject, -1);
 
-            //GardenSmartFoxManager.GardenSmartFox.SmartFox.Send(new ExtensionRequest("0", sfsObject));
+        //    GardenSmartFoxManager.GardenSmartFox.AddRequest(parameter, RequestType.Immediate);
 
-            //ManaPlayer.Player.PlayAnim("newAnimation1");
+        //    GardenSmartFoxManager.GardenSmartFox.SmartFox.Send(new ExtensionRequest("0", sfsObject));
 
-            //ManaReso.Get("C_Notify").TweenForCG();
+        //    ManaPlayer.Player.PlayAnim("newAnimation1");
 
-            ManaMiniGame.Score += 400;
+        //    ManaReso.Get("C_Notify").TweenForCG();
 
-            //ManaSign.SignTime = new DateTime(2007, 1, 1);
-        }
+        //    ManaMiniGame.Score += 400;
 
-        if (Input.GetKeyDown(KeyCode.V))
-        {
-            //ManaData.PlayerDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Version").Attributes[0].Value = 6.ToString();
-            //ManaData.PlayerNode.RemoveChild(ManaData.PlayerNode.SelectSingleNode("FlowerAmtList"));
+        //    ManaSign.SignTime = new DateTime(2007, 1, 1);
+        //}
 
-            Debug.Log(ManaData.GetPlayerString("FlowerList"));
-            Debug.Log(ManaData.GetPlayerString("FlowerAmtList"));
+        //if (Input.GetKeyDown(KeyCode.V))
+        //{
+        //    ManaData.PlayerDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Version").Attributes[0].Value = 6.ToString();
+        //    ManaData.PlayerNode.RemoveChild(ManaData.PlayerNode.SelectSingleNode("FlowerAmtList"));
 
-            //ManaPlayer.Player.PlayAnim("newAnimation2");
+        //    Debug.Log(ManaData.GetPlayerString("FlowerList"));
+        //    Debug.Log(ManaData.GetPlayerString("FlowerAmtList"));
 
-            //ManaPlayer.Player.Flip(PlayerDirection.Right);
+        //    ManaPlayer.Player.PlayAnim("newAnimation2");
 
-            //ManaServer.MailReward mailReward = new ManaServer.MailReward("1", "pack", "4");
-            //ManaServer.MailReward mailReward1 = new ManaServer.MailReward("1", "close", "2");
+        //    ManaPlayer.Player.Flip(PlayerDirection.Right);
 
-            //ManaServer.GetMainReward(mailReward);
-            //ManaServer.GetMainReward(mailReward1);
+        //    ManaServer.MailReward mailReward = new ManaServer.MailReward("1", "pack", "4");
+        //    ManaServer.MailReward mailReward1 = new ManaServer.MailReward("1", "close", "2");
 
-            //ManaGarden.ElfTimer = 0;
+        //    ManaServer.GetMainReward(mailReward);
+        //    ManaServer.GetMainReward(mailReward1);
 
-            //ManaServer.Time = new DateTime(2007, 1, 1);
-        }
+        //    ManaGarden.ElfTimer = 0;
 
-        if (Input.GetKeyDown(KeyCode.B))
-        {
-            //ManaPlayer.Player.PlayAnim("newAnimation3");
+        //    ManaServer.Time = new DateTime(2007, 1, 1);
+        //}
+
+        //if (Input.GetKeyDown(KeyCode.B))
+        //{
+        //    ManaPlayer.Player.PlayAnim("newAnimation3");
 
-            //ManaPlayer.Player.Flip(PlayerDirection.Left);
+        //    ManaPlayer.Player.Flip(PlayerDirection.Left);
 
-            //foreach (var VARIABLE in ManaPlayer.CloseUnitDic)
-            //{
-            //    VARIABLE.Value.Unlock();
-            //}
-        }
+        //    foreach (var VARIABLE in ManaPlayer.CloseUnitDic)
+        //    {
+        //        VARIABLE.Value.Unlock();
+        //    }
+        //}
 
         //if (Input.GetKeyDown(KeyCode.M))
         //{