Browse Source

Fix few bugs

LiuQilin 8 years ago
parent
commit
a84a61bffb
33 changed files with 408 additions and 269 deletions
  1. BIN
      .vs/MyLovelyGarden/v14/.suo
  2. BIN
      Assets/Resource/Logo.unity
  3. BIN
      Assets/Resource/Sprite/Garden/New LightmapParameters.giparams
  4. 8 0
      Assets/Resource/Sprite/Garden/New LightmapParameters.giparams.meta
  5. 11 13
      Assets/Resource/XML/PlayerConfig.xml
  6. 1 0
      Assets/Resource/XML/lan/ChineseSimplified.xml
  7. 1 0
      Assets/Resource/XML/lan/ChineseTraditional.xml
  8. 1 0
      Assets/Resource/XML/lan/English.xml
  9. BIN
      Assets/Resource/Xlsx/language_config.xlsx
  10. 6 4
      Assets/Script/Manage/Initializer.cs
  11. 6 6
      Assets/Script/Manage/ManaAchieve.cs
  12. 21 19
      Assets/Script/Manage/ManaCenter.cs
  13. 80 147
      Assets/Script/Manage/ManaData.cs
  14. 29 12
      Assets/Script/Manage/ManaGarden.cs
  15. 1 1
      Assets/Script/Manage/ManaMiniGame.cs
  16. 12 4
      Assets/Script/Manage/ManaReso.cs
  17. 21 2
      Assets/Script/Manage/ManaServer.cs
  18. 14 4
      Assets/Script/Manage/ManaUI.cs
  19. 61 27
      Assets/Script/Manage/ManaVisit.cs
  20. 14 10
      Assets/Script/Object/Flower.cs
  21. 14 4
      Assets/Script/Object/Garden.cs
  22. 14 1
      Assets/Script/Object/Skill/Ability.cs
  23. 5 0
      Assets/Script/Object/Skill/BigSkill.cs
  24. 9 1
      Assets/Script/Object/Skill/Pack.cs
  25. 5 0
      Assets/Script/Object/Skill/Skill.cs
  26. 10 0
      Assets/Script/Object/Slot.cs
  27. 2 2
      Assets/Script/Tool/Auxiliary.cs
  28. 5 5
      Assets/Script/Tool/Bundle.cs
  29. 42 0
      Assets/Script/Tool/Extension.cs
  30. 3 3
      MyLovelyGarden.Editor.csproj
  31. 3 2
      MyLovelyGarden.csproj
  32. BIN
      ProjectSettings/GraphicsSettings.asset
  33. 9 2
      ToList.txt

BIN
.vs/MyLovelyGarden/v14/.suo


BIN
Assets/Resource/Logo.unity


BIN
Assets/Resource/Sprite/Garden/New LightmapParameters.giparams


+ 8 - 0
Assets/Resource/Sprite/Garden/New LightmapParameters.giparams.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: eefe082c70c65ba4ca4d83395eb81980
+timeCreated: 1496041458
+licenseType: Pro
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 11 - 13
Assets/Resource/XML/PlayerConfig.xml

@@ -1,10 +1,10 @@
 <PlayerConfig>
-  <Version value="380" />
+  <Version value="411" />
 
   <ID value="Default" />
-////  <TutorialA value="1" />
+////  <TutorialA value="0" />
   <TutorialB value="0" />
-////  <TutorialC value="1" />
+////  <TutorialC value="0" />
   <TutorialIndexA value="1" />
   <TutorialIndexB value="1" />
   <TutorialIndexC value="1" />
@@ -15,9 +15,7 @@
   <SignTime value="4/23/2017 09:30:00 AM" />
   <Language value="ChineseSimplified" />
   
-  <Slot value="1" />
-////  <Coin value="0" />
-////  <Level value="0" />
+  <Coin value="0" />
   <Diamond value="0" />
   <SignIndex value="1" />
   <SignRound value="1" />
@@ -31,13 +29,13 @@
   <AchieveData AD="0" Skill="0" Sign="0" Share="0" ElfLevel="0" MiniGame="0" FlowerCoin="0" TotalPerson="0"/>
 
   <SkillList>
-    <Skill ID="Skill4" SkillType="Skill" ItemStatus="Lock" Level="0" CdTimer="0" EffectTimer="0" />
-    <Skill ID="Skill5" SkillType="Skill" ItemStatus="Lock" Level="0" CdTimer="0" EffectTimer="0" />
-    <Skill ID="Skill6" SkillType="Skill" ItemStatus="Lock" Level="0" CdTimer="0" EffectTimer="0" />
-    <Skill ID="Skill1" SkillType="BigSkill" ItemStatus="Lock" BarStatus="UnLock" Level="0" CdTimer="0" EffectTimer="0" />
-    <Skill ID="Skill2" SkillType="BigSkill" ItemStatus="Lock" BarStatus="UnLock" Level="0" CdTimer="0" EffectTimer="0" />
-    <Skill ID="Skill3" SkillType="BigSkill" ItemStatus="Lock" BarStatus="UnLock" Level="0" CdTimer="0" EffectTimer="0" />
-    <Skill ID="Skill7" SkillType="BigSkill" ItemStatus="Lock" BarStatus="UnLock" Level="0" CdTimer="0" EffectTimer="0" />
+    <Skill ID="Skill4" SkillType="Skill" ItemStatus="Lock" Level="0" CoolTimer="0" UseTimer="0" />
+    <Skill ID="Skill5" SkillType="Skill" ItemStatus="Lock" Level="0" CoolTimer="0" UseTimer="0" />
+    <Skill ID="Skill6" SkillType="Skill" ItemStatus="Lock" Level="0" CoolTimer="0" UseTimer="0" />
+    <Skill ID="Skill1" SkillType="BigSkill" ItemStatus="Lock" BarStatus="UnLock" Level="0" CoolTimer="0" UseTimer="0" />
+    <Skill ID="Skill2" SkillType="BigSkill" ItemStatus="Lock" BarStatus="UnLock" Level="0" CoolTimer="0" UseTimer="0" />
+    <Skill ID="Skill3" SkillType="BigSkill" ItemStatus="Lock" BarStatus="UnLock" Level="0" CoolTimer="0" UseTimer="0" />
+    <Skill ID="Skill7" SkillType="BigSkill" ItemStatus="Lock" BarStatus="UnLock" Level="0" CoolTimer="0" UseTimer="0" />
 
     <Skill ID="Pack1" SkillType="Pack" ItemStatus="Lock" Level="0" />
     <Skill ID="Pack2" SkillType="Pack" ItemStatus="Lock" Level="0" />

+ 1 - 0
Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -202,6 +202,7 @@
     <ShareContent desc=""><![CDATA[分享内容]]></ShareContent>
     <ShareSuccess desc=""><![CDATA[分享成功]]></ShareSuccess>
     <ShareFail desc=""><![CDATA[分享失败]]></ShareFail>
+    <IdentifyID desc=""><![CDATA[相同的ID]]></IdentifyID>
   </Common>
   <AchieveName>
     <Achieve1 desc=""><![CDATA[美丽花园-1]]></Achieve1>

+ 1 - 0
Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -202,6 +202,7 @@
     <ShareContent desc=""><![CDATA[]]></ShareContent>
     <ShareSuccess desc=""><![CDATA[分享成功]]></ShareSuccess>
     <ShareFail desc=""><![CDATA[分享失敗]]></ShareFail>
+    <IdentifyID desc=""><![CDATA[相同的ID]]></IdentifyID>
   </Common>
   <AchieveName>
     <Achieve1 desc=""><![CDATA[美麗花園-1]]></Achieve1>

+ 1 - 0
Assets/Resource/XML/lan/English.xml

@@ -202,6 +202,7 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack6>
     <ShareContent desc=""><![CDATA[]]></ShareContent>
     <ShareSuccess desc=""><![CDATA[Share success]]></ShareSuccess>
     <ShareFail desc=""><![CDATA[Share fail]]></ShareFail>
+    <IdentifyID desc=""><![CDATA[Identify ID]]></IdentifyID>
   </Common>
   <AchieveName>
     <Achieve1 desc=""><![CDATA[Lovely Garden 1]]></Achieve1>

BIN
Assets/Resource/Xlsx/language_config.xlsx


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

@@ -108,13 +108,15 @@ public class Initializer : MonoBehaviour
         
         ManaCenter.LoginCallbackInitial(new JsonData());
 
