Temp-小游戏C

Assets/Resource/XML/PlayerConfig.xml

@@ -1,15 +1,17 @@
 <PlayerConfig>
-  <Version value="678" />
+  <Version value="679" />
 
   <ID value="Default" />
   <TutorialA value="1" />
   <TutorialB value="1" />
   <TutorialC value="1" />
   <TutorialD value="1" />
+  <TutorialE value="1" />
   <TutorialIndexA value="1" />
   <TutorialIndexB value="1" />
   <TutorialIndexC value="1" />
   <TutorialIndexD value="1" />
+  <TutorialIndexE value="1" />
 
   <QuitFlag value="0" />
   <QuitTime value="4/23/2017 09:30:00 AM" />

Assets/Script/Extension/ExtensionDictionary.cs

@@ -6,10 +6,34 @@ using System.Collections.Generic;
 
 public static class ExtensionDictionary
 {
-
-    public static T2 Random<T1, T2>(this Dictionary<T1, T2> dic)
+    public static T2 Random<T1, T2>(this Dictionary<T1, T2> dic, bool remove = false, ExtList.RandomDelegate<T2> randomDelegate = null)
     {
-        return dic.Values.ToList().Random();
+        while (true)
+        {
+            int index = UnityEngine.Random.Range(0, dic.Count);
+
+            T1 resultKey = dic.Keys.ToList()[index];
+            T2 resultValue = dic.Values.ToList()[index];
+            
+            if (randomDelegate != null)
+            {
+                if (!randomDelegate(resultValue))
+                {
+                    continue;
+                }
+            }
+
+            if (remove)
+            {
+                dic.Remove(resultKey);
+
+                return resultValue;
+            }
+            else
+            {
+                return resultValue;
+            }
+        }
     }
 
     public static bool UniqueAdd<T1, T2>(this Dictionary<T1, T2> dic, T1 t1, T2 t2)

Assets/Script/Manage/Initializer.cs

@@ -81,10 +81,12 @@ public class Initializer : MonoBehaviour
         ManaTutorial.TutorialB_ = ManaData.GetPlayerBool("TutorialB");
         ManaTutorial.TutorialC_ = ManaData.GetPlayerBool("TutorialC");
         ManaTutorial.TutorialD_ = ManaData.GetPlayerBool("TutorialD");
+        ManaTutorial.TutorialE_ = ManaData.GetPlayerBool("TutorialE");
         ManaTutorial.TutorialIndexA = ManaData.GetPlayerInt("TutorialIndexA");
         ManaTutorial.TutorialIndexB = ManaData.GetPlayerInt("TutorialIndexB");
         ManaTutorial.TutorialIndexC = ManaData.GetPlayerInt("TutorialIndexC");
         ManaTutorial.TutorialIndexD = ManaData.GetPlayerInt("TutorialIndexD");
+        ManaTutorial.TutorialIndexE = ManaData.GetPlayerInt("TutorialIndexE");
 
         Bundle.LoadAtlas2Sprite();
 

Assets/Script/Manage/ManaData.cs

@@ -466,11 +466,13 @@ public class ManaData : Regist
         PlayerNode.SelectSingleNode("TutorialB").Attributes[0].Value = ManaTutorial.TutorialB_.ToInt().ToString();
         PlayerNode.SelectSingleNode("TutorialC").Attributes[0].Value = ManaTutorial.TutorialC_.ToInt().ToString();
         PlayerNode.SelectSingleNode("TutorialD").Attributes[0].Value = ManaTutorial.TutorialD_.ToInt().ToString();
+        PlayerNode.SelectSingleNode("TutorialE").Attributes[0].Value = ManaTutorial.TutorialE_.ToInt().ToString();
 
         PlayerNode.SelectSingleNode("TutorialIndexA").Attributes[0].Value = ManaTutorial.TutorialIndexA.ToString();
         PlayerNode.SelectSingleNode("TutorialIndexB").Attributes[0].Value = ManaTutorial.TutorialIndexB.ToString();
         PlayerNode.SelectSingleNode("TutorialIndexC").Attributes[0].Value = ManaTutorial.TutorialIndexC.ToString();
         PlayerNode.SelectSingleNode("TutorialIndexD").Attributes[0].Value = ManaTutorial.TutorialIndexD.ToString();
+        PlayerNode.SelectSingleNode("TutorialIndexE").Attributes[0].Value = ManaTutorial.TutorialIndexE.ToString();
     }
 
     public static void SaveFlowerList()
