LiuQilin 8 years ago
parent
commit
bd627484b1

BIN
.vs/MyLovelyGarden/v14/.suo


BIN
Assets/Resource/Prefab/PrefabUI/GroupA.prefab


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

@@ -1,5 +1,5 @@
 <PlayerConfig>
-  <Version value="224" />
+  <Version value="232" />
 
   <ID value="Default" />
 ////  <TutorialA value="0" />

+ 5 - 2
Assets/Script/Manage/Initializer.cs

@@ -105,7 +105,7 @@ public class Initializer : MonoBehaviour
 
     public IEnumerator IInitialize()
     {
-        while (Bundle.LoadComplete == false)
+        while (!Bundle.LoadComplete)
         {
             yield return null;
         }
@@ -115,7 +115,10 @@ public class Initializer : MonoBehaviour
             yield return null;
         }
 
-        //ManaUI.InitialInstantiate();
+        while (Data.DamageXml)
+        {
+            yield return null;
+        }
 
         Initialize();
     }

+ 1 - 4
Assets/Script/Manage/ManaIAP.cs

@@ -31,11 +31,8 @@ public class ManaIAP : MonoBehaviour, IStoreListener
         {
             return Application.persistentDataPath + "/ICON2.png";
         }
-        set { ImageUrl_ = value; }
     }
 
-    public static string ImageUrl_;
-
     public static string ShareUrl = "http://www.dashgame.com";
 
     public static ShareSDK ShareSdk;
@@ -188,7 +185,7 @@ public class ManaIAP : MonoBehaviour, IStoreListener
         shareContent.SetUrl(ShareUrl);
         shareContent.SetImagePath(ImageUrl);
         shareContent.SetShareType(ContentType.App);
-
+        
         PlatformType[] platformTypes = new[]
         {
             PlatformType.QQ,

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

@@ -103,7 +103,7 @@ public class ManaServer : Regist
 
             Time = DateUtil.GetTime(jsonData["time"].ToJson());
 
-            if (Data._PlayerDoc != null)
+            if (Data.PlayerDoc_ != null)
             {
                 if (Data.GetPlayerString("ID") == "Default")
                 {

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

@@ -687,7 +687,7 @@ public class ManaUI : Regist
                 ManaReso.Get("GardenMini").TweenBacVec();
                 ManaReso.Get("D_MiniGame").TweenBacCG();
 
-                ManaInfo.Show(Award.Info, 4f);
+                ManaInfo.Show(Award.Info, 6f);
             }
         );
 

+ 1 - 1
Assets/Script/Object/Skill/BigSkill.cs

@@ -439,7 +439,7 @@ public class BigSkill : Skill
             UseA();
             UseB();
 
-            ManaInfo.Show(String.Format("{0}{1}", Language.GetStr("UI", "J_Info1"), Language.GetStr("SkillName", ID)), 2f);
+            ManaInfo.Show(String.Format("{0}{1}", Language.GetStr("UI", "J_Info1"), Language.GetStr("SkillName", ID)), 6f);
         });
     }
 

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

@@ -311,7 +311,7 @@ public class Pack : SkillRoot
 
         if (!string.IsNullOrEmpty(str))
         {
-            ManaInfo.Show(str, 2f);
+            ManaInfo.Show(str, 6f);
         }
 
         Level++;

+ 2 - 2
Assets/Script/Object/Skill/Skill.cs

@@ -298,7 +298,7 @@ public class Skill : SkillRoot
 
         if (!string.IsNullOrEmpty(str))
         {
-            ManaInfo.Show(sb.ToString(), 2f);
+            ManaInfo.Show(sb.ToString(), 6f);
         }
     }
 
@@ -328,7 +328,7 @@ public class Skill : SkillRoot
             UseA();
             UseB();
 
-            ManaInfo.Show(String.Format("{0}{1}", Language.GetStr("UI", "J_Info1"), Language.GetStr("SkillName", ID)), 2f);
+            ManaInfo.Show(String.Format("{0}{1}", Language.GetStr("UI", "J_Info1"), Language.GetStr("SkillName", ID)), 6f);
         });
     }
 

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