+        ManaIAP.Initialize();
+
+        ManaVisit.Initialize();
+
         ManaReso.Get("I_BlackMask").TweenForCG();
 
         ManaReso.SetActive("I_Lab", false);
 
-        ManaIAP.Initialize();
-
-        ManaVisit.Initialize();
+        ManaReso.Release();
     }
 
 
@@ -130,7 +132,7 @@ public class Initializer : MonoBehaviour
             yield return null;
         }
 
-        while (ManaData.DamageXml)
+        while (ManaData.DamageLock)
         {
             yield return null;
         }

+ 6 - 6
Assets/Script/Manage/ManaAchieve.cs

@@ -88,7 +88,7 @@ public class Achieve
     public float CoinPerson;
     public float DiamondOnce;
 
-    public bool Valid = true;
+    public bool Lock = true;
     public bool Delete;
     public bool Complete;
     public double TargetValue;
@@ -158,7 +158,7 @@ public class Achieve
         ManaLan.Add(Tit, new LanStr("AchieveName", ID));
 
 
-        if (Valid)
+        if (Lock)
         {
             UpdateStatus();
             
@@ -172,7 +172,7 @@ public class Achieve
 
     public void GetAward()
     {
-        Valid = false;
+        Lock = false;
 
         ManaCenter.Diamond += DiamondOnce;
         ManaCenter.SkillPerson += Person;
@@ -499,15 +499,15 @@ public class ManaAchieve : Regist
 
         for (int i = 0; i < achieveList.Count; i++)
         {
-            AchieveDic[achieveList[i]].Valid = false;
+            AchieveDic[achieveList[i]].Lock = false;
         }
 
 
         foreach (var kv in AchieveDic)
         {
-            if (kv.Value.Valid)
+            if (kv.Value.Lock)
             {
-                if (kv.Value.Parent == -1 || !AchieveDic[kv.Value.Parent].Valid)
+                if (kv.Value.Parent == -1 || !AchieveDic[kv.Value.Parent].Lock)
                 {
                     kv.Value.Regist();
                 }

+ 21 - 19
Assets/Script/Manage/ManaCenter.cs

@@ -470,8 +470,15 @@ public class ManaCenter : Regist
 
     public static void Reload()
     {
+        Complete = false;
+
         SaveTimer = 0;
 
+        ManaTutorial.TutorialB_ = ManaData.GetPlayerBool("TutorialB");
+        ManaTutorial.TutorialC_ = ManaData.GetPlayerBool("TutorialC");
+        ManaTutorial.TutorialIndexB = ManaData.GetPlayerInt("TutorialIndexB");
+        ManaTutorial.TutorialIndexC = ManaData.GetPlayerInt("TutorialIndexC");
+
         foreach (var kv in SkillDic)
         {
             kv.Value.Reactive();
@@ -487,13 +494,6 @@ public class ManaCenter : Regist
 
         Instance.RegistValueB();
 
-
-        ManaTutorial.TutorialB_ = ManaData.GetPlayerBool("TutorialB");
-        ManaTutorial.TutorialC_ = ManaData.GetPlayerBool("TutorialC");
-        ManaTutorial.TutorialIndexB = ManaData.GetPlayerInt("TutorialIndexB");
-        ManaTutorial.TutorialIndexC = ManaData.GetPlayerInt("TutorialIndexC");
-
-
         RegistSkill();
         RegistIncome();
 
@@ -507,6 +507,11 @@ public class ManaCenter : Regist
                 ManaReso.Get("Ba_Notice").TweenForCG();
             }
         }
+
+
+        Complete = true;
+
+        Level = Level;
     }
 
     public override void Reactive()
@@ -898,7 +903,7 @@ public class ManaCenter : Regist
 
     public static void LoginCallbackInitial(JsonData jsonData)
     {
-        if (!Initializer.Complete || !ManaServer.Complete)
+        if (!Initializer.Complete || !ManaServer.Complete || Complete)
         {
             return;
         }
@@ -944,9 +949,9 @@ public class ManaCenter : Regist
         }
 
 
-        Level = ManaData.GetPlayerInt("Level");
-
         Complete = true;
+
+        Level = Level;
     }
 
     public static void LoginCallbackReactive(JsonData jsonData)
@@ -960,7 +965,7 @@ public class ManaCenter : Regist
     }
 
 
-    public static void Download()
+    public static void Download(string id)
     {
         ManaReso.SetText("La_Lab", "连接中");
 
@@ -968,8 +973,6 @@ public class ManaCenter : Regist
         ManaReso.SetActive("La_Mask", true);
 
 
-        string id = ManaReso.Get<InputField>("La_InputField").text;
-
         ManaServer.Download(id, DownloadCallback);
     }
     
@@ -985,14 +988,13 @@ public class ManaCenter : Regist
 
 
             int version = ManaData.GetPlayerInt("Version");
-
-            ManaData.SavePlayerInt("Version", version);
-
-
+            
             ManaData.PlayerDoc.LoadXml(jsonData["l"].ToString());
 
             ManaData.PlayerNode = ManaData.PlayerDoc.SelectSingleNode("PlayerConfig");
 
+            ManaData.SavePlayerInt("Version", version);
+
 
             ManaReso.SetText("L_UserLab", ManaData.GetPlayerString("ID"));
 
@@ -1003,10 +1005,10 @@ public class ManaCenter : Regist
 
             Garden.Reload();
 
+            ManaCenter.Reload();
+
             ManaGarden.Reload();
 
-            ManaCenter.Reload();
-            
             ManaAchieve.Reload();
 
             ManaPlayer.Reload();

+ 80 - 147
Assets/Script/Manage/ManaData.cs

@@ -33,8 +33,8 @@ public class ManaData
         {
             if (PlayerDoc_ == null)
             {
-                int version = 0;
-                int nativeVersion = 0;
+                int version;
+                int nativeVersion;
 
                 XmlNode node;
                 XmlDocument nativeDoc = new XmlDocument();
@@ -83,7 +83,7 @@ public class ManaData
                     else
                     {
                         nativeVersion = int.Parse(node.Attributes[0].Value);
-
+                        
                         if (nativeVersion < version)
                         {
                             StreamWriter sw = new StreamWriter(Application.persistentDataPath + "/PlayerConfig.xml");
@@ -104,7 +104,7 @@ public class ManaData
                             {
                                 Debug.Log("Damage");
 
-                                DamageXml = true;
+                                DamageLock = true;
 
                                 ManaServer.Download(PlayerPrefs.GetString("id"), RecoveXml);
 
@@ -135,7 +135,7 @@ public class ManaData
     public static XmlNode PlayerNode_;
     public static XmlDocument PlayerDoc_;
 
-    public static bool DamageXml;
+    public static bool DamageLock;
 
     #endregion
 
@@ -165,7 +165,7 @@ public class ManaData
 
     public static void RecoveXml(JsonData jsonData)
     {
-        DamageXml = false;
+        DamageLock = false;
 
         if (jsonData.Inst_Object.Keys.Contains("l"))
         {
@@ -208,7 +208,7 @@ public class ManaData
                 xmlNode = xmlNode.AppendChild(PlayerDoc.CreateNode(XmlNodeType.Element, "Skill", ""));
 
                 xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("ID"));
-                xmlAttribute.Value = skill.ID.ToString();
+                xmlAttribute.Value = skill.ID;
 
                 xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("SkillType"));
                 xmlAttribute.Value = skill.SkillType.ToString();
@@ -219,11 +219,11 @@ public class ManaData
                 xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("Level"));
                 xmlAttribute.Value = skill.Level.ToString();
 
-                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("CdTimer"));
-                xmlAttribute.Value = skill.CoolTimer.ToString();
+                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("CoolTimer"));
+                xmlAttribute.Value = skill.CoolTimer.ToString("0");
 
-                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("EffectTimer"));
-                xmlAttribute.Value = skill.UseTimer.ToString();
+                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("UseTimer"));
+                xmlAttribute.Value = skill.UseTimer.ToString("0");
 
                 xmlNode = PlayerNode.SelectSingleNode("SkillList");
 
@@ -238,7 +238,7 @@ public class ManaData
                 xmlNode = xmlNode.AppendChild(PlayerDoc.CreateNode(XmlNodeType.Element, "Skill", ""));
 
                 xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("ID"));
