Temp 4.16

Assets/Resource/XML/PlayerConfig.xml

@@ -1,7 +1,7 @@
 <PlayerConfig>
-  <Version value="69" />
-  <TutorialA value="1" />
-  <TutorialB value="1" />
+  <Version value="70" />
+  <TutorialA value="0" />
+  <TutorialB value="0" />
   <TutorialIndexA value="1" />
   <TutorialIndexB value="1" />
 
@@ -11,11 +11,9 @@
   <Slot value="1" />
   <Coin value="0" />
   <Level value="0" />
-  <Person value="0" />
   <Diamond value="0" />
   <SignIndex value="0" />
   <MiniTimer value="0" />
-  <CoinPerson value="0" />
   <CircleTimer value="0" />
   <MiniGameIndex value="0" />
   

Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -120,7 +120,7 @@
     <Skill6 desc=""><![CDATA[免费获取钻石]]></Skill6>
     <Skill7 desc=""><![CDATA[技能冷却]]></Skill7>
   </SkillName>
-  <SkillDescription>
+  <SkillDesc>
     <Pack1 desc=""><![CDATA[立即获得金币[&coin&]]]></Pack1>
     <Pack2 desc=""><![CDATA[立即获得金币[&coin&]]]></Pack2>
     <Pack3 desc=""><![CDATA[立即获得金币[&coin&]]]></Pack3>
@@ -156,7 +156,7 @@
     <Skill5 desc=""><![CDATA[免费获取每人次收入的[&coin_once&]倍]]></Skill5>
     <Skill6 desc=""><![CDATA[免费获取金币[&diamond_once&]]]></Skill6>
     <Skill7 desc=""><![CDATA[]]></Skill7>
-  </SkillDescription>
+  </SkillDesc>
   <Object>
     <FlowerItemG_Lab desc=""><![CDATA[已放置]]></FlowerItemG_Lab>
     <AchieveItem_BtnLab0 desc=""><![CDATA[奖励]]></AchieveItem_BtnLab0>
@@ -182,7 +182,7 @@
     <Achieve25 desc=""><![CDATA[鼓鼓的钱包-5]]></Achieve25>
     <Achieve26 desc=""><![CDATA[鼓鼓的钱包-6]]></Achieve26>
   </AchieveName>
-  <AchieveDescription>
+  <AchieveDesc>
     <Achieve1 desc=""><![CDATA[花园等级达到 30]]></Achieve1>
     <Achieve2 desc=""><![CDATA[花园等级达到 50]]></Achieve2>
     <Achieve3 desc=""><![CDATA[花园等级达到 100]]></Achieve3>
@@ -195,5 +195,5 @@
     <Achieve24 desc=""><![CDATA[拥有5000金币]]></Achieve24>
     <Achieve25 desc=""><![CDATA[拥有8000金币]]></Achieve25>
     <Achieve26 desc=""><![CDATA[拥有10000金币]]></Achieve26>
-  </AchieveDescription>
+  </AchieveDesc>
 </lan>

Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -120,7 +120,7 @@
     <Skill6 desc=""><![CDATA[]]></Skill6>
     <Skill7 desc=""><![CDATA[]]></Skill7>
   </SkillName>
-  <SkillDescription>
+  <SkillDesc>
     <Pack1 desc=""><![CDATA[]]></Pack1>
     <Pack2 desc=""><![CDATA[]]></Pack2>
     <Pack3 desc=""><![CDATA[]]></Pack3>
@@ -153,7 +153,7 @@
     <Skill5 desc=""><![CDATA[]]></Skill5>
     <Skill6 desc=""><![CDATA[]]></Skill6>
     <Skill7 desc=""><![CDATA[]]></Skill7>
-  </SkillDescription>
+  </SkillDesc>
   <Object>
     <FlowerItemG_Lab desc=""><![CDATA[]]></FlowerItemG_Lab>
     <AchieveItem_BtnLab0 desc=""><![CDATA[]]></AchieveItem_BtnLab0>
@@ -179,7 +179,7 @@
     <Achieve25 desc=""><![CDATA[]]></Achieve25>
     <Achieve26 desc=""><![CDATA[]]></Achieve26>
   </AchieveName>
-  <AchieveDescription>
+  <AchieveDesc>
     <Achieve1 desc=""><![CDATA[]]></Achieve1>
     <Achieve2 desc=""><![CDATA[]]></Achieve2>
     <Achieve3 desc=""><![CDATA[]]></Achieve3>
@@ -192,5 +192,5 @@
     <Achieve24 desc=""><![CDATA[]]></Achieve24>
     <Achieve25 desc=""><![CDATA[]]></Achieve25>
     <Achieve26 desc=""><![CDATA[]]></Achieve26>
-  </AchieveDescription>
+  </AchieveDesc>
 </lan>

Assets/Resource/XML/lan/English.xml

@@ -120,7 +120,7 @@
     <Skill6 desc=""><![CDATA[]]></Skill6>
     <Skill7 desc=""><![CDATA[]]></Skill7>
   </SkillName>
-  <SkillDescription>
+  <SkillDesc>
     <Pack1 desc=""><![CDATA[]]></Pack1>
     <Pack2 desc=""><![CDATA[]]></Pack2>
     <Pack3 desc=""><![CDATA[]]></Pack3>
@@ -153,7 +153,7 @@
     <Skill5 desc=""><![CDATA[]]></Skill5>
     <Skill6 desc=""><![CDATA[]]></Skill6>
     <Skill7 desc=""><![CDATA[]]></Skill7>
-  </SkillDescription>
+  </SkillDesc>
   <Object>
     <FlowerItemG_Lab desc=""><![CDATA[Planted]]></FlowerItemG_Lab>
     <AchieveItem_BtnLab0 desc=""><![CDATA[Reward]]></AchieveItem_BtnLab0>
@@ -179,7 +179,7 @@
     <Achieve25 desc=""><![CDATA[]]></Achieve25>
     <Achieve26 desc=""><![CDATA[]]></Achieve26>
   </AchieveName>
-  <AchieveDescription>
+  <AchieveDesc>
     <Achieve1 desc=""><![CDATA[GardenLevel Rreach 30]]></Achieve1>
     <Achieve2 desc=""><![CDATA[]]></Achieve2>
     <Achieve3 desc=""><![CDATA[]]></Achieve3>
@@ -192,5 +192,5 @@
     <Achieve24 desc=""><![CDATA[]]></Achieve24>
     <Achieve25 desc=""><![CDATA[]]></Achieve25>
     <Achieve26 desc=""><![CDATA[]]></Achieve26>
-  </AchieveDescription>
+  </AchieveDesc>
 </lan>

Assets/Script/Object/AnimationReceiver.cs → Assets/Script/Interface/AnimationReceiver.cs

@@ -8,5 +8,7 @@ public class AnimationReceiver : MonoBehaviour
     public void SaveAnim()
     {
         ManaReso.Save(transform.parent);
+
+        GetComponentInParent<Flower>().ElfList.Remove(transform);
     }
 }

Assets/Script/Manage/Initializer.cs

@@ -10,7 +10,7 @@ using System.Collections.Generic;
 
 public class Initializer : MonoBehaviour
 {
-    #region
+    #region 变量
 
     public static List<Regist> RegistList = new List<Regist>();
 
@@ -33,6 +33,7 @@ public class Initializer : MonoBehaviour
         gameObject.AddScript<ManaAnim>();
         gameObject.AddScript<ManaAudio>();
         gameObject.AddScript<ManaTutorial>();
+        gameObject.AddScript<ManaAchieve>();
 
         gameObject.AddScript<ManaUI>();
         gameObject.AddScript<ManaSign>();
@@ -41,7 +42,6 @@ public class Initializer : MonoBehaviour
         gameObject.AddScript<ManaData>();
         gameObject.AddScript<ManaPlayer>();
         gameObject.AddScript<ManaDebug>();
-        gameObject.AddScript<ManaAchieve>();
         gameObject.AddScript<ManaMiniGame>();
 
         StartCoroutine(IInitialize());

Assets/Script/Manage/ManaAchieve.cs

@@ -12,6 +12,7 @@ using Object = UnityEngine.Object;
 
 public enum AchieveType
 {
+    Elf,
     AD,
     Skill,
     Sign,
@@ -19,7 +20,6 @@ public enum AchieveType
     Flower,
     Person,
     Garden,
-    ElfLevel,
     TotalCoin,
     MiniGame,
     FlowerCoin,
@@ -28,59 +28,54 @@ public enum AchieveType
 
 public class Achieve
 {
-    public bool Regist
-    {
-        get { return _Regist; }
-        set
-        {
-            _Regist = value;
-
-            if (_Regist)
-            {
-                AchieveItem = ManaReso.GetAchieveItem();
+    #region 变量
 
-                RegistValue();
-            }
-        }
-    }
-    public string ID
+    public string Desc
     {
         get
         {
-            return "Achieve" + _ID;
+            return Language.GetStr("AchieveDesc", ID);
         }
     }
-    public string Desc
+    public string Name
     {
         get
         {
-            return Language.GetStr("AchieveDescription", ID);
+            return Language.GetStr("AchieveName", ID);
         }
     }
-    public string Name
+
+    public int ID_;
+    public string ID
     {
         get
         {
-            return Language.GetStr("AchieveName", ID);
+            return "Achieve" + ID_;
         }
     }
-    public List<Achieve> PostAchieveList
+
+    public bool Regist
     {
-        get
+        get { return Regist_; }
+        set
         {
-            if (_PostAchieveList == null)
+            Regist_ = value;
+
+            if (Regist_)
             {
-                _PostAchieveList = new List<Achieve>();
-            }
+                AchieveItem = ManaReso.GetAchieveItem();
 
-            return _PostAchieveList;
+                RegistValue();
+            }
         }
-        set { _PostAchieveList = value; }
     }
+    public bool Regist_;
 
-    public int _ID;
-    public bool _Regist;
-    public List<Achieve> _PostAchieveList;
+    public string Icon_;
+    public Sprite Icon
+    {
+        get { return ManaReso.Load<Sprite>(Icon_, Folder.UI); }
+    }
 
     public int Index;
     public int Parent;
@@ -90,9 +85,9 @@ public class Achieve
     public float Person;
     public float CoinPerson;
     public float DiamondOnce;
-    public string Icon;
     public double Value;
     public AchieveType Type;
+    public List<Achieve> PostAchieveList = new List<Achieve>();
 
     public Text Tit;
     public Text Lab;
@@ -102,24 +97,26 @@ public class Achieve
     public Button Button;
     public Transform AchieveItem;
 
+    #endregion
+
     public Achieve(XmlAttributeCollection attribute)
     {
         Valid = true;
 
-        Icon = attribute[11].Value;
+        Icon_ = attribute[11].Value;
         Type = TypeParse(attribute[4].Value);
         Value = double.Parse(attribute[5].Value);
-        Delete = Convert.ToBoolean(int.Parse(attribute[7].Value));
+        Delete = BoolParse(attribute[7].Value);
         Parent = ParentParse(attribute[6].Value);
 
-        _ID = int.Parse(attribute[0].Value);
+        ID_ = int.Parse(attribute[0].Value);
         Index = int.Parse(attribute[1].Value);
 
         Person = AwardParse(attribute[10].Value);
         CoinPerson = AwardParse(attribute[9].Value);
         DiamondOnce = AwardParse(attribute[8].Value);
 
-        ManaAchieve.AchieveDic.Add(_ID, this);
+        ManaAchieve.AchieveDic.Add(ID_, this);
         
         if (Parent != -1)
         {
@@ -130,15 +127,14 @@ public class Achieve
 
     public void GetAward()
     {
-        Valid = false;
+        ManaDebug.Log(string.Format("获得钻石<color=red>{0}</color> 参观人次+<color=red>{1}</color> 每人次金币+<color=red>{2}</color>", DiamondOnce, Person, CoinPerson));
 
-        ManaAchieve.DeleDic[Type] = null;
+        Valid = false;
 
         ManaData.Diamond += DiamondOnce;
         ManaData.SkillPerson += Person;
         ManaData.SkillCoinPerson += CoinPerson;
-
-        ManaDebug.Log(string.Format("获得钻石<color=red>{0}</color> 参观人次+<color=red>{1}</color> 每人次金币+<color=red>{2}</color>", DiamondOnce, Person, CoinPerson));
+        ManaAchieve.DeleDic[Type] = null;
 
         if (Delete)
         {
@@ -171,19 +167,17 @@ public class Achieve
         BtnLab = dic["BtnLab"].GetComponent<Text>();
 
         ManaText.Add(Tit, new LanStr("AchieveName", ID));
-        ManaText.Add(Lab, new LanStr("AchieveDescription", ID));
+        ManaText.Add(Lab, new LanStr("AchieveDesc", ID));
+        ManaAchieve.DeleDic[Type] += UpdateValue;
 
-        Image.sprite = ManaReso.Load<Sprite>(Icon, Folder.UI);
+        Image.sprite = Icon;
+        AchieveItem.SetSiblingIndex(Index - 1);
 
         Button.onClick.RemoveAllListeners();
         Button.onClick.AddListener(GetAward);
 
-        AchieveItem.SetSiblingIndex(Index - 1);
-
         UpdateValue();
         UpdateStatus();
-        
-        ManaAchieve.DeleDic[Type] += UpdateValue;
     }
 
 
@@ -215,9 +209,9 @@ public class Achieve
         {
             value = ManaData.Person;
         }
-        else if (Type == AchieveType.ElfLevel)
+        else if (Type == AchieveType.Elf)
         {
-            value = ManaData.ElfLevel;
+            value = ManaData.Elf;
         }
         else if (Type == AchieveType.TotalCoin)
         {
@@ -314,9 +308,8 @@ public class Achieve
             objList.Add(Person.ToString("0") + " ");
         }
 
-        Button.interactable = false;
-
         Button.image.material = ManaReso.Load<Material>("GrayMat", Folder.Shader);
+        Button.interactable = false;
 
         ManaText.Add(BtnLab, objList.ToArray());
     }
@@ -347,18 +340,16 @@ public class Achieve
             objList.Add(Person.ToString("0") + " ");
         }
 
-        Button.interactable = true;
-
         Button.image.material = null;
+        Button.interactable = true;
 
         ManaText.Add(BtnLab, objList.ToArray());
     }
 
     public void StausComplete()
     {
-        Button.interactable = false;
-
         Button.image.material = null;
+        Button.interactable = false;
 
         ManaText.Add(BtnLab, new LanStr("Object", "AchieveItem_BtnLab2"));
     }
@@ -376,6 +367,11 @@ public class Achieve
         }
     }
 
