扩展了动画工具

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="281" />
+  <Version value="284" />
 
   <ID value="Default" />
 ////  <TutorialA value="0" />

Assets/Script/Editor/EditorAuxiliary.cs

@@ -24,6 +24,11 @@ public class EditorAuxiliary : Editor
     {
         base.OnInspectorGUI();
 
+        if (GUILayout.Button("Temp"))
+        {
+            
+        }
+
         if (GUILayout.Button("PrintBounds"))
         {
             PrintBounds();

Assets/Script/Manage/Initializer.cs

@@ -13,9 +13,10 @@ public class Initializer : MonoBehaviour
     #region 变量
 
     public bool DebugMode;
+
     public GameObject DebugModeGo;
 
-    public static bool LoadComplete;
+    public static bool Complete;
     public static Initializer Instance;
     public static Transform Transform;
     public static List<Regist> RegistList = new List<Regist>();
@@ -103,7 +104,7 @@ public class Initializer : MonoBehaviour
             RegistList[i].enabled = true;
         }
 
-        LoadComplete = true;
+        Complete = true;
         
         ManaData.LoginCallbackInitial(new JsonData());
 
@@ -112,18 +113,19 @@ public class Initializer : MonoBehaviour
         ManaReso.SetActive("I_Lab", false);
 
         ManaIAP.Initialize();
+
         ManaVisit.Initialize();
     }
 
 
     public IEnumerator IInitialize()
     {
-        while (!Bundle.LoadComplete)
+        while (!Logo.Complete)
         {
             yield return null;
         }
 
-        while (!Logo.LogoComplete)
+        while (!Bundle.Complete)
         {
             yield return null;
         }

Assets/Script/Manage/ManaAchieve.cs

@@ -58,21 +58,43 @@ public class Achieve
     {
         get { return ManaReso.Load<Sprite>(Icon_, Folder.UI); }
     }
+    public double CurrentValue
+    {
+        get { return CurrentValue_; }
+        set
+        {
+            CurrentValue_ = value;
+
+            Slider.value = (float)(CurrentValue_ / TargetValue);
+
+            if (CurrentValue_ >= TargetValue)
+            {
+                ToComplete();
+            }
+            else
+            {
+                ToProcess(CurrentValue_);
+            }
+        }
+    }
 
     public int ID_;
-    public bool Available = true;
     public string Icon_;
+    public double CurrentValue_;
 
     public int Index;
     public int Parent;
-    public bool Delete;
-    public bool Availible;
     public float Person;
     public float CoinPerson;
     public float DiamondOnce;
-    public double Value;
-    public AchieveType Type;
-    public List<Achieve> PostAchieveList = new List<Achieve>();
+
+    public bool Valid = true;
+    public bool Delete;
+    public bool Complete;
+    public double TargetValue;
+
+    public Achieve PostAchieve;
+    public AchieveType AchieveType;
 
     public Text Tit;
     public Text Lab;
@@ -87,23 +109,24 @@ public class Achieve
     public Achieve(XmlAttributeCollection attribute)
     {
         Icon_ = attribute[11].Value;
-        Type = TypeParse(attribute[4].Value);
         Delete = Auxiliary.BoolParse(attribute[7].Value, false);
         Parent = Auxiliary.IntParse(attribute[6].Value, -1);
+        AchieveType = TypeParse(attribute[4].Value);
 
         ID_ = int.Parse(attribute[0].Value);
         Index = int.Parse(attribute[1].Value) - 1;
-        Value = double.Parse(attribute[5].Value);
+        TargetValue = double.Parse(attribute[5].Value);
 
         Person = Auxiliary.FloatParse(attribute[10].Value, 0);
         CoinPerson = Auxiliary.FloatParse(attribute[9].Value, 0);
         DiamondOnce = Auxiliary.FloatParse(attribute[8].Value, 0);
 
+
         ManaAchieve.AchieveDic.Add(ID_, this);
         
         if (Parent != -1)
         {
-            ManaAchieve.AchieveDic[Parent].PostAchieveList.Add(this);
+            ManaAchieve.AchieveDic[Parent].PostAchieve = this;
         }
     }
 
@@ -123,43 +146,44 @@ public class Achieve
         Button = dic["Btn"].GetComponent<Button>();
         BtnLab = dic["BtnLab"].GetComponent<Text>();
 
-        ManaLan.Add(Tit, new LanStr("AchieveName", ID));
 
-        Lab.text = GetDescription(Desc, Value);
+        Lab.text = GetDescription(Desc, TargetValue);
 
         Image.sprite = Icon;
+
         AchieveItem.SetSiblingIndex(Index);
 
         Button.onClick.RemoveAllListeners();
         Button.onClick.AddListener(GetAward);
 
-        if (Available)
+        ManaLan.Add(Tit, new LanStr("AchieveName", ID));
+
+
+        if (Valid)
         {
-            UpdateValue();
+            UpdateStatus();
             
-            ManaAchieve.DeleDic[Type] += UpdateValue;
+            ManaAchieve.DeleDic.Add(AchieveType, UpdateStatus);
         }
         else
         {
-            ToComplete();       
+            ToFinish();
         }
     }
 
     public void GetAward()
     {
-        ManaAchieve.AchieveDepth--;
-
-        ManaDebug.Log(string.Format("获得钻石<color=red>{0}</color> 参观人次+<color=red>{1}</color> 每人次金币+<color=red>{2}</color>", DiamondOnce, Person, CoinPerson));
-
-        ManaAudio.PlayClip(Clip.CurrentClip);
+        Valid = false;
 
         ManaData.Diamond += DiamondOnce;
         ManaData.SkillPerson += Person;
         ManaData.SkillCoinPerson += CoinPerson;
 
-        Available = false;
+        ManaAudio.PlayClip(Clip.CurrentClip);
+
+        ManaAchieve.AchieveDepth--;
 
-        ManaAchieve.DeleDic[Type] -= UpdateValue;
+        ManaAchieve.DeleDic.Remove(AchieveType);
 
         if (Delete)
         {
@@ -167,68 +191,67 @@ public class Achieve
 
             AchieveItem = null;
 
-            if (PostAchieveList.Count > 0)
+            if (PostAchieve != null)
             {
-                PostAchieveList[0].Regist();
+                PostAchieve.Regist();
             }
         }
         else
         {
-            ToComplete();
+            ToFinish();
         }
     }
 
-    public AchieveType TypeParse(string str)
-    {
-        int integer = int.Parse(str);
 
-        if (integer == 1)
+    public void UpdateStatus()
+    {
+        if (AchieveType == AchieveType.TotalPerson)
         {
-            return AchieveType.GardenLevel;
+            UpdateStatus(ManaData.TotalPerson);
         }
-        else if (integer == 2)
+        else if (AchieveType == AchieveType.ElfLevel)
         {
-            return AchieveType.CurrentCoin;
+            UpdateStatus(ManaData.ElfLevel);
         }
-        else if (integer == 3)
+        else if (AchieveType == AchieveType.GardenLevel)
         {
-            return AchieveType.TotalCoin;
+            UpdateStatus(ManaData.Level);
         }
-        else if (integer == 4)
+        else if (AchieveType == AchieveType.AdAmt)
         {
-            return AchieveType.ElfLevel;
+            UpdateStatus(ManaData.AdAmt);
         }
-        else if (integer == 5)
+        else if (AchieveType == AchieveType.SkillAmt)
         {
-            return AchieveType.FlowerAmt;
+            UpdateStatus(ManaData.SkillAmt);
         }
-        else if (integer == 6)
+        else if (AchieveType == AchieveType.SignAmt)
         {
-            return AchieveType.TotalPerson;
+            UpdateStatus(ManaData.SignAmt);
         }
-        else if (integer == 7)
+        else if (AchieveType == AchieveType.ShareAmt)
         {
-            return AchieveType.SkillAmt;
+            UpdateStatus(ManaData.ShareAmt);
         }
-        else if (integer == 8)
+        else if (AchieveType == AchieveType.FlowerAmt)
         {
-            return AchieveType.AdAmt;
+            UpdateStatus(ManaGarden.MyFlower);
         }
-        else if (integer == 9)
+        else if (AchieveType == AchieveType.MiniGameAmt)
         {
-            return AchieveType.SignAmt;
+            UpdateStatus(ManaData.MiniGameAmt);
         }
-        else if (integer == 10)
+        else if (AchieveType == AchieveType.TotalCoin)
         {
-            return AchieveType.ShareAmt;
+            UpdateStatus(ManaData.TotalCoin);
         }
-        else if (integer == 11)
+        else if (AchieveType == AchieveType.FlowerCoin)
         {
-            return AchieveType.MiniGameAmt;
+            UpdateStatus(ManaData.FlowerCoin);
         }
-        else if (integer == 12)
+        else if (AchieveType == AchieveType.CurrentCoin)
         {
-            return AchieveType.FlowerCoin;
+            UpdateStatus(ManaData.Coin);
         }
         else
         {
@@ -236,85 +259,33 @@ public class Achieve
         }
     }
 
+    public void UpdateStatus(double value)
+    {
+        CurrentValue = value;
+    }
+
 
-    public void UpdateValue()
+    public void ToFinish()
     {
-        double value;
+        Slider.value = 1;
 
-        if (Type == AchieveType.AdAmt)
-        {
-            value = ManaData.AdAmt;
-        }
-        else if (Type == AchieveType.SkillAmt)
-        {
-            value = ManaData.SkillAmt;
-        }
-        else if (Type == AchieveType.SignAmt)
-        {
-            value = ManaData.SignAmt;
-        }
-        else if (Type == AchieveType.ShareAmt)
-        {
-            value = ManaData.ShareAmt;
-        }
-        else if (Type == AchieveType.FlowerAmt)
-        {
-            value = ManaGarden.MyFlower;
-        }
-        else if (Type == AchieveType.TotalPerson)
-        {
-            value = ManaData.TotalPerson;
-        }
-        else if (Type == AchieveType.ElfLevel)
-        {
-            value = ManaData.ElfLevel;
-        }
-        else if (Type == AchieveType.TotalCoin)
-        {
-            value = ManaData.TotalCoin;
-        }
-        else if (Type == AchieveType.MiniGameAmt)
-        {
-            value = ManaData.MiniGameAmt;
-        }
-        else if (Type == AchieveType.FlowerCoin)
-        {
-            value = ManaData.FlowerCoin;
-        }
-        else if (Type == AchieveType.CurrentCoin)
-        {
-            value = ManaData.Coin;
-        }
-        else if (Type == AchieveType.GardenLevel)
-        {
-            value = ManaData.Level;
-        }
-        else
-        {
-            throw new Exception();
-        }
+        Complete = false;
 
-        UpdateValue(value);
-    }
+        Button.interactable = false;
 
-    public void UpdateValue(double value)
-    {
-        Slider.value = (float)(value / Value);
+        Button.image.material = null;
 
-        if (value >= Value)
-        {
-            ToAvailible();
-        }
-        else
-        {
-            ToProcess(value);
-        }
+        ManaLan.Add(BtnLab, new LanStr("Object", "AchieveItem_BtnLab2"));
     }
 
-
     public void ToProcess(double value)
     {
-        Availible = false;
+        Complete = false;
+
+        Button.interactable = false;
+
+        Button.image.material = Shortcut.GrayMat;
+
 
         List<object> objList = new List<object>();
         
@@ -323,7 +294,7 @@ public class Achieve
 
         if (!DiamondOnce.Equal(0))
         {
-            objList.Add("<(钻石)>" + DiamondOnce.ToString("0"));
+            objList.Add("<(钻石)>" + DiamondOnce.ToString("0") + " ");
         }
 
         if (!CoinPerson.Equal(0))
@@ -340,20 +311,26 @@ public class Achieve
             objList.Add(Person.ToString("0") + " ");
         }
 
-        Button.image.material = ManaReso.Load<Material>("GrayMat", Folder.Effect);
-        Button.interactable = false;
-
         ManaLan.Add(BtnLab, objList.ToArray());
     }
 
