Fix few bugs

Assets/Extension.meta → Assets/Advertisements/Editor/Resources/Android.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: b948198483a8b93419206e81215060f3
+guid: 34f35527a1d66ca48a1c8a28dec93f5b
 folderAsset: yes
-timeCreated: 1496150477
+timeCreated: 1494301205
 licenseType: Pro
 DefaultImporter:
   userData: 

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

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

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

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

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

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

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

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

Assets/Resource/Sprite/SpriteUI/快来打理花园对话框.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 5c219cf5190fa4c47bbde3e13a53e4e4
-timeCreated: 1490876618
+timeCreated: 1497851930
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
@@ -39,8 +39,8 @@ TextureImporter:
   spriteMeshType: 1
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spritePixelsToUnits: 100
+  spriteBorder: {x: 80, y: 30, z: 30, w: 20}
+  spritePixelsToUnits: 300
   alphaUsage: 1
   alphaIsTransparency: 1
   spriteTessellationDetail: -1

Assets/Script/Manage/Initializer.cs

@@ -7,6 +7,7 @@ using System;
 using System.Xml;
 using System.Collections;
 using System.Collections.Generic;
+using UnityEngine.UI;
 
 public class Initializer : MonoBehaviour
 {
@@ -70,6 +71,8 @@ public class Initializer : MonoBehaviour
 
     public static void Initialize()
     {
+        GameObject.Find("I_Lab").GetComponent<Text>().text = "Error code : 1";
+
         ManaTutorial.TutorialA = ManaData.GetPlayerBool("TutorialA");
         ManaTutorial.TutorialB_ = ManaData.GetPlayerBool("TutorialB");
         ManaTutorial.TutorialC_ = ManaData.GetPlayerBool("TutorialC");
@@ -82,21 +85,29 @@ public class Initializer : MonoBehaviour
             RegistList[i].Instantiate();
         }
 
+        GameObject.Find("I_Lab").GetComponent<Text>().text = "Error code : 2";
+
         for (int i = 0; i < RegistList.Count; i++)
         {
             RegistList[i].RegistReference();
         }
 
+        GameObject.Find("I_Lab").GetComponent<Text>().text = "Error code : 3";
+        
         for (int i = 0; i < RegistList.Count; i++)
         {
             RegistList[i].RegistValueA();
         }
 
+        GameObject.Find("I_Lab").GetComponent<Text>().text = "Error code : 4";
+
         for (int i = 0; i < RegistList.Count; i++)
         {
             RegistList[i].RegistValueB();
         }
 
+        GameObject.Find("I_Lab").GetComponent<Text>().text = "Error code : 5";
+
         for (int i = 0; i < RegistList.Count; i++)
         {
             RegistList[i].RegistValueC();
@@ -104,6 +115,8 @@ public class Initializer : MonoBehaviour
             RegistList[i].enabled = true;
         }
 
+        GameObject.Find("I_Lab").GetComponent<Text>().text = "Error code : 6";
+
         Complete = true;
         
         ManaCenter.LoginCallbackInitial(new JsonData());

Assets/Script/Manage/ManaCenter.cs

@@ -358,8 +358,6 @@ public class ManaCenter : Regist
 
         MiniThread();
 
-        MiniThread();
-
         SaveThread();
 
         CircleThread();
@@ -412,11 +410,15 @@ public class ManaCenter : Regist
         {
             MiniTimer -= Time.deltaTime;
 
+            ManaReso.SetText("C_MiniGameLab", Mathf.CeilToInt(MiniTimer).ToString());
+
             if (MiniTimer < 0)
             {
                 MiniLock = true;
-                
-                ManaReso.Get("C_MiniGame").TweenForCG();
+
+                ManaReso.Get("C_MiniGame").TweenBacRect();
+
+                ManaReso.SetText("C_MiniGameLab", "");
             }
         }
     }
@@ -502,7 +504,7 @@ public class ManaCenter : Regist
 
         Instance.RegistValueB();
 
