Update

Assets/Editor.meta

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

Assets/Resources/Temp.meta

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

Assets/Resources/XML/Config/PlayerConfig.xml

@@ -3,7 +3,7 @@
   <Level value="0" />
   <Person value="1" />
   <Diamond value="0" />
-  <QuitTime value="3/20/2017 2:10:55 PM" />
+  <QuitTime value="3/21/2017 9:25:50 PM" />
   <CoinPerson value="1" />
   <CircleTimer value="0" />
   <PlantList FlowerTraA1="1" FlowerTraA2="2" FlowerTraA3="3" FlowerTraA4="4" FlowerTraA5="5" FlowerTraA6="6" FlowerTraA7="7" FlowerTraA8="8" FlowerTraA9="9" />

Assets/Editor/EditorSpriteAsste.cs → Assets/Script/Editor/EditorSpriteAsste.cs

@@ -28,7 +28,7 @@ public class EditorSpriteAsste : Editor
             GetSpriteInfo();
         }
 
-        ScrollPos = GUILayout.BeginScrollView(ScrollPos);
+        ScrollPos = GUILayout.BeginScrollView(ScrollPos, false, false);
 
         if (Script.SpriteInfoList != null)
         {
@@ -36,10 +36,8 @@ public class EditorSpriteAsste : Editor
             {
                 SpriteInfo spriteInfo = Script.SpriteInfoList[i];
 
-                GUILayout.BeginHorizontal();
-
                 EditorGUILayout.ObjectField("", spriteInfo.Sprite, typeof(Sprite), false);
-                
+
                 GUILayout.BeginVertical();
 
                 EditorGUILayout.LabelField("ID : " + spriteInfo.ID);
@@ -49,8 +47,6 @@ public class EditorSpriteAsste : Editor
                 EditorGUILayout.LabelField("");
 
                 GUILayout.EndVertical();
-
-                GUILayout.EndHorizontal();
             }
         }
 

Assets/Script/Manage/Initializer.cs

@@ -4,6 +4,7 @@ using UnityEngine;
 using UnityEngine.EventSystems;
 
 using System.Collections;
+using System.Diagnostics;
 
 public delegate void Regist();
 

Assets/Script/Manage/ManaData.cs

@@ -167,21 +167,16 @@ public class ManaData : MonoBehaviour
         {
             return;
         }
-
-        if (Input.anyKeyDown)
+        
+        if (Auxiliary.AnyKeyUp)
         {
             OpTimer = 0;
             
-            if (Main > 0)
+            if (Main == 0)
             {
-                return;
-            }
+                ManaReso.Get("C_Main").TweenForCG();
 
-            GameObject go = ManaReso.Get("C_Main").gameObject;
-
-            if (go.activeSelf == false)
-            {
-                go.transform.TweenForCG();
+                Main--;
             }
         }
         else
@@ -192,11 +187,11 @@ public class ManaData : MonoBehaviour
             {
                 OpTimer = 0;
 
-                GameObject go = ManaReso.Get("C_Main").gameObject;
-
-                if (go.activeSelf)
+                if (Main == -1)
                 {
-                    go.transform.TweenBacCG();
+                    ManaReso.Get("C_Main").TweenBacCG();
+
+                    Main++;
                 }
             }
         }
@@ -239,9 +234,16 @@ public class ManaData : MonoBehaviour
             NewPerson = Person*(1 + SkillPersonBuff) + SkillPerson;
             NewCoinPerson = CoinPerson + SkillCoinPerson;
 
-            Coin += (NewPerson*NewCoinPerson*CircleTime)*(1 + SkillPlus);
+            float temp = (NewPerson*NewCoinPerson*CircleTime)*(1 + SkillPlus);
+
+            Coin += temp;
+
+            if (Main == -1)
+            {
+                ManaReso.GetHudText("+" + temp.ToString("0"), ManaReso.Get("C_HudTra"), false, 25, Color.red);
+            }
 