@@ -899,17 +901,17 @@ public class ManaData : Regist
 
     public static XmlDocument MergeXML(int nativeVersion, XmlDocument nativeDoc, XmlDocument defaultDoc)
     {
-        if (nativeVersion < 678)
+        if (nativeVersion < 679)
         {
             Debug.LogWarning("UpdateArchive");
 
-            To678(nativeDoc, defaultDoc);
+            To679(nativeDoc, defaultDoc);
         }
 
         return nativeDoc;
     }
 
-    public static XmlDocument To678(XmlDocument nativeDoc, XmlDocument defaultDoc)
+    public static XmlDocument To679(XmlDocument nativeDoc, XmlDocument defaultDoc)
     {
         string playerType = "";
         XmlNode xmlNode1 = nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("DressList");
@@ -917,6 +919,8 @@ public class ManaData : Regist
         XmlNode xmlNode3 = nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("TutorialD");
         XmlNode xmlNode4 = nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("TutorialIndexD");
         XmlNode xmlNode5 = nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Player");
+        XmlNode xmlNode6 = nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("TutorialE");
+        XmlNode xmlNode7 = nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("TutorialIndexE");
 
         if (xmlNode1 != null)
         {
@@ -949,14 +953,26 @@ public class ManaData : Regist
             playerType = "PlayerBlond";
         }
 
+        if (xmlNode6 != null)
+        {
+            nativeDoc.SelectSingleNode("PlayerConfig").RemoveChild(xmlNode6);
+        }
+
+        if (xmlNode7 != null)
+        {
+            nativeDoc.SelectSingleNode("PlayerConfig").RemoveChild(xmlNode7);
+        }
+
 
-        nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Version").Attributes[0].Value = 678.ToString();
+        nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Version").Attributes[0].Value = 679.ToString();
 
         xmlNode1 = defaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("DressList");
         xmlNode2 = defaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("DressData");
         xmlNode3 = defaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("TutorialD");
         xmlNode4 = defaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("TutorialIndexD");
         xmlNode5 = defaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Player");
+        xmlNode6 = defaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("TutorialE");
+        xmlNode7 = defaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("TutorialIndexE");
 
         if (playerType == "PlayerBlond")
         {
@@ -997,6 +1013,8 @@ public class ManaData : Regist
         nativeDoc.SelectSingleNode("PlayerConfig").AppendChild(nativeDoc.ImportNode(xmlNode3, true));
         nativeDoc.SelectSingleNode("PlayerConfig").AppendChild(nativeDoc.ImportNode(xmlNode4, true));
         nativeDoc.SelectSingleNode("PlayerConfig").AppendChild(nativeDoc.ImportNode(xmlNode5, true));
+        nativeDoc.SelectSingleNode("PlayerConfig").AppendChild(nativeDoc.ImportNode(xmlNode6, true));
+        nativeDoc.SelectSingleNode("PlayerConfig").AppendChild(nativeDoc.ImportNode(xmlNode7, true));
 
 
         xmlNode1 = nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("SkillList");

Assets/Script/Manage/ManaGarden.cs

@@ -64,6 +64,14 @@ public class ManaGarden : Regist
 
             ManaReso.SetText("F_FlowerLab", string.Format("{0}", MyFlower));
             ManaReso.SetText("G_CollectLab1", string.Format("{0}/{1}", MyFlower, TotalFlower));
+
+            if (MyFlower_ >= 2)
+            {
+                if (ManaTutorial.TutorialE_)
+                {
+                    ManaTutorial.TutorialE = true;
+                }
+            }
         }
     }
     public static int MyFlowerSpec

Assets/Script/Manage/ManaMiniGame.cs

@@ -680,21 +680,26 @@ public class ManaMiniGame : Regist
     public static Transform D_Begin;
     public static Transform D_Status1;
     public static Transform D_Status2;
+    public static Transform D_Status3;
     public static Transform D_Operate1;
     public static Transform D_Operate2;