-                xmlAttribute.Value = pack.ID.ToString();
+                xmlAttribute.Value = pack.ID;
 
                 xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("SkillType"));
                 xmlAttribute.Value = pack.SkillType.ToString();
@@ -262,7 +262,7 @@ public class ManaData
                 xmlNode = xmlNode.AppendChild(PlayerDoc.CreateNode(XmlNodeType.Element, "Skill", ""));
 
                 xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("ID"));
-                xmlAttribute.Value = ability.ID.ToString();
+                xmlAttribute.Value = ability.ID;
 
                 xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("SkillType"));
                 xmlAttribute.Value = ability.SkillType.ToString();
@@ -286,7 +286,7 @@ public class ManaData
                 xmlNode = xmlNode.AppendChild(PlayerDoc.CreateNode(XmlNodeType.Element, "Skill", ""));
 
                 xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("ID"));
-                xmlAttribute.Value = bigSkill.ID.ToString();
+                xmlAttribute.Value = bigSkill.ID;
 
                 xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("SkillType"));
                 xmlAttribute.Value = bigSkill.SkillType.ToString();
@@ -300,11 +300,11 @@ public class ManaData
                 xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("Level"));
                 xmlAttribute.Value = bigSkill.Level.ToString();
 
-                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("CdTimer"));
-                xmlAttribute.Value = bigSkill.CoolTimer.ToString();
+                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("CoolTimer"));
+                xmlAttribute.Value = bigSkill.CoolTimer.ToString("0");
 
-                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("EffectTimer"));
-                xmlAttribute.Value = bigSkill.UseTimer.ToString();
+                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("UseTimer"));
+                xmlAttribute.Value = bigSkill.UseTimer.ToString("0");
 
                 xmlNode = PlayerNode.SelectSingleNode("SkillList");
 
@@ -320,7 +320,7 @@ public class ManaData
 
         foreach (var kv in ManaAchieve.AchieveDic)
         {
-            if (!kv.Value.Valid)
+            if (!kv.Value.Lock)
             {
                 xmlNode.Attributes[0].Value += kv.Value.ID_ + " ";
             }
@@ -349,73 +349,35 @@ public class ManaData
         {
             Slot slot = ManaGarden.PlantList[i];
 
-            attribute[0].Value = slot.ID + "," + slot.Index;
-
-            if (i < ManaGarden.PlantList.Count - 1)
-            {
-                attribute[0].Value += " ";
-            }
+            attribute[0].Value = slot.ID + "," + slot.Index + " ";
         }
+
+        attribute[0].Value = attribute[0].Value.TrimEnd(' ');
     }
 
     public static void SaveCommon()
     {
-        if (!ManaTutorial.TutorialA)
-        {
-            PlayerNode.SelectSingleNode("Level").Attributes[0].Value = ManaCenter.Level.ToString();
-        }
-
-        PlayerNode.SelectSingleNode("Slot").Attributes[0].Value = ManaGarden.SlotAmt.ToString();
-        PlayerNode.SelectSingleNode("SignIndex").Attributes[0].Value = ManaSign.SignIndex.ToString();
-        PlayerNode.SelectSingleNode("SignRound").Attributes[0].Value = ManaSign.SignRound.ToString();
         PlayerNode.SelectSingleNode("Coin").Attributes[0].Value = ManaCenter.Coin.ToString("0");
-        PlayerNode.SelectSingleNode("Diamond").Attributes[0].Value = ManaCenter.Diamond.ToString();
-        PlayerNode.SelectSingleNode("QuitTime").Attributes[0].Value = ManaServer.Time.ToString();
-        PlayerNode.SelectSingleNode("MiniTimer").Attributes[0].Value = ManaCenter.MiniTimer.ToString();
-        PlayerNode.SelectSingleNode("CircleTimer").Attributes[0].Value = ManaCenter.CircleTimer.ToString();
-        PlayerNode.SelectSingleNode("MiniGameIndex").Attributes[0].Value = ManaMiniGame.MiniGameIndex.ToString();
-        PlayerNode.SelectSingleNode("Player").Attributes[0].Value = ManaPlayer.SelePlayer;
-        PlayerNode.SelectSingleNode("Language").Attributes[0].Value = ManaLan.CurrentLan.ToString();
+        PlayerNode.SelectSingleNode("Diamond").Attributes[0].Value = ManaCenter.Diamond.ToString("0");
 
-        PlayerNode.SelectSingleNode("ID").Attributes[0].Value = ManaServer.ID;
-        
         PlayerNode.SelectSingleNode("SignTime").Attributes[0].Value = ManaSign.SignTime.ToString();
+        PlayerNode.SelectSingleNode("SignIndex").Attributes[0].Value = ManaSign.SignIndex.ToString();
+        PlayerNode.SelectSingleNode("SignRound").Attributes[0].Value = ManaSign.SignRound.ToString();
 
-        if (ManaServer.Connect)
-        {
-            PlayerNode.SelectSingleNode("QuitFlag").Attributes[0].Value = "1";
-        }
-        else
-        {
-            PlayerNode.SelectSingleNode("QuitFlag").Attributes[0].Value = "0";
-        }
+        PlayerNode.SelectSingleNode("QuitFlag").Attributes[0].Value = ManaServer.Connect.ToInt().ToString();
+        PlayerNode.SelectSingleNode("QuitTime").Attributes[0].Value = ManaServer.Time.ToString();
 
-        if (ManaTutorial.TutorialA)
-        {
-            PlayerNode.SelectSingleNode("TutorialA").Attributes[0].Value = "1";
-        }
-        else
-        {
-            PlayerNode.SelectSingleNode("TutorialA").Attributes[0].Value = "0";
-        }
+        PlayerNode.SelectSingleNode("MiniTimer").Attributes[0].Value = ManaCenter.MiniTimer.ToString("0");
+        PlayerNode.SelectSingleNode("CircleTimer").Attributes[0].Value = ManaCenter.CircleTimer.ToString("0");
 
-        if (ManaTutorial.TutorialB_)
-        {
-            PlayerNode.SelectSingleNode("TutorialB").Attributes[0].Value = "1";
-        }
-        else
-        {
-            PlayerNode.SelectSingleNode("TutorialB").Attributes[0].Value = "0";
-        }
+        PlayerNode.SelectSingleNode("ID").Attributes[0].Value = ManaServer.ID;
+        PlayerNode.SelectSingleNode("Player").Attributes[0].Value = ManaPlayer.SelePlayer;
+        PlayerNode.SelectSingleNode("Language").Attributes[0].Value = ManaLan.CurrentLan.ToString();
+        PlayerNode.SelectSingleNode("MiniGameIndex").Attributes[0].Value = ManaMiniGame.MiniGameIndex.ToString();
 
-        if (ManaTutorial.TutorialC_)
-        {
-            PlayerNode.SelectSingleNode("TutorialC").Attributes[0].Value = "1";
-        }
-        else
-        {
-            PlayerNode.SelectSingleNode("TutorialC").Attributes[0].Value = "0";
-        }
+        PlayerNode.SelectSingleNode("TutorialA").Attributes[0].Value = ManaTutorial.TutorialA.ToInt().ToString();
+        PlayerNode.SelectSingleNode("TutorialB").Attributes[0].Value = ManaTutorial.TutorialB_.ToInt().ToString();
+        PlayerNode.SelectSingleNode("TutorialC").Attributes[0].Value = ManaTutorial.TutorialC_.ToInt().ToString();
 
         PlayerNode.SelectSingleNode("TutorialIndexA").Attributes[0].Value = ManaTutorial.TutorialIndexA.ToString();
         PlayerNode.SelectSingleNode("TutorialIndexB").Attributes[0].Value = ManaTutorial.TutorialIndexB.ToString();
@@ -473,7 +435,7 @@ public class ManaData
                 xmlNode = xmlNode.AppendChild(PlayerDoc.CreateNode(XmlNodeType.Element, "Skill", ""));
 
                 xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("ID"));
-                xmlAttribute.Value = skill.ID.ToString();
+                xmlAttribute.Value = skill.ID;
 
                 xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("SkillType"));
                 xmlAttribute.Value = skill.SkillType.ToString();
@@ -482,13 +444,13 @@ public class ManaData
                 xmlAttribute.Value = SkillStatus.Lock.ToString();
 
                 xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("Level"));
-                xmlAttribute.Value = 0.ToString();
+                xmlAttribute.Value = "0";
 
