Temp 5.15

Assets/Advertisements/Editor/Resources/Android/builds.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 8d2d384f78b29a44a9c70c3daf45d1cb
-folderAsset: yes
-timeCreated: 1494301205
-licenseType: Pro
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Advertisements/Editor/Resources/Android/builds.zip.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 9cb5c3e4dd0dd574ba655453ad15edfa
-timeCreated: 1494301205
-licenseType: Pro
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Advertisements/Editor/Resources/iOS.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: a5e10dc911691a844b899edb78584282
-folderAsset: yes
-timeCreated: 1494301205
-licenseType: Pro
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Plugins/ShareSDK/iOS.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: db9454787e4284fa9899244d3663dcd4
-folderAsset: yes
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Plugins/iOS.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 091987eeef9232240963d4755d7ea67e
-folderAsset: yes
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Resource/XML/PlayerConfig.xml

@@ -1,5 +1,5 @@
 <PlayerConfig>
-  <Version value="147" />
+  <Version value="149" />
 
   <ID value="Default" />
   <TutorialA value="1" />

Assets/Script/Manage/ManaAudio.cs

@@ -55,7 +55,7 @@ public class ManaAudio : Regist
         CurrentClip = ManaReso.Load<AudioClip>("CurrentClip", Folder.Audio);
         MiniEndClip = ManaReso.Load<AudioClip>("MiniEndClip", Folder.Audio);
 
-        ManaReso.Get<ObjRoot>("Music", Folder.Audio, true, transform, true, ObjType.Music);
+        ManaReso.Get("Music", Folder.Audio, true, transform, true, ObjType.Music);
     }
 
     public override void RegistValueA()

Assets/Script/Manage/ManaData.cs

@@ -155,15 +155,15 @@ public class ManaData : Regist
                 }
             }
 
-            if (ManaTutorial.TutorialB_ && !ManaTutorial.TutorialB)
-            {
-                if (Level_ >= 200)
-                {
-                    ManaTutorial.TutorialB = true;
+            //if (ManaTutorial.TutorialB_ && !ManaTutorial.TutorialB)
+            //{
+            //    if (Level_ >= 200)
+            //    {
+            //        ManaTutorial.TutorialB = true;
 
-                    ManaTutorial.PrepareStep10();
-                }
-            }
+            //        ManaTutorial.PrepareStep10();
+            //    }
+            //}
         }
     }
     public static bool Pause
@@ -880,6 +880,8 @@ public class ManaData : Regist
         RegistIncome();
 
         InitiateComplete = true;
+
+        Level = Level;
     }
 
     public static void LoginCallbackReactive(JsonData jsonData)
@@ -973,6 +975,11 @@ public class ManaData : Regist
             }
             else
             {
+                if (!Initializer.LoadComplete)
+                {
+                    return;
+                }
+
                 ManaServer.Login(LoginCallbackReactive);
             }
         }

Assets/Script/Manage/ManaGarden.cs