-            ManaLog.Log(string.Format("参观收益<color=red>{0:0}</color> = <color=red>{1}</color> * <color=red>{2}</color> * <color=red>{3}</color> * <color=red>{4}</color> (人次*金币*时间*加成)", (NewPerson * NewCoinPerson * CircleTime) * (1 + SkillPlus), NewPerson, NewCoinPerson, CircleTime, 1 + SkillPlus));
+            ManaLog.Log(string.Format("参观收益<color=red>{0:0}</color> = <color=red>{1}</color> * <color=red>{2}</color> * <color=red>{3}</color> * <color=red>{4}</color> (人次*金币*时间*加成)", temp, NewPerson, NewCoinPerson, CircleTime, 1 + SkillPlus));
         }
 
         #endregion
@@ -250,7 +252,7 @@ public class ManaData : MonoBehaviour
 
     private void RegistValue()
     {
-        if (ManaReso.Get("A_Notice").gameObject.activeSelf)
+        if (ManaReso.Get("B_SignIn").gameObject.activeSelf)
         {
             Main = 1;
         }
@@ -424,7 +426,7 @@ public class ManaData : MonoBehaviour
 
             Coin += collectCoin;
             
-            ManaReso.SetText("A_IconLab", collectCoin.ToString("0"));
+            ManaReso.SetText("Ba_IconLab", collectCoin.ToString("0"));
 
             CircleTimer = (float)((elapse - CircleTimer) % CircleTime);
         }
@@ -432,7 +434,7 @@ public class ManaData : MonoBehaviour
         {
             CircleTimer = (float)(CircleTimer - elapse);
 
-            ManaReso.SetText("A_IconLab", "0");
+            ManaReso.SetText("Ba_IconLab", "0");
         }
 
         #endregion

Assets/Script/Manage/ManaReso.cs

@@ -306,22 +306,33 @@ public class ManaReso : MonoBehaviour
     }
 
 
-    public static void GetHudText(string str, Transform posTra)
+    public static void GetHudText(string str, Transform posTra, bool scene, int size, Color color)
     {
         HudText hudText = Get<HudText>(ObjType.HudText);
 
+        Vector3 pos;
+
+        if (scene)
+        {
+            pos = Camera.main.WorldToScreenPoint(posTra.position);
+        }
+        else
+        {
+            pos = posTra.position;
+        }
+
         if (hudText == null)
         {
-            hudText = Get("HudText", Folder.PrefabUI, false, Get("HudParent"), Camera.main.WorldToScreenPoint(posTra.position), ObjType.HudText).AddComponent<HudText>();
+            hudText = Get("HudText", Folder.PrefabUI, false, Get("HudParent"), pos, ObjType.HudText).AddComponent<HudText>();
             hudText.ObjType = ObjType.HudText;
         }
         else
         {
-            hudText.transform.position = Camera.main.WorldToScreenPoint(posTra.position);
+            hudText.transform.position = pos;
             hudText.transform.SetParent(Get("HudParent"));
         }
 
-        hudText.Show(str, Color.red);
+        hudText.Show(str, color, size);
     }
 
     public static Flower GetFlower(int id, bool collider, Transform posTra)

Assets/Script/Manage/ManaUI.cs

@@ -31,12 +31,12 @@ public class ManaUI : MonoBehaviour
 
         ManaReso.AddButtonEvent
         (
-            "A_Confirm",
+            "Ba_Confirm",
             () =>
             {
-                ManaReso.Get("B_SignIn").TweenForCG();
+                ManaReso.Get("Bb_SignIn").TweenForCG();
 
-                ManaReso.SetActive("A_Notice", false);
+                ManaReso.SetActive("Ba_Notice", false);
             }
         );
 
@@ -46,16 +46,16 @@ public class ManaUI : MonoBehaviour
 
         #region B
 