+    public static Transform D_Operate3;
 
     public static List<int> IndexList = new List<int>();
     public static List<Drop> DropList = new List<Drop>();
     public static List<Flower> OpList = new List<Flower>();
     public static List<Flower> IdleList = new List<Flower>();
     public static List<Flower> FadeList = new List<Flower>();
+    public static List<Flower> FlowerListC = new List<Flower>();
     public static Dictionary<int, Flower> FlowerDic = new Dictionary<int, Flower>();
 
+    public static int FlowerID;
     public static int MiniGameIndex;
     public static string ScoreLab;
 
     public static bool GameA;
     public static bool GameB;
+    public static bool GameC;
     public static bool Prepare;
     public static bool FlowerLock;
     public static bool TutorialLock = true;
@@ -870,10 +875,13 @@ public class ManaMiniGame : Regist
         D_Grid = ManaReso.Get("D_Grid");
         D_Begin = ManaReso.Get("D_Begin");
         D_Timer = ManaReso.Get("D_Timer");
+
         D_Status1 = ManaReso.Get("D_Status1");
         D_Status2 = ManaReso.Get("D_Status2");
+        D_Status3 = ManaReso.Get("D_Status3");
         D_Operate1 = ManaReso.Get("D_Operate1");
         D_Operate2 = ManaReso.Get("D_Operate2");
+        D_Operate3 = ManaReso.Get("D_Operate3");
 
         TimerLab = ManaReso.Get<Text>("D_TimerLab");
         PrepareLab = ManaReso.Get<Text>("D_PrepareLab");
@@ -929,9 +937,9 @@ public class ManaMiniGame : Regist
                     EventType.BackwardFinish,
                     () =>
                     {
-                        RoundEnd();
-                        RoundReset();
-                        RoundBegin();
+                        RoundEndB();
+                        RoundResetB();
+                        RoundBeginB();
                     }
                 );
             }
@@ -1068,7 +1076,7 @@ public class ManaMiniGame : Regist
 
                 if (FadeList.Count == 6)
                 {
-                    RoundBegin();
+                    RoundBeginB();
                 }
 
                 break;
@@ -1080,32 +1088,72 @@ public class ManaMiniGame : Regist
     {
         GameA = false;
         GameB = false;
+        GameC = false;
 
         D_Operate1.SetActive(false);
         D_Operate2.SetActive(false);
+        D_Operate3.SetActive(false);
+
+        bool gameAvailibleB = ManaCenter.Level >= 18;
+        bool gameAvailibleC = ManaGarden.MyFlower >= 2;
 
-        if (ManaCenter.Level >= 18)
+        float thresholdA;
+        float thresholdB;
+        float thresholdC;
+
+        if (gameAvailibleB && gameAvailibleC)
         {
-            if (ManaTutorial.TutorialB)
-            {
-                GameB = true;
-            }
-            else
-            {
-                if (Random.Range(0f, 1f) <= 0.5f)
-                {
-                    GameB = true;
-                }
-                else
-                {
-                    GameA = true;
-                }
-            }
+            thresholdA = 0.33f;
+            thresholdB = 0.66f;
+            thresholdC = 1f;
+        }
+        else if (gameAvailibleB)
+        {
+            thresholdA = 0.5f;
+            thresholdB = 1;
+            thresholdC = 0;
+        }
+        else if (gameAvailibleC)
+        {
+            thresholdA = 0.5f;
+            thresholdB = 0;
+            thresholdC = 1;
         }
         else
         {
+            thresholdA = 1;
+            thresholdB = 0;
+            thresholdC = 0;
+        }
+
+        float posibility = Random.Range(0f, 1f);
+
+        if (posibility <= thresholdA)
+        {
             GameA = true;
         }
+        else if (posibility <= thresholdB)
+        {
+            GameB = true;
+        }
+        else if (posibility <= thresholdC)
+        {
+            GameC = true;
+        }
+
+        if (ManaTutorial.TutorialB)
+        {
+            GameA = false;
+            GameB = true;
+            GameC = false;
+        }
+
+        if (ManaTutorial.TutorialE)
+        {
+            GameA = false;
+            GameB = false;
+            GameC = true;
+        }
     }
 
     public static void InitializeAward()