+    public bool BoolParse(string str)
+    {
+        return Convert.ToBoolean(int.Parse(str));
+    }
+
     public float AwardParse(string str)
     {
         if (string.IsNullOrEmpty(str))
@@ -406,7 +402,7 @@ public class Achieve
         }
         else if (integer == 4)
         {
-            return AchieveType.ElfLevel;
+            return AchieveType.Elf;
         }
         else if (integer == 5)
         {
@@ -451,49 +447,7 @@ public class ManaAchieve : Regist
 {
     #region 变量
 
-    public static Dictionary<int, Achieve> AchieveDic
-    {
-        get
-        {
-            if (_AchieveDic == null)
-            {
-                _AchieveDic = new Dictionary<int, Achieve>();
-            }
-
-            return _AchieveDic;
-        }
-        set { _AchieveDic = value; }
-    }
-    public static Dictionary<AchieveType, UnityAction<double>> DeleDic
-    {
-        get
-        {
-            if (_DeleDic == null)
-            {
-                _DeleDic = new Dictionary<AchieveType, UnityAction<double>>();
-
-                _DeleDic.Add(AchieveType.AD, AD);
-                _DeleDic.Add(AchieveType.Skill, Skill);
-                _DeleDic.Add(AchieveType.Sign, Sign);
-                _DeleDic.Add(AchieveType.Share, Share);
-                _DeleDic.Add(AchieveType.Flower, Flower);
-                _DeleDic.Add(AchieveType.Person, Person);
-                _DeleDic.Add(AchieveType.ElfLevel, ElfLevel);
-                _DeleDic.Add(AchieveType.TotalCoin, TotalCoin);
-                _DeleDic.Add(AchieveType.MiniGame, MiniGame);
-                _DeleDic.Add(AchieveType.FlowerCoin, FlowerCoin);
-                _DeleDic.Add(AchieveType.CurrentCoin, CurrentCoin);
-                _DeleDic.Add(AchieveType.Garden, Garden);
-            }
-
-            return _DeleDic;
-        }
-        set { _DeleDic = value; }
-    }
-
-    public static Dictionary<int, Achieve> _AchieveDic;
-    public static Dictionary<AchieveType, UnityAction<double>> _DeleDic;
-
+    public static UnityAction<double> Elf;
     public static UnityAction<double> AD;
     public static UnityAction<double> Skill;
     public static UnityAction<double> Sign;
@@ -501,12 +455,14 @@ public class ManaAchieve : Regist
     public static UnityAction<double> Flower;
     public static UnityAction<double> Person;
     public static UnityAction<double> Garden;
-    public static UnityAction<double> ElfLevel;
     public static UnityAction<double> TotalCoin;
     public static UnityAction<double> MiniGame;
     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>>();
+    
     #endregion
 
     public override void Instantiate()
@@ -517,7 +473,22 @@ public class ManaAchieve : Regist
         {
             new Achieve(attributeList[i]);
         }
+    }
 
+    public override void RegistValueA()
+    {
+        DeleDic.Add(AchieveType.Elf, Elf);
+        DeleDic.Add(AchieveType.AD, AD);
+        DeleDic.Add(AchieveType.Skill, Skill);
+        DeleDic.Add(AchieveType.Sign, Sign);
+        DeleDic.Add(AchieveType.Share, Share);
+        DeleDic.Add(AchieveType.Flower, Flower);
+        DeleDic.Add(AchieveType.Person, Person);
+        DeleDic.Add(AchieveType.Garden, Garden);
+        DeleDic.Add(AchieveType.TotalCoin, TotalCoin);
+        DeleDic.Add(AchieveType.MiniGame, MiniGame);
+        DeleDic.Add(AchieveType.FlowerCoin, FlowerCoin);
+        DeleDic.Add(AchieveType.CurrentCoin, CurrentCoin);
 
         List<int> achieveList = Data.GetAchieveList();
 
@@ -551,11 +522,6 @@ public class ManaAchieve : Regist
 
     public static void UpdateStatus(AchieveType type, double value)
     {
-        UnityAction<double> action = DeleDic[type];
-
-        if (action != null)
-        {
-            action.Invoke(value);
-        }
+        DeleDic[type].SafeInvoke(value);
     }
 }

Assets/Script/Manage/ManaAnim.cs

@@ -34,36 +34,36 @@ public delegate Color CurveFunctionC(float timer, float duration, Color start, C
 
 public delegate Vector3 CurveFunctionV(float timer, float duration, Vector3 start, Vector3 delta);
 
-public class ManaAnim : Regist 
+public class ManaAnim : Regist
 {
     #region 变量
 
-    public static List<Move> MoveList;
-    public static List<Tween> TweenForList;
-    public static List<Tween> TweenBacList;
-
-    public static Dictionary<Curve, ShakeFunctionF> ShakeFuncDicF;
-    public static Dictionary<Curve, ShakeFunctionC> ShakeFuncDicC;
-    public static Dictionary<Curve, ShakeFunctionV> ShakeFuncDicV;
-
-    public static Dictionary<Curve, CurveFunctionF> CurveFuncDicF;
-    public static Dictionary<Curve, CurveFunctionC> CurveFuncDicC;
-    public static Dictionary<Curve, CurveFunctionV> CurveFuncDicV;
-    
-    public static Dictionary<Transform, Shake> ShakeDic;
-    public static Dictionary<Transform, Move2D> MoveDic2D;
-    public static Dictionary<Transform, Move3D> MoveDic3D;
-    public static Dictionary<Transform, Zoom2D> ZoomDic2D;
-
-    public static Dictionary<Transform, TweenSr> TweenSrDic;
-    public static Dictionary<Transform, TweenCG> TweenCgDic;
-    public static Dictionary<Transform, TweenGra> TweenGraDic;
-    public static Dictionary<Transform, TweenVec> TweenVecDic;
-    public static Dictionary<Transform, TweenText> TweenTextDic;
-    public static Dictionary<Transform, TweenRect> TweenRectDic;
-    public static Dictionary<Transform, TweenScale> TweenScaleDic;
-    public static Dictionary<Transform, TweenAudio> TweenAudioDic;
-    public static Dictionary<Transform, TweenNumber> TweenNumberDic;
+    public static List<Move> MoveList = new List<Move>();
+    public static List<Tween> TweenForList = new List<Tween>();
+    public static List<Tween> TweenBacList = new List<Tween>();
+
+    public static Dictionary<Curve, ShakeFunctionF> ShakeFuncDicF = new Dictionary<Curve, ShakeFunctionF>();
+    public static Dictionary<Curve, ShakeFunctionC> ShakeFuncDicC = new Dictionary<Curve, ShakeFunctionC>();
+    public static Dictionary<Curve, ShakeFunctionV> ShakeFuncDicV = new Dictionary<Curve, ShakeFunctionV>();
+
+    public static Dictionary<Curve, CurveFunctionF> CurveFuncDicF = new Dictionary<Curve, CurveFunctionF>();
+    public static Dictionary<Curve, CurveFunctionC> CurveFuncDicC = new Dictionary<Curve, CurveFunctionC>();
+    public static Dictionary<Curve, CurveFunctionV> CurveFuncDicV = new Dictionary<Curve, CurveFunctionV>();
+
+    public static Dictionary<Transform, Shake> ShakeDic = new Dictionary<Transform, Shake>();
+    public static Dictionary<Transform, Move2D> MoveDic2D = new Dictionary<Transform, Move2D>();
+    public static Dictionary<Transform, Move3D> MoveDic3D = new Dictionary<Transform, Move3D>();
+    public static Dictionary<Transform, Zoom2D> ZoomDic2D = new Dictionary<Transform, Zoom2D>();
+
+    public static Dictionary<Transform, TweenSr> TweenSrDic = new Dictionary<Transform, TweenSr>();
+    public static Dictionary<Transform, TweenCG> TweenCgDic = new Dictionary<Transform, TweenCG>();
+    public static Dictionary<Transform, TweenGra> TweenGraDic = new Dictionary<Transform, TweenGra>();
+    public static Dictionary<Transform, TweenVec> TweenVecDic = new Dictionary<Transform, TweenVec>();
+    public static Dictionary<Transform, TweenText> TweenTextDic = new Dictionary<Transform, TweenText>();
+    public static Dictionary<Transform, TweenRect> TweenRectDic = new Dictionary<Transform, TweenRect>();
+    public static Dictionary<Transform, TweenScale> TweenScaleDic = new Dictionary<Transform, TweenScale>();
+    public static Dictionary<Transform, TweenAudio> TweenAudioDic = new Dictionary<Transform, TweenAudio>();
+    public static Dictionary<Transform, TweenNumber> TweenNumberDic = new Dictionary<Transform, TweenNumber>();
 
     #endregion
 
@@ -73,7 +73,7 @@ public class ManaAnim : Regist
         {
             if (MoveList[i].Do())
             {
-                i--;
+                MoveList.RemoveAt(i--);
             }
         }
 
@@ -81,7 +81,7 @@ public class ManaAnim : Regist
         {
             if (TweenForList[i].DoForward())
             {
-                i--;
+                TweenForList.RemoveAt(i--);
             }
         }
 
@@ -89,7 +89,7 @@ public class ManaAnim : Regist
         {
             if (TweenBacList[i].DoBackward())
             {
-                i--;
+                TweenBacList.RemoveAt(i--);
             }
         }
     }
@@ -97,33 +97,6 @@ public class ManaAnim : Regist
 
     public override void RegistImmed()
     {
-        MoveList = new List<Move>();
-        TweenForList = new List<Tween>();
-        TweenBacList = new List<Tween>();
-
-        ShakeFuncDicF = new Dictionary<Curve, ShakeFunctionF>();
-        ShakeFuncDicC = new Dictionary<Curve, ShakeFunctionC>();
-        ShakeFuncDicV = new Dictionary<Curve, ShakeFunctionV>();
-
-        CurveFuncDicF = new Dictionary<Curve, CurveFunctionF>();
-        CurveFuncDicC = new Dictionary<Curve, CurveFunctionC>();
-        CurveFuncDicV = new Dictionary<Curve, CurveFunctionV>();
-
-        ShakeDic = new Dictionary<Transform, Shake>();
-        MoveDic3D = new Dictionary<Transform, Move3D>();
-        MoveDic2D = new Dictionary<Transform, Move2D>();
-        ZoomDic2D = new Dictionary<Transform, Zoom2D>();
-
-        TweenSrDic = new Dictionary<Transform, TweenSr>();
-        TweenCgDic = new Dictionary<Transform, TweenCG>();
-        TweenGraDic = new Dictionary<Transform, TweenGra>();
-        TweenVecDic = new Dictionary<Transform, TweenVec>();
-        TweenTextDic = new Dictionary<Transform, TweenText>();
-        TweenRectDic = new Dictionary<Transform, TweenRect>();
-        TweenScaleDic = new Dictionary<Transform, TweenScale>();
-        TweenAudioDic = new Dictionary<Transform, TweenAudio>();
-        TweenNumberDic = new Dictionary<Transform, TweenNumber>();
-
         ShakeFuncDicF.Add(Curve.Linear, ShakeLinear);
         ShakeFuncDicF.Add(Curve.EaseOutQuad, ShakeEaseOutQuad);
 
@@ -148,7 +121,7 @@ public class ManaAnim : Regist
 
     public static float LinearTimer(float value, float duration, float start, float delta)
     {
-        return (value - start) * duration / delta;
+        return (value - start)*duration/delta;
     }
 
     public static float EaseOutQuadTimer(float value, float duration, float start, float delta)
@@ -168,7 +141,7 @@ public class ManaAnim : Regist
                 return start;
             }
 
-            if (timer <= (i + 1) * sliceTime)
+            if (timer <= (i + 1)*sliceTime)
             {
                 timer -= (i)*sliceTime;
 
@@ -193,32 +166,32 @@ public class ManaAnim : Regist
 
     public static Color ShakeLinear(float timer, float duration, int repeat, Color start, Color strength)
     {
-        float sliceTime = duration / (4 * repeat);
+        float sliceTime = duration/(4*repeat);
 
-        for (int i = 0; i < repeat * 4; i += 4)
+        for (int i = 0; i < repeat*4; i += 4)
         {
             if (timer > duration)
             {
                 return start;
             }
 
-            if (timer <= (i + 1) * sliceTime)
+            if (timer <= (i + 1)*sliceTime)
             {
-                timer -= (i) * sliceTime;
+                timer -= (i)*sliceTime;
 
-                return Linear(timer, sliceTime, start, strength / (i / 4 + 1));
+                return Linear(timer, sliceTime, start, strength/(i/4 + 1));
             }
-            else if (timer <= (i + 3) * sliceTime)
+            else if (timer <= (i + 3)*sliceTime)
             {
-                timer -= (i + 1) * sliceTime;
+                timer -= (i + 1)*sliceTime;
 
-                return Linear(timer, 2 * sliceTime, start + strength / (i / 4 + 1), -2 * strength / (i / 4 + 1));
+                return Linear(timer, 2*sliceTime, start + strength/(i/4 + 1), -2*strength/(i/4 + 1));
             }
-            else if (timer <= (i + 4) * sliceTime)
+            else if (timer <= (i + 4)*sliceTime)
             {
-                timer -= (i + 3) * sliceTime;
+                timer -= (i + 3)*sliceTime;
 
-                return Linear(timer, sliceTime, start - strength / (i / 4 + 1), strength / (i / 4 + 1));
+                return Linear(timer, sliceTime, start - strength/(i/4 + 1), strength/(i/4 + 1));
             }
         }
 
@@ -227,32 +200,32 @@ public class ManaAnim : Regist
 
     public static Vector3 ShakeLinear(float timer, float duration, int repeat, Vector3 start, Vector3 strength)
     {
-        float sliceTime = duration / (4 * repeat);
+        float sliceTime = duration/(4*repeat);
 
-        for (int i = 0; i < repeat * 4; i += 4)
+        for (int i = 0; i < repeat*4; i += 4)
         {
             if (timer > duration)
             {
                 return start;
             }
 
-            if (timer <= (i + 1) * sliceTime)
+            if (timer <= (i + 1)*sliceTime)
             {
-                timer -= (i) * sliceTime;
+                timer -= (i)*sliceTime;
 
-                return Linear(timer, sliceTime, start, strength / (i / 4 + 1));
+                return Linear(timer, sliceTime, start, strength/(i/4 + 1));
             }
-            else if (timer <= (i + 3) * sliceTime)
+            else if (timer <= (i + 3)*sliceTime)
             {
-                timer -= (i + 1) * sliceTime;
+                timer -= (i + 1)*sliceTime;
 
-                return Linear(timer, 2 * sliceTime, start + strength / (i / 4 + 1), -2 * strength / (i / 4 + 1));
+                return Linear(timer, 2*sliceTime, start + strength/(i/4 + 1), -2*strength/(i/4 + 1));
             }
-            else if (timer <= (i + 4) * sliceTime)
+            else if (timer <= (i + 4)*sliceTime)
             {
-                timer -= (i + 3) * sliceTime;
+                timer -= (i + 3)*sliceTime;
 
-                return Linear(timer, sliceTime, start - strength / (i / 4 + 1), strength / (i / 4 + 1));
+                return Linear(timer, sliceTime, start - strength/(i/4 + 1), strength/(i/4 + 1));
             }
         }
 
@@ -262,32 +235,32 @@ public class ManaAnim : Regist
 
     public static float ShakeEaseOutQuad(float timer, float duration, int repeat, float start, float strength)
     {
-        float sliceTime = duration / (4 * repeat);
+        float sliceTime = duration/(4*repeat);
 
-        for (int i = 0; i < repeat * 4; i += 4)
+        for (int i = 0; i < repeat*4; i += 4)
         {
             if (timer > duration)
             {
                 return start;
             }
 
-            if (timer <= (i + 1) * sliceTime)
+            if (timer <= (i + 1)*sliceTime)
             {
-                timer -= (i) * sliceTime;
+                timer -= (i)*sliceTime;
 
-                return EaseOutQuad(timer, sliceTime, start, strength / (i / 4 + 1));
+                return EaseOutQuad(timer, sliceTime, start, strength/(i/4 + 1));
             }
-            else if (timer <= (i + 3) * sliceTime)
+            else if (timer <= (i + 3)*sliceTime)
             {
-                timer -= (i + 1) * sliceTime;
+                timer -= (i + 1)*sliceTime;
 
-                return EaseOutQuad(timer, 2 * sliceTime, start + strength / (i / 4 + 1), -2 * strength / (i / 4 + 1));
+                return EaseOutQuad(timer, 2*sliceTime, start + strength/(i/4 + 1), -2*strength/(i/4 + 1));
             }
-            else if (timer <= (i + 4) * sliceTime)
+            else if (timer <= (i + 4)*sliceTime)
             {
-                timer -= (i + 3) * sliceTime;
+                timer -= (i + 3)*sliceTime;
 
-                return EaseOutQuad(timer, sliceTime, start - strength / (i / 4 + 1), strength / (i / 4 + 1));
+                return EaseOutQuad(timer, sliceTime, start - strength/(i/4 + 1), strength/(i/4 + 1));
             }
         }
 
@@ -296,32 +269,32 @@ public class ManaAnim : Regist
 
     public static Color ShakeEaseOutQuad(float timer, float duration, int repeat, Color start, Color strength)
     {
-        float sliceTime = duration / (4 * repeat);
+        float sliceTime = duration/(4*repeat);
 
-        for (int i = 0; i < repeat * 4; i += 4)
+        for (int i = 0; i < repeat*4; i += 4)
         {
             if (timer > duration)
             {
                 return start;
             }
 
-            if (timer <= (i + 1) * sliceTime)
+            if (timer <= (i + 1)*sliceTime)
             {
-                timer -= (i) * sliceTime;
+                timer -= (i)*sliceTime;
 
-                return EaseOutQuad(timer, sliceTime, start, strength / (i / 4 + 1));
+                return EaseOutQuad(timer, sliceTime, start, strength/(i/4 + 1));
             }
-            else if (timer <= (i + 3) * sliceTime)
+            else if (timer <= (i + 3)*sliceTime)
             {
-                timer -= (i + 1) * sliceTime;
+                timer -= (i + 1)*sliceTime;
 
-                return EaseOutQuad(timer, 2 * sliceTime, start + strength / (i / 4 + 1), -2 * strength / (i / 4 + 1));
+                return EaseOutQuad(timer, 2*sliceTime, start + strength/(i/4 + 1), -2*strength/(i/4 + 1));
             }
-            else if (timer <= (i + 4) * sliceTime)
+            else if (timer <= (i + 4)*sliceTime)
             {
-                timer -= (i + 3) * sliceTime;
+                timer -= (i + 3)*sliceTime;
 
-                return EaseOutQuad(timer, sliceTime, start - strength / (i / 4 + 1), strength / (i / 4 + 1));
+                return EaseOutQuad(timer, sliceTime, start - strength/(i/4 + 1), strength/(i/4 + 1));
             }
         }
 
@@ -330,32 +303,32 @@ public class ManaAnim : Regist
 
     public static Vector3 ShakeEaseOutQuad(float timer, float duration, int repeat, Vector3 start, Vector3 strength)
     {
-        float sliceTime = duration / (4 * repeat);
+        float sliceTime = duration/(4*repeat);
 
-        for (int i = 0; i < repeat * 4; i += 4)
+        for (int i = 0; i < repeat*4; i += 4)
         {
             if (timer > duration)
             {
                 return start;
             }
 
-            if (timer <= (i + 1) * sliceTime)
+            if (timer <= (i + 1)*sliceTime)
             {
-                timer -= (i) * sliceTime;
+                timer -= (i)*sliceTime;
 
-                return EaseOutQuad(timer, sliceTime, start, strength / (i / 4 + 1));
+                return EaseOutQuad(timer, sliceTime, start, strength/(i/4 + 1));
             }
-            else if (timer <= (i + 3) * sliceTime)
+            else if (timer <= (i + 3)*sliceTime)
             {
-                timer -= (i + 1) * sliceTime;
+                timer -= (i + 1)*sliceTime;
 
-                return EaseOutQuad(timer, 2 * sliceTime, start + strength / (i / 4 + 1), -2 * strength / (i / 4 + 1));
+                return EaseOutQuad(timer, 2*sliceTime, start + strength/(i/4 + 1), -2*strength/(i/4 + 1));
             }
-            else if (timer <= (i + 4) * sliceTime)
+            else if (timer <= (i + 4)*sliceTime)
             {
-                timer -= (i + 3) * sliceTime;
+                timer -= (i + 3)*sliceTime;
 
-                return EaseOutQuad(timer, sliceTime, start - strength / (i / 4 + 1), strength / (i / 4 + 1));
+                return EaseOutQuad(timer, sliceTime, start - strength/(i/4 + 1), strength/(i/4 + 1));
             }
         }
 
@@ -371,7 +344,7 @@ public class ManaAnim : Regist
         }
         else
         {
-            return delta * timer / duration + start;
+            return delta*timer/duration + start;
         }
     }
 
@@ -396,7 +369,7 @@ public class ManaAnim : Regist
         {
             timer /= duration;
 
-            return -delta * timer * (timer - 2) + start;
+            return -delta*timer*(timer - 2) + start;
         }
     }
 
@@ -977,7 +950,7 @@ public class ManaAnim : Regist
     public static TweenGra TweenConBacGra(Transform target)
     {
         TweenGra tween;
-    
+
         if (TweenGraDic.TryGetValue(target, out tween))
         {
             tween.ConfineBackward();
@@ -1092,11 +1065,11 @@ public class ManaAnim : Regist
 
     public static Shake GetShake(Transform target)
     {
-        Shake shake;
+        Shake move;
 
-        if (ShakeDic.TryGetValue(target, out shake))
+        if (ShakeDic.TryGetValue(target, out move))
         {
-            return shake;
+            return move;
         }
         else
         {
@@ -1106,11 +1079,11 @@ public class ManaAnim : Regist
 
     public static Move2D GetMove2D(Transform target)
     {
-        Move2D move2D;
+        Move2D move;
 
-        if (MoveDic2D.TryGetValue(target, out move2D))
+        if (MoveDic2D.TryGetValue(target, out move))
         {
-            return move2D;
+            return move;
         }
         else
         {
@@ -1120,11 +1093,11 @@ public class ManaAnim : Regist
 
     public static Move3D GetMove3D(Transform target)
     {
-        Move3D move3D;
+        Move3D move;
 
-        if (MoveDic3D.TryGetValue(target, out move3D))
+        if (MoveDic3D.TryGetValue(target, out move))
         {
-            return move3D;
+            return move;
         }
         else
         {
@@ -1149,11 +1122,11 @@ public class ManaAnim : Regist
 
     public static TweenSr GetTweenSr(Transform target)
     {
-        TweenSr tweenSr;
+        TweenSr tween;
 
-        if (TweenSrDic.TryGetValue(target, out tweenSr))
+        if (TweenSrDic.TryGetValue(target, out tween))
         {
-            return tweenSr;
+            return tween;
         }
         else
         {
@@ -1163,11 +1136,11 @@ public class ManaAnim : Regist
 
     public static TweenCG GetTweenCG(Transform target)
     {
-        TweenCG tweenCG;
+        TweenCG tween;
 
-        if (TweenCgDic.TryGetValue(target, out tweenCG))
+        if (TweenCgDic.TryGetValue(target, out tween))
         {
-            return tweenCG;
+            return tween;
         }
         else
         {
@@ -1177,11 +1150,11 @@ public class ManaAnim : Regist
 
     public static TweenGra GetTweenGra(Transform target)
     {
-        TweenGra tweenGra;
+        TweenGra tween;
 
-        if (TweenGraDic.TryGetValue(target, out tweenGra))
+        if (TweenGraDic.TryGetValue(target, out tween))
         {
-            return tweenGra;
+            return tween;
         }
         else
         {
@@ -1191,11 +1164,11 @@ public class ManaAnim : Regist
 
     public static TweenVec GetTweenVec(Transform target)
     {
-        TweenVec tweenVec;
+        TweenVec tween;
 
-        if (TweenVecDic.TryGetValue(target, out tweenVec))
+        if (TweenVecDic.TryGetValue(target, out tween))
         {
-            return tweenVec;
+            return tween;
         }
         else
         {
@@ -1205,11 +1178,11 @@ public class ManaAnim : Regist
 
     public static TweenText GetTweenText(Transform target)
     {
-        TweenText tweenText;
+        TweenText tween;
 
-        if (TweenTextDic.TryGetValue(target, out tweenText))
+        if (TweenTextDic.TryGetValue(target, out tween))
         {
-            return tweenText;
+            return tween;
         }
         else
         {
@@ -1219,11 +1192,11 @@ public class ManaAnim : Regist
 
     public static TweenRect GetTweenRect(Transform target)
     {
-        TweenRect tweenRect;
+        TweenRect tween;
 
-        if (TweenRectDic.TryGetValue(target, out tweenRect))
+        if (TweenRectDic.TryGetValue(target, out tween))
         {
-            return tweenRect;
+            return tween;
         }
         else
         {
@@ -1233,11 +1206,11 @@ public class ManaAnim : Regist
 
     public static TweenScale GetTweenScale(Transform target)
     {
-        TweenScale tweenScale;
+        TweenScale tween;
 
-        if (TweenScaleDic.TryGetValue(target, out tweenScale))
+        if (TweenScaleDic.TryGetValue(target, out tween))
         {
-            return tweenScale;
+            return tween;
         }
         else
         {
@@ -1360,7 +1333,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)
     {
-        TweenSr tween;
+        TweenSr tweenSr;
         SpriteRenderer sr = target.GetComponent<SpriteRenderer>();
 
         Color origin = sr.color;
@@ -1371,25 +1344,25 @@ public class ManaAnim : Regist
 
         if (TweenSrDic.ContainsKey(target))
         {
-             tween = TweenSrDic[target];
+            tweenSr = TweenSrDic[target];
 
-            tween = new TweenSr(sr, origin, destination, duration, originActive, destActive, curve, cg, group);
+            tweenSr = new TweenSr(sr, origin, destination, duration, originActive, destActive, curve, cg, group);
 
-            return tween;
+            return tweenSr;
         }
         else
         {
-             tween = new TweenSr(sr, origin, destination, duration, originActive, destActive, curve, cg, group);
+            tweenSr = new TweenSr(sr, origin, destination, duration, originActive, destActive, curve, cg, group);
 
-            TweenSrDic.Add(target, tween);
+            TweenSrDic.Add(target, tweenSr);
 
-            return tween;
+            return tweenSr;
         }
     }
 
     public static TweenSr CreateTweenSr(Transform target, float destinationAlpha, float duration, bool originActive, bool destActive, Curve curve, bool cg = false, bool group = false)
     {
-        TweenSr tween;
+        TweenSr tweenSr;
         SpriteRenderer sr = target.GetComponent<SpriteRenderer>();
 
         Color destination = sr.color;
@@ -1398,122 +1371,120 @@ public class ManaAnim : Regist
 
         if (TweenSrDic.ContainsKey(target))
         {
-             tween = TweenSrDic[target];
+            tweenSr = TweenSrDic[target];
 
-            tween = new TweenSr(sr, sr.color, destination, duration, originActive, destActive, curve, cg, group);
+            tweenSr = new TweenSr(sr, sr.color, destination, duration, originActive, destActive, curve, cg, group);
 
-            return tween;
+            return tweenSr;
         }
         else
         {
-             tween = new TweenSr(sr, sr.color, destination, duration, originActive, destActive, curve, cg, group);
+            tweenSr = new TweenSr(sr, sr.color, destination, duration, originActive, destActive, curve, cg, group);
 
-            TweenSrDic.Add(target, tween);
+            TweenSrDic.Add(target, tweenSr);
 
-            return tween;
+            return tweenSr;
         }
     }
 
-    public static TweenSr CreateTweenSr(Transform target, Color origin, Color destination, float duration, bool originActive, bool destActive, Curve curve, bool cg = false, bool group=false)
+    public static TweenSr CreateTweenSr(Transform target, Color origin, Color destination, float duration, bool originActive, bool destActive, Curve curve, bool cg = false, bool group = false)
     {
+        TweenSr tweenSr;
+        SpriteRenderer sr = target.GetComponent<SpriteRenderer>();
+
         if (TweenSrDic.ContainsKey(target))
         {
-            SpriteRenderer sr = target.GetComponent<SpriteRenderer>();
-
-            TweenSr tween = TweenSrDic[target];
+            tweenSr = TweenSrDic[target];
 
-            tween = new TweenSr(sr, origin, destination, duration, originActive, destActive, curve, cg, group);
+            tweenSr = new TweenSr(sr, origin, destination, duration, originActive, destActive, curve, cg, group);
 
-            return tween;
+            return tweenSr;
         }
         else
         {
-            SpriteRenderer sr = target.GetComponent<SpriteRenderer>();
-
-            TweenSr tween = new TweenSr(sr, origin, destination, duration, originActive, destActive, curve, cg, group);
+            tweenSr = new TweenSr(sr, origin, destination, duration, originActive, destActive, curve, cg, group);
 
-            TweenSrDic.Add(target, tween);
+            TweenSrDic.Add(target, tweenSr);
 
-            return tween;
+            return tweenSr;
         }
     }
 
-    public static TweenSr CreateTweenSr(Transform target, Color destination, float duration, bool originActive, bool destActive, Curve curve, bool cg = false, bool group=false)
+    public static TweenSr CreateTweenSr(Transform target, Color destination, float duration, bool originActive, bool destActive, Curve curve, bool cg = false, bool group = false)
     {
+        TweenSr tweenSr;
+        SpriteRenderer sr = target.GetComponent<SpriteRenderer>();
+
         if (TweenSrDic.ContainsKey(target))
         {
-            SpriteRenderer sr = target.GetComponent<SpriteRenderer>();
-
-            TweenSr tween = TweenSrDic[target];
+            tweenSr = TweenSrDic[target];
 
-            tween = new TweenSr(sr, sr.color, destination, duration, originActive, destActive, curve, cg, group);
+            tweenSr = new TweenSr(sr, sr.color, destination, duration, originActive, destActive, curve, cg, group);
 
-            return tween;
+            return tweenSr;
         }
         else
         {
-            SpriteRenderer sr = target.GetComponent<SpriteRenderer>();
+            tweenSr = new TweenSr(sr, sr.color, destination, duration, originActive, destActive, curve, cg, group);
 
-            TweenSr tween = new TweenSr(sr, sr.color, destination, duration, originActive, destActive, curve, cg, group);
+            TweenSrDic.Add(target, tweenSr);
 
-            TweenSrDic.Add(target, tween);
-
-            return tween;
+            return tweenSr;
         }
     }
+    
 
-    public static TweenCG CreateTweenCG(Transform target, float origin, float destination,  float duration, bool originActive, bool destActive, Curve curve)
+    public static TweenCG CreateTweenCG(Transform target, float origin, float destination, float duration, bool originActive, bool destActive, Curve curve)
     {
+        TweenCG tweenCg;
+        CanvasGroup cg = target.GetComponent<CanvasGroup>();
+
         if (TweenCgDic.ContainsKey(target))
         {
-            CanvasGroup cg = target.GetComponent<CanvasGroup>();
+            tweenCg = TweenCgDic[target];
 
-            TweenCG tween = TweenCgDic[target];
+            tweenCg = new TweenCG(cg, origin, destination, duration, originActive, destActive, curve);
 
-            tween = new TweenCG(cg, origin, destination, duration, originActive, destActive, curve);
-
-            return tween;
+            return tweenCg;
         }
         else
         {
-            CanvasGroup cg = target.GetComponent<CanvasGroup>();
+            tweenCg = new TweenCG(cg, origin, destination, duration, originActive, destActive, curve);
 
-            TweenCG tween = new TweenCG(cg, origin, destination, duration, originActive, destActive, curve);
+            TweenCgDic.Add(target, tweenCg);
 
-            TweenCgDic.Add(target, tween);
-
-            return tween;
+            return tweenCg;
         }
     }
 
     public static TweenCG CreateTweenCG(Transform target, float destination, float duration, bool originActive, bool destActive, Curve curve)
     {
+        TweenCG tweenCg;
+        CanvasGroup cg = target.GetComponent<CanvasGroup>();
+
         if (TweenCgDic.ContainsKey(target))
         {
-            CanvasGroup cg = target.GetComponent<CanvasGroup>();
-
-            TweenCG tween = TweenCgDic[target];
+            tweenCg = TweenCgDic[target];
 
-            tween = new TweenCG(cg, cg.alpha, destination, duration, originActive, destActive, curve);
+            tweenCg = new TweenCG(cg, cg.alpha, destination, duration, originActive, destActive, curve);
 
-            return tween;
+            return tweenCg;
         }
         else
         {
-            CanvasGroup cg = target.GetComponent<CanvasGroup>();
-
-            TweenCG tween = new TweenCG(cg, cg.alpha, destination, duration, originActive, destActive, curve);
+            tweenCg = new TweenCG(cg, cg.alpha, destination, duration, originActive, destActive, curve);
 
-            TweenCgDic.Add(target, tween);
+            TweenCgDic.Add(target, tweenCg);
 
-            return tween;
+            return tweenCg;
         }
     }
 
+
     public static TweenGra CreateTweenGra(Transform target, float originAlpha, float destinationAlpha, float duration, bool originActive, bool destActive, Curve curve, bool cg = false)
     {
         Graphic graphic = target.GetComponent<Graphic>();
-        TweenGra tween;
+        TweenGra tweenGra;
 
         Color origin = graphic.color;
         Color destination = graphic.color;
@@ -1523,26 +1494,26 @@ public class ManaAnim : Regist
 
         if (TweenGraDic.ContainsKey(target))
         {
-            tween = TweenGraDic[target];
+            tweenGra = TweenGraDic[target];
 
-            tween = new TweenGra(graphic, origin, destination, duration, originActive, destActive, curve, cg);
+            tweenGra = new TweenGra(graphic, origin, destination, duration, originActive, destActive, curve, cg);
 
-            return tween;
+            return tweenGra;
         }
         else
         {
-            tween = new TweenGra(graphic, origin, destination, duration, originActive, destActive, curve, cg);
+            tweenGra = new TweenGra(graphic, origin, destination, duration, originActive, destActive, curve, cg);
 
-            TweenGraDic.Add(target, tween);
+            TweenGraDic.Add(target, tweenGra);
 
-            return tween;
+            return tweenGra;
         }
     }
 
     public static TweenGra CreateTweenGra(Transform target, float destinationAlpha, float duration, bool originActive, bool destActive, Curve curve, bool cg = false)
     {
         Graphic graphic = target.GetComponent<Graphic>();
-        TweenGra tween;
+        TweenGra tweenGra;
 
         Color destination = graphic.color;
 
@@ -1550,408 +1521,421 @@ public class ManaAnim : Regist
 
         if (TweenGraDic.ContainsKey(target))
         {
-             tween = TweenGraDic[target];
+            tweenGra = TweenGraDic[target];
 
-            tween = new TweenGra(graphic, graphic.color, destination, duration, originActive, destActive, curve, cg);
+            tweenGra = new TweenGra(graphic, graphic.color, destination, duration, originActive, destActive, curve, cg);
 
-            return tween;
+            return tweenGra;
         }
         else
         {
-             tween = new TweenGra(graphic, graphic.color, destination, duration, originActive, destActive, curve, cg);
+            tweenGra = new TweenGra(graphic, graphic.color, destination, duration, originActive, destActive, curve, cg);
 
-            TweenGraDic.Add(target, tween);
+            TweenGraDic.Add(target, tweenGra);
 
-            return tween;
+            return tweenGra;
         }
     }
 
     public static TweenGra CreateTweenGra(Transform target, Color origin, Color destination, float duration, bool originActive, bool destActive, Curve curve, bool cg = false)
     {
+        Graphic graphic = target.GetComponent<Graphic>();
+        TweenGra tweenGra;
+
         if (TweenGraDic.ContainsKey(target))
         {
-            Graphic graphic = target.GetComponent<Graphic>();
-
-            TweenGra tween = TweenGraDic[target];
+            tweenGra = TweenGraDic[target];
 
-            tween = new TweenGra(graphic, origin, destination, duration, originActive, destActive, curve, cg);
+            tweenGra = new TweenGra(graphic, origin, destination, duration, originActive, destActive, curve, cg);
 
-            return tween;
+            return tweenGra;
         }
         else
         {
-            Graphic graphic = target.GetComponent<Graphic>();
+            tweenGra = new TweenGra(graphic, origin, destination, duration, originActive, destActive, curve, cg);
 
-            TweenGra tween = new TweenGra(graphic, origin, destination, duration, originActive, destActive, curve, cg);
+            TweenGraDic.Add(target, tweenGra);
 
-            TweenGraDic.Add(target, tween);
-
-            return tween;
+            return tweenGra;
         }
     }
 
     public static TweenGra CreateTweenGra(Transform target, Color destination, float duration, bool originActive, bool destActive, Curve curve, bool cg = false)
     {
+        Graphic graphic = target.GetComponent<Graphic>();
+        TweenGra tweenGra;
+
         if (TweenGraDic.ContainsKey(target))
         {
-            Graphic graphic = target.GetComponent<Graphic>();
-
-            TweenGra tween = TweenGraDic[target];
+            tweenGra = TweenGraDic[target];
 
-            tween = new TweenGra(graphic, graphic.color, destination, duration, originActive, destActive, curve, cg);
+            tweenGra = new TweenGra(graphic, graphic.color, destination, duration, originActive, destActive, curve, cg);
 
-            return tween;
+            return tweenGra;
         }
         else
         {
-            Graphic graphic = target.GetComponent<Graphic>();
+            tweenGra = new TweenGra(graphic, graphic.color, destination, duration, originActive, destActive, curve, cg);
 
-            TweenGra tween = new TweenGra(graphic, graphic.color, destination, duration, originActive, destActive, curve, cg);
+            TweenGraDic.Add(target, tweenGra);
 
-            TweenGraDic.Add(target, tween);
-
-            return tween;
+            return tweenGra;
         }
     }
 
+
     public static TweenVec CreateTweenVec2D(Transform target, Vector3 origin, Vector3 destination, float duration, bool local, bool originActive, bool destActive, Curve curve, bool cg = false)
     {
+        TweenVec tweenVec2D;
+
         origin.z = target.position.z;
         destination.z = target.position.z;
 
         if (TweenVecDic.ContainsKey(target))
         {
-            TweenVec tween = TweenVecDic[target];
+            tweenVec2D = TweenVecDic[target];
 
-            tween = new TweenVec(target, origin, destination, duration, local, originActive, destActive, curve, cg);
+            tweenVec2D = new TweenVec(target, origin, destination, duration, local, originActive, destActive, curve, cg);
 
-            return tween;
+            return tweenVec2D;
         }
         else
         {
-            TweenVec tween = new TweenVec(target, origin, destination, duration, local, originActive, destActive, curve, cg);
+            tweenVec2D = new TweenVec(target, origin, destination, duration, local, originActive, destActive, curve, cg);
 
-            TweenVecDic.Add(target, tween);
+            TweenVecDic.Add(target, tweenVec2D);
 
-            return tween;
+            return tweenVec2D;
         }
     }
 
     public static TweenVec CreateTweenVec2D(Transform target, Vector3 destination, float duration, bool local, bool originActive, bool destActive, Curve curve, bool cg = false)
     {
+        TweenVec tweenVec2D;
+
         destination.z = target.position.z;
 
         if (TweenVecDic.ContainsKey(target))
         {
-            TweenVec tween = TweenVecDic[target];
+            tweenVec2D = TweenVecDic[target];
 
             if (local)
             {
-                tween = new TweenVec(target, target.localPosition, destination, duration, local, originActive, destActive, curve, cg);
+                tweenVec2D = new TweenVec(target, target.localPosition, destination, duration, local, originActive, destActive, curve, cg);
             }
             else
             {
-                tween = new TweenVec(target, target.position, destination, duration, local, originActive, destActive, curve, cg);
+                tweenVec2D = new TweenVec(target, target.position, destination, duration, local, originActive, destActive, curve, cg);
             }
 
-            return tween;
+            return tweenVec2D;
         }
         else
         {
-            TweenVec tween;
-
             if (local)
             {
-                tween = new TweenVec(target, target.localPosition, destination, duration, local, originActive, destActive, curve, cg);
+                tweenVec2D = new TweenVec(target, target.localPosition, destination, duration, local, originActive, destActive, curve, cg);
             }
             else
             {
-                tween = new TweenVec(target, target.position, destination, duration, local, originActive, destActive, curve, cg);
+                tweenVec2D = new TweenVec(target, target.position, destination, duration, local, originActive, destActive, curve, cg);
             }
 
-            TweenVecDic.Add(target, tween);
+            TweenVecDic.Add(target, tweenVec2D);
 
-            return tween;
+            return tweenVec2D;
         }
     }
 
+
     public static TweenVec CreateTweenVec3D(Transform target, Vector3 origin, Vector3 destination, float duration, bool local, bool originActive, bool destActive, Curve curve, bool cg = false)
     {
+        TweenVec tweenVec3D;
+
         if (TweenVecDic.ContainsKey(target))
         {
-            TweenVec tween = TweenVecDic[target];
+            tweenVec3D = TweenVecDic[target];
 
-            tween = new TweenVec(target, origin, destination, duration, local, originActive, destActive, curve, cg);
+            tweenVec3D = new TweenVec(target, origin, destination, duration, local, originActive, destActive, curve, cg);
 
-            return tween;
+            return tweenVec3D;
         }
         else
         {
-            TweenVec tween = new TweenVec(target, origin, destination, duration, local, originActive, destActive, curve, cg);
+            tweenVec3D = new TweenVec(target, origin, destination, duration, local, originActive, destActive, curve, cg);
 
-            TweenVecDic.Add(target, tween);
+            TweenVecDic.Add(target, tweenVec3D);
 
-            return tween;
+            return tweenVec3D;
         }
     }
 
     public static TweenVec CreateTweenVec3D(Transform target, Vector3 destination, float duration, bool local, bool originActive, bool destActive, Curve curve, bool cg = false)
     {
+        TweenVec tweenVec3D;
+
         if (TweenVecDic.ContainsKey(target))
         {
-            TweenVec tween = TweenVecDic[target];
+            tweenVec3D = TweenVecDic[target];
 
             if (local)
             {
-                tween = new TweenVec(target, target.localPosition, destination, duration, local, originActive, destActive, curve, cg);
+                tweenVec3D = new TweenVec(target, target.localPosition, destination, duration, local, originActive, destActive, curve, cg);
             }
             else
             {
-                tween = new TweenVec(target, target.position, destination, duration, local, originActive, destActive, curve, cg);
+                tweenVec3D = new TweenVec(target, target.position, destination, duration, local, originActive, destActive, curve, cg);
             }
 
-            return tween;
+            return tweenVec3D;
         }
         else
         {
-            TweenVec tween;
-
             if (local)
             {
-                tween = new TweenVec(target, target.localPosition, destination, duration, local, originActive, destActive, curve, cg);
+                tweenVec3D = new TweenVec(target, target.localPosition, destination, duration, local, originActive, destActive, curve, cg);
             }
             else
             {
-                tween = new TweenVec(target, target.position, destination, duration, local, originActive, destActive, curve, cg);
+                tweenVec3D = new TweenVec(target, target.position, destination, duration, local, originActive, destActive, curve, cg);
             }
 
-            TweenVecDic.Add(target, tween);
+            TweenVecDic.Add(target, tweenVec3D);
 
-            return tween;
+            return tweenVec3D;
         }
     }
 
+
     public static TweenText CreateTweenText(Transform target, float origin, float destination, float duration, bool originActive, bool destActive, Curve curve, bool cg = false)
     {
+        Text text = target.GetComponent<Text>();
+        TweenText tweenText;
+
         if (TweenRectDic.ContainsKey(target))
         {
-            Text text = target.GetComponent<Text>();
-
-            TweenText tween = TweenTextDic[target];
+            tweenText = TweenTextDic[target];
 
-            tween = new TweenText(text, origin, destination, duration, originActive, destActive, curve, cg);
+            tweenText = new TweenText(text, origin, destination, duration, originActive, destActive, curve, cg);
 
-            return tween;
+            return tweenText;
         }
         else
         {
-            Text text = target.GetComponent<Text>();
-
-            TweenText tween = new TweenText(text, origin, destination, duration, originActive, destActive, curve, cg);
+            tweenText = new TweenText(text, origin, destination, duration, originActive, destActive, curve, cg);
 
-            TweenTextDic.Add(target, tween);
+            TweenTextDic.Add(target, tweenText);
 
-            return tween;
+            return tweenText;
         }
     }
 
     public static TweenText CreateTweenText(Transform target, float destination, float duration, bool originActive, bool destActive, Curve curve, bool cg = false)
     {
+        Text text = target.GetComponent<Text>();
+        TweenText tweenText;
+
         if (TweenRectDic.ContainsKey(target))
         {
-            Text text = target.GetComponent<Text>();
+            tweenText = TweenTextDic[target];
 
-            TweenText tween = TweenTextDic[target];
+            tweenText = new TweenText(text, text.fontSize, destination, duration, originActive, destActive, curve, cg);
 
-            tween = new TweenText(text, text.fontSize, destination, duration, originActive, destActive, curve, cg);
-
-            return tween;
+            return tweenText;
         }
         else
         {
-            Text text = target.GetComponent<Text>();
-
-            TweenText tween = new TweenText(text, text.fontSize, destination, duration, originActive, destActive, curve, cg);
+            tweenText = new TweenText(text, text.fontSize, destination, duration, originActive, destActive, curve, cg);
 
-            TweenTextDic.Add(target, tween);
+            TweenTextDic.Add(target, tweenText);
 
-            return tween;
+            return tweenText;
         }
     }
 
+
     public static TweenRect CreateTweenRect(Transform target, Vector2 origin, Vector2 destination, float duration, bool originActive, bool destActive, Curve curve, bool cg = false)
     {
+        TweenRect tweenRect;
+        RectTransform rectTra = target.GetComponent<RectTransform>();
+
         if (TweenRectDic.ContainsKey(target))
         {
-            RectTransform rectTra = target.GetComponent<RectTransform>();
+            tweenRect = TweenRectDic[target];
 
-            TweenRect tween = TweenRectDic[target];
+            tweenRect = new TweenRect(rectTra, origin, destination, duration, originActive, destActive, curve, cg);
 
-            tween = new TweenRect(rectTra, origin, destination, duration, originActive, destActive, curve, cg);
-
-            return tween;
+            return tweenRect;
         }
         else
         {
-            RectTransform rectTra = target.GetComponent<RectTransform>();
-
-            TweenRect tween = new TweenRect(rectTra, origin, destination, duration, originActive, destActive, curve, cg);
+            tweenRect = new TweenRect(rectTra, origin, destination, duration, originActive, destActive, curve, cg);
 
-            TweenRectDic.Add(target, tween);
+            TweenRectDic.Add(target, tweenRect);
 
-            return tween;
+            return tweenRect;
         }
     }
 
     public static TweenRect CreateTweenRect(Transform target, Vector2 destination, float duration, bool originActive, bool destActive, Curve curve, bool cg = false)
     {
+        TweenRect tweenRect;
+        RectTransform rectTra = target.GetComponent<RectTransform>();
+
         if (TweenRectDic.ContainsKey(target))
         {
-            RectTransform rectTra = target.GetComponent<RectTransform>();
+            tweenRect = TweenRectDic[target];
 
-            TweenRect tween = TweenRectDic[target];
+            tweenRect = new TweenRect(rectTra, rectTra.rect.size, destination, duration, originActive, destActive, curve, cg);
 
-            tween = new TweenRect(rectTra, rectTra.rect.size, destination, duration, originActive, destActive, curve, cg);
-
-            return tween;
+            return tweenRect;
         }
         else
         {
-            RectTransform rectTra = target.GetComponent<RectTransform>();
-
-            TweenRect tween = new TweenRect(rectTra, rectTra.rect.size, destination, duration, originActive, destActive, curve, cg);
+            tweenRect = new TweenRect(rectTra, rectTra.rect.size, destination, duration, originActive, destActive, curve, cg);
 
-            TweenRectDic.Add(target, tween);
+            TweenRectDic.Add(target, tweenRect);
 
-            return tween;
+            return tweenRect;
         }
     }
 
+
     public static TweenScale CreateTweenScale(Transform target, Vector3 origin, Vector3 destination, float duration, bool originActive, bool destActive, Curve curve, bool cg = false)
     {
+        TweenScale tweenScale;
+
         if (TweenScaleDic.ContainsKey(target))
         {
-            TweenScale tween = TweenScaleDic[target];
+            tweenScale = TweenScaleDic[target];
 
-            tween = new TweenScale(target, origin, destination, duration, originActive, destActive, curve, cg);
+            tweenScale = new TweenScale(target, origin, destination, duration, originActive, destActive, curve, cg);
 
-            return tween;
+            return tweenScale;
         }
         else
         {
-            TweenScale tween = new TweenScale(target, origin, destination, duration, originActive, destActive, curve, cg);
+            tweenScale = new TweenScale(target, origin, destination, duration, originActive, destActive, curve, cg);
 
-            TweenScaleDic.Add(target, tween);
+            TweenScaleDic.Add(target, tweenScale);
 
-            return tween;
+            return tweenScale;
         }
     }
 
     public static TweenScale CreateTweenScale(Transform target, Vector3 destination, float duration, bool originActive, bool destActive, Curve curve, bool cg = false)
     {
+        TweenScale tweenScale;
+
         if (TweenScaleDic.ContainsKey(target))
         {
-            TweenScale tween = TweenScaleDic[target];
+            tweenScale = TweenScaleDic[target];
 
-            tween = new TweenScale(target, target.lossyScale, destination, duration, originActive, destActive, curve, cg);
+            tweenScale = new TweenScale(target, target.lossyScale, destination, duration, originActive, destActive, curve, cg);
 
-            return tween;
+            return tweenScale;
         }
         else
         {
-            TweenScale tween = new TweenScale(target, target.lossyScale, destination, duration, originActive, destActive, curve, cg);
+            tweenScale = new TweenScale(target, target.lossyScale, destination, duration, originActive, destActive, curve, cg);
 
-            TweenScaleDic.Add(target, tween);
+            TweenScaleDic.Add(target, tweenScale);
 
-            return tween;
+            return tweenScale;
         }
     }
 
+
     public static TweenAudio CreateTweenAudio(Transform target, float origin, float destination, float duration, bool originActive, bool destActive, Curve curve, bool cg = false)
     {
+        TweenAudio tweenAudio;
+        AudioSource audio = target.GetComponent<AudioSource>();
+
         if (TweenAudioDic.ContainsKey(target))
         {
-            TweenAudio tween = TweenAudioDic[target];
+            tweenAudio = TweenAudioDic[target];
 
-            tween = new TweenAudio(target.GetComponent<AudioSource>(), origin, destination, duration, originActive, destActive, curve, cg);
+            tweenAudio = new TweenAudio(audio, origin, destination, duration, originActive, destActive, curve, cg);
 
-            return tween;
+            return tweenAudio;
         }
         else
         {
-            TweenAudio tween = new TweenAudio(target.GetComponent<AudioSource>(), origin, destination, duration, originActive, destActive, curve, cg);
+            tweenAudio = new TweenAudio(audio, origin, destination, duration, originActive, destActive, curve, cg);
 
-            TweenAudioDic.Add(target, tween);
+            TweenAudioDic.Add(target, tweenAudio);
 
-            return tween;
+            return tweenAudio;
         }
     }
 
     public static TweenAudio CreateTweenAudio(Transform target, float destination, float duration, bool originActive, bool destActive, Curve curve, bool cg = false)
     {
+        TweenAudio tweenAudio;
+        AudioSource audio = target.GetComponent<AudioSource>();
+
         if (TweenAudioDic.ContainsKey(target))
         {
-            AudioSource audio = target.GetComponent<AudioSource>();
+            tweenAudio = TweenAudioDic[target];
 
-            TweenAudio tween = TweenAudioDic[target];
+            tweenAudio = new TweenAudio(audio, audio.volume, destination, duration, originActive, destActive, curve, cg);
 
-            tween = new TweenAudio(audio , audio.volume, destination, duration, originActive, destActive, curve, cg);
-
-            return tween;
+            return tweenAudio;
         }
         else
         {
-            AudioSource audio = target.GetComponent<AudioSource>();
+            tweenAudio = new TweenAudio(audio, audio.volume, destination, duration, originActive, destActive, curve, cg);
 
-            TweenAudio tween = new TweenAudio(audio, audio.volume, destination, duration, originActive, destActive, curve, cg);
+            TweenAudioDic.Add(target, tweenAudio);
 
-            TweenAudioDic.Add(target, tween);
-
-            return tween;
+            return tweenAudio;
         }
     }
 
+
     public static TweenNumber CreateTweenNumber(Transform target, int origin, int destination, float duration, bool originActive, bool destActive, Curve curve, bool cg = false)
     {
+        Text text = target.GetComponent<Text>();
+        TweenNumber tweenNumber;
+
         if (TweenNumberDic.ContainsKey(target))
         {
-            TweenNumber tween = TweenNumberDic[target];
+            tweenNumber = TweenNumberDic[target];
 
-            tween = new TweenNumber(target.GetComponent<Text>(), origin, destination, duration, originActive, destActive, curve, cg);
+            tweenNumber = new TweenNumber(text, origin, destination, duration, originActive, destActive, curve, cg);
 
-            return tween;
+            return tweenNumber;
         }
         else
         {
-            TweenNumber tween = new TweenNumber(target.GetComponent<Text>(), origin, destination, duration, originActive, destActive, curve, cg);
+            tweenNumber = new TweenNumber(text, origin, destination, duration, originActive, destActive, curve, cg);
 
-            TweenNumberDic.Add(target, tween);
+            TweenNumberDic.Add(target, tweenNumber);
 
-            return tween;
+            return tweenNumber;
         }
     }
 
     public static TweenNumber CreateTweenNumber(Transform target, int destination, float duration, bool originActive, bool destActive, Curve curve, bool cg = false)
     {
+        Text text = target.GetComponent<Text>();
+        TweenNumber tweenNumber;
+
         if (TweenNumberDic.ContainsKey(target))
         {
-            Text text = target.GetComponent<Text>();
-
-            TweenNumber tween = TweenNumberDic[target];
+            tweenNumber = TweenNumberDic[target];
 
-            tween = new TweenNumber(text, int.Parse(text.text), destination, duration, originActive, destActive, curve, cg);
+            tweenNumber = new TweenNumber(text, int.Parse(text.text), destination, duration, originActive, destActive, curve, cg);
 
-            return tween;
+            return tweenNumber;
         }
         else
         {
-            Text text = target.GetComponent<Text>();
-
-            TweenNumber tween = new TweenNumber(text, int.Parse(text.text), destination, duration, originActive, destActive, curve, cg);
+            tweenNumber = new TweenNumber(text, int.Parse(text.text), destination, duration, originActive, destActive, curve, cg);
 
-            TweenNumberDic.Add(target, tween);
+            TweenNumberDic.Add(target, tweenNumber);
 
-            return tween;
+            return tweenNumber;
         }
     }
 

Assets/Script/Manage/ManaData.cs

@@ -1,13 +1,13 @@
 using LitJson;
 
 using UnityEngine;
+using UnityEngine.UI;
 using UnityEngine.EventSystems;
 
 using System;
 using System.Xml;
 using System.Collections;
 using System.Collections.Generic;
-using UnityEngine.UI;
 
 public class ManaData : Regist 
 {
@@ -15,120 +15,122 @@ public class ManaData : Regist
 
     #region 成就
 
-    public static double AD
+    public static double Elf
     {
-        get { return _AD; }
+        get { return Elf_; }
         set
         {
-            _AD = value;
+            Elf_ = value;
 
-            ManaAchieve.UpdateStatus(AchieveType.AD, _AD);
+            ManaAchieve.UpdateStatus(AchieveType.Elf, Elf_);
         }
     }
-    public static double Skill
+    public static double AD
     {
-        get { return _Skill; }
+        get { return AD_; }
         set
         {
-            _Skill = value;
+            AD_ = value;
 
-            ManaAchieve.UpdateStatus(AchieveType.Skill, _Skill);
+            ManaAchieve.UpdateStatus(AchieveType.AD, AD_);
         }
     }
-    public static double Sign
+    public static double Skill
     {
-        get { return _Sign; }
+        get { return Skill_; }
         set
         {
-            _Sign = value;
+            Skill_ = value;
 
-            ManaAchieve.UpdateStatus(AchieveType.Sign, _Sign);
+            ManaAchieve.UpdateStatus(AchieveType.Skill, Skill_);
         }
     }
-    public static double Share
+    public static double Sign
     {
-        get { return _Share; }
+        get { return Sign_; }
         set
         {
-            _Share = value;
+            Sign_ = value;
 
-            ManaAchieve.UpdateStatus(AchieveType.Share, _Share);
+            ManaAchieve.UpdateStatus(AchieveType.Sign, Sign_);
         }
     }
-    public static double ElfLevel
+    public static double Share
     {
-        get { return _ElfLevel; }
+        get { return Share_; }
         set
         {
-            _ElfLevel = value;
+            Share_ = value;
 
-            ManaAchieve.UpdateStatus(AchieveType.ElfLevel, _ElfLevel);
+            ManaAchieve.UpdateStatus(AchieveType.Share, Share_);
         }
     }
     public static double TotalCoin
     {
-        get { return _TotalCoin; }
+        get { return TotalCoin_; }
         set
         {
-            _TotalCoin = value;
+            TotalCoin_ = value;
 
-            ManaAchieve.UpdateStatus(AchieveType.TotalCoin, _TotalCoin);
+            ManaAchieve.UpdateStatus(AchieveType.TotalCoin, TotalCoin_);
         }
     }
     public static double MiniGame
     {
-        get { return _MiniGame; }
+        get { return MiniGame_; }
         set
         {
-            _MiniGame = value;
+            MiniGame_ = value;
 
-            ManaAchieve.UpdateStatus(AchieveType.MiniGame, _MiniGame);
+            ManaAchieve.UpdateStatus(AchieveType.MiniGame, MiniGame_);
         }
     }
     public static double FlowerCoin
     {
-        get { return _FlowerCoin; }
+        get { return FlowerCoin_; }
         set
         {
-            _FlowerCoin = value;
+            FlowerCoin_ = value;
             
-            ManaAchieve.UpdateStatus(AchieveType.FlowerCoin, _FlowerCoin);
+            ManaAchieve.UpdateStatus(AchieveType.FlowerCoin, FlowerCoin_);
         }
     }
 
-    private static double _AD;
-    private static double _Skill;
-    private static double _Sign;
-    private static double _Share;
-    private static double _ElfLevel;
-    private static double _TotalCoin;
-    private static double _MiniGame;
-    private static double _FlowerCoin;
+    private static double Elf_;
+    private static double AD_;
+    private static double Skill_;
+    private static double Sign_;
+    private static double Share_;
+    private static double TotalCoin_;
+    private static double MiniGame_;
+    private static double FlowerCoin_;
 
     #endregion
 
     public static int Slot
     {
-        get { return _Slot; }
+        get { return Slot_; }
         set
         {
-            _Slot = value;
+            Slot_ = value;
 
-            Garden.ValidPage = Mathf.Clamp(Mathf.CeilToInt(_Slot/7f), 1, 2);
+            Garden.ValidPage = Mathf.Clamp(Mathf.CeilToInt(Slot_/7f), 1, 2);
         }
     }
     public static int Level
     {
-        get { return _Level; }
+        get { return Level_; }
         set
         {
-            _Level = value;
+            Level_ = value;
+
+            ManaDebug.Log(string.Format("已升级 花园等级 : <color=red>{0}</color>", Level_));
 
-            ManaDebug.Log(string.Format("已升级 花园等级 : <color=red>{0}</color>", _Level));
+            ManaAchieve.UpdateStatus(AchieveType.Garden, Level_);
 
             if (TabBtn == false)
             {
-                if (_Level >= 20)
+                if (Level_ >= 20)
                 {
                     TabBtn = true;
 
@@ -151,11 +153,9 @@ public class ManaData : Regist
                 SkillList[i].UpdateStatus();
             }
 
-            ManaAchieve.UpdateStatus(AchieveType.Garden, _Level);
-
             if (ManaTutorial.TutorialB && !TutorialB)
             {
-                if (_Level >= 200)
+                if (Level_ >= 200)
                 {
                     TutorialB = true;
 
@@ -166,12 +166,12 @@ public class ManaData : Regist
     }
     public static bool Pause
     {
-        get { return _Pause; }
+        get { return Pause_; }
         set
         {
-            _Pause = value;
+            Pause_ = value;
 
-            if (_Pause)
+            if (Pause_)
             {
                 Time.timeScale = 0;
 
@@ -187,101 +187,72 @@ public class ManaData : Regist
     }
     public static float Person
     {
-        get { return _Person; }
+        get { return Person_; }
         set
         {
-            _Person = value;
+            Person_ = value;
 
-            ManaReso.SetText("F_PersonLab", _Person.ToString("0.0"));
+            ManaReso.SetText("F_PersonLab", Person_.ToString("0.0"));
 
-            ManaAchieve.UpdateStatus(AchieveType.Person, _Person);
+            ManaAchieve.UpdateStatus(AchieveType.Person, Person_);
         }
     }
     public static float CoinPerson
     {
-        get { return _CoinPerson; }
+        get { return CoinPerson_; }
         set
         {
-            _CoinPerson = value;
+            CoinPerson_ = value;
 
-            ManaReso.SetText("F_CoinPersonLab", _CoinPerson.ToString("0.0"));
+            ManaReso.SetText("F_CoinPersonLab", CoinPerson_.ToString("0.0"));
         }
     }
     public static double Coin
     {
-        get { return _Coin; }
+        get { return Coin_; }
         set
         {
-            if (value - _Coin > 0)
+            if (value - Coin_ > 0)
             {
-                TotalCoin += value - _Coin;
+                TotalCoin += value - Coin_;
             }
 
-            _Coin = value;
+            Coin_ = value;
 
-            ManaReso.SetText("F_CoinLab", _Coin.ToString("0"));
-            ManaReso.SetText("C_CoinLab", _Coin.ToString("0"));
+            ManaReso.SetText("F_CoinLab", Coin_.ToString("0"));
+            ManaReso.SetText("C_CoinLab", Coin_.ToString("0"));
             
-            ManaAchieve.UpdateStatus(AchieveType.CurrentCoin, _Coin);
+            ManaAchieve.UpdateStatus(AchieveType.CurrentCoin, Coin_);
         }
     }
     public static double Diamond
     {
-        get { return _Diamond; }
+        get { return Diamond_; }
         set
         {
-            _Diamond = value;
-
-            ManaReso.SetText("F_DiamondLab", _Diamond.ToString("0"));
-        }
-    }
-
-    private static int _Slot;
-    private static int _Level;
-    private static bool _Pause;
-    private static float _Person;
-    private static float _CoinPerson;
-    private static double _Coin;
-    private static double _Diamond;
-
-    public static List<SkillRoot> SkillList
-    {
-        get
-        {
-            if (_SkillList == null)
-            {
-                _SkillList = new List<SkillRoot>();
-            }
-
-            return _SkillList;
-        }
-        set { _SkillList = value; }
-    }
-    public static Dictionary<string, SkillRoot> SkillDic
-    {
-        get
-        {
-            if (_SkillDic == null)
-            {
-                _SkillDic = new Dictionary<string, SkillRoot>();
-            }
+            Diamond_ = value;
 
-            return _SkillDic;
+            ManaReso.SetText("F_DiamondLab", Diamond_.ToString("0"));
         }
-        set { _SkillDic = value; }
     }
 
-    public static List<SkillRoot> _SkillList;
-    public static Dictionary<string, SkillRoot> _SkillDic;
+    private static int Slot_;
+    private static int Level_;
+    private static bool Pause_;
+    private static float Person_;
+    private static float CoinPerson_;
+    private static double Coin_;
+    private static double Diamond_;
 
-    public static int SignIndex;
-    public static int MainDepth;
     public static bool Free;
     public static bool Mini;
     public static bool TabBtn;
     public static bool SkillBar;
     public static bool Connect;
     public static bool TutorialB;
+
+    public static int SignIndex;
+    public static int MainDepth;
     public static float OpTime = 90;
     public static float OpTimer;
     public static float MiniTimer;
@@ -297,6 +268,8 @@ public class ManaData : Regist
 
     public static List<Skill> CoolList = new List<Skill>();
     public static List<SkillRoot> UseList = new List<SkillRoot>();
+    public static List<SkillRoot> SkillList = new List<SkillRoot>();
+    public static Dictionary<string, SkillRoot> SkillDic = new Dictionary<string, SkillRoot>();
 
     #endregion
 
@@ -319,6 +292,14 @@ public class ManaData : Regist
 
     private void RegularUpdate()
     {
+        MiniThread();
+
+        MainThread();
+    }
+
+
+    private void MiniThread()
+    {
         if (Pause)
         {
             return;
@@ -335,6 +316,16 @@ public class ManaData : Regist
                 ManaReso.Get("C_MiniGame").TweenForCG();
             }
         }
+    }
+
+    private void MainThread()
+    {
+        if (Pause)
+        {
+            return;
+        }
+
+        MiniThread();
 
         if (Auxiliary.AnyKeyUp)
         {
@@ -520,7 +511,7 @@ public class ManaData : Regist
     {
         #region 读技能存档
 
-        float elapse = (float) DateTime.Now.Subtract(DateTime.Parse(Data.PlayerNode.SelectSingleNode("QuitTime").Attributes[0].Value)).TotalSeconds;
+        float elapse = (float) DateTime.Now.Subtract(DateTime.Parse(Data.GetPlayerString("QuitTime"))).TotalSeconds;
 
         if (elapse > 43200)
         {
@@ -529,19 +520,19 @@ public class ManaData : Regist
         
         ManaDebug.Log(string.Format("离线时间<color=red>{0}</color>", elapse));
 
-        List<SkillRoot> ffCoolList = new List<SkillRoot>();
-        List<List<SkillRoot>> ffUseList = new List<List<SkillRoot>>();
+        List<Skill> coolList = new List<Skill>();
+        List<List<Skill>> useList = new List<List<Skill>>();
 
         if (elapse > CircleTimer)
         {
-            int ffCircle = 1 + Mathf.FloorToInt((elapse - CircleTimer)/CircleTime);
+            int circle = 1 + Mathf.FloorToInt((elapse - CircleTimer)/CircleTime);
             
-            ManaDebug.Log(string.Format("离线周期<color=red>{0}</color>", ffCircle));
-
-            for (int i = 0; i < ffCircle; i++)
+            for (int i = 0; i < circle; i++)
             {
-                ffUseList.Add(new List<SkillRoot>());
+                useList.Add(new List<Skill>());
             }
+
+            ManaDebug.Log(string.Format("离线周期<color=red>{0}</color>", circle));
         }
         else
         {
@@ -556,7 +547,7 @@ public class ManaData : Regist
 
             skillRoot.RegistReference();
 
-            skillRoot.RegistValue(elapse, ffUseList, attributeList[i]);
+            skillRoot.RegistValue(elapse, useList, attributeList[i]);
         }
 
         #endregion
@@ -579,53 +570,40 @@ public class ManaData : Regist
 
         #region 计算离线收入
 
-        float collectCoin = 0;
+        float coin = 0;
 
-        if (ffUseList.Count > 0)
+        if (useList.Count > 0)
         {
-            for (int i = 0; i < ffUseList.Count; i++)
+            for (int i = 0; i < useList.Count; i++)
             {
-                for (int j = 0; j < ffCoolList.Count; j++)
+                for (int j = 0; j < coolList.Count; j++)
                 {
-                    if (ffCoolList[j] is Skill)
-                    {
-                        if (i == 0)
-                        {
-                            ((Skill)ffCoolList[j]).CoolTimer -= CircleTimer;
-                        }
-                        else
-                        {
-                            ((Skill)ffCoolList[j]).CoolTimer -= CircleTime;
-                        }
-                    }
+                    coolList[j].CoolTimer -= CircleTime;
                 }
 
-                for (int j = 0; j < ffUseList[i].Count; j++)
+                for (int j = 0; j < useList[i].Count; j++)
                 {
-                    ffUseList[i][j].Annul();
+                    useList[i][j].Annul();
 
-                    ffCoolList.Add(ffUseList[i][j]);
+                    coolList.Add(useList[i][j]);
                 }
+            }
 
-                NewPerson = Person * (1 + SkillPersonBuff) + SkillPerson;
-                NewCoinPerson = CoinPerson + SkillCoinPerson;
+            NewPerson = Person * (1 + SkillPersonBuff) + SkillPerson;
+            NewCoinPerson = CoinPerson + SkillCoinPerson;
 
-                collectCoin += (NewPerson * NewCoinPerson * CircleTime) * (1 + SkillPlus);
-            }
+            coin += (NewPerson * NewCoinPerson * CircleTime) * (1 + SkillPlus);
 
             CircleTimer = (elapse - CircleTimer)%CircleTime;
 
-            for (int j = 0; j < ffCoolList.Count; j++)
+            for (int j = 0; j < coolList.Count; j++)
             {
-                if (ffCoolList[j] is Skill)
-                {
-                    ((Skill) ffCoolList[j]).CoolTimer -= CircleTime - CircleTimer;
-                }
+                coolList[j].CoolTimer -= CircleTime - CircleTimer;
             }
 
-            Coin += collectCoin;
+            Coin += coin;
 
-            ManaReso.SetText("Ba_IconLab", collectCoin.ToString("0"));
+            ManaReso.SetText("Ba_IconLab", coin.ToString("0"));
         }
         else
         {

Assets/Script/Manage/ManaGarden.cs

@@ -97,8 +97,8 @@ public class ManaGarden : Regist
 
     public static bool Award = true;
     public static bool AwardLock;
-    public static float AnimTimer = Random.Range(0f, 30f);
-    public static float AwardTimer = Random.Range(20f, 60f);
+    public static float AnimTimer;
+    public static float AwardTimer;
 
     public static Slot SeleSlot;
     public static FlowerInfo SeleFlowerInfo;
@@ -223,6 +223,9 @@ public class ManaGarden : Regist
 
     public override void RegistValueA()
     {
+        AnimTimer = Random.Range(0f, 30f);
+        AwardTimer = Random.Range(20f, 60f);
+
         SlotList = new List<Slot>()
         {
             ManaReso.Get("SlotA1").AddScript<Slot>(),

Assets/Script/Manage/ManaMiniGame.cs

@@ -1242,7 +1242,7 @@ public class ManaMiniGame : Regist
 
             if (flowerInfo.Unlock)
             {
-                IdleList.Add(ManaReso.GetFlower(ManaGarden.FlowerInfoDic[0], ManaReso.Get("SlotMini" + count)));
+                IdleList.Add(ManaReso.GetFlower(flowerInfo, ManaReso.Get("SlotMini" + count)));
 
                 count++;
 

Assets/Script/Object/Flower.cs

@@ -236,6 +236,7 @@ public class Flower : ObjRoot, IPointerClickHandler
     public Animator ParticleAC;
     public Transform GoldBk;
     public Transform GoldIcon;
+    public List<Transform> ElfList = new List<Transform>();
 
     private Dictionary<string, Transform> ChildDic = new Dictionary<string, Transform>();
 
@@ -421,7 +422,10 @@ public class Flower : ObjRoot, IPointerClickHandler
 
     public void PlayAnim(ObjType obj)
     {
-        Animator animator = ManaReso.GetAnim(FlowerIcon.bounds, obj, FlowerIcon.transform.position, transform).GetComponentInChildren<Animator>();
+        Transform elf = ManaReso.GetAnim(FlowerIcon.bounds, obj, FlowerIcon.transform.position, transform);
+        Animator animator = elf.GetComponentInChildren<Animator>();
+
+        ElfList.Add(elf);
 
         animator.SetTrigger("Play");
     }

Assets/Script/Object/Skill/Ability.cs

@@ -173,7 +173,7 @@ public class Ability : SkillRoot
         }
     }
 
-    public override void RegistValue(float elapse, List<List<SkillRoot>> ffList, XmlAttributeCollection attribute)
+    public override void RegistValue(float elapse, List<List<Skill>> ffList, XmlAttributeCollection attribute)
     {
         Level = int.Parse(attribute[3].Value);
 
@@ -242,7 +242,7 @@ public class Ability : SkillRoot
     {
         if (ManaData.Pay(UnlockAmt, UnlockCur))
         {
-            ManaData.ElfLevel++;
+            ManaData.Elf++;
 
             ManaDebug.Log(string.Format("技能<color=red>{0}</color>已解锁", Name));
 
@@ -396,7 +396,7 @@ public class Ability : SkillRoot
 
         if (ManaData.Pay(UnlockAheadAmt, UnlockAheadCur))
         {
-            ManaData.ElfLevel++;
+            ManaData.Elf++;
 
             ManaDebug.Log(string.Format("技能<color=red>{0}</color>已解锁", Name));
 
@@ -562,7 +562,7 @@ public class Ability : SkillRoot
             Level++;
         }
 
-        ManaData.ElfLevel++;
+        ManaData.Elf++;
 
         Annul();
 
@@ -657,7 +657,7 @@ public class Ability : SkillRoot
 
             Level++;
 
-            ManaData.ElfLevel++;
+            ManaData.Elf++;
 
             Annul();
 

Assets/Script/Object/Skill/BigSkill.cs

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

Assets/Script/Object/Skill/Pack.cs

@@ -94,7 +94,7 @@ public class Pack : SkillRoot
     }
 
 
-    public override void RegistValue(float elapse, List<List<SkillRoot>> ffList, XmlAttributeCollection attribute)
+    public override void RegistValue(float elapse, List<List<Skill>> ffList, XmlAttributeCollection attribute)
     {
         Level = int.Parse(attribute[3].Value);
 

Assets/Script/Object/Skill/Skill.cs

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

Assets/Script/Object/Skill/SkillRoot.cs

@@ -53,7 +53,7 @@ public abstract class SkillRoot
     {
         get
         {
-            return Language.GetStr("SkillDescription", _Name);
+            return Language.GetStr("SkillDesc", _Name);
         }
         set { _Desc = value; }
     }
@@ -85,7 +85,7 @@ public abstract class SkillRoot
     public SkillType SkillType;
     public Transform SkillItem;
 
-    public abstract void RegistValue(float elapse, List<List<SkillRoot>> ffList, XmlAttributeCollection attribute);
+    public abstract void RegistValue(float elapse, List<List<Skill>> ffList, XmlAttributeCollection attribute);
     public abstract void UpdateStatus();
 
     #endregion

Assets/Script/Tool/Anim/Move2D.cs

@@ -94,8 +94,6 @@ public class Move2D : Move
                 Target.position = Destination;
             }
 
-            ManaAnim.MoveList.Remove(this);
-
             if (OnForwardFinish != null)
             {
                 OnForwardFinish.Invoke();

Assets/Script/Tool/Anim/Move3D.cs

@@ -94,8 +94,6 @@ public class Move3D : Move
                 Target.position = Destination;
             }
 
-            ManaAnim.MoveList.Remove(this);
-
             if (OnForwardFinish != null)
             {
                 OnForwardFinish.Invoke();

Assets/Script/Tool/Anim/Shake.cs

@@ -61,8 +61,6 @@ public class Shake : Move
 
             InDestination = true;
 
-            ManaAnim.MoveList.Remove(this);
-
             if (OnForwardFinish != null)
             {
                 OnForwardFinish.Invoke();

Assets/Script/Tool/Anim/TweenAudio.cs

@@ -134,8 +134,6 @@ public class TweenAudio : Tween
                 OnForwardFinish.Invoke();
             }
 
-            ManaAnim.TweenForList.Remove(this);
-
             return true;
         }
         else
@@ -164,8 +162,6 @@ public class TweenAudio : Tween
                 OnBackwardFinish.Invoke();
             }
 
-            ManaAnim.TweenBacList.Remove(this);
-
             return true;
         }
         else

Assets/Script/Tool/Anim/TweenCG.cs

@@ -133,8 +133,6 @@ public class TweenCG : Tween
                 OnForwardFinish.Invoke();
             }
 
-            ManaAnim.TweenForList.Remove(this);
-
             return true;
         }
         else
@@ -163,8 +161,6 @@ public class TweenCG : Tween
                 OnBackwardFinish.Invoke();
             }
 
-            ManaAnim.TweenBacList.Remove(this);
-
             return true;
         }
         else

Assets/Script/Tool/Anim/TweenGra.cs

@@ -134,8 +134,6 @@ public class TweenGra : Tween
                 OnForwardFinish.Invoke();
             }
 
-            ManaAnim.TweenForList.Remove(this);
-
             return true;
         }
         else
@@ -164,8 +162,6 @@ public class TweenGra : Tween
                 OnBackwardFinish.Invoke();
             }
 
-            ManaAnim.TweenBacList.Remove(this);
-
             return true;
         }
         else

Assets/Script/Tool/Anim/TweenNumber.cs

@@ -137,8 +137,6 @@ public class TweenNumber : Tween
                 OnForwardFinish.Invoke();
             }
 
-            ManaAnim.TweenForList.Remove(this);
-
             return true;
         }
         else
@@ -167,8 +165,6 @@ public class TweenNumber : Tween
                 OnBackwardFinish.Invoke();
             }
 
-            ManaAnim.TweenBacList.Remove(this);
-
             return true;
         }
         else

Assets/Script/Tool/Anim/TweenRect.cs

@@ -133,8 +133,6 @@ public class TweenRect : Tween
                 OnForwardFinish.Invoke();
             }
 
-            ManaAnim.TweenForList.Remove(this);
-
             return true;
         }
         else
@@ -163,8 +161,6 @@ public class TweenRect : Tween
                 OnBackwardFinish.Invoke();
             }
 
-            ManaAnim.TweenBacList.Remove(this);
-
             return true;
         }
         else

Assets/Script/Tool/Anim/TweenScale.cs

@@ -135,8 +135,6 @@ public class TweenScale : Tween
                 OnForwardFinish.Invoke();
             }
 
-            ManaAnim.TweenForList.Remove(this);
-
             return true;
         }
         else
@@ -165,8 +163,6 @@ public class TweenScale : Tween
                 OnBackwardFinish.Invoke();
             }
 
-            ManaAnim.TweenBacList.Remove(this);
-
             return true;
         }
         else

Assets/Script/Tool/Anim/TweenSr.cs

@@ -166,8 +166,6 @@ public class TweenSr : Tween
                 OnForwardFinish.Invoke();
             }
 
-            ManaAnim.TweenForList.Remove(this);
-
             return true;
         }
         else
@@ -204,8 +202,6 @@ public class TweenSr : Tween
                 OnBackwardFinish.Invoke();
             }
 
-            ManaAnim.TweenBacList.Remove(this);
-
             return true;
         }
         else

Assets/Script/Tool/Anim/TweenText.cs

@@ -135,8 +135,6 @@ public class TweenText : Tween
                 OnForwardFinish.Invoke();
             }
 
-            ManaAnim.TweenForList.Remove(this);
-
             return true;
         }
         else
@@ -165,8 +163,6 @@ public class TweenText : Tween
                 OnBackwardFinish.Invoke();
             }
 
-            ManaAnim.TweenBacList.Remove(this);
-
             return true;
         }
         else

Assets/Script/Tool/Anim/TweenVec.cs

@@ -194,8 +194,6 @@ public class TweenVec : Tween
                 OnForwardFinish.Invoke();
             }
 
-            ManaAnim.TweenForList.Remove(this);
-
             return true;
         }
         else
@@ -231,8 +229,6 @@ public class TweenVec : Tween
                 OnBackwardFinish.Invoke();
             }
 
-            ManaAnim.TweenBacList.Remove(this);
-
             return true;
         }
         else

Assets/Script/Tool/Anim/Zoom2D.cs

@@ -33,8 +33,6 @@ public class Zoom2D : Move
 
             Camera.orthographicSize = Destination;
 
-            ManaAnim.MoveList.Remove(this);
-
             return true;
         }
         else

Assets/Script/Tool/Data.cs

@@ -294,10 +294,8 @@ public class Data
         PlayerNode.SelectSingleNode("SignIndex").Attributes[0].Value = ManaData.SignIndex.ToString();
         PlayerNode.SelectSingleNode("Coin").Attributes[0].Value = ManaData.Coin.ToString("0");
         PlayerNode.SelectSingleNode("Level").Attributes[0].Value = ManaData.Level.ToString();
-        PlayerNode.SelectSingleNode("Person").Attributes[0].Value = ManaData.Person.ToString();
         PlayerNode.SelectSingleNode("Diamond").Attributes[0].Value = ManaData.Diamond.ToString();
         PlayerNode.SelectSingleNode("QuitTime").Attributes[0].Value = DateTime.Now.ToString();
-        PlayerNode.SelectSingleNode("CoinPerson").Attributes[0].Value = ManaData.CoinPerson.ToString();
         PlayerNode.SelectSingleNode("MiniTimer").Attributes[0].Value = ManaData.MiniTimer.ToString();
         PlayerNode.SelectSingleNode("CircleTimer").Attributes[0].Value = ManaData.CircleTimer.ToString();
         PlayerNode.SelectSingleNode("MiniGameIndex").Attributes[0].Value = ManaMiniGame.MiniGameIndex.ToString();
@@ -483,10 +481,8 @@ public class Data
         PlayerNode.SelectSingleNode("SignIndex").Attributes[0].Value = "0";
         PlayerNode.SelectSingleNode("Coin").Attributes[0].Value = "0";
         PlayerNode.SelectSingleNode("Level").Attributes[0].Value = "0";
-        PlayerNode.SelectSingleNode("Person").Attributes[0].Value = "0";
         PlayerNode.SelectSingleNode("Diamond").Attributes[0].Value = "0";
         PlayerNode.SelectSingleNode("QuitTime").Attributes[0].Value = DateTime.Now.ToString();
-        PlayerNode.SelectSingleNode("CoinPerson").Attributes[0].Value = "0";
         PlayerNode.SelectSingleNode("MiniTimer").Attributes[0].Value = "0";
         PlayerNode.SelectSingleNode("CircleTimer").Attributes[0].Value = "10";
         PlayerNode.SelectSingleNode("MiniGameIndex").Attributes[0].Value = "0";

Assets/Script/Tool/Extension.cs

@@ -696,6 +696,14 @@ public static class Extension
         }
     }
 
+    public static void SafeInvoke<T>(this UnityAction<T> action, T t)
+    {
+        if (action != null)
+        {
+            action.Invoke(t);
+        }
+    }
+
     #endregion
 
     #region AddComponent

MyLovelyGarden.csproj

@@ -97,6 +97,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Assets\Resource\Plugins\ConsolePro\ConsoleProRemoteServer.cs" />
+    <Compile Include="Assets\Script\Interface\AnimationReceiver.cs" />
     <Compile Include="Assets\Script\Interface\Regist.cs" />
     <Compile Include="Assets\Script\Manage\Initializer.cs" />
     <Compile Include="Assets\Script\Manage\Main.cs" />
@@ -111,11 +112,9 @@
     <Compile Include="Assets\Script\Manage\ManaPlayer.cs" />
     <Compile Include="Assets\Script\Manage\ManaReso.cs" />
     <Compile Include="Assets\Script\Manage\ManaSign.cs" />
-    <Compile Include="Assets\Script\Manage\ManaSkill.cs" />
     <Compile Include="Assets\Script\Manage\ManaText.cs" />
     <Compile Include="Assets\Script\Manage\ManaTutorial.cs" />
     <Compile Include="Assets\Script\Manage\ManaUI.cs" />
-    <Compile Include="Assets\Script\Object\AnimationReceiver.cs" />
     <Compile Include="Assets\Script\Object\Drop.cs" />
     <Compile Include="Assets\Script\Object\DropDiamond.cs" />
     <Compile Include="Assets\Script\Object\DropGold.cs" />

MyLovelyGarden.sln

@@ -1,9 +1,9 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2008
-
-Project("{8A8BB0A8-D809-F2DF-89D6-F26151FFF558}") = "MyLovelyGarden", "Assembly-CSharp.csproj", "{21BB93BC-2239-D8F5-1219-201F8DCBAF49}"
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2015
+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.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
@@ -11,19 +11,16 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{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
-		{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
+		{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
+		{B575449E-FD9A-1672-368B-EC1E1252F6E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B575449E-FD9A-1672-368B-EC1E1252F6E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B575449E-FD9A-1672-368B-EC1E1252F6E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B575449E-FD9A-1672-368B-EC1E1252F6E4}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(MonoDevelopProperties) = preSolution
-		StartupItem = Assembly-CSharp.csproj
-	EndGlobalSection
 EndGlobal

ToList.txt

@@ -1,3 +1,5 @@
+离线收入 ManaData
+
 切换后台
 
 分段加载场景