-    public void ToAvailible()
+    public void ToComplete()
     {
-        if (!Availible)
+        if (Complete)
         {
-            ManaAchieve.AchieveDepth++;
+            return;
         }
 
-        Availible = true;
+
+        ManaAchieve.AchieveDepth++;
+
+
+        Complete = true;
+
+        Button.interactable = true;
+
+        Button.image.material = null;
+
 
         List<object> objList = new List<object>();
 
@@ -362,7 +339,7 @@ public class Achieve
 
         if (!DiamondOnce.Equal(0))
         {
-            objList.Add("<(钻石)>" + DiamondOnce.ToString("0"));
+            objList.Add("<(钻石)>" + DiamondOnce.ToString("0") + " ");
         }
 
         if (!CoinPerson.Equal(0))
@@ -379,24 +356,68 @@ public class Achieve
             objList.Add(Person.ToString("0") + " ");
         }
 
-        Button.image.material = null;
-        Button.interactable = true;
-
         ManaLan.Add(BtnLab, objList.ToArray());
     }
 
-    public void ToComplete()
-    {
-        Slider.value = 1;
-        Availible = false;
 
-        Button.image.material = null;
-        Button.interactable = false;
+    public AchieveType TypeParse(string str)
+    {
+        int integer = int.Parse(str);
 
-        ManaLan.Add(BtnLab, new LanStr("Object", "AchieveItem_BtnLab2"));
+        if (integer == 1)
+        {
+            return AchieveType.GardenLevel;
+        }
+        else if (integer == 2)
+        {
+            return AchieveType.CurrentCoin;
+        }
+        else if (integer == 3)
+        {
+            return AchieveType.TotalCoin;
+        }
+        else if (integer == 4)
+        {
+            return AchieveType.ElfLevel;
+        }
+        else if (integer == 5)
+        {
+            return AchieveType.FlowerAmt;
+        }
+        else if (integer == 6)
+        {
+            return AchieveType.TotalPerson;
+        }
+        else if (integer == 7)
+        {
+            return AchieveType.SkillAmt;
+        }
+        else if (integer == 8)
+        {
+            return AchieveType.AdAmt;
+        }
+        else if (integer == 9)
+        {
+            return AchieveType.SignAmt;
+        }
+        else if (integer == 10)
+        {
+            return AchieveType.ShareAmt;
+        }
+        else if (integer == 11)
+        {
+            return AchieveType.MiniGameAmt;
+        }
+        else if (integer == 12)
+        {
+            return AchieveType.FlowerCoin;
+        }
+        else
+        {
+            throw new Exception();
+        }
     }
 
-
     public static string GetDescription(string desc, double value)
     {
         return desc.Replace("[&value&]", value.ToString("0"));
@@ -419,43 +440,45 @@ public class ManaAchieve : Regist
                 return;
             }
 
+
             Outline outline = ManaReso.Get<Outline>("C_Achieve");
+            Tween tween = outline.GetTweenOutline();
 
-            if (outline != null)
+            if (tween == null)
+            {
+                return;
+            }
+
+            if (AchieveDepth_ == 0)
+            {
+                outline.enabled = false;
+
+                tween.Pause();
+            }
+            else if (AchieveDepth_ > 0)
             {
-                if (AchieveDepth_ == 0)
+                if (tween.InForward)
                 {
-                    outline.enabled = false;
+                    tween.StartForward();
                 }
-                else if (AchieveDepth_ > 0)
+                else if (tween.InBackward)
                 {
-                    outline.enabled = true;
-
-                    ManaReso.Get("C_Achieve").TweenForOutline();
+                    tween.StartBackward();
                 }
                 else
                 {
-                    throw new Exception();
+                    tween.StartForward();
                 }
             }
+            else
+            {
+                throw new Exception();
+            }
         }
     }
 
     public static int AchieveDepth_;
 
-    public static UnityAction<double> TotalPerson;
-    public static UnityAction<double> AdAmt;
-    public static UnityAction<double> SkillAmt;
-    public static UnityAction<double> SignAmt;
-    public static UnityAction<double> ShareAmt;
-    public static UnityAction<double> FlowerAmt;
-    public static UnityAction<double> MiniGameAmt;
-    public static UnityAction<double> ElfLevel;
-    public static UnityAction<double> GardenLevel;
-    public static UnityAction<double> TotalCoin;
-    public static UnityAction<double> FlowerCoin;
-    public static UnityAction<double> CurrentCoin;
-
     public static Dictionary<int, Achieve> AchieveDic = new Dictionary<int, Achieve>();
     public static Dictionary<AchieveType, UnityAction<double>> DeleDic = new Dictionary<AchieveType, UnityAction<double>>();
 
@@ -467,18 +490,6 @@ public class ManaAchieve : Regist
     {
         Instance = this;
 
-        DeleDic.Add(AchieveType.TotalPerson, TotalPerson);
-        DeleDic.Add(AchieveType.ElfLevel, ElfLevel);
-        DeleDic.Add(AchieveType.GardenLevel, GardenLevel);
-        DeleDic.Add(AchieveType.TotalCoin, TotalCoin);
-        DeleDic.Add(AchieveType.FlowerCoin, FlowerCoin);
-        DeleDic.Add(AchieveType.CurrentCoin, CurrentCoin);
-        DeleDic.Add(AchieveType.AdAmt, AdAmt);
-        DeleDic.Add(AchieveType.SkillAmt, SkillAmt);
-        DeleDic.Add(AchieveType.SignAmt, SignAmt);
-        DeleDic.Add(AchieveType.ShareAmt, ShareAmt);
-        DeleDic.Add(AchieveType.FlowerAmt, FlowerAmt);
-        DeleDic.Add(AchieveType.MiniGameAmt, MiniGameAmt);
 
         List<XmlAttributeCollection> attributeList = Data.GetAchieveConfig();
 
@@ -492,22 +503,22 @@ public class ManaAchieve : Regist
 
         for (int i = 0; i < achieveList.Count; i++)
         {
-            AchieveDic[achieveList[i]].Available = false;
+            AchieveDic[achieveList[i]].Valid = false;
         }
 
 
         foreach (var kv in AchieveDic)
         {
-            if (kv.Value.Available)
+            if (kv.Value.Valid)
             {
-                if (kv.Value.Parent == -1 || !AchieveDic[kv.Value.Parent].Available)
+                if (kv.Value.Parent == -1 || !AchieveDic[kv.Value.Parent].Valid)
                 {
                     kv.Value.Regist();
                 }
             }
             else
             {
-                if (kv.Value.Delete == false)
+                if (!kv.Value.Delete)
                 {
                     kv.Value.Regist();
                 }
@@ -523,7 +534,12 @@ public class ManaAchieve : Regist
 
     public static void UpdateStatus(AchieveType type, double value)
     {
-        DeleDic[type].SafeInvoke(value);
+        UnityAction<double> action;
+
+        if (DeleDic.TryGetValue(type, out action))
+        {
+            DeleDic[type].SafeInvoke(value);
+        }
     }
 
 
@@ -542,4 +558,12 @@ public class ManaAchieve : Regist
 
         Instance.RegistValueA();
     }
-}
+}
+
+#region DebugList
+
+//状态的转换(进行中->待领取->已完成)
+//成就的存档(进行中 已完成)
+//Reload后的成就
+
+#endregion

Assets/Script/Manage/ManaAnim.cs

@@ -558,25 +558,25 @@ public class ManaAnim : Regist
     }
 
 
-    public static Zoom2D Zoom2D(Transform target, float origin, float destination, float duration, float stay, Transform targetZoom, Curve curve)
+    public static Zoom2D Zoom2D(Transform target, float origin, float destination, float duration, float stay, Transform zoom, Curve curve)
     {
         Zoom2D move;
 
         if (ZoomDic2D.TryGetValue(target, out move))
         {
-            move.StartZoom(origin, destination, duration, stay, targetZoom, curve);
+            move.StartZoom(origin, destination, duration, stay, zoom, curve);
         }
         else
         {
             move = CreateZoom2D(target);
 
-            move.StartZoom(origin, destination, duration, stay, targetZoom, curve);
+            move.StartZoom(origin, destination, duration, stay, zoom, curve);
         }
 
         return move;
     }
 
-    public static Zoom2D Zoom2D(Transform target, float destination, float duration, float stay, Transform targetZoom, Curve curve)
+    public static Zoom2D Zoom2D(Transform target, float destination, float duration, float stay, Transform zoom, Curve curve)
     {
         Zoom2D move;
 
@@ -584,13 +584,13 @@ public class ManaAnim : Regist
 
         if (ZoomDic2D.TryGetValue(target, out move))
         {
-            move.StartZoom(camera.orthographicSize, destination, duration, stay, targetZoom, curve);
+            move.StartZoom(camera.orthographicSize, destination, duration, stay, zoom, curve);
         }
         else
         {
             move = CreateZoom2D(target);
 
-            move.StartZoom(camera.orthographicSize, destination, duration, stay, targetZoom, curve);
+            move.StartZoom(camera.orthographicSize, destination, duration, stay, zoom, curve);
         }
 
         return move;
@@ -970,330 +970,6 @@ public class ManaAnim : Regist
     }
 
 