-        #region B_Get
+        #region Bb_Get
 
         ManaReso.AddButtonEvent
         (
-            "B_Get",
+            "Bb_Get",
             () =>
             {
-                ManaReso.SetActive("B_Get", false);
-                ManaReso.SetActive("B_Info", true);
-                ManaReso.SetActive("B_Confirm", true);
+                ManaReso.SetActive("Bb_Get", false);
+                ManaReso.SetActive("Bb_Info", true);
+                ManaReso.SetActive("Bb_Confirm", true);
 
                 SeleDateItem.GetChild(1).SetActive(true);
                 ManaData.Coin += 1500;
@@ -78,7 +78,7 @@ public class ManaUI : MonoBehaviour
             ManaData.Main--;
         };
 
-        Transform tra = ManaReso.Get("B_Grid");
+        Transform tra = ManaReso.Get("Bb_Grid");
 
         SeleDateItem = ManaReso.Get("DateItem", Folder.PrefabUI, false, tra, false);
         ManaReso.Get("DateItem", Folder.PrefabUI, false, tra, false);
@@ -90,11 +90,22 @@ public class ManaUI : MonoBehaviour
 
         #endregion
 
+        #region Bb_SignIn
+
+        tween = ManaReso.Get("Bb_SignIn").CreateTweenCG(0f, 1f, 0.5f, false, true, Curve.EaseOutQuad);
+
+        tween.OnBackwardStart += () =>
+        {
+            ManaData.Main--;
+        };
+
+        #endregion
+
         #region B_Confirm
 
         ManaReso.AddButtonEvent
         (
-            "B_Confirm",
+            "Bb_Confirm",
             () =>
             {
                 ManaReso.Get("B_SignIn").TweenBacCG();
@@ -125,7 +136,7 @@ public class ManaUI : MonoBehaviour
 
         #region C_Main
 
-         ManaReso.Get("C_Main").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
+        ManaReso.Get("C_Main").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
 
         #endregion
 
@@ -339,9 +350,13 @@ public class ManaUI : MonoBehaviour
             {
                 tra = ManaReso.Get("F_Elf");
 
-                tra.SetAsLastSibling();
                 tra.GetComponent<Button>().interactable = false;
 
+                ManaReso.Get("F_Elf").SetAsLastSibling();
+                ManaReso.Get("F_Store").SetSiblingIndex(0);
+                ManaReso.Get("F_Magic").SetSiblingIndex(1);
+                ManaReso.Get("F_Garden").SetSiblingIndex(2);
+
                 ManaReso.Get<Button>("F_Store").interactable = true;
                 ManaReso.Get<Button>("F_Magic").interactable = true;
                 ManaReso.Get<Button>("F_Garden").interactable = true;
@@ -362,9 +377,13 @@ public class ManaUI : MonoBehaviour
             {
                 tra = ManaReso.Get("F_Store");
 
-                tra.SetAsLastSibling();
                 tra.GetComponent<Button>().interactable = false;
 
+                ManaReso.Get("F_Elf").SetSiblingIndex(1);
+                ManaReso.Get("F_Store").SetAsLastSibling();
+                ManaReso.Get("F_Magic").SetSiblingIndex(0);
+                ManaReso.Get("F_Garden").SetSiblingIndex(2);
+
                 ManaReso.Get<Button>("F_Elf").interactable = true;
                 ManaReso.Get<Button>("F_Magic").interactable = true;
                 ManaReso.Get<Button>("F_Garden").interactable = true;
@@ -385,9 +404,13 @@ public class ManaUI : MonoBehaviour
             {
                 tra = ManaReso.Get("F_Magic");
 
-                tra.SetAsLastSibling();
                 tra.GetComponent<Button>().interactable = false;
 
+                ManaReso.Get("F_Elf").SetSiblingIndex(1);
+                ManaReso.Get("F_Store").SetSiblingIndex(0);
+                ManaReso.Get("F_Magic").SetAsLastSibling();
+                ManaReso.Get("F_Garden").SetSiblingIndex(2);
+
                 ManaReso.Get<Button>("F_Elf").interactable = true;
                 ManaReso.Get<Button>("F_Store").interactable = true;
                 ManaReso.Get<Button>("F_Garden").interactable = true;
@@ -408,9 +431,13 @@ public class ManaUI : MonoBehaviour
             {
                 tra = ManaReso.Get("F_Garden");
 
-                tra.SetAsLastSibling();
                 tra.GetComponent<Button>().interactable = false;
 
+                ManaReso.Get("F_Elf").SetSiblingIndex(2);
+                ManaReso.Get("F_Store").SetSiblingIndex(0);
+                ManaReso.Get("F_Magic").SetSiblingIndex(1);
+                ManaReso.Get("F_Garden").SetAsLastSibling();
+
                 ManaReso.Get<Button>("F_Elf").interactable = true;
                 ManaReso.Get<Button>("F_Store").interactable = true;
                 ManaReso.Get<Button>("F_Magic").interactable = true;
@@ -457,7 +484,8 @@ public class ManaUI : MonoBehaviour
 
         tween.OnForwardStart += () =>
         {
-            ManaData.Main++;
+            ManaData.Main += 2;
+            ManaReso.Get("C_Main").TweenBacCG();
         };
 
         tween.OnBackwardStart += () =>
@@ -584,9 +612,15 @@ public class ManaUI : MonoBehaviour
 
         tween.OnForwardStart += () =>
         {
-            ManaData.Main++;
-
-            ManaReso.Get("C_Main").TweenBacCG();
+            if (ManaData.Main == -1)
+            {
+                ManaData.Main += 2;
+                ManaReso.Get("C_Main").TweenBacCG();
+            }
+            else
+            {
+                ManaData.Main++;
+            }
 
             if (ManaGarden.MyFlowerSpec == 0)
             {
@@ -599,13 +633,13 @@ public class ManaUI : MonoBehaviour
             ManaData.Main--;
         };
 
-            #endregion
+        #endregion
 
-            #endregion
+        #endregion
 
-            #region H
+        #region H
 
-            #region H_Prev
+        #region H_Prev
 
             ManaReso.AddButtonEvent
         (
@@ -684,9 +718,15 @@ public class ManaUI : MonoBehaviour
 
         tween.OnForwardStart += () =>
         {
-            ManaData.Main++;
-            
-            ManaReso.Get("C_Main").TweenBacCG();
+            if (ManaData.Main == -1)
+            {
+                ManaData.Main += 2;
+                ManaReso.Get("C_Main").TweenBacCG();
+            }
+            else
+            {
+                ManaData.Main++;
+            }
         };
 
         tween.OnBackwardStart += () =>

Assets/Script/Object/Flower.cs

@@ -128,7 +128,7 @@ public class Flower : ObjRoot, IPointerClickHandler
             }
             else if (Phase == 1)
             {
-                ManaReso.GetHudText("得分+1", ChildDic["ScoreTra"]);
+                ManaReso.GetHudText("得分+1", ChildDic["ScoreTra"], true, 18, Color.red);
                 ManaMiniGame.Score += 1;
 
                 GameReset();
@@ -277,16 +277,6 @@ public class Flower : ObjRoot, IPointerClickHandler
         OperateSr1.SetActive(false);
     }
 
-    private void FullLevel()
-    {
-        
-    }
-
-    private void OnPhaseChange()
-    {
-        
-    }
-
     #endregion
 
 

Assets/Script/Object/Garden.cs

@@ -134,9 +134,8 @@ public class Garden : MonoBehaviour, IDragHandler, IPointerClickHandler, IEndDra
 
         tween.OnForwardStart += () =>
         {
-            ManaData.Main++;
-
-            ManaReso.SetActive("C_MiniGame", false);
+            ManaData.Main += 2;
+            ManaReso.Get("C_Main").TweenBacCG();
         };
 
         tween.OnForwardFinish += () =>

Assets/Script/Object/Skill/Ability.cs

@@ -446,6 +446,31 @@ public class Ability : SkillRoot
 
                 #endregion
             }
+            else if (strings[i].Contains("&skill_cd&"))
+            {
+                #region MyRegion
+
+                if (Math.Abs(SkillCD) > 0.0005f)
+                {
+                    temp = SkillCD + NewSkillCD * (Level + offset);
+
+                    UpgradeUnit(ref temp, strings[i]);
+
+                    stringBuilder.Append(temp);
+                }
+                else if (Math.Abs(SkillCdBuff) > 0.0005f)
+                {
+                    temp = SkillCdBuff + NewSkillCdBuff * (Level + offset);
+
+                    stringBuilder.Append(string.Format("{0}%", temp * 100));
+                }
+                else
+                {
+
+                }
+
+                #endregion
+            }
             else if (strings[i].Contains("&coin_person&"))
             {
                 #region MyRegion

Assets/Script/Object/Skill/BigSkill.cs

@@ -176,7 +176,7 @@ public class BigSkill : Skill
         NewCoinPerson = CoinPerson;
         NewUpgradeAmt = UpgradeAmt;
         NewCoinOnceBuff = CoinOnceBuff;
-
+        
         if (!string.IsNullOrEmpty(UpgradeFml))
         {
             for (int i = 0; i < Level; i++)
@@ -184,12 +184,12 @@ public class BigSkill : Skill
                 NewUpgradeAmt = FmlParse(UpgradeFml, NewUpgradeAmt);
             }
         }
-
+        
         UpgradeValue(ref NewPlus, Plus, UpgradePlus, Level);
         UpgradeValue(ref NewSkillCdBuff, UpgradeCD, Level);
         UpgradeValue(ref NewPersonBuff, PersonBuff, UpgradePerson, Level);
         UpgradeValue(ref NewCoinOnceBuff, UpgradeCoinOnce, Level);
-
+        
         UpgradeValue(ref NewPerson, Person, UpgradePerson, Level);
         UpgradeValue(ref NewSkillCD, SkillCD, UpgradeCD, Level);
         UpgradeValue(ref NewDuration, Duration, UpgradeDuration, Level);

Assets/Script/Object/Skill/Skill.cs

@@ -151,12 +151,12 @@ public class Skill : SkillRoot
         UnlockCur = CurrentParse(attributes[16].Value);
         UpgradeCur = CurrentParse(attributes[21].Value);
         UnlockAheadCur = CurrentParse(attributes[14].Value);
-
+        
         ValueBuffParse(out Person, out PersonBuff, attributes[7].Value);
         ValueBuffParse(out SkillCD, out SkillCdBuff, attributes[10].Value);
         ValueBuffParse(out CoinOnce, out CoinOnceBuff, attributes[8].Value);
         ValueBuffParse(out CoinPerson, out Plus, attributes[6].Value);
-
+        
         #endregion
 
         SkillType = SkillType.Skill;
@@ -175,7 +175,7 @@ public class Skill : SkillRoot
         NewCoinPerson = CoinPerson;
         NewUpgradeAmt = UpgradeAmt;
         NewCoinOnceBuff = CoinOnceBuff;
-
+        
         if (!string.IsNullOrEmpty(UpgradeFml))
         {
             for (int i = 0; i < Level; i++)
@@ -741,9 +741,44 @@ public class Skill : SkillRoot
                 else if (Math.Abs(CoinOnceBuff) > 0.0005f)
                 {
                     temp = NewCoinOnceBuff;
-
+                    
                     UpgradeValue(ref temp, CoinOnceBuff, UpgradeCoinOnce, offset);
 
+                    stringBuilder.Append(temp + "倍");
+                }
+                else
+                {
+                    throw new Exception();
+                }
+
+                #endregion
+            }
+            else if (strings[i].Contains("&diamond_once&"))
+            {
+                #region MyRegion
+
+                stringBuilder.Append(DiamondOnce);
+
+                #endregion
+            }
+            else if (strings[i].Contains("&coin_person&"))
+            {
+                #region MyRegion
+                
+                if (Math.Abs(CoinPerson) > 0.0005f)
+                {
+                    temp = NewCoinPerson;
+
+                    UpgradeValue(ref temp, CoinPerson, UpgradePlus, offset);
+
+                    stringBuilder.Append(temp);
+                }
+                else if (Math.Abs(Plus) > 0.0005f)
+                {
+                    temp = NewPlus;
+
+                    UpgradeValue(ref temp, Plus, UpgradePlus, offset);
+
                     stringBuilder.Append(string.Format("{0}%", temp * 100));
                 }
                 else

Assets/Script/Object/Skill/SkillRoot.cs

@@ -398,7 +398,7 @@ public abstract class SkillRoot
         }
         else if (fml.Contains("%"))
         {
-            target += float.Parse(fml.Replace("%", "")) / 100;
+            target += (float.Parse(fml.Replace("%", ""))/100)*offet;
         }
         else
         {

Assets/Script/Tool/Auxiliary.cs

@@ -23,6 +23,8 @@ public class Auxiliary : MonoBehaviour
     public List<GameObject> GoList;
     public List<SpriteRenderer> SrList;
 
+    public static bool AnyKeyUp;
+    public static bool AnyKeyDown;
     public static Auxiliary Inst;
     public static DESCryptoServiceProvider Des
     {
@@ -52,6 +54,28 @@ public class Auxiliary : MonoBehaviour
     
     private void Update()
     {
+        if (AnyKeyUp)
+        {
+            if (Input.anyKey == false)
+            {
+                AnyKeyUp = false;
+            }
+        }
+
+        if (Input.anyKeyDown)
+        {
+            AnyKeyDown = true;
+        }
+
+        if (AnyKeyDown)
+        {
+            if (Input.anyKey == false)
+            {
+                AnyKeyUp = true;
+                AnyKeyDown = false;
+            }
+        }
+
         if (Input.GetKeyDown(KeyCode.P))
         {
             ManaData.Level += 10;

Assets/SpriteAsset.cs → Assets/Script/Tool/SpriteAsset.cs

@@ -1,5 +1,7 @@
-using UnityEngine;
+using UnityEditor;
+using UnityEngine;
 
+using System;
 using System.Collections;
 using System.Collections.Generic;
 

Assets/Script/Tool/UI/FlowerCard.cs

@@ -21,7 +21,7 @@ public class FlowerCard : MonoBehaviour
     public List<Transform> ItemList;
     public List<FlowerInfo> InfoList;
 
-    public NewScrollRect ScrollRect;
+    public ScrollRectPlus ScrollRect;
 
     #endregion
 
@@ -32,7 +32,7 @@ public class FlowerCard : MonoBehaviour
 
         SelectIndex = -1;
 
-        ScrollRect = ManaReso.Get<NewScrollRect>("H_Scrr");
+        ScrollRect = ManaReso.Get<ScrollRectPlus>("H_Scrr");
         ScrollRect.DragEvent += OnDrag;
         ScrollRect.EndDragEvent += OnEndDrag;
 
@@ -217,19 +217,11 @@ public class FlowerCard : MonoBehaviour
 
     public void OnEndDrag(PointerEventData eventData)
     {
-        //float minX = 999999999;
+        Vector3 delta = ScrollRect.transform.position - SeleItem.transform.position;
 
-        //for (int i = 0; i < ItemList.Count; i++)
-        //{
-        //    float x = Mathf.Abs(ItemList[i].localPosition.x - ScrollRect.content.InverseTransformPoint(ScrollRect.transform.position).x);
-            
-        //    if (x < minX)
-        //    {
-        //        minX = x;
-        //        ScrollSelectIndex = i;
-        //    }
-        //}
-
-        //Select(ScrollSelectIndex);
+        delta.y = 0;
+        delta.z = 0;
+
+        ScrollRect.content.MoveVec(ScrollRect.content.transform.position + delta, 0.25f, Curve.EaseOutQuad);
     }
 }

Assets/Script/Tool/UI/HudText.cs

@@ -38,9 +38,10 @@ public class HudText : ObjRoot
         }
     }
 
-    public void Show(string str, Color color)
+    public void Show(string str, Color color, int size)
     {
         Text.text = str;
         Text.color = color;
+        Text.fontSize = size;
     }
 }

Assets/Script/Tool/UI/NewScrollRect.cs → Assets/Script/Tool/UI/ScrollRectPlus.cs

@@ -5,7 +5,7 @@ using System.Collections;
 using UnityEngine.Events;
 using UnityEngine.EventSystems;
 
-public class NewScrollRect : ScrollRect 
+public class ScrollRectPlus : ScrollRect 
 {
     #region 变量
 

Assets/Script/Tool/UI/TextPlus.cs

@@ -0,0 +1,20 @@
+using UnityEngine;
+using UnityEngine.UI;
+
+using System.Collections;
+
+public class TextPlus : Text
+{
+    protected override void OnPopulateMesh(VertexHelper toFill)
+    {
+        base.OnPopulateMesh(toFill);
+
+        Mesh mesh = new Mesh();
+
+        mesh.vertices = new[] { new Vector3(0, 0, 0), new Vector3(0, 100, 0), new Vector3(100, 0, 0) };
+        mesh.colors = new[] { new Color(1, 1, 1, 1), new Color(1, 1, 1, 1), new Color(1, 1, 1, 1) };
+        mesh.triangles = new[] { 0, 1, 2 };
+
+        toFill.FillMesh(mesh);
+    }
+}

Assets/Script/Tool/UI/TextPlus.cs.meta

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

MyLovelyGarden.Editor.csproj

@@ -154,6 +154,7 @@
     <Compile Include="Assets\Script\Editor\EditorConfigExporter.cs" />
     <Compile Include="Assets\Script\Editor\EditorLanguageExport.cs" />
     <Compile Include="Assets\Script\Editor\EditorPlayer.cs" />
+    <Compile Include="Assets\Script\Editor\EditorSpriteAsste.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Assets\Resources\Shader\Gray.shader" />

MyLovelyGarden.csproj

@@ -122,8 +122,8 @@
     <Compile Include="Assets\Script\Tool\Anim\TweenAudio.cs" />
     <Compile Include="Assets\Script\Tool\Anim\TweenCG.cs" />
     <Compile Include="Assets\Script\Tool\Anim\TweenGra.cs" />
+    <Compile Include="Assets\Script\Tool\Anim\TweenRect.cs" />
     <Compile Include="Assets\Script\Tool\Anim\TweenScale.cs" />
-    <Compile Include="Assets\Script\Tool\Anim\TweenScrr.cs" />
     <Compile Include="Assets\Script\Tool\Anim\TweenVec.cs" />
     <Compile Include="Assets\Script\Tool\Auxiliary.cs" />
     <Compile Include="Assets\Script\Tool\DashGame\DateUtil.cs" />
@@ -136,10 +136,12 @@
     <Compile Include="Assets\Script\Tool\DashGame\URLRequestData.cs" />
     <Compile Include="Assets\Script\Tool\Data.cs" />
     <Compile Include="Assets\Script\Tool\Extension.cs" />
+    <Compile Include="Assets\Script\Tool\SpriteAsset.cs" />
     <Compile Include="Assets\Script\Tool\UI\FlowerCard.cs" />
     <Compile Include="Assets\Script\Tool\UI\HudTarget.cs" />
     <Compile Include="Assets\Script\Tool\UI\HudText.cs" />
-    <Compile Include="Assets\Script\Tool\UI\NewScrollRect.cs" />
+    <Compile Include="Assets\Script\Tool\UI\ScrollRectPlus.cs" />
+    <Compile Include="Assets\Script\Tool\UI\TextPlus.cs" />
     <Compile Include="Assets\Script\Utils\DGFileUtil.cs" />
     <Compile Include="Assets\Script\Utils\JsonUtil.cs" />
     <Compile Include="Assets\Script\Utils\MD5Util.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

MyLovelyGarden.txt

@@ -1,4 +1,4 @@
-FlowerCard与Flower会弹出C_Main 自己写一个检测触碰类?
+特殊花朵和普通花朵的层级(取消LayoutGroup 改用动画处理)
 
 进行到ManaData