-        RegistSkill();
+        RegistSkill(false);
         RegistIncome();
 
         if (OfflineLock)
@@ -529,7 +531,7 @@ public class ManaCenter : Regist
             kv.Value.Reactive();
         }
 
-        RegistSkill();
+        RegistSkill(false);
         RegistIncome();
         
         if (OfflineLock)
@@ -626,6 +628,15 @@ public class ManaCenter : Regist
         MiniTimer = ManaData.GetPlayerFloat("MiniTimer");
         CircleTimer = ManaData.GetPlayerFloat("CircleTimer");
 
+        if (MiniTimer > 0)
+        {
+            ManaReso.Get("C_MiniGame").TweenForRect();
+        }
+        else
+        {
+            MiniLock = true;
+        }
+
 
         ManaServer.ID = ManaData.GetPlayerString("ID");
 
@@ -650,7 +661,7 @@ public class ManaCenter : Regist
     }
 
 
-    public static void RegistSkill()
+    public static void RegistSkill(bool firstRegist)
     {
         OfflineLock = false;
         
@@ -704,7 +715,7 @@ public class ManaCenter : Regist
 
             skillRoot.RegistReference();
 
-            skillRoot.RegistValue(Elapse, TempUseList, attributeList[i]);
+            skillRoot.RegistValue(firstRegist, Elapse, TempUseList, attributeList[i]);
         }
     }
 
@@ -929,7 +940,7 @@ public class ManaCenter : Regist
         }
 
         
-        RegistSkill();
+        RegistSkill(true);
         RegistIncome();
 
 

Assets/Script/Manage/ManaMiniGame.cs

@@ -1147,11 +1147,15 @@ public class ManaMiniGame : Regist
             ManaCenter.MiniTimer = Mathf.Lerp(180, 300, Random.Range(0, 1f));
         }
 
-        if (ManaCenter.MiniTimer <= 0)
+
+        ManaReso.Get("C_MiniGame").TweenForCG();
+
+        if (ManaCenter.MiniTimer > 0)
         {
-            ManaReso.Get("C_MiniGame").TweenForCG();
+            ManaReso.Get("C_MiniGame").TweenForRect();
         }
 
+
         Score = 0;
         Pause = false;
         Game = false;

Assets/Script/Manage/ManaReso.cs

@@ -810,11 +810,11 @@ public class ManaReso : Regist
     }
 
 
-    public static void AsyncLoad(string goName, Folder folder, UnityAction callback = null)
+    public static void AsyncLoad<T>(string goName, Folder folder, UnityAction callback = null)
     {
         KV<AsyncRequest, UnityAction> kv = new KV<AsyncRequest, UnityAction>();
 
-        AssetBundleRequest bundleRequest = Bundle.LoadAsync(goName, folder);
+        AssetBundleRequest bundleRequest = Bundle.LoadAsync<T>(goName, folder);
         
         AsyncRequest asyncRequest = new AsyncRequest();
         asyncRequest.Request = bundleRequest;
@@ -835,8 +835,8 @@ public class ManaReso : Regist
     {
         KV<AsyncRequest, UnityAction> kv = new KV<AsyncRequest, UnityAction>();
 
-        AssetBundleRequest bundleRequest = Bundle.LoadAsync(goName, folder);
-
+        AssetBundleRequest bundleRequest = Bundle.LoadAsync<object>(goName, folder);
+        
         AsyncRequest asyncRequest = new AsyncRequest();
         asyncRequest.Request = bundleRequest;
         asyncRequest.Callback = callback;
@@ -883,13 +883,13 @@ public class ManaReso : Regist
         }
     }
 
-    public static void AddAsyncLoad(string goName, Folder folder, UnityAction callback = null)
+    public static void AddAsyncLoad<T>(string goName, Folder folder, UnityAction callback = null)
     {
         AsyncList.Add
         (
             () =>
             {
-                AsyncLoad(goName, folder, callback);
+                AsyncLoad<T>(goName, folder, callback);
             }
         );
     }