-    public static TweenSr TweenConForSr(Transform target)
-    {
-        TweenSr tween;
-
-        if (TweenSrDic.TryGetValue(target, out tween))
-        {
-            tween.ConfineForward();
-        }
-        else
-        {
-            throw new Exception();
-        }
-
-        return tween;
-    }
-
-    public static TweenCG TweenConForCG(Transform target)
-    {
-        TweenCG tween;
-
-        if (TweenCgDic.TryGetValue(target, out tween))
-        {
-            tween.ConfineForward();
-        }
-        else
-        {
-            throw new Exception();
-        }
-
-        return tween;
-    }
-
-    public static TweenGra TweenConForGra(Transform target)
-    {
-        TweenGra tween;
-
-        if (TweenGraDic.TryGetValue(target, out tween))
-        {
-            tween.ConfineForward();
-        }
-        else
-        {
-            throw new Exception();
-        }
-
-        return tween;
-    }
-
-    public static TweenVec TweenConForVec(Transform target)
-    {
-        TweenVec tween;
-
-        if (TweenVecDic.TryGetValue(target, out tween))
-        {
-            tween.ConfineForward();
-        }
-        else
-        {
-            throw new Exception();
-        }
-
-        return tween;
-    }
-
-    public static TweenFont TweenConForFont(Transform target)
-    {
-        TweenFont tween;
-
-        if (TweenFontDic.TryGetValue(target, out tween))
-        {
-            tween.ConfineForward();
-        }
-        else
-        {
-            throw new Exception();
-        }
-
-        return tween;
-    }
-
-    public static TweenRect TweenConForRect(Transform target)
-    {
-        TweenRect tween;
-
-        if (TweenRectDic.TryGetValue(target, out tween))
-        {
-            tween.ConfineForward();
-        }
-        else
-        {
-            throw new Exception();
-        }
-
-        return tween;
-    }
-
-    public static TweenScale TweenConForScale(Transform target)
-    {
-        TweenScale tween;
-
-        if (TweenScaleDic.TryGetValue(target, out tween))
-        {
-            tween.ConfineForward();
-        }
-        else
-        {
-            throw new Exception();
-        }
-
-        return tween;
-    }
-
-    public static TweenAudio TweenConForAudio(Transform target)
-    {
-        TweenAudio tween;
-        AudioSource audioSource = target.GetComponent<AudioSource>();
-
-        if (TweenAudioDic.TryGetValue(audioSource, out tween))
-        {
-            tween.ConfineForward();
-        }
-        else
-        {
-            throw new Exception();
-        }
-
-        return tween;
-    }
-
-    public static TweenAudio TweenConForAudio(AudioSource audioSource)
-    {
-        TweenAudio tween;
-
-        if (TweenAudioDic.TryGetValue(audioSource, out tween))
-        {
-            tween.ConfineForward();
-        }
-        else
-        {
-            throw new Exception();
-        }
-
-        return tween;
-    }
-
-    public static TweenNumber TweenConForNumber(Transform target)
-    {
-        TweenNumber tween;
-
-        if (TweenNumberDic.TryGetValue(target, out tween))
-        {
-            tween.ConfineForward();
-        }
-        else
-        {
-            throw new Exception();
-        }
-
-        return tween;
-    }
-
-
-    public static TweenSr TweenConBacSr(Transform target)
-    {
-        TweenSr tween;
-
-        if (TweenSrDic.TryGetValue(target, out tween))
-        {
-            tween.ConfineBackward();
-        }
-        else
-        {
-            throw new Exception();
-        }
-
-        return tween;
-    }
-
-    public static TweenCG TweenConBacCG(Transform target)
-    {
-        TweenCG tween;
-
-        if (TweenCgDic.TryGetValue(target, out tween))
-        {
-            tween.ConfineBackward();
-        }
-        else
-        {
-            throw new Exception();
-        }
-
-        return tween;
-    }
-
-    public static TweenGra TweenConBacGra(Transform target)
-    {
-        TweenGra tween;
-
-        if (TweenGraDic.TryGetValue(target, out tween))
-        {
-            tween.ConfineBackward();
-        }
-        else
-        {
-            throw new Exception(target.name);
-        }
-
-        return tween;
-    }
-
-    public static TweenVec TweenConBacVec(Transform target)
-    {
-        TweenVec tween;
-
-        if (TweenVecDic.TryGetValue(target, out tween))
-        {
-            tween.ConfineBackward();
-        }
-        else
-        {
-            throw new Exception(target.name);
-        }
-
-        return tween;
-    }
-
-    public static TweenFont TweenConBacFont(Transform target)
-    {
-        TweenFont tween;
-
-        if (TweenFontDic.TryGetValue(target, out tween))
-        {
-            tween.ConfineBackward();
-        }
-        else
-        {
-            throw new Exception();
-        }
-
-        return tween;
-    }
-
-    public static TweenRect TweenConBacRect(Transform target)
-    {
-        TweenRect tween;
-
-        if (TweenRectDic.TryGetValue(target, out tween))
-        {
-            tween.ConfineBackward();
-        }
-        else
-        {
-            throw new Exception();
-        }
-
-        return tween;
-    }
-
-    public static TweenScale TweenConBacScale(Transform target)
-    {
-        TweenScale tween;
-
-        if (TweenScaleDic.TryGetValue(target, out tween))
-        {
-            tween.ConfineBackward();
-        }
-        else
-        {
-            throw new Exception();
-        }
-
-        return tween;
-    }
-
-    public static TweenAudio TweenConBacAudio(Transform target)
-    {
-        TweenAudio tween;
-        AudioSource audioSource = target.GetComponent<AudioSource>();
-
-        if (TweenAudioDic.TryGetValue(audioSource, out tween))
-        {
-            tween.ConfineBackward();
-        }
-        else
-        {
-            throw new Exception();
-        }
-
-        return tween;
-    }
-
-    public static TweenAudio TweenConBacAudio(AudioSource audioSource)
-    {
-        TweenAudio tween;
-
-        if (TweenAudioDic.TryGetValue(audioSource, out tween))
-        {
-            tween.ConfineBackward();
-        }
-        else
-        {
-            throw new Exception();
-        }
-
-        return tween;
-    }
-
-    public static TweenNumber TweenConBacNumber(Transform target)
-    {
-        TweenNumber tween;
-
-        if (TweenNumberDic.TryGetValue(target, out tween))
-        {
-            tween.ConfineBackward();
-        }
-        else
-        {
-            throw new Exception();
-        }
-
-        return tween;
-    }
-
-
     public static TweenSr TweenReForSr(Transform target)
     {
         TweenSr tween;
@@ -1653,7 +1329,7 @@ public class ManaAnim : Regist
 
     #region 获取动画
 
-    public static float GetTimerVec3(Vector3 value, float duration, Vector3 start, Vector3 delta, Curve curve)
+    public static float GetTimerVec(Vector3 value, float duration, Vector3 start, Vector3 delta, Curve curve)
     {
         if (!delta.x.Equal(0))
         {
@@ -2060,7 +1736,7 @@ public class ManaAnim : Regist
     }
 
 
-    public static TweenSr CreateTweenSr(Transform target, float originAlpha, float destinationAlpha, float duration, bool originActive, bool destActive, Curve curve, bool cg = false, bool group = false)
+    public static TweenSr CreateTweenSr(Transform target, float originAlpha, float destAlpha, float duration, bool originActive, bool destActive, Curve curve, bool cg = false, bool group = false)
     {
         TweenSr tweenSr;
         SpriteRenderer sr = target.GetComponent<SpriteRenderer>();
@@ -2069,7 +1745,7 @@ public class ManaAnim : Regist
         Color destination = sr.color;
 
         origin.a = originAlpha;
-        destination.a = destinationAlpha;
+        destination.a = destAlpha;
 
         if (TweenSrDic.ContainsKey(target))
         {
@@ -2089,14 +1765,14 @@ public class ManaAnim : Regist
         }
     }
 
-    public static TweenSr CreateTweenSr(Transform target, float destinationAlpha, float duration, bool originActive, bool destActive, Curve curve, bool cg = false, bool group = false)
+    public static TweenSr CreateTweenSr(Transform target, float destAlpha, float duration, bool originActive, bool destActive, Curve curve, bool cg = false, bool group = false)
     {
         TweenSr tweenSr;
         SpriteRenderer sr = target.GetComponent<SpriteRenderer>();
 
         Color destination = sr.color;
 
-        destination.a = destinationAlpha;
+        destination.a = destAlpha;
 
         if (TweenSrDic.ContainsKey(target))
         {
@@ -2210,7 +1886,7 @@ public class ManaAnim : Regist
     }
 
 
-    public static TweenGra CreateTweenGra(Transform target, float originAlpha, float destinationAlpha, float duration, bool originActive, bool destActive, Curve curve, bool cg = false)
+    public static TweenGra CreateTweenGra(Transform target, float originAlpha, float destAlpha, float duration, bool originActive, bool destActive, Curve curve, bool cg = false)
     {
         Graphic graphic = target.GetComponent<Graphic>();
         TweenGra tweenGra;
@@ -2219,7 +1895,7 @@ public class ManaAnim : Regist
         Color destination = graphic.color;
 
         origin.a = originAlpha;
-        destination.a = destinationAlpha;
+        destination.a = destAlpha;
 
         if (TweenGraDic.ContainsKey(target))
         {
@@ -2239,14 +1915,14 @@ public class ManaAnim : Regist
         }
     }
 
-    public static TweenGra CreateTweenGra(Transform target, float destinationAlpha, float duration, bool originActive, bool destActive, Curve curve, bool cg = false)
+    public static TweenGra CreateTweenGra(Transform target, float destAlpha, float duration, bool originActive, bool destActive, Curve curve, bool cg = false)
     {
         Graphic graphic = target.GetComponent<Graphic>();
         TweenGra tweenGra;
 
         Color destination = graphic.color;
 
-        destination.a = destinationAlpha;
+        destination.a = destAlpha;
 
         if (TweenGraDic.ContainsKey(target))
         {
@@ -2611,6 +2287,57 @@ public class ManaAnim : Regist
     }
 
 
+    public static TweenScale CreateTweenScale(Transform target, float origin, float destination, float duration, bool originActive, bool destActive, Curve curve, bool cg = false)
+    {
+        Vector3 destScale = new Vector3(destination, destination, destination);
+        Vector3 originScale = new Vector3(origin, origin, origin);
+
+
+        TweenScale tweenScale;
+
+        if (TweenScaleDic.ContainsKey(target))
+        {
+            tweenScale = TweenScaleDic[target];
+
+            TweenScaleDic[target] = new TweenScale(target, originScale, destScale, duration, originActive, destActive, curve, cg);
+
+            return tweenScale;
+        }
+        else
+        {
+            tweenScale = new TweenScale(target, originScale, destScale, duration, originActive, destActive, curve, cg);
+
+            TweenScaleDic.Add(target, tweenScale);
+
+            return tweenScale;
+        }
+    }
+
+    public static TweenScale CreateTweenScale(Transform target, float destination, float duration, bool originActive, bool destActive, Curve curve, bool cg = false)
+    {
+        Vector3 destScale = new Vector3(destination, destination, destination);
+
+
+        TweenScale tweenScale;
+
+        if (TweenScaleDic.ContainsKey(target))
+        {
+            tweenScale = TweenScaleDic[target];
+
+            TweenScaleDic[target] = new TweenScale(target, target.localScale, destScale, duration, originActive, destActive, curve, cg);
+
+            return tweenScale;
+        }
+        else
+        {
+            tweenScale = new TweenScale(target, target.localScale, destScale, duration, originActive, destActive, curve, cg);
+
+            TweenScaleDic.Add(target, tweenScale);
+
+            return tweenScale;
+        }
+    }
+
     public static TweenScale CreateTweenScale(Transform target, Vector3 origin, Vector3 destination, float duration, bool originActive, bool destActive, Curve curve, bool cg = false)
     {
         TweenScale tweenScale;
@@ -2747,7 +2474,7 @@ public class ManaAnim : Regist
     }
 
 
-    public static TweenOutline CreateTweenOutline(Transform target, float originAlpha, float destinationAlpha, float duration, bool originActive, bool destActive, Curve curve, bool cg = false)
+    public static TweenOutline CreateTweenOutline(Transform target, float originAlpha, float destAlpha, float duration, bool originActive, bool destActive, Curve curve, bool cg = false)
     {
         Outline outline = target.GetComponent<Outline>();
         TweenOutline tweenOutline;
@@ -2756,7 +2483,7 @@ public class ManaAnim : Regist
         Color destination = outline.effectColor;
 
         origin.a = originAlpha;
-        destination.a = destinationAlpha;
+        destination.a = destAlpha;
 
         if (TweenOutlineDic.ContainsKey(target))
         {
@@ -2776,14 +2503,14 @@ public class ManaAnim : Regist
         }
     }
 
-    public static TweenOutline CreateTweenOutline(Transform target, float destinationAlpha, float duration, bool originActive, bool destActive, Curve curve, bool cg = false)
+    public static TweenOutline CreateTweenOutline(Transform target, float destAlpha, float duration, bool originActive, bool destActive, Curve curve, bool cg = false)
     {
         Outline graphic = target.GetComponent<Outline>();
         TweenOutline tweenOutline;
 
         Color destination = graphic.effectColor;
 
-        destination.a = destinationAlpha;
+        destination.a = destAlpha;
 
         if (TweenOutlineDic.ContainsKey(target))
         {

Assets/Script/Manage/ManaData.cs

@@ -501,7 +501,7 @@ public class ManaData : Regist
         {
             OpTimer = 0;
 
-            ManaReso.Get("C_Group").TweenConForCG();
+            ManaReso.Get("C_Group").TweenForCG();
         }
         else
         {
@@ -511,7 +511,7 @@ public class ManaData : Regist
             {
                 OpTimer = 0;
 
-                ManaReso.Get("C_Group").TweenConBacCG();
+                ManaReso.Get("C_Group").TweenBacCG();
             }
         }
     }
@@ -557,7 +557,7 @@ public class ManaData : Regist
         {
             if (!ManaTutorial.TutorialA && !ManaTutorial.TutorialB)
             {
-                ManaReso.Get("B_SignIn").TweenConForCG();
+                ManaReso.Get("B_SignIn").TweenForCG();
             }
         }
     }
@@ -576,10 +576,10 @@ public class ManaData : Regist
         {
             if (!ManaTutorial.TutorialA && !ManaTutorial.TutorialB)
             {
-                ManaReso.Get("C_Group").TweenConBacCG();
+                ManaReso.Get("C_Group").TweenBacCG();
 
-                ManaReso.Get("B_SignIn").TweenConForCG();
-                ManaReso.Get("Ba_Notice").TweenConForCG();
+                ManaReso.Get("B_SignIn").TweenForCG();
+                ManaReso.Get("Ba_Notice").TweenForCG();
             }
         }
     }
@@ -962,7 +962,7 @@ public class ManaData : Regist
 
     public static void LoginCallbackInitial(JsonData jsonData)
     {
-        if (!Initializer.LoadComplete || !ManaServer.LoginComplete)
+        if (!Initializer.Complete || !ManaServer.Complete)
         {
             return;
         }
@@ -984,8 +984,8 @@ public class ManaData : Regist
         {
             if (!ManaTutorial.TutorialA)
             {
-                ManaReso.Get("B_SignIn").TweenConForCG();
-                ManaReso.Get("Ba_Notice").TweenConForCG();
+                ManaReso.Get("B_SignIn").TweenForCG();
+                ManaReso.Get("Ba_Notice").TweenForCG();
             }
         }
         else
@@ -998,8 +998,8 @@ public class ManaData : Regist
 
                 if (daySpan >= 1 || yearSpan >= 1 || monthSpan >= 1)
                 {
-                    ManaReso.Get("B_SignIn").TweenConForCG();
-                    ManaReso.Get("Bb_SignIn").TweenConForCG();
+                    ManaReso.Get("B_SignIn").TweenForCG();
+                    ManaReso.Get("Bb_SignIn").TweenForCG();
                 }
             }
         }
@@ -1080,7 +1080,7 @@ public class ManaData : Regist
 
     public void OnApplicationQuit()
     {
-        if (Initializer.LoadComplete && !Reset)
+        if (Initializer.Complete && !Reset)
         {
             Data.SavePlayerConfig();
             Data.SaveXml();
@@ -1102,7 +1102,7 @@ public class ManaData : Regist
             }
             else
             {
-                if (!Initializer.LoadComplete)
+                if (!Initializer.Complete)
                 {
                     return;
                 }

Assets/Script/Manage/ManaInfo.cs

@@ -78,7 +78,7 @@ public class ManaInfo : Regist
             Text.text = str + "\n" + Text.text;
         }
 
-        Text.TweenConForCG();
+        Text.TweenForCG();
 
         Lock = true;
         Timer = time;

Assets/Script/Manage/ManaLan.cs

@@ -96,7 +96,7 @@ public class ManaLan : Regist
         {
             if (kv.Value.AchieveItem != null)
             {
-                kv.Value.Lab.text = Achieve.GetDescription(kv.Value.Desc, kv.Value.Value);
+                kv.Value.Lab.text = Achieve.GetDescription(kv.Value.Desc, kv.Value.TargetValue);
             }
         }
 

Assets/Script/Manage/ManaServer.cs

@@ -58,7 +58,7 @@ public class ManaServer : Regist
     public static bool Connect_;
 
     public static float Timer;
-    public static bool LoginComplete;
+    public static bool Complete;
     public static string ReportStr;
     public static string ID = "Default";
     public static JsonData JsonData;
@@ -68,7 +68,7 @@ public class ManaServer : Regist
 
     private void Update()
     {
-        if (!ManaData.InitiateComplete && !LoginComplete)
+        if (!ManaData.InitiateComplete && !Complete)
         {
             Timer += UnityEngine.Time.fixedDeltaTime;
 
@@ -93,7 +93,7 @@ public class ManaServer : Regist
     {
         ManaDebug.Log(jsonData.ToJson());
 
-        LoginComplete = true;
+        Complete = true;
 
         if (jsonData.Inst_Object.ContainsKey("c"))
         {
@@ -109,7 +109,7 @@ public class ManaServer : Regist
                 {
                     ID = jsonData["o"].ToString();
 
-                    if (Initializer.LoadComplete)
+                    if (Initializer.Complete)
                     {
                         ManaReso.SetText("L_UserLab", ID);
                     }

Assets/Script/Manage/ManaTutorial.cs

@@ -295,7 +295,7 @@ public class ManaTutorial : Regist
 
         ManaReso.SetActive("N_Tutorial", true);
 
-        Tween tween = ManaReso.Get("N_Mask").TweenConForGra();
+        Tween tween = ManaReso.Get("N_Mask").TweenForGra();
 
         tween.AddEventOnetime
         (

Assets/Script/Manage/ManaUI.cs

@@ -121,7 +121,7 @@ public class ManaUI : Regist
                 if (daySpan >= 1 || yearSpan >= 1 || monthSpan >= 1)
                 {
                     ManaReso.Get("Ba_Notice").TweenBacCG();
-                    ManaReso.Get("Bb_SignIn").TweenConForCG();
+                    ManaReso.Get("Bb_SignIn").TweenForCG();
 
                     ManaReso.SetActive("Ba_Notice", false);
                 }
@@ -428,7 +428,7 @@ public class ManaUI : Regist
 
                 ManaMiniGame.Pause = true;
 
-                ManaReso.Get("Da_Info").TweenConForCG();
+                ManaReso.Get("Da_Info").TweenForCG();
 
                 ManaReso.Get("Da_CoinGroup").GetTweenScale().InDestination = true;
                 ManaReso.Get("Da_FlowerGroup").GetTweenScale().InDestination = true;
@@ -889,9 +889,9 @@ public class ManaUI : Regist
                 ManaAudio.PlayClip(Clip.BtnClip);
 
                 ManaReso.Get("F_Elf").TweenForScale();
-                ManaReso.Get("F_Store").TweenConBacScale();
-                ManaReso.Get("F_Magic").TweenConBacScale();
-                ManaReso.Get("F_Garden").TweenConBacScale();
+                ManaReso.Get("F_Store").TweenBacScale();
+                ManaReso.Get("F_Magic").TweenBacScale();
+                ManaReso.Get("F_Garden").TweenBacScale();
 
                 ManaReso.Get("F_Elf").SetAsLastSibling();
                 ManaReso.Get("F_Store").SetSiblingIndex(0);
@@ -924,10 +924,10 @@ public class ManaUI : Regist
             {
                 ManaAudio.PlayClip(Clip.BtnClip);
 
-                ManaReso.Get("F_Elf").TweenConBacScale();
+                ManaReso.Get("F_Elf").TweenBacScale();
                 ManaReso.Get("F_Store").TweenForScale();
-                ManaReso.Get("F_Magic").TweenConBacScale();
-                ManaReso.Get("F_Garden").TweenConBacScale();
+                ManaReso.Get("F_Magic").TweenBacScale();
+                ManaReso.Get("F_Garden").TweenBacScale();
 
                 ManaReso.Get("F_Elf").SetSiblingIndex(1);
                 ManaReso.Get("F_Store").SetAsLastSibling();
@@ -960,10 +960,10 @@ public class ManaUI : Regist
             {
                 ManaAudio.PlayClip(Clip.BtnClip);
 
-                ManaReso.Get("F_Elf").TweenConBacScale();
-                ManaReso.Get("F_Store").TweenConBacScale();
+                ManaReso.Get("F_Elf").TweenBacScale();
+                ManaReso.Get("F_Store").TweenBacScale();
                 ManaReso.Get("F_Magic").TweenForScale();
-                ManaReso.Get("F_Garden").TweenConBacScale();
+                ManaReso.Get("F_Garden").TweenBacScale();
 
                 ManaReso.Get("F_Elf").SetSiblingIndex(1);
                 ManaReso.Get("F_Store").SetSiblingIndex(0);
@@ -996,9 +996,9 @@ public class ManaUI : Regist
             {
                 ManaAudio.PlayClip(Clip.BtnClip);
 
-                ManaReso.Get("F_Elf").TweenConBacScale();
-                ManaReso.Get("F_Store").TweenConBacScale();
-                ManaReso.Get("F_Magic").TweenConBacScale();
+                ManaReso.Get("F_Elf").TweenBacScale();
+                ManaReso.Get("F_Store").TweenBacScale();
+                ManaReso.Get("F_Magic").TweenBacScale();
                 ManaReso.Get("F_Garden").TweenForScale();
 
                 ManaReso.Get("F_Elf").SetSiblingIndex(2);
@@ -1530,9 +1530,9 @@ public class ManaUI : Regist
                 ManaReso.Get<Button>("L_SimChi").interactable = true;
                 ManaReso.Get<Button>("L_English").interactable = true;
 
-                ManaReso.Get<Button>("L_TraChi").image.color = ManaColor.Orange;
-                ManaReso.Get<Button>("L_SimChi").image.color = ManaColor.LightGray;
-                ManaReso.Get<Button>("L_English").image.color = ManaColor.LightGray;
+                ManaReso.Get<Button>("L_TraChi").image.color = Shortcut.Orange;
+                ManaReso.Get<Button>("L_SimChi").image.color = Shortcut.LightGray;
+                ManaReso.Get<Button>("L_English").image.color = Shortcut.LightGray;
 
                 ManaLan.SwitchLanguage(Lan.ChineseTraditional);
             }
@@ -1552,9 +1552,9 @@ public class ManaUI : Regist
                 ManaReso.Get<Button>("L_SimChi").interactable = false;
                 ManaReso.Get<Button>("L_English").interactable = true;
 
-                ManaReso.Get<Button>("L_TraChi").image.color = ManaColor.LightGray;
-                ManaReso.Get<Button>("L_SimChi").image.color = ManaColor.Orange;
-                ManaReso.Get<Button>("L_English").image.color = ManaColor.LightGray;
+                ManaReso.Get<Button>("L_TraChi").image.color = Shortcut.LightGray;
+                ManaReso.Get<Button>("L_SimChi").image.color = Shortcut.Orange;
+                ManaReso.Get<Button>("L_English").image.color = Shortcut.LightGray;
 
                 ManaLan.SwitchLanguage(Lan.ChineseSimplified);
             }
@@ -1574,9 +1574,9 @@ public class ManaUI : Regist
                 ManaReso.Get<Button>("L_SimChi").interactable = true;
                 ManaReso.Get<Button>("L_English").interactable = false;
 
-                ManaReso.Get<Button>("L_TraChi").image.color = ManaColor.LightGray;
-                ManaReso.Get<Button>("L_SimChi").image.color = ManaColor.LightGray;
-                ManaReso.Get<Button>("L_English").image.color = ManaColor.Orange;
+                ManaReso.Get<Button>("L_TraChi").image.color = Shortcut.LightGray;
+                ManaReso.Get<Button>("L_SimChi").image.color = Shortcut.LightGray;
+                ManaReso.Get<Button>("L_English").image.color = Shortcut.Orange;
 
                 ManaLan.SwitchLanguage(Lan.English);
             }

Assets/Script/Object/Tutorial.cs

@@ -48,7 +48,7 @@ public class Tutorial : Regist, IPointerClickHandler
 
         PointScreen(arrowPos.position, target);
 
-        ManaReso.Get("N_Mask").TweenConForGra();
+        ManaReso.Get("N_Mask").TweenForGra();
 
 
         HighLightList.Add(target);
@@ -68,7 +68,7 @@ public class Tutorial : Regist, IPointerClickHandler
 
         PointScreen(arrowPos.position, targetPos);
 
-        ManaReso.Get("N_Mask").TweenConForGra();
+        ManaReso.Get("N_Mask").TweenForGra();
 
 
         HighLightList.Add(target);
@@ -88,8 +88,8 @@ public class Tutorial : Regist, IPointerClickHandler
         HighLightList = new List<Transform>();
 
 
-        ManaReso.Get("N_Mask").TweenConBacGra();
-        ManaReso.Get("N_Arrow").TweenConBacCG();
+        ManaReso.Get("N_Mask").TweenBacGra();
+        ManaReso.Get("N_Arrow").TweenBacCG();
 
         ClearArea();
 
@@ -108,7 +108,7 @@ public class Tutorial : Regist, IPointerClickHandler
 
         if (hideArrow)
         {
-            ManaReso.Get("N_Arrow").TweenConBacCG();
+            ManaReso.Get("N_Arrow").TweenBacCG();
         }
     }
 
@@ -155,7 +155,7 @@ public class Tutorial : Regist, IPointerClickHandler
 
         Arrow.right = pointPos - Arrow.position;
 
-        Arrow.TweenConForCG();
+        Arrow.TweenForCG();
     }
 
     public static void PointScreen(Vector3 pos, Transform tra)
@@ -164,7 +164,7 @@ public class Tutorial : Regist, IPointerClickHandler
 
         Arrow.right = tra.position - Arrow.position;
 
-        Arrow.TweenConForCG();
+        Arrow.TweenForCG();
     }
 
 
@@ -185,13 +185,13 @@ public class Tutorial : Regist, IPointerClickHandler
             ManaReso.Get("PlayerBk2").MoveOffset2D(offset, 1f, false, Curve.EaseOutQuad);
             ManaReso.Get("PlayerBk3").MoveOffset2D(offset, 1f, false, Curve.EaseOutQuad);
 
-            ManaReso.Get("PlayerBk1").TweenConForScale();
-            ManaReso.Get("PlayerBk2").TweenConBacScale();
-            ManaReso.Get("PlayerBk3").TweenConBacScale();
+            ManaReso.Get("PlayerBk1").TweenForScale();
+            ManaReso.Get("PlayerBk2").TweenBacScale();
+            ManaReso.Get("PlayerBk3").TweenBacScale();
 
-            ManaPlayer.PlayerPink.TweenConBacScale();
-            ManaPlayer.PlayerBlond.TweenConBacScale();
-            ManaPlayer.PlayerBrown.TweenConForScale();
+            ManaPlayer.PlayerPink.TweenBacScale();
+            ManaPlayer.PlayerBlond.TweenBacScale();
+            ManaPlayer.PlayerBrown.TweenForScale();
 
             ManaPlayer.SelePlayer = "PlayerBrown";
             ManaPlayer.SelePlayerTra = ManaPlayer.PlayerBrown;
@@ -210,13 +210,13 @@ public class Tutorial : Regist, IPointerClickHandler
             ManaReso.Get("PlayerBk2").MoveOffset2D(offset, 1f, false, Curve.EaseOutQuad);
             ManaReso.Get("PlayerBk3").MoveOffset2D(offset, 1f, false, Curve.EaseOutQuad);
 
-            ManaReso.Get("PlayerBk2").TweenConForScale();
-            ManaReso.Get("PlayerBk1").TweenConBacScale();
-            ManaReso.Get("PlayerBk3").TweenConBacScale();
+            ManaReso.Get("PlayerBk2").TweenForScale();
+            ManaReso.Get("PlayerBk1").TweenBacScale();
+            ManaReso.Get("PlayerBk3").TweenBacScale();
 
-            ManaPlayer.PlayerPink.TweenConBacScale();
-            ManaPlayer.PlayerBlond.TweenConForScale();
-            ManaPlayer.PlayerBrown.TweenConBacScale();
+            ManaPlayer.PlayerPink.TweenBacScale();
+            ManaPlayer.PlayerBlond.TweenForScale();
+            ManaPlayer.PlayerBrown.TweenBacScale();
 
             ManaPlayer.SelePlayer = "PlayerBlond";
             ManaPlayer.SelePlayerTra = ManaPlayer.PlayerBlond;
@@ -235,13 +235,13 @@ public class Tutorial : Regist, IPointerClickHandler
             ManaReso.Get("PlayerBk2").MoveOffset2D(offset, 1f, false, Curve.EaseOutQuad);
             ManaReso.Get("PlayerBk3").MoveOffset2D(offset, 1f, false, Curve.EaseOutQuad);
 
-            ManaReso.Get("PlayerBk3").TweenConForScale();
-            ManaReso.Get("PlayerBk1").TweenConBacScale();
-            ManaReso.Get("PlayerBk2").TweenConBacScale();
+            ManaReso.Get("PlayerBk3").TweenForScale();
+            ManaReso.Get("PlayerBk1").TweenBacScale();
+            ManaReso.Get("PlayerBk2").TweenBacScale();
 
-            ManaPlayer.PlayerPink.TweenConForScale();
-            ManaPlayer.PlayerBlond.TweenConBacScale();
-            ManaPlayer.PlayerBrown.TweenConBacScale();
+            ManaPlayer.PlayerPink.TweenForScale();
+            ManaPlayer.PlayerBlond.TweenBacScale();
+            ManaPlayer.PlayerBrown.TweenBacScale();
 
             ManaPlayer.SelePlayer = "PlayerPink";
             ManaPlayer.SelePlayerTra = ManaPlayer.PlayerPink;

Assets/Script/Tool/Anim/Move.cs

@@ -1,7 +1,7 @@
 using UnityEngine;
+using UnityEngine.Events;
 
 using System.Collections;
-using UnityEngine.Events;
 
 public abstract class Move 
 {
@@ -9,11 +9,11 @@ public abstract class Move
 
     public virtual bool InDestination
     {
-        get { return _InDestination; }
-        set { _InDestination = value; }
+        get { return InDestination_; }
+        set { InDestination_ = value; }
     }
 
-    public bool _InDestination;
+    public bool InDestination_;
 
     public UnityAction OnForwardStart;
     public UnityAction OnForwardFinish;

Assets/Script/Tool/Anim/Move2D.cs

@@ -16,41 +16,41 @@ public class Move2D : Move
             {
                 if (Target.localPosition.Equal(Destination))
                 {
-                    _InDestination = true;
+                    InDestination_ = true;
                 }
                 else
                 {
-                    _InDestination = false;
+                    InDestination_ = false;
                 }
             }
             else
             {
                 if (Target.position.Equal(Destination))
                 {
-                    _InDestination = true;
+                    InDestination_ = true;
                 }
                 else
                 {
-                    _InDestination = false;
+                    InDestination_ = false;
                 }
             }
 
-            return _InDestination;
+            return InDestination_;
         }
         set
         {
-            _InDestination = value;
+            InDestination_ = value;
 
             if (Local)
             {
-                if (_InDestination)
+                if (InDestination_)
                 {
                     Target.localPosition = Destination;
                 }
             }
             else
             {
-                if (_InDestination)
+                if (InDestination_)
                 {
                     Target.position = Destination;
                 }

Assets/Script/Tool/Anim/Move3D.cs

@@ -16,41 +16,41 @@ public class Move3D : Move
             {
                 if (Target.localPosition.Equal(Destination))
                 {
-                    _InDestination = true;
+                    InDestination_ = true;
                 }
                 else
                 {
-                    _InDestination = false;
+                    InDestination_ = false;
                 }
             }
             else
             {
                 if (Target.position.Equal(Destination))
                 {
-                    _InDestination = true;
+                    InDestination_ = true;
                 }
                 else
                 {
-                    _InDestination = false;
+                    InDestination_ = false;
                 }
             }
 
-            return _InDestination;
+            return InDestination_;
         }
         set
         {
-            _InDestination = value;
+            InDestination_ = value;
 
             if (Local)
             {
-                if (_InDestination)
+                if (InDestination_)
                 {
                     Target.localPosition = Destination;
                 }
             }
             else
             {
-                if (_InDestination)
+                if (InDestination_)
                 {
                     Target.position = Destination;
                 }

Assets/Script/Tool/Anim/Shake.cs

@@ -15,20 +15,20 @@ public class Shake : Move
         {
             if (Target.position.Equal(Origin))
             {
-                _InDestination = true;
+                InDestination_ = true;
             }
             else
             {
-                _InDestination = false;
+                InDestination_ = false;
             }
 
-            return _InDestination;
+            return InDestination_;
         }
         set
         {
-            _InDestination = value;
+            InDestination_ = value;
 
-            if (_InDestination)
+            if (InDestination_)
             {
                 Target.position = Origin;
             }

Assets/Script/Tool/Anim/StreamFont.cs

@@ -66,7 +66,7 @@ public class StreamFont : Tween
                     Target.fontSize = DestKvList[0].Key;
                 }
 
-                FinishBackward();
+                BackwardFinish();
             }
         }
     }
@@ -115,7 +115,7 @@ public class StreamFont : Tween
                     Target.fontSize = DestKvList.Last(0).Value;
                 }
 
-                FinishForward();
+                ForwardFinish();
             }
         }
     }
@@ -264,8 +264,6 @@ public class StreamFont : Tween
         {
             if (Timer > TempDuration)
             {
-                FinishForward();
-
                 Timer = 0;
 
                 InForward = false;

Assets/Script/Tool/Anim/StreamScale.cs

@@ -1,10 +1,10 @@
 using UnityEngine;
 using UnityEngine.UI;
+using UnityEngine.Events;
 
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using UnityEngine.Events;
 
 public struct VecPair
 {
@@ -72,7 +72,7 @@ public class StreamScale : Tween
                     Target.localScale = DestKvList[0].Key;
                 }
 
-                FinishBackward();
+                BackwardFinish();
             }
         }
     }
@@ -121,7 +121,7 @@ public class StreamScale : Tween
                     Target.localScale = DestKvList.Last(0).Value;
                 }
 