-                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("CdTimer"));
-                xmlAttribute.Value = 0.ToString();
+                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("CoolTimer"));
+                xmlAttribute.Value = "0";
 
-                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("EffectTimer"));
-                xmlAttribute.Value = 0.ToString();
+                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("UseTimer"));
+                xmlAttribute.Value = "0";
 
                 xmlNode = PlayerNode.SelectSingleNode("SkillList");
 
@@ -503,7 +465,7 @@ public class ManaData
                 xmlNode = xmlNode.AppendChild(PlayerDoc.CreateNode(XmlNodeType.Element, "Skill", ""));
 
                 xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("ID"));
-                xmlAttribute.Value = pack.ID.ToString();
+                xmlAttribute.Value = pack.ID;
 
                 xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("SkillType"));
                 xmlAttribute.Value = pack.SkillType.ToString();
@@ -512,7 +474,7 @@ public class ManaData
                 xmlAttribute.Value = SkillStatus.Lock.ToString();
 
                 xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("Level"));
-                xmlAttribute.Value = 0.ToString();
+                xmlAttribute.Value = "0";
 
                 xmlNode = PlayerNode.SelectSingleNode("SkillList");
 
@@ -527,7 +489,7 @@ public class ManaData
                 xmlNode = xmlNode.AppendChild(PlayerDoc.CreateNode(XmlNodeType.Element, "Skill", ""));
 
                 xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("ID"));
-                xmlAttribute.Value = ability.ID.ToString();
+                xmlAttribute.Value = ability.ID;
 
                 xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("SkillType"));
                 xmlAttribute.Value = ability.SkillType.ToString();
@@ -536,7 +498,7 @@ public class ManaData
                 xmlAttribute.Value = SkillStatus.Lock.ToString();
 
                 xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("Level"));
-                xmlAttribute.Value = 0.ToString();
+                xmlAttribute.Value = "0";
 
                 xmlNode = PlayerNode.SelectSingleNode("SkillList");
 
@@ -551,7 +513,7 @@ public class ManaData
                 xmlNode = xmlNode.AppendChild(PlayerDoc.CreateNode(XmlNodeType.Element, "Skill", ""));
 
                 xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("ID"));
-                xmlAttribute.Value = bigSkill.ID.ToString();
+                xmlAttribute.Value = bigSkill.ID;
 
                 xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("SkillType"));
                 xmlAttribute.Value = bigSkill.SkillType.ToString();
@@ -563,13 +525,13 @@ public class ManaData
                 xmlAttribute.Value = SkillStatus.UnLock.ToString();
 
                 xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("Level"));
-                xmlAttribute.Value = 0.ToString();
+                xmlAttribute.Value = "0";
 
-                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("CdTimer"));
-                xmlAttribute.Value = 0.ToString();
+                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("CoolTimer"));
+                xmlAttribute.Value = "0";
 
-                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("EffectTimer"));
-                xmlAttribute.Value = 0.ToString();
+                xmlAttribute = xmlNode.Attributes.Append(PlayerDoc.CreateAttribute("UseTimer"));
+                xmlAttribute.Value = "0";
 
                 xmlNode = PlayerNode.SelectSingleNode("SkillList");
 
@@ -602,27 +564,30 @@ public class ManaData
 
     public static void ResetCommon()
     {
-        PlayerNode.SelectSingleNode("Slot").Attributes[0].Value = "1";
+        PlayerNode.SelectSingleNode("SignTime").Attributes[0].Value = "4/22/2017 09:30:00 AM";
         PlayerNode.SelectSingleNode("SignIndex").Attributes[0].Value = "1";
         PlayerNode.SelectSingleNode("SignRound").Attributes[0].Value = "1";
+
         PlayerNode.SelectSingleNode("Coin").Attributes[0].Value = "0";
-        PlayerNode.SelectSingleNode("Level").Attributes[0].Value = "0";
         PlayerNode.SelectSingleNode("Diamond").Attributes[0].Value = "0";
-        PlayerNode.SelectSingleNode("QuitTime").Attributes[0].Value = DateTime.Now.ToString();
-        PlayerNode.SelectSingleNode("MiniTimer").Attributes[0].Value = "0";
+
+        PlayerNode.SelectSingleNode("ID").Attributes[0].Value = "Default";
+        PlayerNode.SelectSingleNode("Player").Attributes[0].Value = "PlayerBlond";
+        PlayerNode.SelectSingleNode("Language").Attributes[0].Value = "ChineseSimplified";
         PlayerNode.SelectSingleNode("CircleTimer").Attributes[0].Value = "10";
+
+        PlayerNode.SelectSingleNode("QuitFlag").Attributes[0].Value = "1";
+        PlayerNode.SelectSingleNode("QuitTime").Attributes[0].Value = "4/22/2017 09:30:00 AM";
+
+        PlayerNode.SelectSingleNode("MiniTimer").Attributes[0].Value = "0";
         PlayerNode.SelectSingleNode("MiniGameIndex").Attributes[0].Value = "0";
-        PlayerNode.SelectSingleNode("Player").Attributes[0].Value = "PlayerBlond";
+
         PlayerNode.SelectSingleNode("TutorialA").Attributes[0].Value = "1";
         PlayerNode.SelectSingleNode("TutorialB").Attributes[0].Value = "1";
         PlayerNode.SelectSingleNode("TutorialC").Attributes[0].Value = "1";
         PlayerNode.SelectSingleNode("TutorialIndexA").Attributes[0].Value = "1";
         PlayerNode.SelectSingleNode("TutorialIndexB").Attributes[0].Value = "1";
         PlayerNode.SelectSingleNode("TutorialIndexC").Attributes[0].Value = "1";
-        PlayerNode.SelectSingleNode("ID").Attributes[0].Value = "Default";
-        PlayerNode.SelectSingleNode("QuitFlag").Attributes[0].Value = "1";
-        PlayerNode.SelectSingleNode("SignTime").Attributes[0].Value = "4/22/2017 09:30:00 AM";
-        PlayerNode.SelectSingleNode("Language").Attributes[0].Value = "ChineseSimplified";
     }
 
     public static void ResetFlowerList()
@@ -651,7 +616,7 @@ public class ManaData
 
     public static bool GetPlayerBool(string node)
     {
-        return Convert.ToBoolean(int.Parse(PlayerNode.SelectSingleNode(node).Attributes[0].Value));
+        return int.Parse(PlayerNode.SelectSingleNode(node).Attributes[0].Value).ToBool();
     }
 
     public static float GetPlayerFloat(string node)
@@ -677,20 +642,7 @@ public class ManaData
 
     public static void SavePlayerBool(string node, bool value)
     {
-        string str;
-
-        if (value)
-        {
-            str = "1";
-        }
-        else
-        {
-            str = "0";
-        }
-
-        PlayerNode.SelectSingleNode(node).Attributes[0].Value = str;
-
-        SaveXml();
+        PlayerNode.SelectSingleNode(node).Attributes[0].Value = value.ToInt().ToString();
     }
 
     public static void SavePlayerFloat(string node, float value)
@@ -715,17 +667,7 @@ public class ManaData
 
         XmlAttributeCollection attribute = PlayerNode.SelectSingleNode("FlowerList").Attributes;
 
-        if (!string.IsNullOrEmpty(attribute[0].Value))
-        {
-            string[] strings = attribute[0].Value.Split(' ');
-
-            for (int i = 0; i < strings.Length; i++)
-            {
-                list.Add(int.Parse(strings[i]));
-            }
-        }
-
-        return list;
+        return Auxiliary.IntListParse(' ', attribute[0].Value, list);
     }
 
     public static List<int> GetAchieveList()