@@ -913,7 +913,7 @@ public class ManaReso : Regist
             {
                 KV<AsyncRequest, UnityAction> kv = new KV<AsyncRequest, UnityAction>();
 
-                AssetBundleRequest bundleRequest = Bundle.LoadAsync("Player", Folder.Scene);
+                AssetBundleRequest bundleRequest = Bundle.LoadAsync<object>("Player", Folder.Scene);
                 
                 AsyncRequest asyncRequest = new AsyncRequest();
                 asyncRequest.Request = bundleRequest;

Assets/Script/Manage/ManaTutorial.cs

@@ -101,6 +101,8 @@ public class ManaTutorial : Regist
             ManaReso.Get("TutorialMask").CreateTweenSr(0, 180 / 255f, 0.25f, true, true, Curve.EaseOutQuad);
 
 
+            ManaReso.Get("C_MiniGame").TweenBacCG();
+
             if (TutorialIndexA == 1)
             {
                 EnterA1();
@@ -204,6 +206,8 @@ public class ManaTutorial : Regist
         ManaReso.SetActive("Tutorial", false);
         ManaReso.SetActive("N_Tutorial", false);
 
+        ManaReso.Get("C_MiniGame").TweenForCG();
+
         ManaPlayer.Player.SetAllCollider(true);
 
         PayExemptAmt = 0;
@@ -346,6 +350,8 @@ public class ManaTutorial : Regist
             () =>
             {
                 EndA3();
+
+                ManaReso.Get("C_MiniGame").TweenBacCG();
             }
         );
     }

Assets/Script/Manage/ManaUI.cs

@@ -16,6 +16,8 @@ public class ManaUI : Regist
 {
     #region 变量
 
+    public static bool Complete;
+
     public static ManaUI Instance;
     public static Transform Canvas;
     public static Transform Camera;
@@ -27,6 +29,16 @@ public class ManaUI : Regist
 
     public static void InitialInstantiate()
     {
+        if (Complete)
+        {
+            return;
+        }
+
+        if (Bundle.UI == null)
+        {
+            return;
+        }
+
         Transform tra = new GameObject("UI").transform;
 
         tra.parent = Transform;
@@ -48,6 +60,8 @@ public class ManaUI : Regist
         tra.SetActive(true);
 
         ManaReso.TraDic.Add(Canvas.name, Canvas);
+
+        Complete = true;
     }
 
 
@@ -63,6 +77,11 @@ public class ManaUI : Regist
         return false;
     }
 