@@ -1232,7 +1280,12 @@ public class ManaMiniGame : Regist
         if (GameB)
         {
             GameEnterB();
-        }        
+        }
+
+        if (GameC)
+        {
+            GameEnterC();
+        }
 
         ScoreLab = Language.GetStr("UI", "D_ScoreLab");
 
@@ -1399,6 +1452,50 @@ public class ManaMiniGame : Regist
         }
     }
 
+    public static void GameEnterC()
+    {
+        D_Operate3.SetActive(true);
+
+        ManaReso.SetActive("D_Begin", true);
+        ManaReso.SetActive("D_DescB", true);
+
+        D_Begin.SetParent(D_Operate3);
+        D_Timer.SetParent(D_Status3);
+        D_Grid.SetParent(D_Status3);
+
+        PrepareLab.SetParent(ManaReso.Get("D_PrepareLayout3"));
+
+
+        FlowerListC = new List<Flower>();
+
+        List<int> slotList = new List<int>() { 1, 2, 3, 4, 5, 6, 7, 8, 9 };
+
+
+        FlowerInfo flowerInfo = ManaGarden.FlowerInfoDic.Random(false, flowerIndo => { return flowerIndo.Unlock; });
+
+        FlowerID = flowerInfo.ID_;
+
+        FlowerListC.Add(ManaReso.GetFlower(flowerInfo, ManaReso.Get("SlotMini" + slotList.Random(true))));
+
+        while (slotList.Count > 0)
+        {
+            flowerInfo = ManaGarden.FlowerInfoDic.Random(false, flowerIndo => { return flowerIndo.Unlock; });
+
+            for (int i = 0; i < Mathf.Min(Random.Range(2, 9), slotList.Count); i++)
+            {
+                FlowerListC.Add(ManaReso.GetFlower(flowerInfo, ManaReso.Get("SlotMini" + slotList.Random(true))));
+            }
+        }
+
+
+        for (int i = 0; i < FlowerListC.Count; i++)
+        {
+            FlowerListC[i].FlowerIcon.CreateTweenSr(1, 0, 0.25f, true, false, Curve.EaseOutQuad, false, true);
+
+            FlowerListC[i].FlowerIcon.GetTweenSr().InDestination = true;
+        }
+    }
+
     public static void GameBegin()
     {
         Game = true;
@@ -1424,7 +1521,12 @@ public class ManaMiniGame : Regist
 
         if (GameB)
         {
-            RoundReset();
+            RoundResetB();
+        }
+
+        if (GameC)
+        {
+            RoundBeginC();
         }
 
         if (Random.Range(5, 9) <= MiniGameIndex)
@@ -1454,10 +1556,10 @@ public class ManaMiniGame : Regist
         ManaReso.Get("D_Begin").SetActive(false);
         ManaReso.Get("D_DescA").SetActive(false);
         ManaReso.Get("D_DescB").SetActive(false);
+        ManaReso.Get("D_DescC").SetActive(false);
 
         if (GameA)
         {
-
             ManaReso.Get("D_Rip1").SetActive(true);
             ManaReso.Get("D_Water1").SetActive(true);
             ManaReso.Get("D_Fertilize1").SetActive(true);
@@ -1486,12 +1588,12 @@ public class ManaMiniGame : Regist
     }
 
 
-    public static void RoundEnd()
+    public static void RoundEndB()
     {
         ManaReso.Get("D_Mask").TweenForGra();
     }
 
-    public static void RoundReset()
+    public static void RoundResetB()
     {
         for (int i = 0; i < FadeList.Count; i++)
         {
@@ -1520,7 +1622,7 @@ public class ManaMiniGame : Regist
         ResetOprerate();
     }
 
-    public static void RoundBegin()
+    public static void RoundBeginB()
     {
         ManaReso.Get("D_Mask").TweenBacGra();
 
@@ -1531,6 +1633,29 @@ public class ManaMiniGame : Regist
     }
 
 
+    public static void RoundEndC()
+    {
+        
+    }
+
+    public static void RoundResetC()
+    {
+
+    }
+
+    public static void RoundBeginC()
+    {
+        ManaReso.Get("D_FlowerBtn7").TweenReForCG();
+        ManaReso.Get("D_FlowerBtn8").TweenReForCG();
+        ManaReso.Get("D_FlowerBtn9").TweenReForCG();
+
+        for (int i = 0; i < FlowerListC.Count; i++)
+        {
+            FlowerListC[i].FlowerIcon.TweenBacSr();
+        }
+    }
+
+
     public static int IndexMap(int slotIndex)
     {
         if (slotIndex == 1)

Assets/Script/Manage/ManaTutorial.cs

@@ -67,14 +67,17 @@ public class ManaTutorial : Regist
     public static bool TutorialB;
     public static bool TutorialC;
     public static bool TutorialD;
+    public static bool TutorialE;
     public static bool TutorialB_;
     public static bool TutorialC_;
     public static bool TutorialD_;
+    public static bool TutorialE_;
 
     public static int TutorialIndexA;
     public static int TutorialIndexB;
     public static int TutorialIndexC;
     public static int TutorialIndexD;
+    public static int TutorialIndexE;
 
     #endregion
 
@@ -989,14 +992,4 @@ public class ManaTutorial : Regist
             }
         );
     }