-                FinishForward();
+                ForwardFinish();
             }
         }
     }
@@ -270,8 +270,6 @@ public class StreamScale : Tween
         {
             if (Timer > TempDuration)
             {
-                FinishForward();
-
                 Timer = 0;
 
                 InForward = false;

Assets/Script/Tool/Anim/Tween.cs

@@ -22,6 +22,8 @@ public abstract class Tween
     public bool _InDestination;
 
     public bool CG;
+    public bool Loop;
+    public bool PingPong;
     public bool InForward;
     public bool InBackward;
     public Curve Curve;
@@ -83,6 +85,7 @@ public abstract class Tween
     public void ReForward()
     {
         Timer = 0;
+        InOrigin = true;
 
         if (InBackward)
         {
@@ -90,7 +93,7 @@ public abstract class Tween
 
             ManaAnim.TweenBacList.Remove(this);
         }
-
+        
         if (!InForward)
         {
             StartForward();
@@ -100,6 +103,7 @@ public abstract class Tween
     public void ReBackward()
     {
         Timer = 0;
+        InDestination = true;
 
         if (InForward)
         {
@@ -115,25 +119,15 @@ public abstract class Tween
     }
 
 
-    public void ConfineForward()
-    {
-        if (!InDestination)
-        {
-            StartForward();
-        }
-    }
-
-    public void ConfineBackward()
+    public virtual void StartForward()
     {
-        if (!InOrigin)
+        if (InForward || InDestination)
         {
-            StartBackward();
+            return;
         }
-    }
 
+        Timer = 0;
 
-    public virtual void StartForward()
-    {
         InForward = true;
 
         Component.SetActive(true);
@@ -153,11 +147,18 @@ public abstract class Tween
             ManaAnim.TweenBacList.Remove(this);
         }
         
-        ManaAnim.TweenForList.UniqueAdd(this);
+        ManaAnim.TweenForList.Add(this);
     }
 
     public virtual void StartBackward()
     {
+        if (InBackward || InOrigin)
+        {
+            return;
+        }
+
+        Timer = 0;
+
         InBackward = true;
 
         Component.SetActive(true);
@@ -177,11 +178,11 @@ public abstract class Tween
             ManaAnim.TweenForList.Remove(this);
         }
 
-        ManaAnim.TweenBacList.UniqueAdd(this);
+        ManaAnim.TweenBacList.Add(this);
     }
 
 
-    protected void FinishForward()
+    protected void ForwardFinish()
     {
         Component.SetActive(DestActive);
 
@@ -189,9 +190,20 @@ public abstract class Tween
         {
             CanvasGroup.interactable = DestActive;
         }
+
+        if (Loop)
+        {
+            ManaAnim.TweenForList.Add(this);
+
+            ReForward();
+        }
+        else if (PingPong)
+        {
+            StartBackward();
+        }
     }
 
-    protected void FinishBackward()
+    protected void BackwardFinish()
     {
         Component.SetActive(OriginActive);
 
@@ -199,6 +211,17 @@ public abstract class Tween
         {
             CanvasGroup.interactable = OriginActive;
         }
+
+        if (Loop)
+        {
+            ManaAnim.TweenBacList.Add(this);
+
+            ReBackward();
+        }
+        else if (PingPong)
+        {
+            StartForward();
+        }
     }
 
 

Assets/Script/Tool/Anim/TweenAudio.cs

@@ -30,7 +30,7 @@ public class TweenAudio : Tween
             {
                 Target.volume = Origin;
 
-                FinishBackward();
+                BackwardFinish();
             }
         }
     }
@@ -58,7 +58,7 @@ public class TweenAudio : Tween
             {
                 Target.volume = Destination;
 
-                FinishForward();
+                ForwardFinish();
             }
         }
     }