@@ -735,12 +677,10 @@ public class ManaData
 
     public static List<string> GetOfflineConfig()
     {
-        TextAsset textAsset;
+        TextAsset textAsset = ManaReso.Load<TextAsset>("offline_config", Folder.Config);
 
         XmlDocument xmlDoc = new XmlDocument();
 
-        textAsset = ManaReso.Load<TextAsset>("offline_config", Folder.Config);
-
         xmlDoc.LoadXml(textAsset.text);
 
         XmlNode xmlNode = xmlDoc.SelectSingleNode("data").SelectSingleNode("item");
@@ -825,12 +765,10 @@ public class ManaData
 
     public static XmlAttributeCollection GetVisitConfig()
     {
-        TextAsset textAsset;
+        TextAsset textAsset = ManaReso.Load<TextAsset>("visit_config", Folder.Config);
 
         XmlDocument xmlDoc = new XmlDocument();
 
-        textAsset = ManaReso.Load<TextAsset>("visit_config", Folder.Config);
-
         xmlDoc.LoadXml(textAsset.text);
 
         XmlNode xmlNode = xmlDoc.SelectSingleNode("data").SelectSingleNode("item");
@@ -840,11 +778,9 @@ public class ManaData
 
     public static XmlAttributeCollection GetAwardConfig()
     {
-        TextAsset textAsset;
+        TextAsset textAsset = ManaReso.Load<TextAsset>("award_config", Folder.Config);
 
         XmlDocument xmlDoc = new XmlDocument();
-        
-        textAsset = ManaReso.Load<TextAsset>("award_config", Folder.Config);
 
         xmlDoc.LoadXml(textAsset.text);
 
@@ -857,26 +793,26 @@ public class ManaData
     {
         TextAsset textAsset;
         XmlDocument xmlDoc = new XmlDocument();
-        List<XmlNodeList> xmlNodeLists = new List<XmlNodeList>();
+        List<XmlNodeList> xmlNodeList = new List<XmlNodeList>();
         List<XmlAttributeCollection> attributeList = new List<XmlAttributeCollection>();
         
         textAsset = ManaReso.Load<TextAsset>("pack_config", Folder.Config);
         xmlDoc.LoadXml(textAsset.text);
-        xmlNodeLists.Add(xmlDoc.SelectSingleNode("data").SelectNodes("item"));
+        xmlNodeList.Add(xmlDoc.SelectSingleNode("data").SelectNodes("item"));
         
         textAsset = ManaReso.Load<TextAsset>("skill_config", Folder.Config);
         xmlDoc.LoadXml(textAsset.text);
-        xmlNodeLists.Add(xmlDoc.SelectSingleNode("data").SelectNodes("item"));
+        xmlNodeList.Add(xmlDoc.SelectSingleNode("data").SelectNodes("item"));
         
         textAsset = ManaReso.Load<TextAsset>("ability_config", Folder.Config);
         xmlDoc.LoadXml(textAsset.text);
-        xmlNodeLists.Add(xmlDoc.SelectSingleNode("data").SelectNodes("item"));
+        xmlNodeList.Add(xmlDoc.SelectSingleNode("data").SelectNodes("item"));
 
-        for (int i = 0; i < xmlNodeLists.Count; i++)
+        for (int i = 0; i < xmlNodeList.Count; i++)
         {
-            for (int j = 0; j < xmlNodeLists[i].Count; j++)
+            for (int j = 0; j < xmlNodeList[i].Count; j++)
             {
-                attributeList.Add(xmlNodeLists[i][j].Attributes);
+                attributeList.Add(xmlNodeList[i][j].Attributes);
             }
         }
 
@@ -886,13 +822,12 @@ public class ManaData
     public static List<XmlAttributeCollection> GetSignConfig()
     {
         TextAsset textAsset;
-
         XmlNodeList xmlNodeList;
 
         XmlDocument xmlDoc = new XmlDocument();
-
         List<XmlAttributeCollection> attributeList = new List<XmlAttributeCollection>();
         
+
         textAsset = ManaReso.Load<TextAsset>("signin_config", Folder.Config);
 
         xmlDoc.LoadXml(textAsset.text);
@@ -910,13 +845,12 @@ public class ManaData
     public static List<XmlAttributeCollection> GetFlowerConfig()
     {
         TextAsset textAsset;
-
         XmlNodeList xmlNodeList;
 
         XmlDocument xmlDoc = new XmlDocument();
-
         List<XmlAttributeCollection> attributeList = new List<XmlAttributeCollection>();
         
+
         textAsset = ManaReso.Load<TextAsset>("flower_config", Folder.Config);
 
         xmlDoc.LoadXml(textAsset.text);
@@ -934,13 +868,12 @@ public class ManaData
     public static List<XmlAttributeCollection> GetAchieveConfig()
     {
         TextAsset textAsset;
-
         XmlNodeList xmlNodeList;
 
         XmlDocument xmlDoc = new XmlDocument();
-
         List<XmlAttributeCollection> attributeList = new List<XmlAttributeCollection>();
 
+
         textAsset = ManaReso.Load<TextAsset>("achieve_config", Folder.Config);
 
         xmlDoc.LoadXml(textAsset.text);

+ 29 - 12
Assets/Script/Manage/ManaGarden.cs

@@ -144,7 +144,7 @@ public class ManaGarden : Regist
 
             if (AwardTimer <= 0)
             {
-                AwardTimer = Random.Range(5, 15);
+                AwardTimer = Random.Range(5f, 15);
 
                 List<Flower> spareList = new List<Flower>();
 
@@ -241,15 +241,11 @@ public class ManaGarden : Regist
         Instance = this;
 
         ElfTimer = Random.Range(5f, 30f);
-        AwardTimer = Random.Range(5, 15);
+        AwardTimer = Random.Range(5f, 15f);
 
-        #region 读花朵存档
-
-        for (int i = 0; i < ManaData.GetPlayerInt("Slot"); i++)
-        {
-            UnlockSlot();
-        }
+        UnlockSlot();
 
+        #region 读花朵存档
 
         List<int> flowerList = ManaData.GetFlowerList();
 
@@ -270,6 +266,24 @@ public class ManaGarden : Regist
     }
 
 
+    public static void LockSlot()
+    {
+        for (int i = 0; i < SlotList.Count; i++)
+        {
+            if (SlotList[i].Valid)
+            {
+                SlotAmt--;
+
+                SlotList[i].Valid = false;
+                SlotList[i].Available = false;
+
+                return;
+            }
+        }
+
+        throw new Exception();
+    }
+
     public static void UnlockSlot()
     {
         for (int i = 0; i < SlotList.Count; i++)
@@ -277,13 +291,16 @@ public class ManaGarden : Regist
             if (SlotList[i].Valid == false)
             {
                 SlotAmt++;
-
+                
                 SlotList[i].Valid = true;
                 SlotList[i].Available = true;
                 
                 if (SlotAmt%9 == 7)
                 {
-                    CreatePage();
+                    if (SlotAmt/9 + 2 >= Page)
+                    {
+                        CreatePage();
+                    }
                 }
 
                 return;
@@ -296,7 +313,7 @@ public class ManaGarden : Regist
     public static void CreatePage()
     {
         Transform tra = ManaReso.Get("Page", Folder.Scene, false, ManaReso.Get("GardenPage"), false, ObjType.Page);
-
+        
         float offset = Page*19.2f;
 
         tra.SetLX(offset);
@@ -304,7 +321,7 @@ public class ManaGarden : Regist
         Vector3 pos = ManaReso.Get("GardenPage").position;
 
         pos.x = -offset;
-
+        
         Garden.PagePos.Add(pos);
 
 

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

@@ -626,7 +626,7 @@ public class ManaMiniGame : Regist
     public static float OpTime = 1.5f;
     public static float OpTimer;
     public static float GoldTimer;
-    public static float GameTime = 45;
+    public static float GameTime = 5;
     public static float PanaltyTime = 1;
     public static float NewOpTime;
     public static float PanaltyTimer;

+ 12 - 4
Assets/Script/Manage/ManaReso.cs

@@ -187,6 +187,18 @@ public class ManaReso : Regist
 
     #region ObjPool
 
+    public static void Release()
+    {
+        //ObjDic = new Dictionary<string, Object>();
+
+        //Bundle.UI.Unload(true);
+        //Bundle.Effect.Unload(true);
+        //Bundle.Audio.Unload(true);
+        //Bundle.Scene.Unload(true);
+        //Bundle.Config.Unload(true);
+    }
+
+
     public static void Save<T>(T t, bool aware = false) where T : Component
     {
         Save(t.gameObject);
@@ -533,8 +545,6 @@ public class ManaReso : Regist
 
         flower.RegistImmed();
 
-        flower.GoldBk.SetActive(false);
-
         flower.FlowerInfo = flowerInfo;
         flower.Slot = slot;
 
@@ -553,8 +563,6 @@ public class ManaReso : Regist
 
         flower.RegistImmed();
 
-        flower.GoldBk.SetActive(false);
-
         flower.FlowerInfo = flowerInfo;
 
         flower.SetCollider(false);

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

@@ -66,19 +66,38 @@ public class ManaServer : Regist
 
     #endregion
 
-    private void Update()
+    public void Update()
     {
         if (!ManaCenter.Complete && !Complete)
         {
             Timer += UnityEngine.Time.fixedDeltaTime;
 
-            if (Timer >= 5)
+            if (Timer >= 27.5f)
             {
+                Complete = true;
+
                 ManaCenter.LoginCallbackInitial(new JsonData());
             }
+            else if (Timer >= 15f && Timer <= 10)
+            {
+                Timer += 10;
+
+                Login(ManaCenter.LoginCallbackInitial);
+            }
+            else if (Timer >= 2.5f && Timer <= 10)
+            {
+                Timer += 10;
+
+                Login(ManaCenter.LoginCallbackInitial);
+            }
         }
     }
 
+    public override void RegistImmed()
+    {
+        enabled = true;
+    }
+
 
     public static void Login(URLRequest.URLRequestJsonCallBackDelegate callback = null)
     {

+ 14 - 4
Assets/Script/Manage/ManaUI.cs

@@ -291,8 +291,8 @@ public class ManaUI : Regist
                     "", ManaVisit.Cost, Current.Coin,
                     () =>
                     {
-                        ManaVisit.LoadFinish = false;
-                        ManaVisit.TweenFinish = false;
+                        ManaVisit.LoadComplete = false;
+                        ManaVisit.TweenComplete = false;
 
                         ManaVisit.GetArchive();
 
@@ -330,7 +330,7 @@ public class ManaUI : Regist
                             EventType.BackwardFinish,
                             () =>
                             {
-                                ManaVisit.TweenFinish = true;
+                                ManaVisit.TweenComplete = true;
 
                                 ManaVisit.Enter();
                             }
@@ -1572,7 +1572,17 @@ public class ManaUI : Regist
             () =>
             {
                 ManaAudio.PlayClip(Clip.BtnClip);
-                ManaCenter.Download();
+
+                string id = ManaReso.Get<InputField>("La_InputField").text;
+
+                if (id.ToLower() == ManaServer.ID.ToLower())
+                {
+                    Bubble.Show(null, Language.GetStr("Common", "IdentifyID"));
+                }
+                else
+                {
+                    ManaCenter.Download(id);
+                }
             }
         );
 

+ 61 - 27
Assets/Script/Manage/ManaVisit.cs

@@ -24,9 +24,9 @@ public class ManaVisit
 
     #endregion
 
-    public static bool Visit;
-    public static bool LoadFinish;
-    public static bool TweenFinish;
+    public static bool InVisit;
+    public static bool LoadComplete;
+    public static bool TweenComplete;
     public static string XmlStr;
 
     public static int Slot;
@@ -152,10 +152,7 @@ public class ManaVisit
         ManaGarden.PageList = new List<Transform>();
 
 
-        Garden.Garden2.position = Garden.GardenPos2[0];
-        Garden.Garden3.position = Garden.GardenPos3[0];
-        Garden.Garden4.position = Garden.GardenPos4[0];
-        Garden.GardenPage.position = Garden.PagePos[0];
+        Garden.ResetPage();
 
         for (int i = 0; i < ManaGarden.SlotAmt / 7 + 2; i++)
         {
@@ -237,12 +234,12 @@ public class ManaVisit
 
         ManaGarden.ElfList = new List<ObjType>(OriginElfList);
 
-        Visit = false;
+        InVisit = false;
     }
 
     public static void Enter()
     {
-        if (!LoadFinish || !TweenFinish)
+        if (!LoadComplete || !TweenComplete)
         {
             return;
         }
@@ -254,14 +251,8 @@ public class ManaVisit
         Document.LoadXml(XmlStr);
 
         Node = Document.SelectSingleNode("PlayerConfig");
-
-        Slot = int.Parse(Node.SelectSingleNode("Slot").Attributes[0].Value);
-        Level = int.Parse(Node.SelectSingleNode("Level").Attributes[0].Value);
         Player = Node.SelectSingleNode("Player").Attributes[0].Value;
 
-
-        ManaReso.SetText("C_GardenLab", Language.GetStr("UI", "C_GardenLab") + Level);
-
         ManaReso.SetActive("C_Coin", false);
         ManaReso.SetActive("C_Group1", false);
         ManaReso.SetActive("C_Group2", false);
@@ -277,7 +268,7 @@ public class ManaVisit
 
         #region Bird Tree Rainbow
 
-        if (!Visit)
+        if (!InVisit)
         {
             if (ManaReso.Get("Bird0").gameObject.activeSelf)
             {
@@ -304,7 +295,9 @@ public class ManaVisit
 
         #region Ability
 
-        if (!Visit)
+        Slot = 1;
+
+        if (!InVisit)
         {
             ManaData.SavePlantList();
 
@@ -322,6 +315,15 @@ public class ManaVisit
                 continue;
             }
 
+            if (attributeList[i][0].Value == "Ability1")
+            {
+                Level = int.Parse(attributeList[i][3].Value);
+
+                ManaReso.SetText("C_GardenLab", Language.GetStr("UI", "C_GardenLab") + Level);
+
+                continue;
+            }
+
             if (int.Parse(attributeList[i][3].Value) == 0)
             {
                 continue;
@@ -346,38 +348,56 @@ public class ManaVisit
             }
             else if (attributeList[i][0].Value == "Ability6")
             {
+                Slot++;
+
                 ManaGarden.ElfList.Add(ObjType.BeePurple);
             }
             else if (attributeList[i][0].Value == "Ability7")
             {
+                Slot++;
+
                 ManaGarden.ElfList.Add(ObjType.BeeBlue);
             }
             else if (attributeList[i][0].Value == "Ability8")
             {
+                Slot++;
+
                 ManaGarden.ElfList.Add(ObjType.BeeRed);
             }
             else if (attributeList[i][0].Value == "Ability9")
             {
+                Slot++;
+
                 ManaGarden.ElfList.Add(ObjType.BeeWhite);
             }
             else if (attributeList[i][0].Value == "Ability10")
             {
+                Slot++;
+
                 ManaGarden.ElfList.Add(ObjType.ButterflyYellow);
             }
             else if (attributeList[i][0].Value == "Ability11")
             {
+                Slot++;
+
                 ManaGarden.ElfList.Add(ObjType.ButterflyPurple);
             }
             else if (attributeList[i][0].Value == "Ability12")
             {
+                Slot++;
+
                 ManaGarden.ElfList.Add(ObjType.ButterflyBlue);
             }
             else if (attributeList[i][0].Value == "Ability13")
             {
+                Slot++;
+
                 ManaGarden.ElfList.Add(ObjType.ButterflyRed);
             }
             else if (attributeList[i][0].Value == "Ability14")
             {
+                Slot++;
+
                 ManaGarden.ElfList.Add(ObjType.ButterflyWhite);
             }
         }
@@ -386,7 +406,10 @@ public class ManaVisit
 
         #region Garden
 
-        OriginPlantList = new List<Slot>(ManaGarden.PlantList);
+        if (!InVisit)
+        {
+            OriginPlantList = new List<Slot>(ManaGarden.PlantList);
+        }
 
         ManaGarden.RetriveFlowerAll();
 
@@ -402,10 +425,7 @@ public class ManaVisit
         ManaGarden.PageList = new List<Transform>();
 
 
-        Garden.Garden2.position = Garden.GardenPos2[0];
-        Garden.Garden3.position = Garden.GardenPos3[0];
-        Garden.Garden4.position = Garden.GardenPos4[0];
-        Garden.GardenPage.position = Garden.PagePos[0];
+        Garden.ResetPage();
 
         for (int i = 0; i < Slot/7 + 2; i++)
         {
@@ -463,13 +483,13 @@ public class ManaVisit
 
         #endregion
 
-        Visit = true;
+        InVisit = true;
     }
 
 
     public static void DataReverse()
     {
-        if (Visit)
+        if (InVisit)
         {
             VisitPlantList = new List<Slot>(ManaGarden.PlantList);
 
@@ -479,7 +499,7 @@ public class ManaVisit
 
     public static void DataRecover()
     {
-        if (Visit)
+        if (InVisit)
         {
             ManaGarden.PlantList = VisitPlantList;
         }
@@ -488,11 +508,12 @@ public class ManaVisit
 
     public static void GetArchive()
     {
-        ManaServer.Random
+        ManaServer.Download
         (
+            "ytcy9g",
             (jsonData) =>
             {
-                LoadFinish = true;
+                LoadComplete = true;
 
                 XmlStr = jsonData["l"].ToString();
 
@@ -501,6 +522,19 @@ public class ManaVisit
         );
 
 
+        //ManaServer.Random
+        //(
+        //    (jsonData) =>
+        //    {
+        //        LoadComplete = true;
+
+        //        XmlStr = jsonData["l"].ToString();
+
+        //        Enter();
+        //    }
+        //);
+
+
         //if (Random.Range(0f, 1f) <= CreatePosi)
         //{
         //    XmlDocument document = new XmlDocument();

+ 14 - 10
Assets/Script/Object/Flower.cs

@@ -280,7 +280,12 @@ public class Flower : Regist, IPointerClickHandler
         OperateBk = ChildDic["OperateBk"].GetComponent<SpriteRenderer>();
         OperateIcon = ChildDic["OperateIcon"].GetComponent<SpriteRenderer>();
         OperateOutline = ChildDic["OperateOutline1"].GetComponent<SpriteRenderer>();
-        
+
+
+        GoldBk.CreateTweenSr(new Color(1, 1, 1, 0), new Color(1, 1, 1, 1), 1f, false, true, Curve.EaseOutQuad);
+        GoldIcon.CreateTweenSr(new Color(1, 1, 1, 0), new Color(1, 1, 1, 1), 1f, false, true, Curve.EaseOutQuad);
+
+
         TweenRoot tween = FlowerIcon.CreateTweenSr(new Color(1, 1, 1), new Color(1, 0.5f, 0.5f), 0.2f, true, true, Curve.EaseOutQuad);
 
         tween.OnForwardFinish += () =>
@@ -484,7 +489,7 @@ public class Flower : Regist, IPointerClickHandler
 
         int coin;
 
-        if (ManaVisit.Visit)
+        if (ManaVisit.InVisit)
         {
             coin = Mathf.CeilToInt(Mathf.Lerp(ManaVisit.AwardMin, ManaVisit.AwardMax, Random.Range(0f, 1f)));
 
@@ -492,8 +497,6 @@ public class Flower : Regist, IPointerClickHandler
         }
         else
         {
-            ManaGarden.AwardValid = true;
-
             coin = Mathf.CeilToInt((float)Auxiliary.FmlParse(CoinFml, "l", Mathf.Clamp(ManaCenter.Level, 1, Mathf.Infinity).ToString()));
 
             ManaCenter.Coin += coin;
@@ -503,19 +506,20 @@ public class Flower : Regist, IPointerClickHandler
         ManaReso.GetHudText("+" + coin, Color.white, 90, ChildDic["GoldPosTra"], ManaReso.Get("A_HudParent"), true);
 
         GoldBk.SetActive(false);
+
+        GoldBk.GetTweenSr().Pause();
+        GoldIcon.GetTweenSr().Pause();
+
         GoldBk.GetTweenSr().InOrigin = true;
         GoldIcon.GetTweenSr().InOrigin = true;
     }
 
     public void ShowAward()
     {
-        GoldBk.CreateTweenSr(new Color(1, 1, 1, 0), new Color(1, 1, 1, 1), 1f, true, true, Curve.EaseOutQuad);
-        GoldIcon.CreateTweenSr(new Color(1, 1, 1, 0), new Color(1, 1, 1, 1), 1f, true, true, Curve.EaseOutQuad);
-
         GoldBk.SetY(transform.position.y + 2.5f);
 
-        GoldBk.TweenForSr();
-        GoldIcon.TweenForSr();
+        GoldBk.TweenReForSr();
+        GoldIcon.TweenReForSr();
 
         
         GoldBk.MoveOffset2D
@@ -532,7 +536,7 @@ public class Flower : Regist, IPointerClickHandler
     {
         if (eventData.rawPointerPress.transform == transform)
         {
-            if (ManaVisit.Visit)
+            if (ManaVisit.InVisit)
             {
                 return;
             }

+ 14 - 4
Assets/Script/Object/Garden.cs

@@ -50,6 +50,8 @@ public class Garden : Regist, IDragHandler, IPointerClickHandler, IEndDragHandle
 
     public static void Reload()
     {
+        ResetPage();
+
         CurPage = 0;
 
         PagePos = new List<Vector3>();
@@ -326,7 +328,7 @@ public class Garden : Regist, IDragHandler, IPointerClickHandler, IEndDragHandle
 
         if (eventData.rawPointerPress.transform.name.Contains("Slot"))
         {
-            if (ManaVisit.Visit)
+            if (ManaVisit.InVisit)
             {
                 return;
             }
@@ -345,7 +347,7 @@ public class Garden : Regist, IDragHandler, IPointerClickHandler, IEndDragHandle
     }
 
 
-    private void Return()
+    public static void Return()
     {
         Flag1 = false;
 
@@ -374,7 +376,7 @@ public class Garden : Regist, IDragHandler, IPointerClickHandler, IEndDragHandle
         GardenPage.Move2D(PagePos[CurPage], 0.5f, false, Curve.EaseOutQuad);
     }
 
-    private void PrevPage()
+    public static void PrevPage()
     {
         CurPage--;
         
@@ -396,7 +398,7 @@ public class Garden : Regist, IDragHandler, IPointerClickHandler, IEndDragHandle
         GardenPage.Move2D(PagePos[CurPage], 0.5f, false, Curve.EaseOutQuad);
     }
 
-    private void NextPage()
+    public static void NextPage()
     {
         CurPage++;
         
@@ -417,4 +419,12 @@ public class Garden : Regist, IDragHandler, IPointerClickHandler, IEndDragHandle
 
         GardenPage.Move2D(PagePos[CurPage], 0.5f, false, Curve.EaseOutQuad);
     }
+
+    public static void ResetPage()
+    {
+        Garden2.position = GardenPos2[0];
+        Garden3.position = GardenPos3[0];
+        Garden4.position = GardenPos4[0];
+        GardenPage.position = PagePos[0];
+    }
 }

+ 14 - 1
Assets/Script/Object/Skill/Ability.cs

@@ -170,7 +170,9 @@ public class Ability : SkillRoot
 
         if (ID == "Ability1")
         {
-            if (ItemStatus_ == SkillStatus.Upgrade)
+            ManaCenter.Level = Level;
+
+            if (Level > 0)
             {
                 UnlockTab();
             }
@@ -195,6 +197,7 @@ public class Ability : SkillRoot
             }
 
             UseA();
+            UseC();
         }
 
 
@@ -533,6 +536,11 @@ public class Ability : SkillRoot
         ManaCenter.SkillPlus -= NewPlus;
         ManaCenter.SkillPersonBuff -= NewPersonBuff;
 
+        for (int i = 0; i < Auxiliary.IntParse(UnlockPos, 0); i++)
+        {
+            ManaGarden.LockSlot();
+        }
+
         if (Math.Abs(NewSkillCD) > 0.0005f)
         {
             for (int i = 0; i < ManaCenter.SkillList.Count; i++)
@@ -552,6 +560,11 @@ public class Ability : SkillRoot
 
     public override void UpdateStatus()
     {
+        if (!ManaCenter.Complete)
+        {
+            return;
+        }
+
         if (ManaCenter.Level >= UnlockLv)
         {
             if (ItemStatus == SkillStatus.Lock)

+ 5 - 0
Assets/Script/Object/Skill/BigSkill.cs

@@ -320,6 +320,11 @@ public class BigSkill : Skill
 
     public override void UpdateStatus()
     {
+        if (!ManaCenter.Complete)
+        {
+            return;
+        }
+
         if (ManaCenter.Level >= UnlockLv)
         {
             if (SkillTab == SkillTab.Null)

+ 9 - 1
Assets/Script/Object/Skill/Pack.cs

@@ -172,6 +172,11 @@ public class Pack : SkillRoot
 
     public override void UpdateStatus()
     {
+        if (!ManaCenter.Complete)
+        {
+            return;
+        }
+
         ItemLab.text = Description(0);
 
         if (MaxUseLv == MinUseLv)
@@ -194,7 +199,10 @@ public class Pack : SkillRoot
 
     protected void UseB()
     {
-        ManaCenter.Coin += Auxiliary.FmlParse(CoinFml, "l", ManaCenter.Level.ToString(), "c", ManaCenter.CoinPerson.ToString("0.000"));
+        if (!string.IsNullOrEmpty(CoinFml))
+        {
+            ManaCenter.Coin += Auxiliary.FmlParse(CoinFml, "l", ManaCenter.Level.ToString(), "c", ManaCenter.CoinPerson.ToString("0.000"));
+        }
 
         ManaCenter.Diamond += DiamondOnce;
     }

+ 5 - 0
Assets/Script/Object/Skill/Skill.cs

@@ -236,6 +236,11 @@ public class Skill : SkillRoot
 
     public override void UpdateStatus()
     {
+        if (!ManaCenter.Complete)
+        {
+            return;
+        }
+
         if (ManaCenter.Level >= UnlockLv)
         {
             if (ItemStatus == SkillStatus.Lock)

+ 10 - 0
Assets/Script/Object/Slot.cs

@@ -101,5 +101,15 @@ public class Slot : Regist
         }
 
         Flower.ElfList = new List<Transform>();
+
+        Flower.Award_ = false;
+
+        Flower.GoldBk.SetActive(false);
+
+        Flower.GoldBk.GetTweenSr().Pause();
+        Flower.GoldIcon.GetTweenSr().Pause();
+
+        Flower.GoldBk.GetTweenSr().InOrigin = true;
+        Flower.GoldIcon.GetTweenSr().InOrigin = true;
     }
 }

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

@@ -118,7 +118,7 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.Z))
         {
-            GetComponent<AudioSource>().Play();
+            
         }
 
         if (Input.GetKeyDown(KeyCode.X))
@@ -251,7 +251,7 @@ public class Auxiliary : Regist
         XmlElement encryptXmlElement = (XmlElement)doc.GetElementsByTagName("EncryptedData")[0];
 
         EncryptedData encryptedData = new EncryptedData();
-
+        
         encryptedData.LoadXml(encryptXmlElement);
 
         byte[] bytes = encryptedXml.DecryptData(encryptedData, Des);

+ 5 - 5
Assets/Script/Tool/Bundle.cs

@@ -19,11 +19,11 @@ public class Bundle : MonoBehaviour
 
     public static AssetBundle Atlas;
 
-    private static AssetBundle UI;
-    private static AssetBundle Effect;
-    private static AssetBundle Audio;
-    private static AssetBundle Scene;
-    private static AssetBundle Config;
+    public static AssetBundle UI;
+    public static AssetBundle Effect;
+    public static AssetBundle Audio;
+    public static AssetBundle Scene;
+    public static AssetBundle Config;
 
     public List<Object> UiList;
     public List<Object> AtlasList;

+ 42 - 0
Assets/Script/Tool/Extension.cs

@@ -22,6 +22,43 @@ public enum LocatePos
 
 public static class Extension
 {
+    #region Int
+
+    public static bool ToBool(this int integer)
+    {
+        if (integer == 0)
+        {
+            return false;
+        }
+        else if (integer == 1)
+        {
+            return true;
+        }
+        else
+        {
+            throw new Exception();
+        }
+    }
+
+    #endregion
+
+    #region Bool
+
+    public static int ToInt(this bool boolean)
+    {
+        if (boolean)
+        {
+            return 1;
+        }
+        else
+        {
+            return 0;
+        }
+    }
+
+    #endregion
+
+
     #region List
 
     public static T Last<T>(this List<T> list, int index)
@@ -88,6 +125,11 @@ public static class Extension
         }
     }
 
+    public static void LastRemoveAt<T>(this List<T> list, int index)
+    {
+        list.RemoveAt(list.Count - 1 - index);
+    }
+
     #endregion
 
     #region UGUI

+ 3 - 3
MyLovelyGarden.Editor.csproj

@@ -15,7 +15,7 @@
     <TargetFrameworkProfile>Unity Full v3.5</TargetFrameworkProfile>
     <CompilerResponseFile></CompilerResponseFile>
     <UnityProjectType>Editor:5</UnityProjectType>
-    <UnityBuildTarget>Android:13</UnityBuildTarget>
+    <UnityBuildTarget>StandaloneWindows64:19</UnityBuildTarget>
     <UnityVersion>5.5.0f3</UnityVersion>
     <RootNamespace></RootNamespace>
     <LangVersion Condition=" '$(VisualStudioVersion)' != '10.0' ">4</LangVersion>
@@ -27,7 +27,7 @@
     <IntermediateOutputPath>Temp\UnityVS_obj\Debug\</IntermediateOutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DefineConstants>DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_5_0;UNITY_5_5;UNITY_5;UNITY_PURCHASING;UNITY_ANALYTICS;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_GENERICS;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;PLATFORM_SUPPORTS_MONO;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_SCRIPTING_NEW_CSHARP_COMPILER;UNITY_ANDROID;ENABLE_SUBSTANCE;UNITY_ANDROID_API;ENABLE_EGL;ENABLE_NETWORK;ENABLE_RUNTIME_GI;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;PLATFORM_SUPPORTS_ADS_ID;UNITY_CAN_SHOW_SPLASH_SCREEN;ENABLE_VIDEO;ENABLE_VR;ENABLE_UNITYADS_RUNTIME;UNITY_UNITYADS_API;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE</DefineConstants>
+    <DefineConstants>DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_5_0;UNITY_5_5;UNITY_5;UNITY_64;UNITY_PURCHASING;UNITY_ANALYTICS;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_GENERICS;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_SCRIPTING_NEW_CSHARP_COMPILER;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_VIDEO;ENABLE_VR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE</DefineConstants>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -37,7 +37,7 @@
     <IntermediateOutputPath>Temp\UnityVS_obj\Release\</IntermediateOutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DefineConstants>TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_5_0;UNITY_5_5;UNITY_5;UNITY_PURCHASING;UNITY_ANALYTICS;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_GENERICS;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;PLATFORM_SUPPORTS_MONO;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_SCRIPTING_NEW_CSHARP_COMPILER;UNITY_ANDROID;ENABLE_SUBSTANCE;UNITY_ANDROID_API;ENABLE_EGL;ENABLE_NETWORK;ENABLE_RUNTIME_GI;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;PLATFORM_SUPPORTS_ADS_ID;UNITY_CAN_SHOW_SPLASH_SCREEN;ENABLE_VIDEO;ENABLE_VR;ENABLE_UNITYADS_RUNTIME;UNITY_UNITYADS_API;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE</DefineConstants>
+    <DefineConstants>TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_5_0;UNITY_5_5;UNITY_5;UNITY_64;UNITY_PURCHASING;UNITY_ANALYTICS;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_GENERICS;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_SCRIPTING_NEW_CSHARP_COMPILER;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_VIDEO;ENABLE_VR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE</DefineConstants>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>

+ 3 - 2
MyLovelyGarden.csproj

@@ -45,7 +45,6 @@
   <ItemGroup>
     <Reference Include="mscorlib" />
     <Reference Include="System" />
-    <Reference Include="System.Security" />
     <Reference Include="System.XML" />
     <Reference Include="System.Core" />
     <Reference Include="Boo.Lang" />
@@ -293,7 +292,9 @@
     <None Include="Assets\Resource\XML\Config\skill_config.xml" />
     <None Include="Assets\Resource\XML\Config\visit_config.xml" />
     <None Include="Assets\Resource\XML\Config\生成存档方案.txt" />
-    <None Include="Assets\Resource\XML\PlayerConfig.xml" />
+    <None Include="Assets\Resource\XML\PlayerConfig.xml">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="Assets\Resource\XML\lan\ChineseSimplified.xml" />
     <None Include="Assets\Resource\XML\lan\ChineseTraditional.xml" />
     <None Include="Assets\Resource\XML\lan\English.xml" />

BIN
ProjectSettings/GraphicsSettings.asset


+ 9 - 2
ToList.txt

@@ -1,13 +1,15 @@
 编存档 下载随机存档失败时就编一个存档
 
 
-注册Bug
+注册Bug(开始的时候拔掉网线)
 
 存档损坏Bug
 
 
 分享图片报错
 
+一开始就有一个成就完成了
+
 带宽优化 打包图集
 
 从Hierrarchy视图中检查是否有Bug
@@ -16,10 +18,15 @@
 
 发布前把服务器中的存档清理一次
 
+蝴蝶蜜蜂是否和彩虹冲突
+
 红色小蝴蝶和教程B冲突了 自动解锁蜜蜂和蝴蝶会冲突
 
 
 Hud换装
 
+释放掉不用的Bundle
+
+小游戏时间45
 
-不再单独存一个Level
+PageView有点不合适