@@ -16,6 +16,11 @@ using System.ComponentModel;
 using System.Net;
 using System.Security.Cryptography;
 using System.Runtime.Serialization.Formatters.Binary;
+
+using System.Security;
+using System.Security.Cryptography.Xml;
+
+using System.Xml;
 using UnityEngine.Advertisements;
 using Random = UnityEngine.Random;
 using Transform = UnityEngine.Transform;
@@ -72,8 +77,8 @@ public class Auxiliary : Regist
             if (_Des == null)
             {
                 _Des = new DESCryptoServiceProvider();
-                _Des.IV = Encoding.UTF8.GetBytes("12345678");
-                _Des.Key = Encoding.UTF8.GetBytes("12345678");
+                _Des.IV = Encoding.UTF8.GetBytes("19283740");
+                _Des.Key = Encoding.UTF8.GetBytes("93287123");
             }
 
             return _Des;
@@ -198,6 +203,41 @@ public class Auxiliary : Regist
     }
 
 
+    public static void EncryptXml(XmlDocument doc)
+    {
+        EncryptedXml encryptedXml = new EncryptedXml();
+
+        XmlElement xmlElement = doc.DocumentElement;
+
+        byte[] bytes = encryptedXml.EncryptData(xmlElement, Des, false);
+
+        EncryptedData encryptedData = new EncryptedData();
+
+        encryptedData.Type = EncryptedXml.XmlEncElementUrl;
+
+        encryptedData.EncryptionMethod = new EncryptionMethod(EncryptedXml.XmlEncDESUrl);
+
+        encryptedData.CipherData.CipherValue = bytes;
+
+        EncryptedXml.ReplaceElement(xmlElement, encryptedData, false);
+    }
+
+    public static void DecryptXml(XmlDocument doc)
+    {
+        EncryptedXml encryptedXml = new EncryptedXml();
+
+        XmlElement encryptXmlElement = (XmlElement)doc.GetElementsByTagName("EncryptedData")[0];
+
+        EncryptedData encryptedData = new EncryptedData();
+
+        encryptedData.LoadXml(encryptXmlElement);
+
+        byte[] bytes = encryptedXml.DecryptData(encryptedData, Des);
+
+        encryptedXml.ReplaceData(encryptXmlElement, bytes);
+    }
+
+
     public static byte[] Encrypt(string str)
     {
         byte[] bytes = Encoding.UTF8.GetBytes(str);

+ 2 - 0
Assets/Script/Tool/Bundle.cs

@@ -215,6 +215,8 @@ public class Bundle : MonoBehaviour
     {
         yield return LoadConfig();
 
+        ManaReso.AddAsyncLoad("skill_config", Folder.Config, () => { Data.PlayerDoc = Data.PlayerDoc; });
+
         yield return LoadUI();
 
         if (!Logo.LogoComplete && !Instance.DebugMode)

+ 65 - 21
Assets/Script/Tool/Data.cs

@@ -6,6 +6,8 @@ using System.Xml;
 using System.Text;
 using System.Collections;
 using System.Collections.Generic;
+using System.Security.Cryptography;
+using LitJson;
 
 public class Data
 {
@@ -15,20 +17,20 @@ public class Data
     {
         get
         {
-            if (_PlayerNode == null)
+            if (PlayerNode_ == null)
             {
-                _PlayerNode = PlayerDoc.SelectSingleNode("PlayerConfig");
+                PlayerNode_ = PlayerDoc.SelectSingleNode("PlayerConfig");
             }
 
-            return _PlayerNode;
+            return PlayerNode_;
         }
-        set { _PlayerNode = value; }
+        set { PlayerNode_ = value; }
     }
     public static XmlDocument PlayerDoc
     {
         get
         {
-            if (_PlayerDoc == null)
+            if (PlayerDoc_ == null)
             {
                 int version = 0;
                 int nativeVersion = 0;
@@ -55,6 +57,22 @@ public class Data
                     tempDoc1 = new XmlDocument();
                     tempDoc1.LoadXml(sr.ReadToEnd());
 
+                    byte[] bytes = Encoding.UTF8.GetBytes(tempDoc1.OuterXml);
+
+                    MD5 md5 = new MD5CryptoServiceProvider();
+
+                    if (PlayerPrefs.GetString("config") != Encoding.UTF8.GetString(md5.ComputeHash(bytes)))
+                    {
+                        DamageXml = true;
+
+                        ManaServer.Load(PlayerPrefs.GetString("id"), RecoveXml);
+
+                        return null;
+                    }
+
+                    Auxiliary.DecryptXml(tempDoc1);
+
+
                     sr.Close();
                     
                     TextAsset textAsset = ManaReso.Load<TextAsset>("PlayerConfig", Folder.Config);
@@ -74,7 +92,7 @@ public class Data
 
                         sw.Close();
 
-                        _PlayerDoc = tempDoc2;
+                        PlayerDoc_ = tempDoc2;
                     }
                     else
                     {
@@ -88,11 +106,11 @@ public class Data
 
                             sw.Close();
 
-                            _PlayerDoc = tempDoc2;
+                            PlayerDoc_ = tempDoc2;
                         }
                         else
                         {
-                            _PlayerDoc = tempDoc1;
+                            PlayerDoc_ = tempDoc1;
                         }
                     }
                 }
@@ -103,25 +121,21 @@ public class Data
                     tempDoc2 = new XmlDocument();
                     tempDoc2.LoadXml(textAsset.text);
 
-                    StreamWriter sw = new StreamWriter(Application.persistentDataPath + "/PlayerConfig.xml");
-
-                    sw.Write(tempDoc2.OuterXml);
-
-                    sw.Close();
-
-                    _PlayerDoc = tempDoc2;
+                    PlayerDoc_ = tempDoc2;
 
-                    _PlayerDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("QuitTime").Attributes[0].Value = DateTime.Now.ToString();
+                    PlayerDoc_.SelectSingleNode("PlayerConfig").SelectSingleNode("QuitTime").Attributes[0].Value = DateTime.Now.ToString();
                 }
             }
 
-            return _PlayerDoc;
+            return PlayerDoc_;
         }