@@ -114,10 +114,6 @@ public class TweenAudio : Tween
 
         if (Timer > Duration)
         {
-            FinishForward();
-
-            Timer = 0;
-
             InForward = false;
             InDestination = true;
 
@@ -142,10 +138,6 @@ public class TweenAudio : Tween
 
         if (Timer > Duration)
         {
-            FinishBackward();
-
-            Timer = 0;
-
             InBackward = false;
             InOrigin = true;
 

Assets/Script/Tool/Anim/TweenCG.cs

@@ -30,7 +30,7 @@ public class TweenCG : Tween
             {
                 Target.alpha = Origin;
 
-                FinishBackward();
+                BackwardFinish();
             }
         }
     }
@@ -58,7 +58,7 @@ public class TweenCG : Tween
             {
                 Target.alpha = Destination;
 
-                FinishForward();
+                ForwardFinish();
             }
         }
     }
@@ -113,10 +113,6 @@ public class TweenCG : Tween
 
         if (Timer > Duration)
         {
-            FinishForward();
-
-            Timer = 0;
-
             InForward = false;
             InDestination = true;
 
@@ -141,10 +137,6 @@ public class TweenCG : Tween
 
         if (Timer > Duration)
         {
-            FinishBackward();
-
-            Timer = 0;
-
             InBackward = false;
             InOrigin = true;
 

Assets/Script/Tool/Anim/TweenFont.cs

@@ -31,7 +31,7 @@ public class TweenFont : Tween
             {
                 Target.fontSize = (int)Origin;
 
-                FinishBackward();
+                BackwardFinish();
             }
         }
     }