-}
-
-#region DebugList
-
-//教程有A,B,C三部分
-
-//教程结束后各部分能否正常运行
-//教程的存档
-//中途进入教程的遮罩
-
-#endregion
+}

Assets/Script/Manage/ManaUI.cs

@@ -826,54 +826,7 @@ public class ManaUI : Regist
 
         #region D_FlowerBtn
 
-        //tweenRoot = ManaReso.Get("D_FlowerBtn1").CreateTweenGra(new Color(1, 1, 1), new Color(1, 0.5f, 0.5f), 0.25f, true, true, Curve.EaseOutQuad);
-
-        //var root0 = tweenRoot;
-        //tweenRoot.OnForwardFinish = () =>
-        //{
-        //    root0.StartBackward();
-        //};
-
-        //tweenRoot = ManaReso.Get("D_FlowerBtn2").CreateTweenGra(new Color(1, 1, 1), new Color(1, 0.5f, 0.5f), 0.25f, true, true, Curve.EaseOutQuad);
-
-        //var root1 = tweenRoot;
-        //tweenRoot.OnForwardFinish = () =>
-        //{
-        //    root1.StartBackward();
-        //};
-
-        //tweenRoot = ManaReso.Get("D_FlowerBtn3").CreateTweenGra(new Color(1, 1, 1), new Color(1, 0.5f, 0.5f), 0.25f, true, true, Curve.EaseOutQuad);
-
-        //var root2 = tweenRoot;
-        //tweenRoot.OnForwardFinish = () =>
-        //{
-        //    root2.StartBackward();
-        //};
-
-        //tweenRoot = ManaReso.Get("D_FlowerBtn4").CreateTweenGra(new Color(1, 1, 1), new Color(1, 0.5f, 0.5f), 0.25f, true, true, Curve.EaseOutQuad);
-
-        //var root3 = tweenRoot;
-        //tweenRoot.OnForwardFinish = () =>
-        //{
-        //    root3.StartBackward();
-        //};
-
-        //tweenRoot = ManaReso.Get("D_FlowerBtn5").CreateTweenGra(new Color(1, 1, 1), new Color(1, 0.5f, 0.5f), 0.25f, true, true, Curve.EaseOutQuad);
-
-        //var root4 = tweenRoot;
-        //tweenRoot.OnForwardFinish = () =>
-        //{
-        //    root4.StartBackward();
-        //};
-
-        //tweenRoot = ManaReso.Get("D_FlowerBtn6").CreateTweenGra(new Color(1, 1, 1), new Color(1, 0.5f, 0.5f), 0.25f, true, true, Curve.EaseOutQuad);
-
-        //var root6 = tweenRoot;
-        //tweenRoot.OnForwardFinish = () =>
-        //{
-        //    root6.StartBackward();
-        //};
-
+        #region 小游戏B
 
         tweenRoot = ManaReso.Get("D_FlowerIcon1").CreateTweenGra(new Color(1, 1, 1), new Color(1, 0.7f, 0.7f), 0.25f, true, true, Curve.EaseOutQuad);
 
@@ -932,6 +885,40 @@ public class ManaUI : Regist
 
         #endregion
 