-        set { _PlayerDoc = value; }
+        set { PlayerDoc_ = value; }
     }
 
-    public static XmlNode _PlayerNode;
-    public static XmlDocument _PlayerDoc;
+    public static XmlNode PlayerNode_;
+    public static XmlDocument PlayerDoc_;
+
+    public static bool DamageXml;
 
     #endregion
 
@@ -129,11 +143,41 @@ public class Data
     {
         if (Initializer.LoadComplete)
         {
-            StreamWriter sw = new StreamWriter(Application.persistentDataPath + "/PlayerConfig.xml");
+            Auxiliary.EncryptXml(PlayerDoc);
 
+            StreamWriter sw = new StreamWriter(Application.persistentDataPath + "/PlayerConfig.xml");
+            
             sw.Write(PlayerDoc.OuterXml);
 
             sw.Close();
+
+
+            byte[] bytes = Encoding.UTF8.GetBytes(PlayerDoc.OuterXml);
+
+            MD5 md5 = new MD5CryptoServiceProvider();
+
+            PlayerPrefs.SetString("id", ManaServer.ID);
+            PlayerPrefs.SetString("config", Encoding.UTF8.GetString(md5.ComputeHash(bytes)));
+        }
+    }
+
+    public static void RecoveXml(JsonData jsonData)
+    {
+        DamageXml = false;
+
+        if (jsonData.Inst_Object.Keys.Contains("l"))
+        {
+            PlayerDoc_ = new XmlDocument();
+
+            PlayerDoc_.LoadXml(jsonData["l"].ToString());
+        }
+        else
+        {
+            TextAsset textAsset = ManaReso.Load<TextAsset>("PlayerConfig", Folder.Config);
+
+            PlayerDoc_ = new XmlDocument();
+
+            PlayerDoc_.LoadXml(textAsset.text);
         }
     }
 

+ 10 - 4
Assets/Script/Tool/UI/TextPlus.cs

@@ -396,7 +396,7 @@ public class TextPlus : Text
 
                 front = imageIndex.Last(i) + 1;
                 
-                if (rear <= front)
+                if (rear < front)
                 {
                     continue;
                 }