@@ -59,7 +59,7 @@ public class TweenFont : Tween
             {
                 Target.fontSize = (int)Destination;
 
-                FinishForward();
+                ForwardFinish();
             }
         }
     }
@@ -115,10 +115,6 @@ public class TweenFont : Tween
 
         if (Timer > Duration)
         {
-            FinishForward();
-
-            Timer = 0;
-
             InForward = false;
             InDestination = true;
 
@@ -143,10 +139,6 @@ public class TweenFont : Tween
 
         if (Timer > Duration)
         {
-            FinishBackward();
-
-            Timer = 0;
-
             InBackward = false;
             InOrigin = true;
 

Assets/Script/Tool/Anim/TweenGra.cs

@@ -31,7 +31,7 @@ public class TweenGra : Tween
             {
                 Target.color = Origin;
 
-                FinishBackward();
+                BackwardFinish();
             }
         }
     }
@@ -59,7 +59,7 @@ public class TweenGra : Tween
             {
                 Target.color = Destination;
 
-                FinishForward();
+                ForwardFinish();
             }
         }
     }
@@ -114,10 +114,6 @@ public class TweenGra : Tween
 
         if (Timer > Duration)
         {
-            FinishForward();
-
-            Timer = 0;
-
             InForward = false;
             InDestination = true;
 
@@ -142,10 +138,6 @@ public class TweenGra : Tween
 
         if (Timer > Duration)
         {
-            FinishBackward();
-
-            Timer = 0;
-
             InBackward = false;
             InOrigin = true;
 

Assets/Script/Tool/Anim/TweenNumber.cs

@@ -32,7 +32,7 @@ public class TweenNumber : Tween
             {
                 Target.text = Origin.ToString();
 
-                FinishBackward();
+                BackwardFinish();
             }
         }
     }
@@ -60,7 +60,7 @@ public class TweenNumber : Tween
             {
                 Target.text = Destination.ToString();
 
-                FinishForward();
+                ForwardFinish();
             }
         }
     }
@@ -117,10 +117,6 @@ public class TweenNumber : Tween
 
         if (Timer > Duration)
         {
-            FinishForward();
-
-            Timer = 0;
-
             InForward = false;
             InDestination = true;
 
@@ -145,10 +141,6 @@ public class TweenNumber : Tween
 
         if (Timer > Duration)
         {
-            FinishBackward();
-
-            Timer = 0;
-
             InBackward = false;
             InOrigin = true;
 

Assets/Script/Tool/Anim/TweenOutline.cs

@@ -31,7 +31,7 @@ public class TweenOutline : Tween
             {
                 Target.effectColor = Origin;
 
-                FinishBackward();
+                BackwardFinish();
             }
         }
     }
@@ -59,7 +59,7 @@ public class TweenOutline : Tween
             {
                 Target.effectColor = Destination;
 
-                FinishForward();
+                ForwardFinish();
             }
         }
     }
@@ -118,10 +118,6 @@ public class TweenOutline : Tween
 
         if (Timer > Duration)
         {
-            FinishForward();
-
-            Timer = 0;
-
             InForward = false;
             InDestination = true;
 
@@ -146,10 +142,6 @@ public class TweenOutline : Tween
 
         if (Timer > Duration)
         {
-            FinishBackward();
-
-            Timer = 0;
-
             InBackward = false;
             InOrigin = true;
 

Assets/Script/Tool/Anim/TweenRect.cs

@@ -29,7 +29,7 @@ public class TweenRect : Tween
             {
                 Target.sizeDelta = Origin;
 
-                FinishBackward();
+                BackwardFinish();
             }
         }
     }
@@ -57,7 +57,7 @@ public class TweenRect : Tween
             {
                 Target.sizeDelta = Destination;
 
-                FinishForward();
+                ForwardFinish();
             }
         }
     }
@@ -93,7 +93,7 @@ public class TweenRect : Tween
 
         if (InBackward)
         {
-            Timer = ManaAnim.GetTimerVec3(Target.sizeDelta, Duration, Origin, Delta, Curve);
+            Timer = ManaAnim.GetTimerVec(Target.sizeDelta, Duration, Origin, Delta, Curve);
         }
     }
 
@@ -103,7 +103,7 @@ public class TweenRect : Tween
 
         if (InForward)
         {
-            Timer = ManaAnim.GetTimerVec3(Target.sizeDelta, Duration, Destination, -Delta, Curve);
+            Timer = ManaAnim.GetTimerVec(Target.sizeDelta, Duration, Destination, -Delta, Curve);
         }
     }
 
@@ -113,10 +113,6 @@ public class TweenRect : Tween
 
         if (Timer > Duration)
         {
-            FinishForward();
-
-            Timer = 0;
-
             InForward = false;
             InDestination = true;
 
@@ -141,10 +137,6 @@ public class TweenRect : Tween
 
         if (Timer > Duration)
         {
-            FinishBackward();
-
-            Timer = 0;
-
             InBackward = false;
             InOrigin = true;
 

Assets/Script/Tool/Anim/TweenScale.cs

@@ -30,7 +30,7 @@ public class TweenScale : Tween
             {
                 Target.localScale = Origin;
 
-                FinishBackward();
+                BackwardFinish();
             }
         }
     }
@@ -58,7 +58,7 @@ public class TweenScale : Tween
             {
                 Target.localScale = Destination;
 
-                FinishForward();
+                ForwardFinish();
             }
         }
     }
@@ -93,14 +93,14 @@ public class TweenScale : Tween
     {
         base.StartForward();
 
-        Timer = ManaAnim.GetTimerVec3(Target.localScale, Duration, Origin, Delta, Curve);
+        Timer = ManaAnim.GetTimerVec(Target.localScale, Duration, Origin, Delta, Curve);
     }
 
     public override void StartBackward()
     {
         base.StartBackward();
 
-        Timer = ManaAnim.GetTimerVec3(Target.localScale, Duration, Destination, -Delta, Curve);
+        Timer = ManaAnim.GetTimerVec(Target.localScale, Duration, Destination, -Delta, Curve);
     }
 
     public override bool DoForward()
@@ -109,10 +109,6 @@ public class TweenScale : Tween
 
         if (Timer > Duration)
         {
-            FinishForward();
-
-            Timer = 0;
-
             InForward = false;
             InDestination = true;
 
@@ -137,10 +133,6 @@ public class TweenScale : Tween
 
         if (Timer > Duration)
         {
-            FinishBackward();
-
-            Timer = 0;
-
             InBackward = false;
             InOrigin = true;
 

Assets/Script/Tool/Anim/TweenSr.cs

@@ -1,6 +1,8 @@
 using UnityEngine;
 
+using System.Linq;
 using System.Collections;
+using System.Collections.Generic;
 
 public class TweenSr : Tween 
 {
@@ -31,22 +33,22 @@ public class TweenSr : Tween
 
                 if (Group)
                 {
-                    Renderer[] renderers = Target.GetComponentsInChildren<Renderer>();
+                    for (int i = 0; i < ChildList.Count; i++)
+                    {
+                        if (ChildList[i].transform.parent != Target.transform)
+                        {
+                            ChildList.RemoveAt(i--);
 
-                    Targets = new Material[renderers.Length];
+                            continue;
+                        }
 
-                    for (int i = 0; i < renderers.Length; i++)
-                    {
-                        Targets[i] = renderers[i].material;
-                    }
+                        Color selfColor = ColorDic[ChildList[i]];
 
-                    for (int i = 1; i < Targets.Length; i++)
-                    {
-                        Targets[i].SetAlpha(Target.color.a, "_Color");
+                        ChildList[i].material.SetColor("_Color", selfColor * Target.color);
                     }
                 }
 
-                FinishBackward();
+                BackwardFinish();
             }
         }
     }
@@ -76,22 +78,22 @@ public class TweenSr : Tween
 
                 if (Group)
                 {
-                    Renderer[] renderers = Target.GetComponentsInChildren<Renderer>();
+                    for (int i = 0; i < ChildList.Count; i++)
+                    {
+                        if (ChildList[i].transform.parent != Target.transform)
+                        {
+                            ChildList.RemoveAt(i--);
 
-                    Targets = new Material[renderers.Length];
+                            continue;
+                        }
 
-                    for (int i = 0; i < renderers.Length; i++)
-                    {
-                        Targets[i] = renderers[i].material;
-                    }
+                        Color selfColor = ColorDic[ChildList[i]];
 
-                    for (int i = 1; i < Targets.Length; i++)
-                    {
-                        Targets[i].SetAlpha(Target.color.a, "_Color");
+                        ChildList[i].material.SetColor("_Color", selfColor * Target.color);
                     }
                 }
 
-                FinishForward();
+                ForwardFinish();
             }
         }
     }
@@ -100,10 +102,12 @@ public class TweenSr : Tween
     public Color Delta;
     public Color Origin;
     public Color Destination;
-    public Material[] Targets;
     public SpriteRenderer Target;
     public CurveFunctionC Func;
 
+    public List<Renderer> ChildList;
+    public Dictionary<Renderer, Color> ColorDic = new Dictionary<Renderer, Color>();
+
     #endregion
 
     public TweenSr(SpriteRenderer target, Color origin, Color destination, float duration, bool originActive, bool destActive, Curve curve,bool cg = false,bool group=false) : base(cg, curve, target)
@@ -131,11 +135,29 @@ public class TweenSr : Tween
         {
             Renderer[] renderers = Target.GetComponentsInChildren<Renderer>();
 
-            Targets = new Material[renderers.Length];
+            ChildList = new List<Renderer>();
+
+            for (int i = 1; i < renderers.Length; i++)
+            {
+                Renderer renderer = renderers[i];
+
+                ChildList.Add(renderer);
 
-            for (int i = 0; i < renderers.Length; i++)
+                if (!ColorDic.ContainsKey(renderer))
+                {
+                    ColorDic.Add(renderer, renderer.material.GetColor("_Color"));
+                }
+            }
+
+
+            List<Renderer> keyList = ColorDic.Keys.ToList();
+
+            for (int i = 0; i < keyList.Count; i++)
             {
-                Targets[i] = renderers[i].material;
+                if (!ChildList.Contains(keyList[i]))
+                {
+                    ColorDic.Remove(keyList[i]);
+                }
             }
         }
 
@@ -153,11 +175,29 @@ public class TweenSr : Tween
         {
             Renderer[] renderers = Target.GetComponentsInChildren<Renderer>();
 
-            Targets = new Material[renderers.Length];
-            
-            for (int i = 0; i < renderers.Length; i++)
+            ChildList = new List<Renderer>();
+
+            for (int i = 1; i < renderers.Length; i++)
             {
-                Targets[i] = renderers[i].material;
+                Renderer renderer = renderers[i];
+
+                ChildList.Add(renderer);
+
+                if (!ColorDic.ContainsKey(renderer))
+                {
+                    ColorDic.Add(renderer, renderer.material.GetColor("_Color"));
+                }
+            }
+
+
+            List<Renderer> keyList = ColorDic.Keys.ToList();
+
+            for (int i = 0; i < keyList.Count; i++)
+            {
+                if (!ChildList.Contains(keyList[i]))
+                {
+                    ColorDic.Remove(keyList[i]);
+                }
             }
         }
 