+    public override void Instantiate()
+    {
+        InitialInstantiate();
+    }
+
     public override void RegistValueA()
     {
         Instance = this;
@@ -256,6 +275,51 @@ public class ManaUI : Regist
 
         #region C_MiniGame
 
+        Vector3 big = ManaReso.Get<RectTransform>("C_MiniGame").sizeDelta;
+        Vector3 small = big*0.5f;
+
+        TweenRoot tweenRoot = ManaReso.Get("C_MiniGame").CreateTweenRect(big, small, 1f, true, true, Curve.EaseOutQuad, true);
+
+        tweenRoot.OnForwardStart = () =>
+        {
+            TweenOutline tweenOutline = ManaReso.Get("C_MiniGame").GetTweenOutline();
+
+            tweenOutline.PingPong = false;
+            tweenOutline.StartBackward();
+        };
+
+        tweenRoot.OnForwardFinish = () =>
+        {
+            TweenOutline tweenOutline = ManaReso.Get("C_MiniGame").GetTweenOutline();
+
+            tweenOutline.Target.enabled = false;
+
+            ManaReso.Get<Button>("C_MiniGame").interactable = false;
+        };
+
+        tweenRoot.OnBackwardFinish = () =>
+        {
+            TweenOutline tweenOutline = ManaReso.Get("C_MiniGame").GetTweenOutline();
+
+            tweenOutline.Resume();
+            tweenOutline.StartForward();
+
+            tweenOutline.PingPong = true;
+            tweenOutline.Target.enabled = true;
+
+            ManaLan.Add(ManaReso.Get<Text>("C_MiniGameLab"), new LanStr("UI", "C_MiniGameLab"));
+
+            ManaReso.Get<Button>("C_MiniGame").interactable = true;
+        };
+
+
+        tweenRoot = ManaReso.Get("C_MiniGame").CreateTweenOutline(0, 180/255f, 1f, true, true, Curve.EaseOutQuad);
+
+        tweenRoot.PingPong = true;
+
+        tweenRoot.StartBackward();
+
+
         ManaReso.Get("C_MiniGame").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
 
         ManaReso.AddButtonEvent

Assets/Script/Object/Skill/Ability.cs

@@ -156,15 +156,20 @@ public class Ability : SkillRoot
 
     public override void Reactive()
     {
-        if (Level > 0)
-        {
-            AnnulA();
-            AnnulB();
-        }
+        //if (Level > 0)
+        //{
+        //    AnnulA();
+        //    AnnulB();
+        //}
     }
 
-    public override void RegistValue(float elapse, List<List<Skill>> useList, XmlAttributeCollection attribute)
+    public override void RegistValue(bool firstRegist, float elapse, List<List<Skill>> useList, XmlAttributeCollection attribute)
     {
+        if (!firstRegist)
+        {
+            return;
+        }
+
         Level = int.Parse(attribute[3].Value);
 
         ItemStatus_ = (SkillStatus)Enum.Parse(typeof(SkillStatus), attribute[2].Value);

Assets/Script/Object/Skill/BigSkill.cs

@@ -178,7 +178,7 @@ public class BigSkill : Skill
         }
     }
 
-    public override void RegistValue(float elapse, List<List<Skill>> useList, XmlAttributeCollection attribute)
+    public override void RegistValue(bool firstRegist, float elapse, List<List<Skill>> useList, XmlAttributeCollection attribute)
     {
         Level = int.Parse(attribute[4].Value);
         UseTimer = float.Parse(attribute[6].Value);

Assets/Script/Object/Skill/Pack.cs

@@ -145,14 +145,19 @@ public class Pack : SkillRoot
 
     public override void Reactive()
     {
-        for (int i = 0; i < Level; i++)
-        {
-            AnnulA();
-        }
+        //for (int i = 0; i < Level; i++)
+        //{
+        //    AnnulA();
+        //}
     }
 
-    public override void RegistValue(float elapse, List<List<Skill>> useList, XmlAttributeCollection attribute)
+    public override void RegistValue(bool firstRegist, float elapse, List<List<Skill>> useList, XmlAttributeCollection attribute)
     {
+        if (!firstRegist)
+        {
+            return;
+        }
+
         Level = int.Parse(attribute[3].Value);
         ItemStatus_ = (SkillStatus)Enum.Parse(typeof(SkillStatus), attribute[2].Value);
 

Assets/Script/Object/Skill/Skill.cs

@@ -454,7 +454,7 @@ public class Skill : SkillRoot
         }
     }
 
-    public override void RegistValue(float elapse, List<List<Skill>> useList, XmlAttributeCollection attribute)
+    public override void RegistValue(bool firstRegist, float elapse, List<List<Skill>> useList, XmlAttributeCollection attribute)
     {
         Level = int.Parse(attribute[3].Value);
         UseTimer = float.Parse(attribute[5].Value);

Assets/Script/Object/Skill/SkillRoot.cs

@@ -164,7 +164,7 @@ public abstract class SkillRoot
 
     }
 
-    public virtual void RegistValue(float elapse, List<List<Skill>> useList, XmlAttributeCollection attribute)
+    public virtual void RegistValue(bool firstRegist, float elapse, List<List<Skill>> useList, XmlAttributeCollection attribute)
     {
 
     }

Assets/Script/Tool/Auxiliary.cs

@@ -108,6 +108,7 @@ public class Auxiliary : Regist
         return false;
     }
 