@@ -442,9 +442,9 @@ public class TextPlus : Text
 
     protected void CreateImage(ImageInfo imageInfo)
     {
-        float height = LineHeight;
-        float width = (height/imageInfo.SpriteInfo.Height)*imageInfo.SpriteInfo.Width;
-        
+        float width;
+        float height;
+
         bool first = false;
 
         if (imageInfo.Left == 0)
@@ -473,6 +473,9 @@ public class TextPlus : Text
 
         if (first)
         {
+            height = (TextVertex[0 + imageInfo.Left*6].position.y - TextVertex[4 + imageInfo.Left*6].position.y)*2;
+            width = (height/imageInfo.SpriteInfo.Height)*imageInfo.SpriteInfo.Width;
+
             Vector3 middleLeft = (TextVertex[0 + imageInfo.Left*6].position + TextVertex[4 + imageInfo.Left*6].position)/2;
 
             v0.position = middleLeft + new Vector3(0, height/2);
@@ -487,6 +490,9 @@ public class TextPlus : Text
         }
         else
         {
+            height = TextVertex[1 + (imageInfo.Left - 1)*6].position.y - TextVertex[2 + (imageInfo.Left - 1)*6].position.y;
+            width = (height/imageInfo.SpriteInfo.Height)*imageInfo.SpriteInfo.Width;
+
             Vector3 middleRight = (TextVertex[1 + (imageInfo.Left - 1) * 6].position + TextVertex[2 + (imageInfo.Left - 1) * 6].position) / 2;
 
             v0.position = middleRight + new Vector3(0, height / 2);

+ 1 - 0
Assets/mcs.rsp

@@ -0,0 +1 @@
+-r:System.Security.dll

+ 8 - 0
Assets/mcs.rsp.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4e5f14e0b2ce7474e87bb2f8e886298b
+timeCreated: 1495522594
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 3 - 3
MyLovelyGarden.Editor.csproj

@@ -15,7 +15,7 @@
     <TargetFrameworkProfile>Unity Full v3.5</TargetFrameworkProfile>
     <CompilerResponseFile></CompilerResponseFile>
     <UnityProjectType>Editor:5</UnityProjectType>
-    <UnityBuildTarget>StandaloneWindows64:19</UnityBuildTarget>
+    <UnityBuildTarget>Android:13</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_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>
+    <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>
     <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_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>
+    <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>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>

+ 4 - 4
MyLovelyGarden.csproj

@@ -12,10 +12,10 @@
     <ProjectTypeGuids>{E097FAD1-6243-4DAD-9C02-E9B9EFC3FFC1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <TargetFrameworkIdentifier>.NETFramework</TargetFrameworkIdentifier>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Unity Subset v3.5</TargetFrameworkProfile>
+    <TargetFrameworkProfile>Unity Full v3.5</TargetFrameworkProfile>
     <CompilerResponseFile></CompilerResponseFile>
     <UnityProjectType>Game:1</UnityProjectType>
-    <UnityBuildTarget>StandaloneWindows64:19</UnityBuildTarget>
+    <UnityBuildTarget>Android:13</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_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>
+    <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>
     <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_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>
+    <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>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>

BIN
ProjectSettings/GraphicsSettings.asset


BIN
ProjectSettings/ProjectSettings.asset


+ 6 - 5
ToList.txt

@@ -1,13 +1,12 @@
 编存档 下载随机存档失败时就编一个存档
 
-分享图片是否报错
+分享图片报错
 
-发布前把服务器中的存档清理一次
-
-Anchor Encrypt 带宽优化 Preload(Atlas)
+如果存档被删除了就重新下载一次
 
+发布前把服务器中的存档清理一次
 
-Hud能往左右上下走,设置自己的颜色 设置Outline的颜色 设置速度
+带宽优化 打包图集
 
 返回时有存蝴蝶、花的Bug
 
@@ -20,6 +19,8 @@ Hud
 红色小蝴蝶和教程B冲突了 自动解锁蜜蜂和蝴蝶会冲突
 
 
+Hud能往左右上下走,设置自己的颜色 设置Outline的颜色 设置速度
+
 动画
 (
 Move的SetActive