@@ -174,10 +214,6 @@ public class TweenSr : Tween
 
         if (Timer > Duration)
         {
-            FinishForward();
-
-            Timer = 0;
-
             InForward = false;
             InDestination = true;
 
@@ -191,15 +227,24 @@ public class TweenSr : Tween
         else
         {
             Target.color = Func(Timer, Duration, Origin, Delta);
-            
+
             if (Group)
             {
-                for (int i = 1; i < Targets.Length; i++)
+                for (int i = 0; i < ChildList.Count; i++)
                 {
-                    Targets[i].SetAlpha(Target.color.a, "_Color");
+                    if (ChildList[i].transform.parent != Target.transform)
+                    {
+                        ChildList.RemoveAt(i--);
+
+                        continue;
+                    }
+                    
+                    Color selfColor = ColorDic[ChildList[i]];
+
+                    ChildList[i].material.SetColor("_Color", selfColor * Target.color);
                 }
             }
-            
+
             return false;
         }
     }
@@ -210,10 +255,6 @@ public class TweenSr : Tween
 
         if (Timer > Duration)
         {
-            FinishBackward();
-
-            Timer = 0;
-
             InBackward = false;
             InOrigin = true;
 
@@ -230,9 +271,18 @@ public class TweenSr : Tween
 
             if (Group)
             {
-                for (int i = 1; i < Targets.Length; i++)
+                for (int i = 0; i < ChildList.Count; i++)
                 {
-                    Targets[i].SetAlpha(Target.color.a, "_Color");
+                    if (ChildList[i].transform.parent != Target.transform)
+                    {
+                        ChildList.RemoveAt(i--);
+
+                        continue;
+                    }
+
+                    Color selfColor = ColorDic[ChildList[i]];
+
+                    ChildList[i].material.SetColor("_Color", selfColor * Target.color);
                 }
             }
 

Assets/Script/Tool/Anim/TweenVec.cs

@@ -51,7 +51,7 @@ public class TweenVec : Tween
                     Target.position = Origin;
                 }
 
-                FinishBackward();
+                BackwardFinish();
             }
         }
     }
@@ -100,7 +100,7 @@ public class TweenVec : Tween
                     Target.position = Destination;
                 }
 
-                FinishForward();
+                ForwardFinish();
             }
         }
     }
@@ -141,7 +141,7 @@ public class TweenVec : Tween
         
         if (InBackward)
         {
-            Timer = ManaAnim.GetTimerVec3(Target.position, Duration, Origin, Delta, Curve);
+            Timer = ManaAnim.GetTimerVec(Target.position, Duration, Origin, Delta, Curve);
         }
     }
 
@@ -151,7 +151,7 @@ public class TweenVec : Tween
 
         if (InForward)
         {
-            Timer = ManaAnim.GetTimerVec3(Target.position, Duration, Destination, -Delta, Curve);
+            Timer = ManaAnim.GetTimerVec(Target.position, Duration, Destination, -Delta, Curve);
         }
     }
 