+        #region 小游戏C
+
+        ManaReso.Get("D_FlowerBtn7").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
+        ManaReso.Get("D_FlowerBtn8").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
+        ManaReso.Get("D_FlowerBtn9").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
+
+        tweenRoot = ManaReso.Get("D_FlowerIcon7").CreateTweenGra(new Color(1, 1, 1), new Color(1, 0.7f, 0.7f), 0.25f, true, true, Curve.EaseOutQuad);
+
+        root0 = tweenRoot;
+        tweenRoot.OnForwardFinish = () =>
+        {
+            root0.StartBackward();
+        };
+
+        tweenRoot = ManaReso.Get("D_FlowerIcon8").CreateTweenGra(new Color(1, 1, 1), new Color(1, 0.7f, 0.7f), 0.25f, true, true, Curve.EaseOutQuad);
+
+        root1 = tweenRoot;
+        tweenRoot.OnForwardFinish = () =>
+        {
+            root1.StartBackward();
+        };
+
+        tweenRoot = ManaReso.Get("D_FlowerIcon9").CreateTweenGra(new Color(1, 1, 1), new Color(1, 0.7f, 0.7f), 0.25f, true, true, Curve.EaseOutQuad);
+
+        root2 = tweenRoot;
+        tweenRoot.OnForwardFinish = () =>
+        {
+            root2.StartBackward();
+        };
+
+        #endregion
+
+        #endregion
+
         #endregion
 
         #region E

Assets/Script/Tool/AtlasUtil/ExtList.cs

@@ -12,6 +12,8 @@ public static class ExtList
 
     public delegate bool SortDelegate<T>(T t1, T t2);
 
+    public delegate bool RandomDelegate<T>(T t);
+
 
     public static T Prev<T>(this List<T> list, int index)
     {
@@ -48,21 +50,32 @@ public static class ExtList
         return t;
     }
 
-    public static T Random<T>(this List<T> list, bool remove = false)
+    public static T Random<T>(this List<T> list, bool remove = false, RandomDelegate<T> randomDelegate = null)
     {
-        int index = UnityEngine.Random.Range(0, list.Count);
-
-        if (remove)
+        while (true)
         {
+            int index = UnityEngine.Random.Range(0, list.Count);
+
             T result = list[index];
 
-            list.RemoveAt(index);
+            if (randomDelegate != null)
+            {
+                if (!randomDelegate(result))
+                {
+                    continue;
+                }
+            }
 
-            return result;
-        }
-        else
-        {
-            return list[index];
+            if (remove)
+            {
+                list.RemoveAt(index);
+
+                return result;
+            }
+            else
+            {
+                return result;
+            }
         }
     }
 

Assets/Script/Tool/Auxiliary.cs

@@ -130,22 +130,22 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.Z))
         {
-            
+            ManaCenter.MiniTimer = 0;
         }
 
         if (Input.GetKeyDown(KeyCode.X))
         {
-            
+            ManaMiniGame.Score = 1000;
         }
 
         if (Input.GetKeyDown(KeyCode.C))
         {
-
+            ManaMiniGame.GameTimer = 45;
         }
 
         if (Input.GetKeyDown(KeyCode.V))
         {
-            
+            ManaGarden.ElfTimer = 0;
         }
 
         //if (Input.GetKeyDown(KeyCode.P))

ToList.txt

@@ -1,8 +1,18 @@
-合并分支
+小游戏C的教程
 
-上传DragonBone
+小游戏C的教程覆盖小游戏B的教程
 
-测试新精灵的对象池
+小游戏C的语言（D_D_Operate3）
+
+小游戏C结束时要把花的SR透明度还原 把操作按钮Deactive掉
+
+按钮的事件与动画
+
+测试进游戏的概率
+
+解锁精灵时只在当前页的花上缩进
+
+试衣间的收起和关闭
 
 
 还原PlayerConfig
@@ -34,4 +44,17 @@
   VerticalBestfit计算次数太多时性能低
 
   Unity是如何实现不同图片也Batch的(看DragonBones源代码)
+}
+
+动画
+{
+  增加一个Return功能(分为ForwardReturn和BackwardReturn 当ForwardFinish后自动开始Backward 或者 当BackwardFinish后自动开始Forward 把Pingpong改为由ForwardReturn和BackwardReturn组成)
+  Triplet结构(True Flase Null)
+}
+
+Extension
+{
+  将Extension放在同一个命名空间下
+
+  ExArray
 }