@@ -207,7 +207,7 @@ public class ManaGarden : Regist
 
     public override void Instantiate()
     {
-        ManaReso.Get<ObjRoot>("Garden", Folder.Scene, true, transform, true, ObjType.Garden).AddScript<Garden>();
+        ManaReso.Get("Garden", Folder.Scene, true, transform, true, ObjType.Garden).AddScript<Garden>();
 
         CreatePage();
         CreatePage();
@@ -296,7 +296,7 @@ public class ManaGarden : Regist
 
     public static void CreatePage()
     {
-        Transform tra = ManaReso.Get<ObjRoot>("Page", Folder.Scene, false, ManaReso.Get("GardenPage"), false, ObjType.Page);
+        Transform tra = ManaReso.Get("Page", Folder.Scene, false, ManaReso.Get("GardenPage"), false, ObjType.Page);
 
         float offset = PageAmt*19.2f;
 

Assets/Script/Manage/ManaMiniGame.cs

@@ -622,7 +622,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;

Assets/Script/Manage/ManaPlayer.cs

@@ -31,11 +31,18 @@ public class ManaPlayer : Regist
     {
         ManaReso.TraDic.Remove("Player");
 
+        Transform tra = Player.transform;
+
         ManaReso.Save(Player);
 
         Instance.GetPlayer();
 
         ManaReso.Get<HudTarget>("C_MiniGame").PosTra = Player.ChildDic["EnterGameTra"];
+
+        if (ManaReso.Contains(tra))
+        {
+            Destroy(tra.gameObject);
+        }
     }
 
 
@@ -58,9 +65,9 @@ public class ManaPlayer : Regist
         }
         else
         {
-            PlayerPink = ManaReso.Get<ObjRoot>("Player", Folder.Scene, false, ManaReso.Get("PlayerPos3"), false, ObjType.PlayerPink);
-            PlayerBlond = ManaReso.Get<ObjRoot>("Player", Folder.Scene, false, ManaReso.Get("PlayerPos2"), false, ObjType.PlayerBlond);
-            PlayerBrown = ManaReso.Get<ObjRoot>("Player", Folder.Scene, false, ManaReso.Get("PlayerPos1"), false, ObjType.PlayerBrown);
+            PlayerPink = ManaReso.Get("Player", Folder.Scene, false, ManaReso.Get("PlayerPos3"), false, ObjType.PlayerPink);
+            PlayerBlond = ManaReso.Get("Player", Folder.Scene, false, ManaReso.Get("PlayerPos2"), false, ObjType.PlayerBlond);
+            PlayerBrown = ManaReso.Get("Player", Folder.Scene, false, ManaReso.Get("PlayerPos1"), false, ObjType.PlayerBrown);
 
             if (PlayerPink.GetComponent<Player>() == null)
             {
@@ -97,7 +104,7 @@ public class ManaPlayer : Regist
         string player = Data.GetPlayerString("Player");
 
 
-        Transform tra = ManaReso.Get<ObjRoot>("Player", Folder.Scene, false, transform, ManaReso.Get("PlayerPosTra").position, player.ToEnum<ObjType>());
+        Transform tra = ManaReso.Get("Player", Folder.Scene, false, transform, ManaReso.Get("PlayerPosTra").position, player.ToEnum<ObjType>());
 
         Player = tra.GetComponent<Player>();
 

Assets/Script/Manage/ManaReso.cs

@@ -94,6 +94,7 @@ public class ManaReso : Regist
 
     public static Dictionary<string, Object> ObjDic = new Dictionary<string, Object>();
     public static Dictionary<string, Transform> TraDic = new Dictionary<string, Transform>();
+    public static Dictionary<GameObject, ObjType> ObjPoolDic = new Dictionary<GameObject, ObjType>();
 
     public static Dictionary<ObjType, List<Transform>> ObjectPool = new Dictionary<ObjType, List<Transform>>();
 
@@ -187,55 +188,21 @@ public class ManaReso : Regist
 
     public static void Save<T>(T t, bool aware = false) where T : Component
     {
-        Transform tra = t.transform;
-
-        ObjRoot objRoot = tra.GetComponent<ObjRoot>();
-
-        if (objRoot == null)
-        {
-            throw new Exception();
-        }
-
-        List<Transform> traList;
-
-        if (ObjectPool.TryGetValue(objRoot.ObjType, out traList))
-        {
-            if (traList.Contains(tra))
-            {
-                if (aware)
-                {
-                    return;
-                }
-                else
-                {
-                    throw new Exception();
-                }
-            }
-
-            tra.SetActive(false);
-
-            traList.Add(tra);
-
-            tra.transform.SetParent(Get("ObjPool"));
-        }
-        else
-        {
-            throw new Exception();
-        }
+        Save(t.gameObject);
     }
 
     public static void Save(GameObject go, bool aware = false)
     {
-        ObjRoot objRoot = go.GetComponent<ObjRoot>();
+        ObjType objType;
 
-        if (objRoot == null)
+        if (!ObjPoolDic.TryGetValue(go, out objType))
         {
             throw new Exception();
         }
 
         List<Transform> traList;
 
-        if (ObjectPool.TryGetValue(objRoot.ObjType, out traList))
+        if (ObjectPool.TryGetValue(objType, out traList))
         {
             if (traList.Contains(go.transform))
             {
@@ -262,6 +229,24 @@ public class ManaReso : Regist
     }
 
 
+    public static bool Contains<T>(T t) where T : Component
+    {
+        return Contains(t.gameObject);
+    }
+
+    public static bool Contains(GameObject go)
+    {
+        foreach (var kv in ObjectPool)
+        {
+            if (kv.Value.Contains(go.transform))
+            {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     public static Transform Get(ObjType objType)
     {
         List<Transform> traList;
@@ -431,7 +416,7 @@ public class ManaReso : Regist
         return Load<Sprite>(goName, Folder.UI);
     }
 
-    public static Transform Get<T>(string goName, Folder folder, bool compile, Transform par, bool worldSpace, ObjType objType = ObjType.Null) where T : ObjRoot
+    public static Transform Get(string goName, Folder folder, bool compile, Transform par, bool worldSpace, ObjType objType = ObjType.Null, Type type = null)
     {
         Transform tra = Get(objType);
 
@@ -449,7 +434,12 @@ public class ManaReso : Regist
 
             if (objType != ObjType.Null)
             {
-                go.AddComponent<T>().ObjType = objType;
+                ObjPoolDic.Add(go, objType);
+            }
+
+            if (type != null)
+            {
+                go.AddComponent(type);
             }
 
             return go.transform;
@@ -478,7 +468,7 @@ public class ManaReso : Regist
         }
     }
 
-    public static Transform Get<T>(string goName, Folder folder, bool compile, Transform par, Vector3 pos, ObjType objType = ObjType.Null) where T : ObjRoot
+    public static Transform Get(string goName, Folder folder, bool compile, Transform par, Vector3 pos, ObjType objType = ObjType.Null, Type type = null)
     {
         Transform tra = Get(objType);
 
@@ -496,7 +486,12 @@ public class ManaReso : Regist
 
             if (objType != ObjType.Null)
             {
-                go.AddComponent<T>().ObjType = objType;
+                ObjPoolDic.Add(go, objType);
+            }
+
+            if (type != null)
+            {
+                go.AddComponent(type);
             }
 
             return go.transform;
@@ -527,11 +522,11 @@ public class ManaReso : Regist
 
         if (objType == ObjType.DropGold)
         {
-            tra = Get<DropGold>(objType.ToString(), Folder.UI, false, null, pos, objType);
+            tra = Get(objType.ToString(), Folder.UI, false, null, pos, objType, typeof(DropGold));
         }
         else if(objType == ObjType.DropDiamond)
         {
-            tra = Get<DropDiamond>(objType.ToString(), Folder.UI, false, null, pos, objType);
+            tra = Get(objType.ToString(), Folder.UI, false, null, pos, objType, typeof(DropDiamond));
         }
         else
         {
@@ -549,7 +544,7 @@ public class ManaReso : Regist
 
     public static Flower GetFlower(FlowerInfo flowerInfo, Slot slot, bool collider)
     {
-        Transform tra = Get<Flower>("Flower", Folder.Scene, false, slot.transform, false, ObjType.Flower);
+        Transform tra = Get("Flower", Folder.Scene, false, slot.transform, false, ObjType.Flower, typeof(Flower));
 
         tra.localScale = new Vector3(1, 1, 1);
 
@@ -569,7 +564,7 @@ public class ManaReso : Regist
 
     public static Flower GetFlower(FlowerInfo flowerInfo, Transform par)
     {
-        Transform tra = Get<Flower>("Flower", Folder.Scene, false, par, false, ObjType.Flower);
+        Transform tra = Get("Flower", Folder.Scene, false, par, false, ObjType.Flower, typeof(Flower));
 
         tra.localScale = new Vector3(1, 1, 1);
 
@@ -600,7 +595,7 @@ public class ManaReso : Regist
             pos = posTra.position;
         }
 
-        Transform tra = Get<HudText>("HudText", Folder.UI, false, parTra, pos, ObjType.HudText);
+        Transform tra = Get("HudText", Folder.UI, false, parTra, pos, ObjType.HudText, typeof(HudText));
 
         HudText hudText = tra.GetComponent<HudText>();
 
@@ -621,7 +616,7 @@ public class ManaReso : Regist
 
         pos.z -= Random.Range(0.001f, 0.1f);
 
-        tra = Get<ObjRoot>(obj.ToString(), Folder.Scene, false, par, pos, obj);
+        tra = Get(obj.ToString(), Folder.Scene, false, par, pos, obj);
 
         Elf elf = tra.GetChild(0).GetComponent<Elf>();
 
@@ -658,19 +653,19 @@ public class ManaReso : Regist
 
         if (skillRoot.SkillTab == SkillTab.Elf)
         {
-            tra = Get<ObjRoot>("SkillItem", Folder.UI, false, Get("Fd_Grid"), false, ObjType.SkillItem);
+            tra = Get("SkillItem", Folder.UI, false, Get("Fd_Grid"), false, ObjType.SkillItem);
         }
         else if (skillRoot.SkillTab == SkillTab.Store)
         {
-            tra = Get<ObjRoot>("SkillItem", Folder.UI, false, Get("Fc_Grid"), false, ObjType.SkillItem);
+            tra = Get("SkillItem", Folder.UI, false, Get("Fc_Grid"), false, ObjType.SkillItem);
         }
         else if (skillRoot.SkillTab == SkillTab.Magic)
         {
-            tra = Get<ObjRoot>("SkillItem", Folder.UI, false, Get("Fb_Grid"), false, ObjType.SkillItem);
+            tra = Get("SkillItem", Folder.UI, false, Get("Fb_Grid"), false, ObjType.SkillItem);
         }
         else if (skillRoot.SkillTab == SkillTab.Garden)
         {
-            tra = Get<ObjRoot>("SkillItem", Folder.UI, false, Get("Fa_Grid"), false, ObjType.SkillItem);
+            tra = Get("SkillItem", Folder.UI, false, Get("Fa_Grid"), false, ObjType.SkillItem);
         }
         else
         {
@@ -684,7 +679,7 @@ public class ManaReso : Regist
 
     public static Transform GetAchieveItem()
     {
-        Transform tra = Get<ObjRoot>("AchieveItem", Folder.UI, false, ManaReso.Get("M_Grid"), false, ObjType.AchieveItem);
+        Transform tra = Get("AchieveItem", Folder.UI, false, ManaReso.Get("M_Grid"), false, ObjType.AchieveItem);
 
         return tra;
     }
@@ -692,7 +687,7 @@ public class ManaReso : Regist
 
     public static ParticleSystem GetFirework(Vector3 pos)
     {
-        Transform tra = Get<Effect>("Firework", Folder.Effect, false, null, pos, ObjType.Firework);
+        Transform tra = Get("Firework", Folder.Effect, false, null, pos, ObjType.Firework, typeof(Effect));
 
         ParticleSystem particle = tra.GetComponent<ParticleSystem>();
 
@@ -703,7 +698,7 @@ public class ManaReso : Regist
 
     public static ParticleSystem GetLightwall()
     {
-        Transform tra = Get<Effect>("LightwallUI", Folder.Effect, false, Get("Canvas"), false, ObjType.LightwallUI);
+        Transform tra = Get("LightwallUI", Folder.Effect, false, Get("Canvas"), false, ObjType.LightwallUI, typeof(Effect));
 
         ParticleSystem particle = tra.GetComponent<ParticleSystem>();
 
@@ -759,7 +754,7 @@ public class ManaReso : Regist
         InstantiateList.Add(kv);
     }
 
-    public static void AsyncLoad<T>(string goName, int amt, Folder folder, ObjType objType, bool ui = false, bool canvas = false, UnityAction callback = null) where T : ObjRoot
+    public static void AsyncLoad(string goName, int amt, Folder folder, ObjType objType, bool ui = false, bool canvas = false, UnityAction callback = null, Type type = null)
     {
         KV<AsyncRequest, UnityAction> kv = new KV<AsyncRequest, UnityAction>();
 
@@ -815,7 +810,12 @@ public class ManaReso : Regist
                 go = (GameObject)Instantiate(bundleRequest.asset);
             }
 
-            go.AddComponent<T>().ObjType = objType;
+            ObjPoolDic.Add(go, objType);
+
+            if (type != null)
+            {
+                go.AddComponent(type);
+            }
 
             go.name = go.name.Replace("(Clone)", "");
 
@@ -846,13 +846,13 @@ public class ManaReso : Regist
         );
     }
 
-    public static void AddAsyncLoad<T>(string goName, int amt, Folder folder, ObjType objType, bool ui = false, bool canvas = false, UnityAction callback = null) where T : ObjRoot
+    public static void AddAsyncLoad(string goName, int amt, Folder folder, ObjType objType, bool ui = false, bool canvas = false, UnityAction callback = null, Type type = null)
     {
         AsyncList.Add
         (
             () =>
             {
-                AsyncLoad<T>(goName, amt, folder, objType, ui, canvas, callback);
+                AsyncLoad(goName, amt, folder, objType, ui, canvas, callback, type);
             }
         );
     }
@@ -891,7 +891,7 @@ public class ManaReso : Regist
 
                         go.AddScript<Player>().BuildPink();
 
-                        go.AddComponent<ObjRoot>().ObjType = objType;
+                        ObjPoolDic.Add(go, objType);
                     }
                     else if (player == "PlayerBlond")
                     {
@@ -901,7 +901,7 @@ public class ManaReso : Regist
 
                         go.AddScript<Player>().BuildBlond();
 
-                        go.AddComponent<ObjRoot>().ObjType = objType;
+                        ObjPoolDic.Add(go, objType);
                     }
                     else if(player == "PlayerBrown")
                     {
@@ -911,7 +911,7 @@ public class ManaReso : Regist
 
                         go.AddScript<Player>().BuildBrown();
 
-                        go.AddComponent<ObjRoot>().ObjType = objType;
+                        ObjPoolDic.Add(go, objType);
                     }
                     else
                     {

Assets/Script/Manage/ManaServer.cs

@@ -91,49 +91,36 @@ public class ManaServer : Regist
 
     private static void LoginCallback(JsonData jsonData)
     {
-        try
-        {
-            LoginComplete = true;
+        LoginComplete = true;
 
-            if (jsonData.Inst_Object.ContainsKey("c") && jsonData["c"].ToJson() == "0")
-            {
-                Connect = true;
+        if (jsonData.Inst_Object.ContainsKey("c"))
+        {
+            Connect = true;
 
-                JsonData = jsonData;
+            JsonData = jsonData;
 
-                Time = DateUtil.GetTime(jsonData["time"].ToJson());
+            Time = DateUtil.GetTime(jsonData["time"].ToJson());
 
-                if (Data._PlayerDoc != null)
+            if (Data._PlayerDoc != null)
+            {
+                if (Data.GetPlayerString("ID") == "Default")
                 {
-                    if (Data.GetPlayerString("ID") == "Default")
-                    {
-                        ID = jsonData["o"].ToString();
+                    ID = jsonData["o"].ToString();
 
-                        if (Initializer.LoadComplete)
-                        {
-                            ManaReso.SetText("L_UserLab", ID);
-                        }
+                    if (Initializer.LoadComplete)
+                    {
+                        ManaReso.SetText("L_UserLab", ID);
                     }
                 }
-
-                ManaDebug.Log("<color=red>连接成功</color>");
             }
-            else
-            {
-                Connect = false;
 
-                ManaDebug.Log("<color=red>连接失败</color>");
-            }
+            ManaDebug.Log("<color=red>连接成功</color>");
         }
-        catch (Exception e)
+        else
         {
-            ManaDebug.Log(e.Message);
-            ManaDebug.Log(jsonData.ToJson());
-            ManaDebug.Log("如果看到这个Bug,把上面的调试信息发给我,thank you");
+            Connect = false;
 
-            Debug.Log(e.Message);
-            Debug.Log(jsonData.ToJson());
-            Debug.LogError("如果看到这个Bug,把上面的调试信息发给我,thank you");
+            ManaDebug.Log("<color=red>连接失败</color>");
         }
     }
 

Assets/Script/Manage/ManaSign.cs

@@ -225,7 +225,7 @@ public class ManaSign : Regist
 
         for (int i = 0; i < attributeList.Count; i++)
         {
-            Transform tra = ManaReso.Get<ObjRoot>("SignItem", Folder.UI, false, par, false, ObjType.SignItem);
+            Transform tra = ManaReso.Get("SignItem", Folder.UI, false, par, false, ObjType.SignItem);
 
             SignDic.Add(i + 1, new Sign(i + 1, tra, attributeList[i]));
         }

Assets/Script/Manage/ManaTutorial.cs

@@ -75,7 +75,7 @@ public class ManaTutorial : Regist
     {
         if (TutorialA)
         {
-            ManaReso.Get<ObjRoot>("Tutorial", Folder.Scene, true, transform, false, ObjType.Tutorial).AddScript<Tutorial>();
+            ManaReso.Get("Tutorial", Folder.Scene, true, transform, false, ObjType.Tutorial).AddScript<Tutorial>();
         }
     }
 
@@ -207,6 +207,9 @@ public class ManaTutorial : Regist
 
         ManaReso.SetActive("Tutorial", false);
         ManaReso.SetActive("N_Tutorial", false);
+
+        PayExemptAmt = 0;
+        ConnectExemptAmt = 0;
     }
 
 
@@ -471,6 +474,8 @@ public class ManaTutorial : Regist
             () =>
             {
                 Tutorial.HightDisable(0, true);
+
+                PayExemptAmt = 1;
             }
         );
 
@@ -487,7 +492,12 @@ public class ManaTutorial : Regist
                 ManaReso.AddButtonEventOnetime
                 (
                     "Fe_Btn",
-                    EndStep7
+
+                    () =>
+                    {
+                        ManaReso.Get("Fe_Info").TweenBacCG();
+                        EndStep7();
+                    }
                 );
             }
         );
@@ -516,6 +526,8 @@ public class ManaTutorial : Regist
             () =>
             {
                 Tutorial.HightDisable(0, true);
+
+                PayExemptAmt = 1;
             }
         );
 
@@ -532,7 +544,11 @@ public class ManaTutorial : Regist
                 ManaReso.AddButtonEventOnetime
                 (
                     "Fe_Btn",
-                    EndStep8
+                    () =>
+                    {
+                        ManaReso.Get("Fe_Info").TweenBacCG();
+                        EndStep8();
+                    }
                 );
             }
         );
@@ -560,8 +576,6 @@ public class ManaTutorial : Regist
             () =>
             {
                 EndStep9();
-
-                ConnectExemptAmt = 0;
             }
         );
     }

Assets/Script/Manage/ManaUI.cs

@@ -30,20 +30,20 @@ public class ManaUI : Regist
 
         tra.parent = Transform;
 
-        Canvas = ManaReso.Get<ObjRoot>("Canvas", Folder.UI, false, tra, false, ObjType.Canvas);
-        Camera = ManaReso.Get<ObjRoot>("MainCamera", Folder.UI, true, tra, false, ObjType.MainCamera);
-        EventSystem = ManaReso.Get<ObjRoot>("EventSystem", Folder.UI, false, tra, false, ObjType.EventSystem);
+        Canvas = ManaReso.Get("Canvas", Folder.UI, false, tra, false, ObjType.Canvas);
+        Camera = ManaReso.Get("MainCamera", Folder.UI, true, tra, false, ObjType.MainCamera);
+        EventSystem = ManaReso.Get("EventSystem", Folder.UI, false, tra, false, ObjType.EventSystem);
 
-        tra = ManaReso.Get<ObjRoot>("GroupA", Folder.UI, true, Canvas, false, ObjType.GroupA);
+        tra = ManaReso.Get("GroupA", Folder.UI, true, Canvas, false, ObjType.GroupA);
         tra.SetActive(true);
 
-        tra = ManaReso.Get<ObjRoot>("GroupB", Folder.UI, true, Canvas, false, ObjType.GroupB);
+        tra = ManaReso.Get("GroupB", Folder.UI, true, Canvas, false, ObjType.GroupB);
         tra.SetActive(true);
 
-        tra = ManaReso.Get<ObjRoot>("GroupC", Folder.UI, true, Canvas, false, ObjType.GroupC);
+        tra = ManaReso.Get("GroupC", Folder.UI, true, Canvas, false, ObjType.GroupC);
         tra.SetActive(true);
 
-        tra = ManaReso.Get<ObjRoot>("GroupD", Folder.UI, true, Canvas, false, ObjType.GroupD);
+        tra = ManaReso.Get("GroupD", Folder.UI, true, Canvas, false, ObjType.GroupD);
         tra.SetActive(true);
 
         ManaReso.TraDic.Add(Canvas.name, Canvas);
@@ -97,6 +97,12 @@ public class ManaUI : Regist
 
         #endregion
 
+        #region Ba_Notice
+
+        ManaReso.Get("Ba_Notice").CreateTweenCG(0f, 1f, 0.5f, false, true, Curve.EaseOutQuad);
+
+        #endregion
+
         #region Ba_Confirm
 
         ManaReso.AddButtonEvent

Assets/Script/Manage/ManagerIAP.cs

@@ -45,9 +45,9 @@ public class ManagerIAP : MonoBehaviour, IStoreListener
 
         UnityPurchasing.Initialize(Instance, cb);
 
-        ShareSdk = Instance.gameObject.AddComponent<ShareSDK>();
+        //ShareSdk = Instance.gameObject.AddComponent<ShareSDK>();
 
-        ShareSdk.Initialize();
+        //ShareSdk.Initialize();
     }
 
     public static void InitializeAd()

Assets/Script/Object/Drop.cs

@@ -4,7 +4,7 @@ using UnityEngine.EventSystems;
 using System.Collections;
 using System.Collections.Generic;
 
-public class Drop : ObjRoot,IPointerClickHandler
+public class Drop : Regist,IPointerClickHandler
 {
     #region 变量
 

Assets/Script/Object/DropDiamond.cs

@@ -24,8 +24,6 @@ public class DropDiamond : Drop
         }
 
         base.RegistImmed();
-
-        ObjType = ObjType.DropDiamond;
     }
 
     public override void OnPointerClick(PointerEventData eventData)

Assets/Script/Object/DropGold.cs

@@ -24,8 +24,6 @@ public class DropGold : Drop
         }
 
         base.RegistImmed();
-
-	    ObjType = ObjType.DropGold;
     }
 
     public override void OnPointerClick(PointerEventData eventData)