@@ -162,10 +162,6 @@ public class TweenVec : Tween
 
         if (Timer > Duration)
         {
-            FinishForward();
-
-            Timer = 0;
-
             InForward = false;
             InDestination = true;
 
@@ -197,10 +193,6 @@ public class TweenVec : Tween
 
         if (Timer > Duration)
         {
-            FinishBackward();
-
-            Timer = 0;
-
             InBackward = false;
             InOrigin = true;
 

Assets/Script/Tool/Auxiliary.cs

@@ -114,6 +114,26 @@ public class Auxiliary : Regist
     {
         #region 调试
 
+        if (Input.GetKeyDown(KeyCode.Z))
+        {
+            
+        }
+
+        if (Input.GetKeyDown(KeyCode.X))
+        {
+            
+        }
+
+        if (Input.GetKeyDown(KeyCode.C))
+        {
+            
+        }
+
+        if (Input.GetKeyDown(KeyCode.V))
+        {
+            
+        }
+
         //if (Input.GetKeyDown(KeyCode.P))
         //{
         //    ManaData.Level += 20;

Assets/Script/Tool/Bundle.cs

@@ -15,7 +15,7 @@ public class Bundle : MonoBehaviour
 
     public static Bundle Instance;
 
-    public static bool LoadComplete;
+    public static bool Complete;
 
     public static AssetBundle Atlas;
 
@@ -40,7 +40,7 @@ public class Bundle : MonoBehaviour
 
         LoadAll
         (
-            () => LoadComplete = true
+            () => Complete = true
         );
     }
 
@@ -217,7 +217,7 @@ public class Bundle : MonoBehaviour
 
         yield return LoadUI();
 
-        if (!Logo.LogoComplete && !Initializer.Instance.DebugMode)
+        if (!Logo.Complete && !Initializer.Instance.DebugMode)
         {
             ManaReso.AddAsyncLoad("Canvas",1,Folder.UI,ObjType.Canvas);
 
@@ -237,7 +237,7 @@ public class Bundle : MonoBehaviour
 
         yield return LoadScene();
 
-        if (!Logo.LogoComplete && !Initializer.Instance.DebugMode)
+        if (!Logo.Complete && !Initializer.Instance.DebugMode)
         {
             //if (Data.GetPlayerBool("TutorialA") && Data.GetPlayerInt("TutorialIndexA") == 1)
             //{
@@ -258,7 +258,7 @@ public class Bundle : MonoBehaviour
 
         yield return LoadAudio();
 
-        if (!Logo.LogoComplete && !Initializer.Instance.DebugMode)
+        if (!Logo.Complete && !Initializer.Instance.DebugMode)
         {
             ManaReso.AddAsyncLoad("Music", 1, Folder.Audio, ObjType.Music);
 

Assets/Script/Tool/DashGame/Language.cs

@@ -42,9 +42,9 @@ public class Language
             ManaReso.Get<Button>("L_SimChi").interactable = true;
             ManaReso.Get<Button>("L_English").interactable = false;
 
-            ManaReso.Get<Button>("L_TraChi").image.color = ManaColor.LightGray;
-            ManaReso.Get<Button>("L_SimChi").image.color = ManaColor.LightGray;
-            ManaReso.Get<Button>("L_English").image.color = ManaColor.Orange;
+            ManaReso.Get<Button>("L_TraChi").image.color = Shortcut.LightGray;
+            ManaReso.Get<Button>("L_SimChi").image.color = Shortcut.LightGray;
+            ManaReso.Get<Button>("L_English").image.color = Shortcut.Orange;
         }
         else if (ManaLan.CurrentLan == Lan.ChineseSimplified)
         {
@@ -52,9 +52,9 @@ public class Language
             ManaReso.Get<Button>("L_SimChi").interactable = false;
             ManaReso.Get<Button>("L_English").interactable = true;
 
-            ManaReso.Get<Button>("L_TraChi").image.color = ManaColor.LightGray;
-            ManaReso.Get<Button>("L_SimChi").image.color = ManaColor.Orange;
-            ManaReso.Get<Button>("L_English").image.color = ManaColor.LightGray;
+            ManaReso.Get<Button>("L_TraChi").image.color = Shortcut.LightGray;
+            ManaReso.Get<Button>("L_SimChi").image.color = Shortcut.Orange;
+            ManaReso.Get<Button>("L_English").image.color = Shortcut.LightGray;
         }
         else if (ManaLan.CurrentLan == Lan.ChineseTraditional)
         {
@@ -62,9 +62,9 @@ public class Language
             ManaReso.Get<Button>("L_SimChi").interactable = true;
             ManaReso.Get<Button>("L_English").interactable = true;
 
-            ManaReso.Get<Button>("L_TraChi").image.color = ManaColor.Orange;
-            ManaReso.Get<Button>("L_SimChi").image.color = ManaColor.LightGray;
-            ManaReso.Get<Button>("L_English").image.color = ManaColor.LightGray;
+            ManaReso.Get<Button>("L_TraChi").image.color = Shortcut.Orange;
+            ManaReso.Get<Button>("L_SimChi").image.color = Shortcut.LightGray;
+            ManaReso.Get<Button>("L_English").image.color = Shortcut.LightGray;
         }
     }
 

Assets/Script/Tool/DashGame/Logo.cs

@@ -8,7 +8,7 @@ public class Logo : MonoBehaviour
 {
     #region 变量
 
-    public static bool LogoComplete;
+    public static bool Complete;
 
     public static GameObject Camera;
 
@@ -21,12 +21,12 @@ public class Logo : MonoBehaviour
 
     public void Begin()
     {
-        LogoComplete = false;
+        Complete = false;
     }
 
-    public void Complete()
+    public void Finish()
     {
-        LogoComplete = true;
+        Complete = true;
 
         Camera.SetActive(false);
 

Assets/Script/Tool/Data.cs

@@ -1,4 +1,6 @@
-using UnityEngine;
+using LitJson;
+
+using UnityEngine;
 
 using System;
 using System.IO;
@@ -7,7 +9,6 @@ using System.Text;
 using System.Collections;
 using System.Collections.Generic;
 using System.Security.Cryptography;
-using LitJson;
 
 public class Data
 {
@@ -97,7 +98,7 @@ public class Data
                     {
                         nativeVersion = int.Parse(tempNode.Attributes[0].Value);
 
-                        if (nativeVersion != version)
+                        if (nativeVersion < version)
                         {
                             StreamWriter sw = new StreamWriter(Application.persistentDataPath + "/PlayerConfig.xml");
 
@@ -121,7 +122,7 @@ public class Data
                     tempDoc2.LoadXml(textAsset.text);
 
                     PlayerDoc_ = tempDoc2;
-
+                    
                     PlayerDoc_.SelectSingleNode("PlayerConfig").SelectSingleNode("QuitTime").Attributes[0].Value = DateTime.Now.ToString();
                 }
             }
@@ -140,7 +141,7 @@ public class Data
 
     public static void SaveXml()
     {
-        if (Initializer.LoadComplete)
+        if (Initializer.Complete)
         {
             Auxiliary.EncryptXml(PlayerDoc);
             
@@ -317,7 +318,7 @@ public class Data
 
         foreach (var kv in ManaAchieve.AchieveDic)
         {
-            if (!kv.Value.Available)
+            if (!kv.Value.Valid)
             {
                 xmlNode.Attributes[0].Value += kv.Value.ID_ + " ";
             }
@@ -437,7 +438,7 @@ public class Data
 
     public  static void SavePlayerConfig()
     {
-        if (Initializer.LoadComplete)
+        if (Initializer.Complete)
         {
             ManaVisit.DataReverse();
 

Assets/Script/Tool/Extension.cs

@@ -304,15 +304,6 @@ public static class Extension
 
     #region Alpha
 
-    public static void SetAlpha(this Material material, float alpha, string propertyName)
-    {
-        Color color = material.GetColor(propertyName);
-
-        color.a = alpha;
-
-        material.SetColor(propertyName, color);
-    }
-
     public static void SetAlpha(this Graphic graphic, float alpha)
     {
         graphic.color = new Color(graphic.color.r, graphic.color.g, graphic.color.b, alpha);
@@ -653,108 +644,6 @@ public static class Extension
     }
 
 
-    public static TweenSr TweenConForSr(this Component comp)
-    {
-        return ManaAnim.TweenConForSr(comp.transform);
-    }
-
-    public static TweenCG TweenConForCG(this Component comp)
-    {
-        return ManaAnim.TweenConForCG(comp.transform);
-    }
-
-    public static TweenVec TweenConForVec(this Component comp)
-    {
-        return ManaAnim.TweenConForVec(comp.transform);
-    }
-
-    public static TweenGra TweenConForGra(this Component comp)
-    {
-        return ManaAnim.TweenConForGra(comp.transform);
-    }
-
-    public static TweenFont TweenConForFont(this Component comp)
-    {
-        return ManaAnim.TweenConForFont(comp.transform);
-    }
-
-    public static TweenRect TweenConForRect(this Component comp)
-    {
-        return ManaAnim.TweenConForRect(comp.transform);
-    }
-
-    public static TweenScale TweenConForScale(this Component comp)
-    {
-        return ManaAnim.TweenConForScale(comp.transform);
-    }
-
-    public static TweenAudio TweenConForAudio(this Component comp)
-    {
-        return ManaAnim.TweenConForAudio(comp.transform);
-    }
-
-    public static TweenAudio TweenConForAudio(this AudioSource audioSource)
-    {
-        return ManaAnim.TweenConForAudio(audioSource);
-    }
-
-    public static TweenNumber TweenConForNumber(this Component comp)
-    {
-        return ManaAnim.TweenConForNumber(comp.transform);
-    }
-
-
-    public static TweenSr TweenConBacSr(this Component comp)
-    {
-        return ManaAnim.TweenConBacSr(comp.transform);
-    }
-
-    public static TweenCG TweenConBacCG(this Component comp)
-    {
-        return ManaAnim.TweenConBacCG(comp.transform);
-    }
-
-    public static TweenVec TweenConBacVec(this Component comp)
-    {
-        return ManaAnim.TweenConBacVec(comp.transform);
-    }
-
-    public static TweenGra TweenConBacGra(this Component comp)
-    {
-        return ManaAnim.TweenConBacGra(comp.transform);
-    }
-
-    public static TweenFont TweenConBacFont(this Component comp)
-    {
-        return ManaAnim.TweenConBacFont(comp.transform);
-    }
-
-    public static TweenRect TweenConBacRect(this Component comp)
-    {
-        return ManaAnim.TweenConBacRect(comp.transform);
-    }
-
-    public static TweenScale TweenConBacScale(this Component comp)
-    {
-        return ManaAnim.TweenConBacScale(comp.transform);
-    }
-
-    public static TweenAudio TweenConBacAudio(this Component comp)
-    {
-        return ManaAnim.TweenConBacAudio(comp.transform);
-    }
-
-    public static TweenAudio TweenConBacAudio(this AudioSource audioSource)
-    {
-        return ManaAnim.TweenConBacAudio(audioSource);
-    }
-
-    public static TweenNumber TweenConBacNumber(this Component comp)
-    {
-        return ManaAnim.TweenConBacNumber(comp.transform);
-    }
-
-
     public static TweenSr GetTweenSr(this Component comp)
     {
         return ManaAnim.GetTweenSr(comp.transform);
@@ -917,6 +806,16 @@ public static class Extension
     }
 
 
+    public static TweenScale CreateTweenScale(this Component comp, float origin, float destination, float duration, bool originActive, bool destActive, Curve curve, bool cg = false)
+    {
+        return ManaAnim.CreateTweenScale(comp.transform, origin, destination, duration, originActive, destActive, curve, cg);
+    }
+
+    public static TweenScale CreateTweenScale(this Component comp, float destination, float duration, bool originActive, bool destActive, Curve curve, bool cg = false)
+    {
+        return ManaAnim.CreateTweenScale(comp.transform, destination, duration, originActive, destActive, curve, cg);
+    }
+
     public static TweenScale CreateTweenScale(this Component comp, Vector3 origin, Vector3 destination, float duration, bool originActive, bool destActive, Curve curve, bool cg = false)
     {
         return ManaAnim.CreateTweenScale(comp.transform, origin, destination, duration, originActive, destActive, curve, cg);
@@ -1025,6 +924,27 @@ public static class Extension
 
     #endregion
 
+    #region Material
+
+    public static void SetAlpha(this Material material, float alpha, string propertyName)
+    {
+        Color color = material.GetColor(propertyName);
+
+        color.a = alpha;
+
+        material.SetColor(propertyName, color);
+    }
+
+
+    public static float GetAlpha(this Material material, string propertyName)
+    {
+        Color color = material.GetColor(propertyName);
+
+        return color.a;
+    }
+
+    #endregion
+
     #region GetChild
 
     public static Transform GetChild(this Component comp, int index)

Assets/Script/Tool/SceneMask.cs

@@ -39,7 +39,7 @@ public class SceneMask : Regist
 
         BoxCollider.size = new Vector2(36*radiusX, 20*radiusY);
 
-        ManaReso.Get("TutorialMask").TweenConForSr();
+        ManaReso.Get("TutorialMask").TweenForSr();
     }
 
     public static void ClearArea()
@@ -53,6 +53,6 @@ public class SceneMask : Regist
 
         BoxCollider.size = new Vector2();
 
-        ManaReso.Get("TutorialMask").TweenConBacSr();
+        ManaReso.Get("TutorialMask").TweenBacSr();
     }
 }

Assets/Script/Manage/ManaColor.cs → Assets/Script/Tool/Shortcut.cs

@@ -3,8 +3,14 @@
 using System.Collections;
 using System.Collections.Generic;
 
-public class ManaColor
+public class Shortcut
 {
+
 	public static Color Orange = new Color(233/255f, 63/255f, 20/255f, 1);
 	public static Color LightGray = new Color(165/255f, 192/255f, 200/255f, 1);
+
+    public static Material GrayMat
+    {
+        get { return ManaReso.Load<Material>("GrayMat", Folder.Effect); }
+    }
 }

Assets/Script/Tool/UI/Bubble.cs

@@ -40,8 +40,8 @@ public class Bubble : Regist
     {
         ManaAudio.PlayClip(Clip.BubbleClip);
 
-        Box.TweenConForScale();
-        Background.TweenConForGra();
+        Box.TweenForScale();
+        Background.TweenForGra();
 
         if (string.IsNullOrEmpty(tit))
         {

Assets/Script/Tool/UI/HudTextPlus.cs

@@ -39,24 +39,37 @@ public class HudTextPlus : MonoBehaviour
     public Outline Outline_;
 
     public float Speed;
+    public Mode MoveMode;
     public Vector3 Direction;
 
     #endregion
 
-    private void FixedUpdate()
+    public enum Mode
     {
-        transform.position += new Vector3(0, Speed*Time.fixedDeltaTime, 0);
+        Position,
+        Direction,
+    }
+
 
-        if (Text.color.a <= 0.05f)
+    public void FixedUpdate()
+    {
+        if (MoveMode == Mode.Direction)
         {
-            ManaReso.Save(gameObject);
+            transform.position += Direction * Speed * Time.fixedDeltaTime;
         }
     }
 
 
-    public void SetOutline(Color color)
+    public void SetTween(float time, Color origin, Color dest)
     {
-        Outline.effectColor = color;
+        Tween tween = Text.CreateTweenGra(origin, dest, time, false, false, Curve.EaseOutQuad);
+
+        tween.StartForward();
+
+        tween.OnForwardFinish = () =>
+        {
+            ManaReso.Save(gameObject);
+        };
     }
 
     public void SetOutline(Color color, Vector2 size)
@@ -71,42 +84,52 @@ public class HudTextPlus : MonoBehaviour
     }
 
 
-    public void Show(string str, int size, float time, float speed)
+    public void Show(string str, int size, float speed)
     {
+        MoveMode = Mode.Direction;
+
+        Outline.enabled = false;
+
         Text.text = str;
+        Text.color = Color.white;
         Text.fontSize = size;
 
         Speed = speed;
-
-        Tween tween = Text.CreateTweenGra(0, time, false, false, Curve.EaseOutQuad);
-
-        tween.StartForward();
+        Direction = Vector3.up;
     }
 
-    public void Show(string str, int size, float time, float speed, Color originColor)
+
+    public void Show(string str, int size, float time, Vector3 dest)
     {
+        MoveMode = Mode.Position;
+
+        Outline.enabled = false;
+
         Text.text = str;
+        Text.color = Color.white;
         Text.fontSize = size;
 
-        Speed = speed;
+        Direction = Vector3.up;
 
-        Text.color = originColor;
 
-        Tween tween = Text.CreateTweenGra(0, time, false, false, Curve.EaseOutQuad);
+        Tween tween = Text.CreateTweenVec2D(dest, time, false, true, true, Curve.EaseOutQuad);
 
         tween.StartForward();
     }
 
-    public void Show(string str, int size, float time, float speed, Color originColor, Color destColor)
+    public void Show(string str, int size, float time, Vector3 origin, Vector3 dest)
     {
+        MoveMode = Mode.Position;
+
+        Outline.enabled = false;
+
         Text.text = str;
         Text.fontSize = size;
 
-        Speed = speed;
+        Direction = Vector3.up;
 
-        Text.color = originColor;
 
-        Tween tween = Text.CreateTweenGra(destColor, time, false, false, Curve.EaseOutQuad);
+        Tween tween = Text.CreateTweenVec2D(origin, dest, time, false, true, true, Curve.EaseOutQuad);
 
         tween.StartForward();
     }

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>

MyLovelyGarden.csproj

@@ -13,11 +13,13 @@
     <TargetFrameworkIdentifier>.NETFramework</TargetFrameworkIdentifier>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <TargetFrameworkProfile>Unity Full v3.5</TargetFrameworkProfile>
-    <CompilerResponseFile></CompilerResponseFile>
+    <CompilerResponseFile>
+    </CompilerResponseFile>
     <UnityProjectType>Game:1</UnityProjectType>
-    <UnityBuildTarget>Android:13</UnityBuildTarget>
+    <UnityBuildTarget>StandaloneWindows64:19</UnityBuildTarget>
     <UnityVersion>5.5.0f3</UnityVersion>
-    <RootNamespace></RootNamespace>
+    <RootNamespace>
+    </RootNamespace>
     <LangVersion Condition=" '$(VisualStudioVersion)' != '10.0' ">4</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -27,7 +29,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,12 +39,13 @@
     <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>
     <Reference Include="mscorlib" />
     <Reference Include="System" />
+    <Reference Include="System.Security" />
     <Reference Include="System.XML" />
     <Reference Include="System.Core" />
     <Reference Include="Boo.Lang" />
@@ -177,7 +180,6 @@
     <Compile Include="Assets\Script\Manage\ManaAchieve.cs" />
     <Compile Include="Assets\Script\Manage\ManaAnim.cs" />
     <Compile Include="Assets\Script\Manage\ManaAudio.cs" />
-    <Compile Include="Assets\Script\Manage\ManaColor.cs" />
     <Compile Include="Assets\Script\Manage\ManaData.cs" />
     <Compile Include="Assets\Script\Manage\ManaDebug.cs" />
     <Compile Include="Assets\Script\Manage\ManaGarden.cs" />
@@ -239,9 +241,11 @@
     <Compile Include="Assets\Script\Tool\Data.cs" />
     <Compile Include="Assets\Script\Tool\Extension.cs" />
     <Compile Include="Assets\Script\Tool\SceneMask.cs" />
+    <Compile Include="Assets\Script\Tool\Shortcut.cs" />
     <Compile Include="Assets\Script\Tool\UI\Bubble.cs" />
     <Compile Include="Assets\Script\Tool\UI\HudTarget.cs" />
     <Compile Include="Assets\Script\Tool\UI\HudText.cs" />
+    <Compile Include="Assets\Script\Tool\UI\HudTextPlus.cs" />
     <Compile Include="Assets\Script\Tool\UI\ImagePlus.cs" />
     <Compile Include="Assets\Script\Tool\UI\LightwallUI.cs" />
     <Compile Include="Assets\Script\Tool\UI\PointsUI.cs" />
@@ -296,4 +300,4 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="GenerateTargetFrameworkMonikerAttribute" />
-</Project>
+</Project>

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

@@ -21,29 +21,11 @@ Reactive
 红色小蝴蝶和教程B冲突了 自动解锁蜜蜂和蝴蝶会冲突
 
 
-
-Hud能往左右上下走，设置自己的颜色 设置Outline的颜色、宽度 设置速度 未设置时的默认值
+Hud换装
 
 动画
 (
-Move的SetActive
-
-完善Stream
-
-TweenSr需要改善(alpha相乘的问题)
-
-Loop功能 Return功能
-
-Move缺少一个DestinationActive
+完善Stream的Backward与ReForward和Rebackward
 
 Stream进入Delay时也应该有事件
-
-TweenScale和StreamScale增加一个浮点数重载,方便统一Scale 
-
-可以手动设置是否触发事件 
-
-取消掉ConfineTween,每次执行Forward和Backward时都进行一次Timer计算 Forward时Timer递加,Backward时Timer递减,免去了Timer的计算,判断
-InDestination和InOrigin也可以改用Timer,Timer清零的位置需要改变 
-
-Tween的第一帧也需要执行一次
 )