+
     private void Awake()
     {
         Instance = this;
@@ -129,17 +130,21 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.X))
         {
+            //ManaMiniGame.Score = 2000;
             //ManaMiniGame.GameTimer = 45;
         }
 
         if (Input.GetKeyDown(KeyCode.C))
         {
-            //ManaMiniGame.Score = 2000;
+            //foreach (var kv in ManaGarden.FlowerInfoDic)
+            //{
+            //    kv.Value.Unlock = true;
+            //}
         }
 
         if (Input.GetKeyDown(KeyCode.V))
         {
-            
+            //ManaReso.Get("C_MiniGame").TweenBacRect();
         }
 
         //if (Input.GetKeyDown(KeyCode.P))

Assets/Script/Tool/Bundle.cs

@@ -165,35 +165,35 @@ public class Bundle : MonoBehaviour
         throw new Exception();
     }
 
-    public static AssetBundleRequest LoadAsync(string goName, Folder folder)
+    public static AssetBundleRequest LoadAsync<T>(string goName, Folder folder)
     {
         if (folder == Folder.UI)
         {
-            return UI.LoadAssetAsync(goName);
+            return UI.LoadAssetAsync<T>(goName);
         }
         else if (folder == Folder.Audio)
         {
-            return Audio.LoadAssetAsync(goName);
+            return Audio.LoadAssetAsync<T>(goName);
         }
         else if (folder == Folder.Config)
         {
-            return Config.LoadAssetAsync(goName);
+            return Config.LoadAssetAsync<T>(goName);
         }
         else if (folder == Folder.Effect)
         {
-            return Effect.LoadAssetAsync(goName);
+            return Effect.LoadAssetAsync<T>(goName);
         }
         else if (folder == Folder.Scene)
         {
-            return Scene.LoadAssetAsync(goName);
+            return Scene.LoadAssetAsync<T>(goName);
         }
         else if (folder == Folder.Atlas)
         {
-            return Atlas.LoadAssetAsync(goName);
+            return Atlas.LoadAssetAsync<T>(goName);
         }
         else if (folder == Folder.Discard)
         {
-            return Discard.LoadAssetAsync(goName);
+            return Discard.LoadAssetAsync<T>(goName);
         }
         else
         {
@@ -233,7 +233,7 @@ public class Bundle : MonoBehaviour
     {
         yield return LoadConfig();
 
-        ManaReso.AddAsyncLoad("PlayerConfig", Folder.Config, () => { ManaData.PlayerDoc = ManaData.PlayerDoc; });
+        ManaReso.AddAsyncLoad<TextAsset>("PlayerConfig", Folder.Config, () => { ManaData.PlayerDoc = ManaData.PlayerDoc; });
 
         yield return LoadDiscard();
 
@@ -242,7 +242,7 @@ public class Bundle : MonoBehaviour
 
         if (!Logo.Complete && !Initializer.Instance.DebugMode)
         {
-            ManaReso.AddAsyncLoad("Canvas",1,Folder.UI,ObjType.Canvas);
+            ManaReso.AddAsyncLoad("Canvas", 1, Folder.UI, ObjType.Canvas);
 
             ManaReso.AddAsyncLoad("GroupA", 1, Folder.UI, ObjType.GroupA, true);
             ManaReso.AddAsyncLoad("GroupB", 1, Folder.UI, ObjType.GroupB, true);
@@ -286,82 +286,82 @@ public class Bundle : MonoBehaviour
             ManaReso.AddAsyncLoad("Music", 1, Folder.Audio, ObjType.Music);
 
 
-            ManaReso.AddAsyncLoad("skill_config", Folder.Config);
-            ManaReso.AddAsyncLoad("pack_config", Folder.Config);
-            ManaReso.AddAsyncLoad("ability_config", Folder.Config);
-            ManaReso.AddAsyncLoad("achieve_config", Folder.Config);
-
-            ManaReso.AddAsyncLoad("visit_config", Folder.Config);
-            ManaReso.AddAsyncLoad("award_config", Folder.Config);
-            ManaReso.AddAsyncLoad("flower_config", Folder.Config);
-            ManaReso.AddAsyncLoad("offline_config", Folder.Config);
-            ManaReso.AddAsyncLoad("signin_config", Folder.Config);
-
-            ManaReso.AddAsyncLoad("English", Folder.Config);
-            ManaReso.AddAsyncLoad("ChineseSimplified", Folder.Config);
-            ManaReso.AddAsyncLoad("ChineseTraditional", Folder.Config);
-
-            ManaReso.AddAsyncLoad("BtnClip", Folder.Audio);
-            ManaReso.AddAsyncLoad("SkillClip", Folder.Audio);
-            ManaReso.AddAsyncLoad("ErrorClip", Folder.Audio);
-            ManaReso.AddAsyncLoad("DropClip", Folder.Audio);
-            ManaReso.AddAsyncLoad("CloseClip", Folder.Audio);
-            ManaReso.AddAsyncLoad("FlowerClip", Folder.Audio);
-            ManaReso.AddAsyncLoad("BubbleClip", Folder.Audio);
-            ManaReso.AddAsyncLoad("CurrentClip", Folder.Audio);
-            ManaReso.AddAsyncLoad("MiniEndClip", Folder.Audio);
-
-            ManaReso.AddAsyncLoad("stand_tex", Folder.Config);
-            ManaReso.AddAsyncLoad("stand_ske", Folder.Config);
-            ManaReso.AddAsyncLoad("stand_texture", Folder.Scene);
-
-            ManaReso.AddAsyncLoad("Closet_tex", Folder.Config);
-            ManaReso.AddAsyncLoad("Closet_ske", Folder.Config);
-            ManaReso.AddAsyncLoad("Closet_texture", Folder.Scene);
-
-            ManaReso.AddAsyncLoad("4大技能1", Folder.UI);
-            ManaReso.AddAsyncLoad("4大技能2", Folder.UI);
-            ManaReso.AddAsyncLoad("4大技能3", Folder.UI);
-            ManaReso.AddAsyncLoad("4大技能4", Folder.UI);
-            ManaReso.AddAsyncLoad("4大技能1副", Folder.UI);
-            ManaReso.AddAsyncLoad("4大技能2副", Folder.UI);
-            ManaReso.AddAsyncLoad("4大技能3副", Folder.UI);
-            ManaReso.AddAsyncLoad("4大技能4副", Folder.UI);
-
-            ManaReso.AddAsyncLoad("红-公园", Folder.UI);
-            ManaReso.AddAsyncLoad("红-彩虹", Folder.UI);
-            ManaReso.AddAsyncLoad("红-樱花树", Folder.UI);
-            ManaReso.AddAsyncLoad("红-灌木", Folder.UI);
-            ManaReso.AddAsyncLoad("红-黄莺鸟", Folder.UI);
-
-            ManaReso.AddAsyncLoad("绿-免费金币", Folder.UI);
-            ManaReso.AddAsyncLoad("绿-繁花似锦", Folder.UI);
-            ManaReso.AddAsyncLoad("绿-金币包1", Folder.UI);
-            ManaReso.AddAsyncLoad("绿-金币包2", Folder.UI);
-            ManaReso.AddAsyncLoad("绿-金币包3", Folder.UI);
-
-            ManaReso.AddAsyncLoad("蓝-中级包", Folder.UI);
-            ManaReso.AddAsyncLoad("蓝-免费钻", Folder.UI);
-            ManaReso.AddAsyncLoad("蓝-高级包", Folder.UI);
-            ManaReso.AddAsyncLoad("蓝-初级包", Folder.UI);
-            ManaReso.AddAsyncLoad("蓝-中量钻石", Folder.UI);
-            ManaReso.AddAsyncLoad("蓝-大量钻石", Folder.UI);
-            ManaReso.AddAsyncLoad("蓝-小量钻石", Folder.UI);
-
-            ManaReso.AddAsyncLoad("黄-白蝴蝶", Folder.UI);
-            ManaReso.AddAsyncLoad("黄-紫蝴蝶", Folder.UI);
-            ManaReso.AddAsyncLoad("黄-红蝴蝶", Folder.UI);
-            ManaReso.AddAsyncLoad("黄-蓝蝴蝶", Folder.UI);
-            ManaReso.AddAsyncLoad("黄-黄蝴蝶", Folder.UI);
-            ManaReso.AddAsyncLoad("黄-白色蜜蜂", Folder.UI);
-            ManaReso.AddAsyncLoad("黄-紫色蜜蜂", Folder.UI);
-            ManaReso.AddAsyncLoad("黄-红色蜜蜂", Folder.UI);
-            ManaReso.AddAsyncLoad("黄-蓝色蜜蜂", Folder.UI);
-            ManaReso.AddAsyncLoad("黄-黄色蜜蜂", Folder.UI);
+            ManaReso.AddAsyncLoad<TextAsset>("skill_config", Folder.Config);
+            ManaReso.AddAsyncLoad<TextAsset>("pack_config", Folder.Config);
+            ManaReso.AddAsyncLoad<TextAsset>("ability_config", Folder.Config);
+            ManaReso.AddAsyncLoad<TextAsset>("achieve_config", Folder.Config);
+
+            ManaReso.AddAsyncLoad<TextAsset>("visit_config", Folder.Config);
+            ManaReso.AddAsyncLoad<TextAsset>("award_config", Folder.Config);
+            ManaReso.AddAsyncLoad<TextAsset>("flower_config", Folder.Config);
+            ManaReso.AddAsyncLoad<TextAsset>("offline_config", Folder.Config);
+            ManaReso.AddAsyncLoad<TextAsset>("signin_config", Folder.Config);
+
+            ManaReso.AddAsyncLoad<TextAsset>("English", Folder.Config);
+            ManaReso.AddAsyncLoad<TextAsset>("ChineseSimplified", Folder.Config);
+            ManaReso.AddAsyncLoad<TextAsset>("ChineseTraditional", Folder.Config);
+
+            ManaReso.AddAsyncLoad<AudioClip>("BtnClip", Folder.Audio);
+            ManaReso.AddAsyncLoad<AudioClip>("SkillClip", Folder.Audio);
+            ManaReso.AddAsyncLoad<AudioClip>("ErrorClip", Folder.Audio);
+            ManaReso.AddAsyncLoad<AudioClip>("DropClip", Folder.Audio);
+            ManaReso.AddAsyncLoad<AudioClip>("CloseClip", Folder.Audio);
+            ManaReso.AddAsyncLoad<AudioClip>("FlowerClip", Folder.Audio);
+            ManaReso.AddAsyncLoad<AudioClip>("BubbleClip", Folder.Audio);
+            ManaReso.AddAsyncLoad<AudioClip>("CurrentClip", Folder.Audio);
+            ManaReso.AddAsyncLoad<AudioClip>("MiniEndClip", Folder.Audio);
+
+            ManaReso.AddAsyncLoad<TextAsset>("stand_tex", Folder.Config);
+            ManaReso.AddAsyncLoad<TextAsset>("stand_ske", Folder.Config);
+            ManaReso.AddAsyncLoad<Texture2D>("stand_texture", Folder.Scene);
+
+            ManaReso.AddAsyncLoad<TextAsset>("Closet_tex", Folder.Config);
+            ManaReso.AddAsyncLoad<TextAsset>("Closet_ske", Folder.Config);
+            ManaReso.AddAsyncLoad<Texture2D>("Closet_texture", Folder.Scene);
+
+            ManaReso.AddAsyncLoad<Sprite>("4大技能1", Folder.UI);
+            ManaReso.AddAsyncLoad<Sprite>("4大技能2", Folder.UI);
+            ManaReso.AddAsyncLoad<Sprite>("4大技能3", Folder.UI);
+            ManaReso.AddAsyncLoad<Sprite>("4大技能4", Folder.UI);
+            ManaReso.AddAsyncLoad<Sprite>("4大技能1副", Folder.UI);
+            ManaReso.AddAsyncLoad<Sprite>("4大技能2副", Folder.UI);
+            ManaReso.AddAsyncLoad<Sprite>("4大技能3副", Folder.UI);
+            ManaReso.AddAsyncLoad<Sprite>("4大技能4副", Folder.UI);
+
+            ManaReso.AddAsyncLoad<Sprite>("红-公园", Folder.UI);
+            ManaReso.AddAsyncLoad<Sprite>("红-彩虹", Folder.UI);
+            ManaReso.AddAsyncLoad<Sprite>("红-樱花树", Folder.UI);
+            ManaReso.AddAsyncLoad<Sprite>("红-灌木", Folder.UI);
+            ManaReso.AddAsyncLoad<Sprite>("红-黄莺鸟", Folder.UI);
+
+            ManaReso.AddAsyncLoad<Sprite>("绿-免费金币", Folder.UI);
+            ManaReso.AddAsyncLoad<Sprite>("绿-繁花似锦", Folder.UI);
+            ManaReso.AddAsyncLoad<Sprite>("绿-金币包1", Folder.UI);
+            ManaReso.AddAsyncLoad<Sprite>("绿-金币包2", Folder.UI);
+            ManaReso.AddAsyncLoad<Sprite>("绿-金币包3", Folder.UI);
+
+            ManaReso.AddAsyncLoad<Sprite>("蓝-中级包", Folder.UI);
+            ManaReso.AddAsyncLoad<Sprite>("蓝-免费钻", Folder.UI);
+            ManaReso.AddAsyncLoad<Sprite>("蓝-高级包", Folder.UI);
+            ManaReso.AddAsyncLoad<Sprite>("蓝-初级包", Folder.UI);
+            ManaReso.AddAsyncLoad<Sprite>("蓝-中量钻石", Folder.UI);
+            ManaReso.AddAsyncLoad<Sprite>("蓝-大量钻石", Folder.UI);
+            ManaReso.AddAsyncLoad<Sprite>("蓝-小量钻石", Folder.UI);
+
+            ManaReso.AddAsyncLoad<Sprite>("黄-白蝴蝶", Folder.UI);
+            ManaReso.AddAsyncLoad<Sprite>("黄-紫蝴蝶", Folder.UI);
+            ManaReso.AddAsyncLoad<Sprite>("黄-红蝴蝶", Folder.UI);
+            ManaReso.AddAsyncLoad<Sprite>("黄-蓝蝴蝶", Folder.UI);
+            ManaReso.AddAsyncLoad<Sprite>("黄-黄蝴蝶", Folder.UI);
+            ManaReso.AddAsyncLoad<Sprite>("黄-白色蜜蜂", Folder.UI);
+            ManaReso.AddAsyncLoad<Sprite>("黄-紫色蜜蜂", Folder.UI);
+            ManaReso.AddAsyncLoad<Sprite>("黄-红色蜜蜂", Folder.UI);
+            ManaReso.AddAsyncLoad<Sprite>("黄-蓝色蜜蜂", Folder.UI);
+            ManaReso.AddAsyncLoad<Sprite>("黄-黄色蜜蜂", Folder.UI);
 
             for (int i = 1; i < 28; i++)
             {
-                ManaReso.AddAsyncLoad("Flower" + i, Folder.Scene);
+                ManaReso.AddAsyncLoad<Sprite>("Flower" + i, Folder.Scene);
             }
         }
 

ProjectSettings/ProjectVersion.txt

@@ -1 +1 @@
-m_EditorVersion: 5.5.0f3
+m_EditorVersion: 5.5.2f1

ToList.txt

@@ -1,12 +1,14 @@
 //还原PlayerConfig
 
-关闭调试界面
+//关闭调试界面
 
 //关闭调试按键
 
 //注意存档覆盖情况
 
 
-装个WPS
+移除Reload代码
+
+技能的注册机制
 
 监督补上循环特效