Assets/Script/Object/Effect.cs

@@ -2,7 +2,7 @@
 
 using System.Collections;
 
-public class Effect : ObjRoot 
+public class Effect : Regist 
 {
     #region 变量
 

Assets/Script/Object/Flower.cs

@@ -117,7 +117,7 @@ public class FlowerInfo
 
     public FlowerInfo(XmlAttributeCollection attribute)
     {
-        FlowerItem = ManaReso.Get<ObjRoot>("FlowerItem", Folder.UI, false, ManaReso.Get("G_RegularGrid"),  false, ObjType.FlowerItem);
+        FlowerItem = ManaReso.Get("FlowerItem", Folder.UI, false, ManaReso.Get("G_RegularGrid"),  false, ObjType.FlowerItem);
 
         Dictionary<string, Transform> dic = new Dictionary<string, Transform>();
 
@@ -155,7 +155,7 @@ public class FlowerInfo
     }
 }
 
-public class Flower : ObjRoot, IPointerClickHandler
+public class Flower : Regist, IPointerClickHandler
 {
     #region 变量
 

Assets/Script/Object/ObjRoot.cs

@@ -1,9 +0,0 @@
-using UnityEngine;
-
-using System;
-using System.Collections;
-
-public class ObjRoot : Regist 
-{
-    public ObjType ObjType;
-}

Assets/Script/Object/ObjRoot.cs.meta

@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: c13373c396f60184dadab851ef7e537d
-timeCreated: 1486383871
-licenseType: Pro
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Script/Object/Skill/Ability.cs

@@ -353,7 +353,10 @@ public class Ability : SkillRoot
         {
             ItemStatus = SkillStatus.Upgrade;
 
-            ManaAudio.PlayClip(Clip.SkillClip);
+            if (!ManaTutorial.TutorialA)
+            {
+                ManaAudio.PlayClip(Clip.SkillClip);
+            }
 
             Level = 1;
 
@@ -532,11 +535,23 @@ public class Ability : SkillRoot
 
     public override void UpdateStatus()
     {
+        if (!ManaData.InitiateComplete)
+        {
+            return;
+        }
+
         if (ManaData.Level >= UnlockLv)
         {
             if (ItemStatus == SkillStatus.Lock)
             {
-                ItemStatus = SkillStatus.UnLock;
+                if (UnlockCur == Current.Free)
+                {
+                    Unlock();
+                }
+                else
+                {
+                    ItemStatus = SkillStatus.UnLock;
+                }
             }
         }
     }

Assets/Script/Object/Skill/BigSkill.cs

@@ -333,7 +333,14 @@ public class BigSkill : Skill
             {
                 if (ItemStatus == SkillStatus.Lock)
                 {
-                    ItemStatus = SkillStatus.UnLock;
+                    if (UnlockCur == Current.Free)
+                    {
+                        Unlock();
+                    }
+                    else
+                    {
+                        ItemStatus = SkillStatus.UnLock;
+                    }
                 }
             }
         }
@@ -361,7 +368,10 @@ public class BigSkill : Skill
     {
         ManaData.Pay(ID, UnlockAmt, UnlockCur, () =>
         {
-            ManaAudio.PlayClip(Clip.SkillClip);
+            if (!ManaTutorial.TutorialA)
+            {
+                ManaAudio.PlayClip(Clip.SkillClip);
+            }
 
             BarStatus = SkillStatus.Buy;
             ItemStatus = SkillStatus.Upgrade;

Assets/Script/Tool/Auxiliary.cs

@@ -108,11 +108,6 @@ public class Auxiliary : Regist
     {
         #region 调试
 
-        if (Input.GetKeyDown(KeyCode.P))
-        {
-            ManaSign.SignIndex = 21;
-        }
-
         //if (Input.GetKeyDown(KeyCode.P))
         //{
         //    ManaData.Level += 20;

Assets/Script/Tool/Bundle.cs

@@ -75,20 +75,20 @@ public class Bundle : Regist
 
         if (!Logo.LogoComplete)
         {
-            ManaReso.AddAsyncLoad<ObjRoot>("Canvas",1,Folder.UI,ObjType.Canvas);
+            ManaReso.AddAsyncLoad("Canvas",1,Folder.UI,ObjType.Canvas);
 
-            ManaReso.AddAsyncLoad<ObjRoot>("GroupA", 1, Folder.UI, ObjType.GroupA, true);
-            ManaReso.AddAsyncLoad<ObjRoot>("GroupB", 1, Folder.UI, ObjType.GroupB, true);
-            ManaReso.AddAsyncLoad<ObjRoot>("GroupC", 1, Folder.UI, ObjType.GroupC, true);
-            ManaReso.AddAsyncLoad<ObjRoot>("GroupD", 1, Folder.UI, ObjType.GroupD, true);
+            ManaReso.AddAsyncLoad("GroupA", 1, Folder.UI, ObjType.GroupA, true);
+            ManaReso.AddAsyncLoad("GroupB", 1, Folder.UI, ObjType.GroupB, true);
+            ManaReso.AddAsyncLoad("GroupC", 1, Folder.UI, ObjType.GroupC, true);
+            ManaReso.AddAsyncLoad("GroupD", 1, Folder.UI, ObjType.GroupD, true);
 
-            ManaReso.AddAsyncLoad<ObjRoot>("EventSystem", 1, Folder.UI, ObjType.EventSystem);
-            ManaReso.AddAsyncLoad<ObjRoot>("MainCamera", 1, Folder.UI, ObjType.MainCamera);
+            ManaReso.AddAsyncLoad("EventSystem", 1, Folder.UI, ObjType.EventSystem);
+            ManaReso.AddAsyncLoad("MainCamera", 1, Folder.UI, ObjType.MainCamera);
 
-            ManaReso.AddAsyncLoad<ObjRoot>("SkillItem", 31, Folder.UI, ObjType.SkillItem, true);
-            ManaReso.AddAsyncLoad<ObjRoot>("SignItem", 21, Folder.UI, ObjType.SignItem, true);
-            ManaReso.AddAsyncLoad<ObjRoot>("FlowerItem", 17, Folder.UI, ObjType.FlowerItem, true);
-            ManaReso.AddAsyncLoad<ObjRoot>("AchieveItem", 2, Folder.UI, ObjType.AchieveItem, true);
+            ManaReso.AddAsyncLoad("SkillItem", 31, Folder.UI, ObjType.SkillItem, true);
+            ManaReso.AddAsyncLoad("SignItem", 21, Folder.UI, ObjType.SignItem, true);
+            ManaReso.AddAsyncLoad("FlowerItem", 17, Folder.UI, ObjType.FlowerItem, true);
+            ManaReso.AddAsyncLoad("AchieveItem", 2, Folder.UI, ObjType.AchieveItem, true);
         }
 
         yield return LoadScene();
@@ -106,17 +106,17 @@ public class Bundle : Regist
             //    ManaReso.AddAsyncPlayer(Data.GetPlayerString("Player"));
             //}
 
-            ManaReso.AddAsyncLoad<Flower>("Flower", 9, Folder.Scene, ObjType.Flower);
+            ManaReso.AddAsyncLoad("Flower", 9, Folder.Scene, ObjType.Flower, false, false, null, typeof(Flower));
 
-            ManaReso.AddAsyncLoad<ObjRoot>("Page", 2, Folder.Scene, ObjType.Page);
-            ManaReso.AddAsyncLoad<ObjRoot>("Garden", 1, Folder.Scene, ObjType.Garden);
+            ManaReso.AddAsyncLoad("Page", 2, Folder.Scene, ObjType.Page);
+            ManaReso.AddAsyncLoad("Garden", 1, Folder.Scene, ObjType.Garden);
         }
 
         yield return LoadAudio();
 
         if (!Logo.LogoComplete)
         {
-            ManaReso.AddAsyncLoad<ObjRoot>("Music", 1, Folder.Audio, ObjType.Music);
+            ManaReso.AddAsyncLoad("Music", 1, Folder.Audio, ObjType.Music);
 
 
             ManaReso.AddAsyncLoad("skill_config", Folder.Config);

Assets/Script/Tool/DashGame/URLRequest.cs

@@ -111,8 +111,7 @@ public class URLRequest : MonoBehaviour
 		}
 		
 		JsonData json = new JsonData();
-		json["c"] = -1;
-		json["d"] = data;
+	    json["error"] = 0;
 		return json;
 	}
 }

Assets/Script/Tool/Data.cs

@@ -134,7 +134,7 @@ public class Data
         {
             return;
         }
-
+        
         XmlNode xmlNode;
         XmlAttribute xmlAttribute;
 
@@ -304,10 +304,14 @@ public class Data
 
     private static void SaveCommon()
     {
+        if (!ManaTutorial.TutorialA)
+        {
+            PlayerNode.SelectSingleNode("Level").Attributes[0].Value = ManaData.Level.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 = ManaData.Coin.ToString("0");
-        PlayerNode.SelectSingleNode("Level").Attributes[0].Value = ManaData.Level.ToString();
         PlayerNode.SelectSingleNode("Diamond").Attributes[0].Value = ManaData.Diamond.ToString();
         PlayerNode.SelectSingleNode("QuitTime").Attributes[0].Value = ManaServer.Time.ToString();
         PlayerNode.SelectSingleNode("MiniTimer").Attributes[0].Value = ManaData.MiniTimer.ToString();

Assets/Script/Tool/Extension.cs

@@ -1044,7 +1044,6 @@ public static class Extension
 
         Rect rect2 = tra2.rect;
 
-
         if (locatePos == LocatePos.Up)
         {
             Vector3 itemPos = tra2.position + new Vector3(0, rect2.yMax, 0);
@@ -1062,7 +1061,7 @@ public static class Extension
 
             Vector3 offset = targetPos - itemPos;
             offset.x = 0;
-            
+
             return scrollRect.content.MoveOffset2D(offset, duration, false, curve);
         }
         else if (locatePos == LocatePos.Middle)

Assets/Script/Tool/UI/HudText.cs

@@ -4,7 +4,7 @@ using UnityEngine.UI;
 using System;
 using System.Collections;
 
-public class HudText : ObjRoot 
+public class HudText : Regist 
 {
     #region 变量
 

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>
@@ -166,12 +166,12 @@
     <Reference Include="Excel">
       <HintPath>Assets\Resource\Plugins\Xlsx\Excel.dll</HintPath>
     </Reference>
-    <Reference Include="ICSharpCode.SharpZipLib">
-      <HintPath>Assets\Resource\Plugins\Xlsx\ICSharpCode.SharpZipLib.dll</HintPath>
-    </Reference>
     <Reference Include="System.Data">
       <HintPath>Assets\Resource\Plugins\Xlsx\System.Data.dll</HintPath>
     </Reference>
+    <Reference Include="ICSharpCode.SharpZipLib">
+      <HintPath>Assets\ShareSDKiOSAutoPackage\Editor\SDKPorter\XCodeEditor\ICSharpCode.SharpZipLib.dll</HintPath>
+    </Reference>
     <Reference Include="UnityEngine.Advertisements.Editor">
       <HintPath>Assets\UnityAds\UnityEngine.Advertisements.Editor.dll</HintPath>
     </Reference>
@@ -198,8 +198,39 @@
     <Compile Include="Assets\Script\Editor\EditorLanguageExport.cs" />
     <Compile Include="Assets\Script\Editor\EditorPlayer.cs" />
     <Compile Include="Assets\Script\Editor\EditorSpriteAsste.cs" />
+    <Compile Include="Assets\ShareSDKiOSAutoPackage\Editor\SDKPorter\ManagePlatforms\ChosenPlatforms.cs" />
+    <Compile Include="Assets\ShareSDKiOSAutoPackage\Editor\SDKPorter\ManagePlatforms\EditorUI.cs" />
+    <Compile Include="Assets\ShareSDKiOSAutoPackage\Editor\SDKPorter\ShareSDKPostProcessBuild.cs" />
+    <Compile Include="Assets\ShareSDKiOSAutoPackage\Editor\SDKPorter\XCPlist.cs" />
+    <Compile Include="Assets\ShareSDKiOSAutoPackage\Editor\SDKPorter\XCodeEditor\PBXBuildFile.cs" />
+    <Compile Include="Assets\ShareSDKiOSAutoPackage\Editor\SDKPorter\XCodeEditor\PBXBuildPhase.cs" />
+    <Compile Include="Assets\ShareSDKiOSAutoPackage\Editor\SDKPorter\XCodeEditor\PBXDictionary.cs" />
+    <Compile Include="Assets\ShareSDKiOSAutoPackage\Editor\SDKPorter\XCodeEditor\PBXFileReference.cs" />
+    <Compile Include="Assets\ShareSDKiOSAutoPackage\Editor\SDKPorter\XCodeEditor\PBXGroup.cs" />
+    <Compile Include="Assets\ShareSDKiOSAutoPackage\Editor\SDKPorter\XCodeEditor\PBXList.cs" />
+    <Compile Include="Assets\ShareSDKiOSAutoPackage\Editor\SDKPorter\XCodeEditor\PBXObject.cs" />
+    <Compile Include="Assets\ShareSDKiOSAutoPackage\Editor\SDKPorter\XCodeEditor\PBXParser.cs" />
+    <Compile Include="Assets\ShareSDKiOSAutoPackage\Editor\SDKPorter\XCodeEditor\PBXProject.cs" />
+    <Compile Include="Assets\ShareSDKiOSAutoPackage\Editor\SDKPorter\XCodeEditor\XCBuildConfiguration.cs" />
+    <Compile Include="Assets\ShareSDKiOSAutoPackage\Editor\SDKPorter\XCodeEditor\XCConfigurationList.cs" />
+    <Compile Include="Assets\ShareSDKiOSAutoPackage\Editor\SDKPorter\XCodeEditor\XCFileOperationQueue.cs" />
+    <Compile Include="Assets\ShareSDKiOSAutoPackage\Editor\SDKPorter\XCodeEditor\XCMod.cs" />
+    <Compile Include="Assets\ShareSDKiOSAutoPackage\Editor\SDKPorter\XCodeEditor\XCProject.cs" />
+    <Compile Include="Assets\ShareSDKiOSAutoPackage\Editor\SDKPorter\XCodeEditor\XCSourceFile.cs" />
+    <Compile Include="Assets\ShareSDKiOSAutoPackage\Editor\SDKPorter\XCodeEditor\XCTarget.cs" />
+    <Compile Include="Assets\ShareSDKiOSAutoPackage\Editor\SDKPorter\XCodeEditor\XCodeEditorMenu.cs" />
+    <Compile Include="Assets\ShareSDKiOSAutoPackage\Editor\SDKPorter\XCodeEditor\ZipHelper.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="Assets\Plugins\Android\ShareSDK\AndroidManifest.xml" />
+    <None Include="Assets\Plugins\Android\ShareSDK\res\drawable\ssdk_oks_classic_platform_cell_back.xml" />
+    <None Include="Assets\Plugins\Android\ShareSDK\res\drawable\ssdk_oks_classic_progressbar.xml" />
+    <None Include="Assets\Plugins\Android\ShareSDK\res\values-en\ssdk_oks_strings.xml" />
+    <None Include="Assets\Plugins\Android\ShareSDK\res\values-en\ssdk_strings.xml" />
+    <None Include="Assets\Plugins\Android\ShareSDK\res\values\ssdk_instapaper_strings.xml" />
+    <None Include="Assets\Plugins\Android\ShareSDK\res\values\ssdk_oks_color_drawables.xml" />
+    <None Include="Assets\Plugins\Android\ShareSDK\res\values\ssdk_oks_strings.xml" />
+    <None Include="Assets\Plugins\Android\ShareSDK\res\values\ssdk_strings.xml" />
     <None Include="Assets\Resource\Effect\Cartoon FX\CartoonFX Readme.txt" />
     <None Include="Assets\Resource\Effect\Cartoon FX\CartoonFX Releases Notes.txt" />
     <None Include="Assets\Resource\Effect\Cartoon FX\Demo\Assets\CFX_Demo_WaterWiggle.shader" />

MyLovelyGarden.csproj

@@ -15,7 +15,7 @@
     <TargetFrameworkProfile>Unity Subset v3.5</TargetFrameworkProfile>
     <CompilerResponseFile></CompilerResponseFile>
     <UnityProjectType>Game:1</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>
@@ -115,9 +115,6 @@
     <Reference Include="Excel">
       <HintPath>Assets\Resource\Plugins\Xlsx\Excel.dll</HintPath>
     </Reference>
-    <Reference Include="ICSharpCode.SharpZipLib">
-      <HintPath>Assets\Resource\Plugins\Xlsx\ICSharpCode.SharpZipLib.dll</HintPath>
-    </Reference>
     <Reference Include="System.Data">
       <HintPath>Assets\Resource\Plugins\Xlsx\System.Data.dll</HintPath>
     </Reference>
@@ -200,7 +197,6 @@
     <Compile Include="Assets\Script\Object\Elf.cs" />
     <Compile Include="Assets\Script\Object\Flower.cs" />
     <Compile Include="Assets\Script\Object\Garden.cs" />
-    <Compile Include="Assets\Script\Object\ObjRoot.cs" />
     <Compile Include="Assets\Script\Object\Player.cs" />
     <Compile Include="Assets\Script\Object\Skill\Ability.cs" />
     <Compile Include="Assets\Script\Object\Skill\BigSkill.cs" />
@@ -221,6 +217,7 @@
     <Compile Include="Assets\Script\Tool\Anim\TweenFont.cs" />
     <Compile Include="Assets\Script\Tool\Anim\TweenGra.cs" />
     <Compile Include="Assets\Script\Tool\Anim\TweenNumber.cs" />
+    <Compile Include="Assets\Script\Tool\Anim\TweenOutline.cs" />
     <Compile Include="Assets\Script\Tool\Anim\TweenRect.cs" />
     <Compile Include="Assets\Script\Tool\Anim\TweenScale.cs" />
     <Compile Include="Assets\Script\Tool\Anim\TweenSr.cs" />
@@ -256,8 +253,19 @@
     <Compile Include="Assets\Script\Utils\MD5Util.cs" />
     <Compile Include="Assets\Script\Utils\NumberUtil.cs" />
     <Compile Include="Assets\Script\Utils\StringUtil.cs" />
+    <Compile Include="Assets\Share.cs" />
+    <Compile Include="Assets\ShareSDKiOSAutoPackage\ManagePlatforms.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="Assets\Plugins\Android\ShareSDK\AndroidManifest.xml" />
+    <None Include="Assets\Plugins\Android\ShareSDK\res\drawable\ssdk_oks_classic_platform_cell_back.xml" />
+    <None Include="Assets\Plugins\Android\ShareSDK\res\drawable\ssdk_oks_classic_progressbar.xml" />
+    <None Include="Assets\Plugins\Android\ShareSDK\res\values-en\ssdk_oks_strings.xml" />
+    <None Include="Assets\Plugins\Android\ShareSDK\res\values-en\ssdk_strings.xml" />
+    <None Include="Assets\Plugins\Android\ShareSDK\res\values\ssdk_instapaper_strings.xml" />
+    <None Include="Assets\Plugins\Android\ShareSDK\res\values\ssdk_oks_color_drawables.xml" />
+    <None Include="Assets\Plugins\Android\ShareSDK\res\values\ssdk_oks_strings.xml" />
+    <None Include="Assets\Plugins\Android\ShareSDK\res\values\ssdk_strings.xml" />
     <None Include="Assets\Resource\Effect\Cartoon FX\CartoonFX Readme.txt" />
     <None Include="Assets\Resource\Effect\Cartoon FX\CartoonFX Releases Notes.txt" />
     <None Include="Assets\Resource\Effect\Cartoon FX\Demo\Assets\CFX_Demo_WaterWiggle.shader" />

MyLovelyGarden.sln

@@ -1,13 +1,13 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2008
-
-Project("{8A8BB0A8-D809-F2DF-89D6-F26151FFF558}") = "MyLovelyGarden", "Assembly-CSharp-firstpass.csproj", "{76439BDA-6081-7FA3-9C3B-368968A7EA5E}"
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2015
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyLovelyGarden.Plugins", "MyLovelyGarden.Plugins.csproj", "{6E74E584-9DFC-C050-676F-69A7C37E7E0C}"
 EndProject
-Project("{8A8BB0A8-D809-F2DF-89D6-F26151FFF558}") = "MyLovelyGarden", "Assembly-CSharp.csproj", "{21BB93BC-2239-D8F5-1219-201F8DCBAF49}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyLovelyGarden", "MyLovelyGarden.csproj", "{9F3A3259-D53B-F6C8-8878-C5B99621035A}"
 EndProject
-Project("{8A8BB0A8-D809-F2DF-89D6-F26151FFF558}") = "MyLovelyGarden", "Assembly-CSharp-Editor-firstpass.csproj", "{527B5E1B-6A56-0EB9-22D1-0FE7785A959A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyLovelyGarden.Editor.Plugins", "MyLovelyGarden.Editor.Plugins.csproj", "{30FF29F4-DBAE-475C-A2D4-DCA87549A28A}"
 EndProject
-Project("{8A8BB0A8-D809-F2DF-89D6-F26151FFF558}") = "MyLovelyGarden", "Assembly-CSharp-Editor.csproj", "{A08052E5-32CE-91C0-FF56-C60C901D6BEF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyLovelyGarden.Editor", "MyLovelyGarden.Editor.csproj", "{B575449E-FD9A-1672-368B-EC1E1252F6E4}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -15,27 +15,24 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{76439BDA-6081-7FA3-9C3B-368968A7EA5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{76439BDA-6081-7FA3-9C3B-368968A7EA5E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{76439BDA-6081-7FA3-9C3B-368968A7EA5E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{76439BDA-6081-7FA3-9C3B-368968A7EA5E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{21BB93BC-2239-D8F5-1219-201F8DCBAF49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{21BB93BC-2239-D8F5-1219-201F8DCBAF49}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{21BB93BC-2239-D8F5-1219-201F8DCBAF49}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{21BB93BC-2239-D8F5-1219-201F8DCBAF49}.Release|Any CPU.Build.0 = Release|Any CPU
-		{527B5E1B-6A56-0EB9-22D1-0FE7785A959A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{527B5E1B-6A56-0EB9-22D1-0FE7785A959A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{527B5E1B-6A56-0EB9-22D1-0FE7785A959A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{527B5E1B-6A56-0EB9-22D1-0FE7785A959A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A08052E5-32CE-91C0-FF56-C60C901D6BEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A08052E5-32CE-91C0-FF56-C60C901D6BEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A08052E5-32CE-91C0-FF56-C60C901D6BEF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A08052E5-32CE-91C0-FF56-C60C901D6BEF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6E74E584-9DFC-C050-676F-69A7C37E7E0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6E74E584-9DFC-C050-676F-69A7C37E7E0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6E74E584-9DFC-C050-676F-69A7C37E7E0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6E74E584-9DFC-C050-676F-69A7C37E7E0C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9F3A3259-D53B-F6C8-8878-C5B99621035A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9F3A3259-D53B-F6C8-8878-C5B99621035A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9F3A3259-D53B-F6C8-8878-C5B99621035A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9F3A3259-D53B-F6C8-8878-C5B99621035A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{30FF29F4-DBAE-475C-A2D4-DCA87549A28A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{30FF29F4-DBAE-475C-A2D4-DCA87549A28A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{30FF29F4-DBAE-475C-A2D4-DCA87549A28A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{30FF29F4-DBAE-475C-A2D4-DCA87549A28A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B575449E-FD9A-1672-368B-EC1E1252F6E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B575449E-FD9A-1672-368B-EC1E1252F6E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B575449E-FD9A-1672-368B-EC1E1252F6E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B575449E-FD9A-1672-368B-EC1E1252F6E4}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(MonoDevelopProperties) = preSolution
-		StartupItem = Assembly-CSharp.csproj
-	EndGlobalSection
 EndGlobal

ToList.txt

@@ -1,21 +1,18 @@
-对象池脱离脚本
+图文混排(显示多个图片 缩进后能自动换行)
 
-ObjRoot(和其他脚本分离 Destroy掉多余的Player)
+小游戏错误的时候使用Error音效
 
-ScrollRect的Locate好像有点误差(金币不够时的导航)
 
+注册Bug
 
-超时Bug
+加载的时候切换后台会出现Bug
 
-配置更新
+红色小蝴蝶和教程B冲突了
 
 分享
 
 成就中的分享
 
-
-收益控制
-
 Font Anchor Encrypt RichText OverFlow bestfit RaycastTarget 带宽优化
 
 Auxiliary中的测试按键 DisableButton的颜色