Temp

Assets/Resources/Animations/ElfFly.anim.meta → Assets/Resource/Animations/UIFlashLight.anim.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 1d59bb6e5f588094fbe0a5ec773d3fc6
-timeCreated: 1491022339
+guid: fb372b7e1f7d8e8418dfbd552cfebde5
+timeCreated: 1491127140
 licenseType: Pro
 NativeFormatImporter:
   userData: 

Assets/Resource/Animations/UIFlashLight.controller.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3cb63e6565a032441ba7cab073c800c8
+timeCreated: 1491127102
+licenseType: Pro
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resource/Prefab/Object/UIFlashLight.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: bdcd18d0c2eea674eb871549514933c7
+timeCreated: 1491180703
+licenseType: Pro
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resource/Shader/Discard.shader

@@ -0,0 +1,48 @@
+Shader "DashGame/Discard"
+{
+	Properties
+	{
+		
+	}
+	SubShader
+	{
+		Tags { "RenderType"="Opaque" }
+
+		Pass
+		{
+			CGPROGRAM
+
+			#pragma vertex vert
+			#pragma fragment frag
+			
+			#include "UnityCG.cginc"
+
+			struct appdata
+			{
+				float4 vertex : POSITION;
+			};
+
+			struct v2f
+			{
+				float4 vertex : SV_POSITION;
+			};
+
+			v2f vert (appdata v)
+			{
+				v2f o;
+
+				o.vertex = UnityObjectToClipPos(v.vertex);
+				
+				return o;
+			}
+			
+			fixed4 frag (v2f i) : SV_Target
+			{
+				discard;
+
+				return fixed4(1, 1, 1, 1);
+			}
+			ENDCG
+		}
+	}
+}

Assets/Resource/Shader/Discard.shader.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: bf1070f034267e24ab102c6eb9dd05ab
+timeCreated: 1491124368
+licenseType: Pro
+ShaderImporter:
+  defaultTextures: []
+  userData: 
+  assetBundleName: shader
+  assetBundleVariant: 

Assets/Resource/Shader/DiscardMat.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d112dba8bb2f53941b3807271af7bc52
+timeCreated: 1491124379
+licenseType: Pro
+NativeFormatImporter:
+  userData: 
+  assetBundleName: shader
+  assetBundleVariant: 

Assets/Resource/Shader/HighLight.shader

@@ -82,23 +82,19 @@
 
 				if (c.a == 0) 
 				{
-					fixed4 c1 = SampleSpriteTexture(IN.texcoord + float2(_Scale, 0));
-					fixed4 c2 = SampleSpriteTexture(IN.texcoord + float2(-_Scale, 0));
-					fixed4 c3 = SampleSpriteTexture(IN.texcoord + float2(0, _Scale));
-					fixed4 c4 = SampleSpriteTexture(IN.texcoord + float2(0, -_Scale));
-					fixed4 c5 = SampleSpriteTexture(IN.texcoord + float2(_Scale, _Scale));
-					fixed4 c6 = SampleSpriteTexture(IN.texcoord + float2(_Scale, -_Scale));
-					fixed4 c7 = SampleSpriteTexture(IN.texcoord + float2(-_Scale, _Scale));
-					fixed4 c8 = SampleSpriteTexture(IN.texcoord + float2(-_Scale, -_Scale));
-
-					if (c1.a > 0 || c2.a > 0 || c3.a > 0 || c4.a > 0 || c5.a > 0 || c6.a > 0 || c7.a > 0 || c8.a > 0)
+					fixed4 c1 = SampleSpriteTexture(IN.texcoord + float2(0, _Scale));
+					fixed4 c2 = SampleSpriteTexture(IN.texcoord + float2(_Scale, 0));
+					fixed4 c3 = SampleSpriteTexture(IN.texcoord + float2(0, -_Scale));
+					fixed4 c4 = SampleSpriteTexture(IN.texcoord + float2(-_Scale, 0));
+
+					if (c1.a > 0 || c2.a > 0 || c3.a > 0 || c4.a > 0)
 					{
-						c.rgba = 1;
+						c.rgba = fixed4(1,0,0,1);
 					}
 				}
 				else if (c.a < 1)
 				{
-					c.rgba = 1;
+					c.rgba = fixed4(1, 0, 0, 1);
 				}
 
 				return c;

Assets/Resource/Sprite/Garden/描边.png.meta

@@ -0,0 +1,68 @@
+fileFormatVersion: 2
+guid: defb31a82b042e34e823c5eb4d1305d6
+timeCreated: 1491217242
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resource/Sprite/SpriteUI/Fertilize.png.meta

@@ -36,7 +36,7 @@ TextureImporter:
   compressionQuality: 50
   spriteMode: 1
   spriteExtrude: 1
-  spriteMeshType: 1
+  spriteMeshType: 0
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
@@ -94,7 +94,7 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
-  spritePackingTag: 3
+  spritePackingTag: 4
   userData: 
   assetBundleName: ui
   assetBundleVariant: 

Assets/Resource/Sprite/SpriteUI/Rip.png.meta

@@ -36,7 +36,7 @@ TextureImporter:
   compressionQuality: 50
   spriteMode: 1
   spriteExtrude: 1
-  spriteMeshType: 1
+  spriteMeshType: 0
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
@@ -94,7 +94,7 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
-  spritePackingTag: 3
+  spritePackingTag: 4
   userData: 
   assetBundleName: ui
   assetBundleVariant: 

Assets/Resource/Sprite/SpriteUI/Water.png.meta

@@ -36,7 +36,7 @@ TextureImporter:
   compressionQuality: 50
   spriteMode: 1
   spriteExtrude: 1
-  spriteMeshType: 1
+  spriteMeshType: 0
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
@@ -94,7 +94,7 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
-  spritePackingTag: 3
+  spritePackingTag: 4
   userData: 
   assetBundleName: ui
   assetBundleVariant: 

Assets/Resources/XML/Config.meta → Assets/Resource/XML/Config.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: 4185ebaaa294aa540a7acffb0e1edab8
+guid: 5e7e46e2d4762024dbfa2778bfc7a350
 folderAsset: yes
-timeCreated: 1491034865
+timeCreated: 1491207234
 licenseType: Pro
 DefaultImporter:
   userData: 

Assets/Resources/XML/Config/ability_config.xml.meta → Assets/Resource/XML/Config/ability_config.xml.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: e67f33e16ebe8a14e85878ce9fa52501
-timeCreated: 1491034865
+guid: f039d2181a3e9ea418ff5f211730b175
+timeCreated: 1491207235
 licenseType: Pro
 TextScriptImporter:
   userData: 

Assets/Resources/xml/Config/achieve_config.xml.meta → Assets/Resource/XML/Config/achieve_config.xml.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: ba4a9718bc01f6a479fc37e6f3108435
-timeCreated: 1491034865
+guid: ff8c2496a2cfe6e4eaa5262e9d7b0b2a
+timeCreated: 1491207235
 licenseType: Pro
 TextScriptImporter:
   userData: 

Assets/Resources/XML/Config/award_config.xml.meta → Assets/Resource/XML/Config/award_config.xml.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: cd1b88c2eb7b81e469e7d244ac9b9901
-timeCreated: 1491034865
+guid: 592b5873809f003499db8a5484f2b765
+timeCreated: 1491207235
 licenseType: Pro
 TextScriptImporter:
   userData: 

Assets/Resources/XML/Config/flower_config.xml.meta → Assets/Resource/XML/Config/flower_config.xml.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 960ebc22c2d041347bda83114a03ba9a
-timeCreated: 1491034866
+guid: aed362854a581da4399847ab3c71acce
+timeCreated: 1491207236
 licenseType: Pro
 TextScriptImporter:
   userData: 

Assets/Resources/XML/Config/offline_config.xml.meta → Assets/Resource/XML/Config/offline_config.xml.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: a68ce5689876ddc43a0db69f5728a85c
-timeCreated: 1491034866
+guid: 5f649838ec2ce1d43b1b0cc6326149b0
+timeCreated: 1491207236
 licenseType: Pro
 TextScriptImporter:
   userData: 

Assets/Resources/XML/Config/pack_config.xml.meta → Assets/Resource/XML/Config/pack_config.xml.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 475ae2d51f09d28428327186a3e72ad8
-timeCreated: 1491034866
+guid: 4e6ffe6a76751f64fbe4a8e9187d73d7
+timeCreated: 1491207236
 licenseType: Pro
 TextScriptImporter:
   userData: 

Assets/Resources/XML/Config/signin_config.xml.meta → Assets/Resource/XML/Config/signin_config.xml.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 5a4f5fdfa5477d945aaaaa5c8a2c1de7
-timeCreated: 1491034867
+guid: 16643d19dfc304a41b32298462967d94
+timeCreated: 1491207237
 licenseType: Pro
 TextScriptImporter:
   userData: 

Assets/Resources/XML/Config/skill_config.xml.meta → Assets/Resource/XML/Config/skill_config.xml.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 20c2653f1fe9ae54bba519f533d487fa
-timeCreated: 1491034867
+guid: d8ed8cd3127330247beb079345e6c151
+timeCreated: 1491207237
 licenseType: Pro
 TextScriptImporter:
   userData: 

Assets/Resources/XML/lan.meta → Assets/Resource/XML/lan.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: 2aa016a763da6524ab7aa1595270fab8
+guid: 5becb6c30b0a5a54d814a422f3c62456
 folderAsset: yes
-timeCreated: 1491033973
+timeCreated: 1491207025
 licenseType: Pro
 DefaultImporter:
   userData: 

Assets/Resources/XML/lan/ChineseSimplified.xml.meta → Assets/Resource/XML/lan/ChineseSimplified.xml.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 9ed210908fb8df546bc3c8b1f6d385cf
-timeCreated: 1491033974
+guid: 2a6d8a1acd28b9b40acaa68244594b9d
+timeCreated: 1491207122
 licenseType: Pro
 TextScriptImporter:
   userData: 

Assets/Resources/XML/lan/ChineseTraditional.xml.meta → Assets/Resource/XML/lan/ChineseTraditional.xml.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: b2cb20e400468a7469fe188bc499dede
-timeCreated: 1491033975
+guid: d9f61a725b556c844a98ee0b486eabe7
+timeCreated: 1491207123
 licenseType: Pro
 TextScriptImporter:
   userData: 

Assets/Resources/XML/lan/English.xml.meta → Assets/Resource/XML/lan/English.xml.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 88057999ac752dd4da3d82173c33fccb
-timeCreated: 1491033973
+guid: 6bf784d003b5c104e94531afb827212a
+timeCreated: 1491207122
 licenseType: Pro
 TextScriptImporter:
   userData: 

Assets/Resources.meta

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

Assets/Resources/XML.meta

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

Assets/Script/Editor/EditorAuxiliary.cs

@@ -54,9 +54,37 @@ public class EditorAuxiliary : Editor
             ChangePrefix();
         }
 
-        if (GUILayout.Button("Temp"))
+        if (GUILayout.Button("CopyCurve"))
         {
+            //EditorCurveBinding[] bindings = AnimationUtility.GetCurveBindings(Script.ClipOrigin);
+
+            //for (int i = 0; i < bindings.Length; i++)
+            //{
+            //    Debug.Log(string.Format("path : {0}  type : {1}  name : {2}", bindings[i].path, bindings[i].type, bindings[i].propertyName));
+            //}
             
+            //EditorCurveBinding bindingOrigin = new EditorCurveBinding();
+
+            //bindingOrigin.type = typeof(SpriteRenderer);
+            //bindingOrigin.path = "Flash";
+            //bindingOrigin.propertyName = "m_Color.a";
+
+            //AnimationCurve curveOrigin = AnimationUtility.GetEditorCurve(Script.ClipOrigin, bindingOrigin);
+
+            //EditorCurveBinding bindingNew = new EditorCurveBinding();
+
+            //bindingNew.type = typeof(Image);
+            //bindingNew.path = "UIFlash";
+            //bindingNew.propertyName = "m_Color.a";
+
+            //AnimationCurve curveNew = AnimationUtility.GetEditorCurve(Script.ClipNew, bindingNew);
+
+
+            //curveNew.keys = curveOrigin.keys;
+
+            //AnimationUtility.SetEditorCurve(Script.ClipNew, bindingNew, curveNew);
+
+            //EditorUtility.SetDirty(Script.ClipNew);
         }
     }
 

Assets/Script/Editor/EditorConfigExporter.cs

@@ -30,7 +30,7 @@ public class EditorConfigExporter : EditorWindow
 
     void Awake()
     {
-        defaultPath = Application.dataPath + @"/XlsxSource";
+        defaultPath = Application.dataPath + @"/Resource/Xlsx";
         if (!Directory.Exists(defaultPath))
             Directory.CreateDirectory(defaultPath);
         GetObjectNameToArray<string>(defaultPath, "xlsx");
@@ -162,7 +162,7 @@ public class EditorConfigExporter : EditorWindow
         idArr = new List<string>();
 
 //        string filepath = Application.dataPath + @"/Resources/XML/Config" + fileName + ".xml";
-		string filepath = Application.dataPath + @"/Resources/XML/Config" + fileName + ".xml";
+		string filepath = Application.dataPath + @"/Resource/XML/Config" + fileName + ".xml";
         text = "";
 
         filepath = filepath.Replace("\\", "/");
@@ -188,7 +188,7 @@ public class EditorConfigExporter : EditorWindow
 
             try
             {
-                FileStream stream = File.Open(Application.dataPath + @"/XlsxSource" + fileName + ".xlsx", FileMode.Open, FileAccess.Read);
+                FileStream stream = File.Open(Application.dataPath + @"/Resource/Xlsx" + fileName + ".xlsx", FileMode.Open, FileAccess.Read);
                 IExcelDataReader excelReader = ExcelReaderFactory.CreateOpenXmlReader(stream);
 
                 text += "\nexcelReader.ResultsCount is" + excelReader.ResultsCount + "\n";

Assets/Script/Editor/EditorLanguageExport.cs

@@ -32,7 +32,7 @@ public class EditorLanguageExport : EditorWindow
 
     void Awake()
     {
-		defaultPath = Application.dataPath + @"/XlsxSource/language_config.xlsx";
+		defaultPath = Application.dataPath + @"/Resource/Xlsx/language_config.xlsx";
     }
 
     void OnGUI()
@@ -97,7 +97,7 @@ public class EditorLanguageExport : EditorWindow
     {
         parentNodeDict = new Dictionary<string, XmlNode>();
 
-        string filepath = Application.dataPath + @"/Resources/xml/lan/" + lan + ".xml";
+        string filepath = Application.dataPath + @"/Resource/xml/lan/" + lan + ".xml";
 	    text = "";
 
         filepath = filepath.Replace("\\", "/");
@@ -299,7 +299,7 @@ public class EditorLanguageExport : EditorWindow
             {
                 string fullText = "<?php\n";
 
-                FileStream stream = File.Open(Application.dataPath + @"/XlsxSource" + fileName + ".xlsx", FileMode.Open, FileAccess.Read);
+                FileStream stream = File.Open(Application.dataPath + @"/Resource/Xlsx" + fileName + ".xlsx", FileMode.Open, FileAccess.Read);
                 IExcelDataReader excelReader = ExcelReaderFactory.CreateOpenXmlReader(stream);
 
                 text += "\nexcelReader.ResultsCount is" + excelReader.ResultsCount + "\n";

Assets/Script/Manage/ManaAudio.cs

@@ -29,7 +29,7 @@ public class ManaAudio : Regist
     {
         Music = true;
         Audio = true;
-
+        
         #region MusicMini
 
         Transform tra = MusicMini.transform;
@@ -123,9 +123,9 @@ public class ManaAudio : Regist
             {
                 yield return null;
             }
-
+            
             yield return new WaitForSeconds(3);
-
+            
             audioSource.Play();
         }
     }

Assets/Script/Manage/ManaMiniGame.cs

@@ -556,7 +556,7 @@ public class ManaMiniGame : Regist
         {
             ManaData.Mini = false;
 
-            ManaData.MiniTimer = Mathf.Lerp(180, 300, Random.Range(0, 1f));
+            ManaData.MiniTimer = Mathf.Lerp(1.8f, 3, Random.Range(0, 1f));
 
             ManaReso.Get("C_MiniGame").TweenBacCG();
 

Assets/Script/Manage/ManaReso.cs

@@ -416,7 +416,7 @@ public class ManaReso : Regist
 
     #region ObjPool
 
-    public static void Save<T>(T t) where T : Component
+    public static void Save<T>(T t, bool warn = true) where T : Component
     {
         Transform tra = t.transform;
 
@@ -433,7 +433,14 @@ public class ManaReso : Regist
         {
             if (traList.Contains(tra))
             {
-                throw new Exception();
+                if (warn)
+                {
+                    throw new Exception();
+                }
+                else
+                {
+                    return;
+                }
             }
 
             tra.SetActive(false);
@@ -448,7 +455,7 @@ public class ManaReso : Regist
         }
     }
 
-    public static void Save(GameObject go)
+    public static void Save(GameObject go, bool warn = true)
     {
         ObjRoot objRoot = go.GetComponent<ObjRoot>();
 
@@ -463,7 +470,14 @@ public class ManaReso : Regist
         {
             if (traList.Contains(go.transform))
             {
-                throw new Exception();
+                if (warn)
+                {
+                    throw new Exception();
+                }
+                else
+                {
+                    return;
+                }
             }
 
             go.SetActive(false);
@@ -479,7 +493,7 @@ public class ManaReso : Regist
     }
 
 
-    public static void SaveUI<T>(T t) where T : Component
+    public static void SaveUI<T>(T t, bool warn = true) where T : Component
     {
         Transform tra = t.transform;
 
@@ -496,7 +510,14 @@ public class ManaReso : Regist
         {
             if (traList.Contains(tra))
             {
-                throw new Exception();
+                if (warn)
+                {
+                    throw new Exception();
+                }
+                else
+                {
+                    return;
+                }
             }
 
             tra.SetActive(false);
@@ -511,7 +532,7 @@ public class ManaReso : Regist
         }
     }
 
-    public static void SaveUI(GameObject go)
+    public static void SaveUI(GameObject go, bool warn = true)
     {
         ObjRoot objRoot = go.GetComponent<ObjRoot>();
 
@@ -526,7 +547,14 @@ public class ManaReso : Regist
         {
             if (traList.Contains(go.transform))
             {
-                throw new Exception();
+                if (warn)
+                {
+                    throw new Exception();
+                }
+                else
+                {
+                    return;
+                }
             }
 
             go.SetActive(false);

Assets/Script/Object/Drop.cs

@@ -21,7 +21,7 @@ public class Drop : ObjRoot,IPointerClickHandler
 
         tween.OnForwardFinish += () =>
         {
-            ManaReso.Save(this);
+            ManaReso.Save(this, false);
         };
     }
 
@@ -29,9 +29,9 @@ public class Drop : ObjRoot,IPointerClickHandler
     {
         Timer += Time.fixedDeltaTime;
 
-        if (Timer > 15)
+        if (Timer > 5)
         {
-            ManaReso.Save(this);
+            Retrieve();
         }
 
         if (Move)
@@ -49,7 +49,7 @@ public class Drop : ObjRoot,IPointerClickHandler
         Speed = Random.Range(3f, 5f);
         transform.localScale = new Vector3(0.8f, 0.8f, 0.8f);
 
-        transform.GetTweenSr().InForward = true;
+        transform.GetTweenSr().InOrigin = true;
         GetComponent<SpriteRenderer>().color = new Color(1, 1, 1, 1);
     }
 

Assets/Script/Object/Flower.cs

@@ -32,7 +32,7 @@ public class FlowerInfo
             {
                 Text.text = "已放置";
 
-                //Animator.Play("FlashLight");
+                UIPartical.Begin();
             }
             else
             {
@@ -90,7 +90,7 @@ public class FlowerInfo
     public Sprite Sprite;
     public Image Image;
     public Button Button;
-    public Animator Animator;
+    public UIPartical UIPartical;
 
     #endregion
 
@@ -105,8 +105,8 @@ public class FlowerInfo
         Text = dic["Lab"].GetComponent<Text>();
         Image = dic["Icon"].GetComponent<Image>();
         Button = dic["FlowerItemG"].GetComponent<Button>();
-        //Animator = dic["FlashLight"].GetComponent<Animator>();
-        
+        UIPartical = dic["UIParticle System"].GetComponent<UIPartical>();
+
         Id = int.Parse(attributes[0].Value);
         Sprite = ManaReso.Load<Sprite>(attributes[3].Value, Folder.Garden);
        
@@ -147,7 +147,9 @@ public class Flower : ObjRoot, IPointerClickHandler
             {
                 Phase = 0;
 
+                OperateBk.SetActive(false);
                 OperateIcon.SetActive(false);
+                OperateOutline.SetActive(false);
 
                 ManaReso.GetHudText("得分+15", Color.red, 18, ChildDic["ScoreTra"], ManaReso.Get("D_Status"), true);
 
@@ -160,7 +162,9 @@ public class Flower : ObjRoot, IPointerClickHandler
 
     private OpType OpType;
     private SpriteRenderer FlowerIcon;
+    private SpriteRenderer OperateBk;
     private SpriteRenderer OperateIcon;
+    private SpriteRenderer OperateOutline;
 
     #endregion
 
@@ -216,7 +220,9 @@ public class Flower : ObjRoot, IPointerClickHandler
         GoldIcon = ChildDic["GoldIcon"];
         Animator = ChildDic["FlashLight"].GetComponent<Animator>();
         FlowerIcon = ChildDic["FlowerIcon"].GetComponent<SpriteRenderer>();
+        OperateBk = ChildDic["OperateBk"].GetComponent<SpriteRenderer>();
         OperateIcon = ChildDic["OperateIcon"].GetComponent<SpriteRenderer>();
+        OperateOutline = ChildDic["OperateOutline"].GetComponent<SpriteRenderer>();
 
         Tween tween = FlowerIcon.CreateTweenSr(new Color(1, 1, 1), new Color(1, 0.5f, 0.5f), 0.2f, true, true, Curve.EaseOutQuad);
 
@@ -231,6 +237,15 @@ public class Flower : ObjRoot, IPointerClickHandler
         {
             OperateIcon.TweenBacSr();
         };
+
+        tween = OperateBk.CreateTweenSr(new Color(1, 1, 1), new Color(1, 0.5f, 0.5f), 0.2f, true, true, Curve.EaseOutQuad);
+
+        tween.OnForwardFinish += () =>
+        {
+            OperateBk.TweenBacSr();
+        };
+
+        OperateBk.CreateTweenScale(OperateBk.transform.localScale + new Vector3(0.1f, 0.1f, 0.1f), 0.25f, false, true, Curve.EaseOutQuad);
     }
 
 
@@ -239,6 +254,7 @@ public class Flower : ObjRoot, IPointerClickHandler
     public void GameOver()
     {
         ChildDic["MiniGame"].SetActive(false);
+        OperateBk.TweenBacScale();
     }
 
     public void GameBegin()
@@ -250,32 +266,39 @@ public class Flower : ObjRoot, IPointerClickHandler
 
     public void SetFirstOp()
     {
+        OperateBk.TweenForScale();
+
         OperateIcon.SetAlpha(1);
-        OperateIcon.material.shader = Shader.Find("DashGame/HighLight");
+        OperateOutline.SetAlpha(1);
 
         OperateIcon.SetActive(true);
+        OperateOutline.SetActive(true);
     }
 
     public void SetSecondOp()
     {
         OperateIcon.SetAlpha(1);
-        OperateIcon.material.shader = Shader.Find("Sprites/Default");
+        OperateOutline.SetAlpha(1);
 
         OperateIcon.SetActive(true);
+        OperateOutline.SetActive(false);
     }
 
     public void SetThirdOp()
     {
         OperateIcon.SetAlpha(0.5f);
-        OperateIcon.material.shader = Shader.Find("Sprites/Default");
+        OperateOutline.SetAlpha(0.5f);
 
         OperateIcon.SetActive(true);
+        OperateOutline.SetActive(false);
     }
 
     public void CreateOp(int sequence)
     {
         float random = Random.Range(0f, 1f);
 
+        OperateBk.SetActive(true);
+
         if (random <= 0.3333333f)
         {
             OpType = OpType.Rip;
@@ -310,6 +333,7 @@ public class Flower : ObjRoot, IPointerClickHandler
     {
         if (opType != OpType) //错误的操作
         {
+            OperateBk.TweenForSr();
             FlowerIcon.TweenForSr();
             OperateIcon.TweenForSr();
 
@@ -354,7 +378,7 @@ public class Flower : ObjRoot, IPointerClickHandler
 
             PlayAnim();
 
-            OperateIcon.SetActive(false);
+            OperateBk.TweenBacScale();
 
             return true;
         }

Assets/Script/Tool/Anim/Tween.cs

@@ -6,11 +6,23 @@ using System.Collections;
 
 public abstract class Tween 
 {
+    public virtual bool InOrigin
+    {
+        get { return _InOrigin; }
+        set { _InOrigin = value; }
+    }
+
+    public virtual bool InDestination
+    {
+        get { return _InDestination; }
+        set { _InDestination = value; }
+    }
+
+    protected bool _InOrigin;
+    protected bool _InDestination;
+
     public bool InForward;
     public bool InBackward;
-
-    public bool IsForward;
-    public bool IsBackward;
     public UnityAction OnForwardStart;
     public UnityAction OnForwardFinish;
     public UnityAction OnBackwardStart;
@@ -28,7 +40,7 @@ public abstract class Tween
 
     public void ConfineForward()
     {
-        if (InForward)
+        if (InOrigin)
         {
             StartForward();
         }
@@ -36,7 +48,7 @@ public abstract class Tween
 
     public void ConfineBackward()
     {
-        if (InBackward)
+        if (InDestination)
         {
             StartBackward();
         }
@@ -45,8 +57,8 @@ public abstract class Tween
 
     public virtual void StartForward()
     {
-        IsForward = true;
-        InForward = false;
+        InForward = true;
+        InOrigin = false;
 
         OnForwardStart.Invoke();
 
@@ -56,8 +68,8 @@ public abstract class Tween
 
     public virtual void StartBackward()
     {
-        IsBackward = true;
-        InBackward = false;
+        InBackward = true;
+        InDestination = false;
 
         OnBackwardStart.Invoke();
 

Assets/Script/Tool/Anim/TweenAudio.cs

@@ -7,6 +7,51 @@ public class TweenAudio : Tween
 {
     #region 变量
 
+    public override bool InOrigin
+    {
+        get
+        {
+            if (Math.Abs(Target.volume - Origin) < 0.0005f)
+            {
+                _InOrigin = true;
+            }
+
+            return _InOrigin;
+        }
+
+        set
+        {
+            _InOrigin = value;
+
+            if (_InOrigin)
+            {
+                Target.volume = Origin;
+            }
+        }
+    }
+
+    public override bool InDestination
+    {
+        get
+        {
+            if (Math.Abs(Target.volume - Destination) < 0.0005f)
+            {
+                InDestination = true;
+            }
+
+            return _InDestination;
+        }
+        set
+        {
+            _InDestination = value;
+
+            if (_InDestination)
+            {
+                Target.volume = Destination;
+            }
+        }
+    }
+
     protected float Delta;
     protected float Origin;
     protected float Destination;
@@ -17,20 +62,11 @@ public class TweenAudio : Tween
 
     public TweenAudio(AudioSource target, float origin, float destination, float duration, bool originActive, bool destActive, Curve curve)
     {
-        if (Math.Abs(target.volume - origin) < 0.0005f)
-        {
-            InForward = true;
-        }
-        else if (Math.Abs(target.volume - destination) < 0.0005f)
-        {
-            InBackward = true;
-        }
-
         Func = ManaAnim.FunctionDicF[curve];
         Target = target;
 
-        IsForward = false;
-        IsBackward = false;
+        InForward = false;
+        InBackward = false;
 
         Delta = destination - origin;
         Origin = origin;
@@ -63,7 +99,7 @@ public class TweenAudio : Tween
     {
         base.StartForward();
 
-        if (IsBackward)
+        if (InBackward)
         {
             Timer = Duration - Timer;
         }
@@ -77,7 +113,7 @@ public class TweenAudio : Tween
     {
         base.StartBackward();
 
-        if (IsForward)
+        if (InForward)
         {
             Timer = Duration - Timer;
         }
@@ -95,10 +131,8 @@ public class TweenAudio : Tween
         {
             Timer = 0;
 
-            Target.volume = Destination;
-
-            IsForward = false;
-            InBackward = true;
+            InForward = false;
+            InDestination = true;
 
             OnForwardFinish.Invoke();
 
@@ -122,10 +156,8 @@ public class TweenAudio : Tween
         {
             Timer = 0;
 
-            Target.volume = Origin;
-
-            IsBackward = false;
-            InForward = true;
+            InBackward = false;
+            InOrigin = true;
 
             OnBackwardFinish.Invoke();
 

Assets/Script/Tool/Anim/TweenCG.cs

@@ -7,6 +7,54 @@ public class TweenCG : Tween
 {
     #region 变量
 
+    public override bool InOrigin
+    {
+        get
+        {
+            if (Math.Abs(Target.alpha - Origin) < 0.0005f)
+            {
+                _InOrigin = true;
+            }
+
+            return _InOrigin;
+        }
+
+        set
+        {
+            _InOrigin = value;
+
+            if (_InOrigin)
+            {
+                Target.alpha = Origin;
+            }
+
+            
+        }
+    }
+
+    public override bool InDestination
+    {
+        get
+        {
+            if (Math.Abs(Target.alpha - Destination) < 0.0005f)
+            {
+                InDestination = true;
+            }
+
+            return _InDestination;
+        }
+        set
+        {
+            _InDestination = value;
+
+            if (_InDestination)
+            {
+                Target.alpha = Destination;
+            }
+            
+        }
+    }
+
     protected float Delta;
     protected float Origin;
     protected float Destination;
@@ -17,20 +65,11 @@ public class TweenCG : Tween
 
     public TweenCG(CanvasGroup target, float origin, float destination, float duration, bool originActive, bool destActive, Curve curve)
     {
-        if (Math.Abs(target.alpha - origin) < 0.0005f)
-        {
-            InForward = true;
-        }
-        else if (Math.Abs(target.alpha - destination) < 0.0005f)
-        {
-            InBackward = true;
-        }
-
         Func = ManaAnim.FunctionDicF[curve];
         Target = target;
 
-        IsForward = false;
-        IsBackward = false;
+        InForward = false;
+        InBackward = false;
 
         Delta = destination - origin;
         Origin = origin;
@@ -68,7 +107,7 @@ public class TweenCG : Tween
     {
         base.StartForward();
 
-        if (IsBackward)
+        if (InBackward)
         {
             Timer = Duration - Timer;
         }
@@ -82,7 +121,7 @@ public class TweenCG : Tween
     {
         base.StartBackward();
 
-        if (IsForward)
+        if (InForward)
         {
             Timer = Duration - Timer;
         }
@@ -100,10 +139,8 @@ public class TweenCG : Tween
         {
             Timer = 0;
 
-            Target.alpha = Destination;
-
-            IsForward = false;
-            InBackward = true;
+            InForward = false;
+            InDestination = true;
 
             OnForwardFinish.Invoke();
 
@@ -127,10 +164,8 @@ public class TweenCG : Tween
         {
             Timer = 0;
 
-            Target.alpha = Origin;
-
-            IsBackward = false;
-            InForward = true;
+            InBackward = false;
+            InOrigin = true;
 
             OnBackwardFinish.Invoke();
 

Assets/Script/Tool/Anim/TweenGra.cs

@@ -8,6 +8,54 @@ public class TweenGra : Tween
 {
     #region 变量
 
+    public override bool InOrigin
+    {
+        get
+        {
+            if (Target.color == Origin)
+            {
+                _InOrigin = true;
+            }
+
+            return _InOrigin;
+        }
+
+        set
+        {
+            _InOrigin = value;
+
+            if (_InOrigin)
+            {
+                Target.color = Origin;
+            }
+
+            
+        }
+    }
+
+    public override bool InDestination
+    {
+        get
+        {
+            if (Target.color == Destination)
+            {
+                _InDestination = true;
+            }
+
+            return _InDestination;
+        }
+        set
+        {
+            _InDestination = value;
+
+            if (_InDestination)
+            {
+                Target.color = Destination;
+            }
+            
+        }
+    }
+
     protected Color Delta;
     protected Color Origin;
     protected Color Destination;
@@ -18,20 +66,11 @@ public class TweenGra : Tween
 
     public TweenGra(Graphic target, Color origin, Color destination, float duration, bool originActive, bool destActive, Curve curve)
     {
-        if (target.color == origin)
-        {
-            InForward = true;
-        }
-        else if (target.color == destination)
-        {
-            InBackward = true;
-        }
-
         Func = ManaAnim.FunctionDicC[curve];
         Target = target;
 
-        IsForward = false;
-        IsBackward = false;
+        InForward = false;
+        InBackward = false;
 
         Delta = destination - origin;
         Origin = origin;
@@ -65,7 +104,7 @@ public class TweenGra : Tween
     {
         base.StartForward();
 
-        if (IsBackward)
+        if (InBackward)
         {
             Timer = Duration - Timer;
         }
@@ -79,7 +118,7 @@ public class TweenGra : Tween
     {
         base.StartBackward();
 
-        if (IsForward)
+        if (InForward)
         {
             Timer = Duration - Timer;
         }
@@ -97,10 +136,8 @@ public class TweenGra : Tween
         {
             Timer = 0;
 
-            Target.color = Destination;
-
-            IsForward = false;
-            InBackward = true;
+            InForward = false;
+            InDestination = true;
 
             OnForwardFinish.Invoke();
 
@@ -124,10 +161,8 @@ public class TweenGra : Tween
         {
             Timer = 0;
 
-            Target.color = Origin;
-
-            IsBackward = false;
-            InForward = true;
+            InBackward = false;
+            InOrigin = true;
 
             OnBackwardFinish.Invoke();
 

Assets/Script/Tool/Anim/TweenRect.cs

@@ -6,6 +6,53 @@ public class TweenRect : Tween
 {
     #region
 
+    public override bool InOrigin
+    {
+        get
+        {
+            if (Target.sizeDelta == Origin)
+            {
+                _InOrigin = true;
+            }
+
+            return _InOrigin;
+        }
+
+        set
+        {
+            _InOrigin = value;
+
+            if (_InOrigin)
+            {
+                Target.sizeDelta = Origin;
+            }
+            
+        }
+    }
+
+    public override bool InDestination
+    {
+        get
+        {
+            if (Target.sizeDelta == Destination)
+            {
+                _InDestination = true;
+            }
+
+            return _InDestination;
+        }
+        set
+        {
+            _InDestination = value;
+
+            if (_InDestination)
+            {
+                Target.sizeDelta = Destination;
+            }
+            
+        }
+    }
+
     protected Vector2 Delta;
     protected Vector2 Origin;
     protected Vector2 Destination;
@@ -17,21 +64,12 @@ public class TweenRect : Tween
 
     public TweenRect(RectTransform target, Vector2 origin, Vector2 destination, float duration, bool originActive, bool destActive, Curve curve)
     {
-        if (target.sizeDelta == origin)
-        {
-            InForward = true;
-        }
-        else if (target.sizeDelta == destination)
-        {
-            InBackward = true;
-        }
-
         CG = target.GetComponent<CanvasGroup>();
         Func = ManaAnim.FunctionDicV[curve];
         Target = target;
 
-        IsForward = false;
-        IsBackward = false;
+        InForward = false;
+        InBackward = false;
 
         Delta = destination - origin;
         Origin = origin;
@@ -85,7 +123,7 @@ public class TweenRect : Tween
     {
         base.StartForward();
 
-        if (IsBackward)
+        if (InBackward)
         {
             Timer = Duration - Timer;
         }
@@ -99,7 +137,7 @@ public class TweenRect : Tween
     {
         base.StartBackward();
 
-        if (IsForward)
+        if (InForward)
         {
             Timer = Duration - Timer;
         }
@@ -117,10 +155,8 @@ public class TweenRect : Tween
         {
             Timer = 0;
 
-            Target.sizeDelta = Destination;
-
-            IsForward = false;
-            InBackward = true;
+            InForward = false;
+            InDestination = true;
 
             OnForwardFinish.Invoke();
 
@@ -144,10 +180,8 @@ public class TweenRect : Tween
         {
             Timer = 0;
 
-            Target.sizeDelta = Origin;
-
-            IsBackward = false;
-            InForward = true;
+            InBackward = false;
+            InOrigin = true;
 
             OnBackwardFinish.Invoke();
 

Assets/Script/Tool/Anim/TweenScale.cs

@@ -7,6 +7,53 @@ public class TweenScale : Tween
 {
     #region
 
+    public override bool InOrigin
+    {
+        get
+        {
+            if (Target.localScale == Origin)
+            {
+                _InOrigin = true;
+            }
+
+            return _InOrigin;
+        }
+
+        set
+        {
+            _InOrigin = value;
+
+            if (_InOrigin)
+            {
+                Target.localScale = Origin;
+            }
+            
+        }
+    }
+
+    public override bool InDestination
+    {
+        get
+        {
+            if (Target.localScale == Destination)
+            {
+                _InDestination = true;
+            }
+
+            return _InDestination;
+        }
+        set
+        {
+            _InDestination = value;
+
+            if (_InDestination)
+            {
+                Target.localScale = Destination;
+            }
+            
+        }
+    }
+
     public Vector3 Delta;
     public Vector3 Origin;
     public Vector3 Destination;
@@ -18,21 +65,12 @@ public class TweenScale : Tween
 
     public TweenScale(Transform target, Vector3 origin, Vector3 destination, float duration, bool originActive, bool destActive, Curve curve)
     {
-        if (target.localScale == origin)
-        {
-            InForward = true;
-        }
-        else if (target.localScale == destination)
-        {
-            InBackward = true;
-        }
-
         CG = target.GetComponent<CanvasGroup>();
         Func = ManaAnim.FunctionDicV[curve];
         Target = target;
 
-        IsForward = false;
-        IsBackward = false;
+        InForward = false;
+        InBackward = false;
 
         Delta = destination - origin;
         Origin = origin;
@@ -87,7 +125,7 @@ public class TweenScale : Tween
     {
         base.StartForward();
 
-        if (IsBackward)
+        if (InBackward)
         {
             Timer = Duration - Timer;
         }
@@ -101,7 +139,7 @@ public class TweenScale : Tween
     {
         base.StartBackward();
 
-        if (IsForward)
+        if (InForward)
         {
             Timer = Duration - Timer;
         }
@@ -119,10 +157,8 @@ public class TweenScale : Tween
         {
             Timer = 0;
 
-            Target.localScale = Destination;
-
-            IsForward = false;
-            InBackward = true;
+            InForward = false;
+            InDestination = true;
 
             OnForwardFinish.Invoke();
 
@@ -146,10 +182,8 @@ public class TweenScale : Tween
         {
             Timer = 0;
 
-            Target.localScale = Origin;
-
-            IsBackward = false;
-            InForward = true;
+            InBackward = false;
+            InOrigin = true;
 
             OnBackwardFinish.Invoke();
 

Assets/Script/Tool/Anim/TweenSr.cs

@@ -6,6 +6,53 @@ public class TweenSr : Tween
 {
     #region 变量
 
+    public override bool InOrigin
+    {
+        get
+        {
+            if (Target.color == Origin)
+            {
+                _InOrigin = true;
+            }
+
+            return _InOrigin;
+        }
+
+        set
+        {
+            _InOrigin = value;
+
+            if (_InOrigin)
+            {
+                Target.color = Origin;
+            }
+            
+        }
+    }
+
+    public override bool InDestination
+    {
+        get
+        {
+            if (Target.color == Destination)
+            {
+                _InDestination = true;
+            }
+
+            return _InDestination;
+        }
+        set
+        {
+            _InDestination = value;
+
+            if (_InDestination)
+            {
+                Target.color = Destination;
+            }
+            
+        }
+    }
+
     protected Color Delta;
     protected Color Origin;
     protected Color Destination;
@@ -16,20 +63,11 @@ public class TweenSr : Tween
 
     public TweenSr(SpriteRenderer target, Color origin, Color destination, float duration, bool originActive, bool destActive, Curve curve)
     {
-        if (target.color == origin)
-        {
-            InForward = true;
-        }
-        else if (target.color == destination)
-        {
-            InBackward = true;
-        }
-
         Func = ManaAnim.FunctionDicC[curve];
         Target = target;
 
-        IsForward = false;
-        IsBackward = false;
+        InForward = false;
+        InBackward = false;
 
         Delta = destination - origin;
         Origin = origin;
@@ -63,7 +101,7 @@ public class TweenSr : Tween
     {
         base.StartForward();
 
-        if (IsBackward)
+        if (InBackward)
         {
             Timer = Duration - Timer;
         }
@@ -77,7 +115,7 @@ public class TweenSr : Tween
     {
         base.StartBackward();
 
-        if (IsForward)
+        if (InForward)
         {
             Timer = Duration - Timer;
         }
@@ -95,10 +133,8 @@ public class TweenSr : Tween
         {
             Timer = 0;
 
-            Target.color = Destination;
-
-            IsForward = false;
-            InBackward = true;
+            InForward = false;
+            InDestination = true;
 
             OnForwardFinish.Invoke();
 
@@ -122,10 +158,8 @@ public class TweenSr : Tween
         {
             Timer = 0;
 
-            Target.color = Origin;
-
-            IsBackward = false;
-            InForward = true;
+            InBackward = false;
+            InOrigin = true;
 
             OnBackwardFinish.Invoke();
 

Assets/Script/Tool/Anim/TweenText.cs

@@ -8,6 +8,53 @@ public class TweenText : Tween
 {
     #region 变量
 
+    public override bool InOrigin
+    {
+        get
+        {
+            if (Math.Abs(Target.fontSize - Origin) < 0.0005f)
+            {
+                _InOrigin = true;
+            }
+
+            return _InOrigin;
+        }
+
+        set
+        {
+            _InOrigin = value;
+
+            if (_InOrigin)
+            {
+                Target.fontSize = (int)Origin;
+            }
+            
+        }
+    }
+
+    public override bool InDestination
+    {
+        get
+        {
+            if (Math.Abs(Target.fontSize - Destination) < 0.0005f)
+            {
+                InDestination = true;
+            }
+
+            return _InDestination;
+        }
+        set
+        {
+            _InDestination = value;
+
+            if (_InDestination)
+            {
+                Target.fontSize = (int)Destination;
+            }
+            
+        }
+    }
+
     protected float Delta;
     protected float Origin;
     protected float Destination;
@@ -19,20 +66,11 @@ public class TweenText : Tween
 
     public TweenText(Text target, float origin, float destination, float duration, bool originActive, bool destActive, Curve curve)
     {
-        if (Math.Abs(target.fontSize - origin) < 0.0005f)
-        {
-            InForward = true;
-        }
-        else if (Math.Abs(target.fontSize - destination) < 0.0005f)
-        {
-            InBackward = true;
-        }
-
         Func = ManaAnim.FunctionDicF[curve];
         Target = target;
 
-        IsForward = false;
-        IsBackward = false;
+        InForward = false;
+        InBackward = false;
 
         Delta = destination - origin;
         Origin = origin;
@@ -66,7 +104,7 @@ public class TweenText : Tween
     {
         base.StartForward();
 
-        if (IsBackward)
+        if (InBackward)
         {
             Timer = Duration - Timer;
         }
@@ -80,7 +118,7 @@ public class TweenText : Tween
     {
         base.StartBackward();
 
-        if (IsForward)
+        if (InForward)
         {
             Timer = Duration - Timer;
         }
@@ -98,10 +136,8 @@ public class TweenText : Tween
         {
             Timer = 0;
 
-            Target.fontSize = (int) Destination;
-
-            IsForward = false;
-            InBackward = true;
+            InForward = false;
+            InDestination = true;
 
             OnForwardFinish.Invoke();
 
@@ -125,10 +161,8 @@ public class TweenText : Tween
         {
             Timer = 0;
 
-            Target.fontSize = (int) Origin;
-
-            IsBackward = false;
-            InForward = true;
+            InBackward = false;
+            InOrigin = true;
 
             OnBackwardFinish.Invoke();
 

Assets/Script/Tool/Anim/TweenVec.cs

@@ -7,6 +7,53 @@ public class TweenVec : Tween
 {
     #region
 
+    public override bool InOrigin
+    {
+        get
+        {
+            if (Target.position == Origin)
+            {
+                _InOrigin = true;
+            }
+
+            return _InOrigin;
+        }
+
+        set
+        {
+            _InOrigin = value;
+
+            if (_InOrigin)
+            {
+                Target.position = Origin;
+            }
+            
+        }
+    }
+
+    public override bool InDestination
+    {
+        get
+        {
+            if (Target.position == Destination)
+            {
+                _InDestination = true;
+            }
+
+            return _InDestination;
+        }
+        set
+        {
+            _InDestination = value;
+
+            if (_InDestination)
+            {
+                Target.position = Destination;
+            }
+            
+        }
+    }
+
     protected Vector3 Delta;
     protected Vector3 Origin;
     protected Vector3 Destination;
@@ -18,21 +65,12 @@ public class TweenVec : Tween
 
     public TweenVec(Transform target, Vector3 origin, Vector3 destination, float duration, bool originActive, bool destActive, Curve curve)
     {
-        if (target.position == origin)
-        {
-            InForward = true;
-        }
-        else if (target.position == destination)
-        {
-            InBackward = true;
-        }
-
         CG = target.GetComponent<CanvasGroup>();
         Func = ManaAnim.FunctionDicV[curve];
         Target = target;
 
-        IsForward = false;
-        IsBackward = false;
+        InForward = false;
+        InBackward = false;
 
         Delta = destination - origin;
         Origin = origin;
@@ -86,7 +124,7 @@ public class TweenVec : Tween
     {
         base.StartForward();
 
-        if (IsBackward)
+        if (InBackward)
         {
             Timer = Duration - Timer;
         }
@@ -100,7 +138,7 @@ public class TweenVec : Tween
     {
         base.StartBackward();
 
-        if (IsForward)
+        if (InForward)
         {
             Timer = Duration - Timer;
         }
@@ -118,10 +156,8 @@ public class TweenVec : Tween
         {
             Timer = 0;
 
-            Target.position = Destination;
-
-            IsForward = false;
-            InBackward = true;
+            InForward = false;
+            InDestination = true;
 
             OnForwardFinish.Invoke();
 
@@ -145,10 +181,8 @@ public class TweenVec : Tween
         {
             Timer = 0;
 
-            Target.position = Origin;
-
-            IsBackward = false;
-            InForward = true;
+            InBackward = false;
+            InOrigin = true;
 
             OnBackwardFinish.Invoke();
 

Assets/Script/Tool/UI/UIPartical.cs

@@ -0,0 +1,114 @@
+using UnityEngine;
+using UnityEngine.UI;
+
+using System;
+using System.Collections;
+
+public class UIPartical : Image 
+{
+    #region 变量
+
+    public Animator Animator
+    {
+        get
+        {
+            if (_Animator == null)
+            {
+                _Animator = GetComponentInParent<Animator>();
+            }
+
+            return _Animator;
+        }
+        set { _Animator = value; }
+    }
+    public ParticleSystem ParticleSystem
+    {
+        get
+        {
+            if (_ParticleSystem == null)
+            {
+                _ParticleSystem = GetComponent<ParticleSystem>();
+            }
+
+            return _ParticleSystem;
+        }
+        set { _ParticleSystem = value; }
+    }
+
+    private Animator _Animator;
+    private ParticleSystem _ParticleSystem;
+
+    #endregion
+
+    private void Update()
+    {
+        SetAllDirty();
+    }
+
+    public void Begin()
+    {
+        if (Animator == null || ParticleSystem == null)
+        {
+            return;
+        }
+
+        Animator.SetTrigger("Play");
+
+        ParticleSystem.Play();
+    }
+
+
+    protected override void OnPopulateMesh(VertexHelper toFill)
+    {
+        if (ParticleSystem == null)
+        {
+            Debug.Log("There is no ParticalSystem");
+            
+            return;
+        }
+
+        toFill.Clear();
+
+        ParticleSystem.Particle[] particles = new ParticleSystem.Particle[ParticleSystem.particleCount];
+
+        ParticleSystem.GetParticles(particles);
+
+        for (int i = 0; i < particles.Length; i++)
+        {
+            DrawParticle(toFill, particles[i]);
+        }
+    }
+
+    protected void DrawParticle(VertexHelper toFill, ParticleSystem.Particle particle)
+    {
+        UIVertex[] vertices = new UIVertex[4];
+
+        Vector3 upAxis = new Vector3(0, 1, 0);
+        Vector3 rightAxis = new Vector3(1, 0, 0);
+
+        if (Math.Abs(particle.rotation) > 0.0005f)
+        {
+            particle.rotation *= Mathf.Deg2Rad;
+
+            upAxis = new Vector3(-Mathf.Sin(particle.rotation), Mathf.Cos(particle.rotation), 0);
+            rightAxis = new Vector3(Mathf.Cos(particle.rotation), Mathf.Sin(particle.rotation), 0);
+        }
+
+        vertices[0].position = particle.position + upAxis*sprite.rect.height/50 - rightAxis*sprite.rect.width/50;
+        vertices[1].position = particle.position + upAxis*sprite.rect.height/50 + rightAxis*sprite.rect.width/50;
+        vertices[2].position = particle.position - upAxis*sprite.rect.height/50 + rightAxis*sprite.rect.width/50;
+        vertices[3].position = particle.position - upAxis*sprite.rect.height/50 - rightAxis*sprite.rect.width/50;
+
+        vertices[0].color = particle.GetCurrentColor(ParticleSystem);
+        vertices[1].color = particle.GetCurrentColor(ParticleSystem);
+        vertices[2].color = particle.GetCurrentColor(ParticleSystem);
+        vertices[3].color = particle.GetCurrentColor(ParticleSystem);
+
+        vertices[0].uv0 = new Vector2(0, 1);
+        vertices[1].uv0 = new Vector2(1, 1);
+        vertices[2].uv0 = new Vector2(1, 0);
+        vertices[3].uv0 = new Vector2(0, 0);
+
+        toFill.AddUIVertexQuad(vertices);
+    }
+}

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

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

MyLovelyGarden.Editor.csproj

@@ -15,7 +15,7 @@
     <TargetFrameworkProfile>Unity Full v3.5</TargetFrameworkProfile>
     <CompilerResponseFile></CompilerResponseFile>
     <UnityProjectType>Editor:5</UnityProjectType>
-    <UnityBuildTarget>Android:13</UnityBuildTarget>
+    <UnityBuildTarget>StandaloneWindows64:19</UnityBuildTarget>
     <UnityVersion>5.5.0f3</UnityVersion>
     <RootNamespace></RootNamespace>
     <LangVersion Condition=" '$(VisualStudioVersion)' != '10.0' ">4</LangVersion>
@@ -27,7 +27,7 @@
     <IntermediateOutputPath>Temp\UnityVS_obj\Debug\</IntermediateOutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DefineConstants>DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_5_0;UNITY_5_5;UNITY_5;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_GENERICS;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;PLATFORM_SUPPORTS_MONO;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_SCRIPTING_NEW_CSHARP_COMPILER;UNITY_ANDROID;ENABLE_SUBSTANCE;UNITY_ANDROID_API;ENABLE_EGL;ENABLE_NETWORK;ENABLE_RUNTIME_GI;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;PLATFORM_SUPPORTS_ADS_ID;UNITY_CAN_SHOW_SPLASH_SCREEN;ENABLE_VIDEO;ENABLE_VR;ENABLE_UNITYADS_RUNTIME;UNITY_UNITYADS_API;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE</DefineConstants>
+    <DefineConstants>DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_5_0;UNITY_5_5;UNITY_5;UNITY_64;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_GENERICS;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_SCRIPTING_NEW_CSHARP_COMPILER;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_VIDEO;ENABLE_VR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE</DefineConstants>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -37,7 +37,7 @@
     <IntermediateOutputPath>Temp\UnityVS_obj\Release\</IntermediateOutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DefineConstants>TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_5_0;UNITY_5_5;UNITY_5;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_GENERICS;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;PLATFORM_SUPPORTS_MONO;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_SCRIPTING_NEW_CSHARP_COMPILER;UNITY_ANDROID;ENABLE_SUBSTANCE;UNITY_ANDROID_API;ENABLE_EGL;ENABLE_NETWORK;ENABLE_RUNTIME_GI;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;PLATFORM_SUPPORTS_ADS_ID;UNITY_CAN_SHOW_SPLASH_SCREEN;ENABLE_VIDEO;ENABLE_VR;ENABLE_UNITYADS_RUNTIME;UNITY_UNITYADS_API;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE</DefineConstants>
+    <DefineConstants>TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_5_0;UNITY_5_5;UNITY_5;UNITY_64;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_GENERICS;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_SCRIPTING_NEW_CSHARP_COMPILER;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_VIDEO;ENABLE_VR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE</DefineConstants>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
@@ -158,20 +158,21 @@
     <Compile Include="Assets\Script\Editor\EditorSpriteAsste.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="Assets\Resource\Shader\Discard.shader" />
     <None Include="Assets\Resource\Shader\Gray.shader" />
     <None Include="Assets\Resource\Shader\HighLight.shader" />
+    <None Include="Assets\Resource\XML\Config\ability_config.xml" />
+    <None Include="Assets\Resource\XML\Config\achieve_config.xml" />
+    <None Include="Assets\Resource\XML\Config\award_config.xml" />
+    <None Include="Assets\Resource\XML\Config\flower_config.xml" />
+    <None Include="Assets\Resource\XML\Config\offline_config.xml" />
+    <None Include="Assets\Resource\XML\Config\pack_config.xml" />
+    <None Include="Assets\Resource\XML\Config\signin_config.xml" />
+    <None Include="Assets\Resource\XML\Config\skill_config.xml" />
     <None Include="Assets\Resource\XML\PlayerConfig.xml" />
-    <None Include="Assets\Resources\xml\Config\ability_config.xml" />
-    <None Include="Assets\Resources\xml\Config\achieve_config.xml" />
-    <None Include="Assets\Resources\xml\Config\award_config.xml" />
-    <None Include="Assets\Resources\xml\Config\flower_config.xml" />
-    <None Include="Assets\Resources\xml\Config\offline_config.xml" />
-    <None Include="Assets\Resources\xml\Config\pack_config.xml" />
-    <None Include="Assets\Resources\xml\Config\signin_config.xml" />
-    <None Include="Assets\Resources\xml\Config\skill_config.xml" />
-    <None Include="Assets\Resources\xml\lan\ChineseSimplified.xml" />
-    <None Include="Assets\Resources\xml\lan\ChineseTraditional.xml" />
-    <None Include="Assets\Resources\xml\lan\English.xml" />
+    <None Include="Assets\Resource\XML\lan\ChineseSimplified.xml" />
+    <None Include="Assets\Resource\XML\lan\ChineseTraditional.xml" />
+    <None Include="Assets\Resource\XML\lan\English.xml" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="GenerateTargetFrameworkMonikerAttribute" />

MyLovelyGarden.csproj

@@ -15,7 +15,7 @@
     <TargetFrameworkProfile>Unity Subset v3.5</TargetFrameworkProfile>
     <CompilerResponseFile></CompilerResponseFile>
     <UnityProjectType>Game:1</UnityProjectType>
-    <UnityBuildTarget>Android:13</UnityBuildTarget>
+    <UnityBuildTarget>StandaloneWindows64:19</UnityBuildTarget>
     <UnityVersion>5.5.0f3</UnityVersion>
     <RootNamespace></RootNamespace>
     <LangVersion Condition=" '$(VisualStudioVersion)' != '10.0' ">4</LangVersion>
@@ -27,7 +27,7 @@
     <IntermediateOutputPath>Temp\UnityVS_obj\Debug\</IntermediateOutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DefineConstants>DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_5_0;UNITY_5_5;UNITY_5;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_GENERICS;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;PLATFORM_SUPPORTS_MONO;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_SCRIPTING_NEW_CSHARP_COMPILER;UNITY_ANDROID;ENABLE_SUBSTANCE;UNITY_ANDROID_API;ENABLE_EGL;ENABLE_NETWORK;ENABLE_RUNTIME_GI;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;PLATFORM_SUPPORTS_ADS_ID;UNITY_CAN_SHOW_SPLASH_SCREEN;ENABLE_VIDEO;ENABLE_VR;ENABLE_UNITYADS_RUNTIME;UNITY_UNITYADS_API;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE</DefineConstants>
+    <DefineConstants>DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_5_0;UNITY_5_5;UNITY_5;UNITY_64;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_GENERICS;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_SCRIPTING_NEW_CSHARP_COMPILER;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_VIDEO;ENABLE_VR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE</DefineConstants>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -37,7 +37,7 @@
     <IntermediateOutputPath>Temp\UnityVS_obj\Release\</IntermediateOutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DefineConstants>TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_5_0;UNITY_5_5;UNITY_5;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_GENERICS;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;PLATFORM_SUPPORTS_MONO;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_SCRIPTING_NEW_CSHARP_COMPILER;UNITY_ANDROID;ENABLE_SUBSTANCE;UNITY_ANDROID_API;ENABLE_EGL;ENABLE_NETWORK;ENABLE_RUNTIME_GI;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;PLATFORM_SUPPORTS_ADS_ID;UNITY_CAN_SHOW_SPLASH_SCREEN;ENABLE_VIDEO;ENABLE_VR;ENABLE_UNITYADS_RUNTIME;UNITY_UNITYADS_API;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE</DefineConstants>
+    <DefineConstants>TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_5_0;UNITY_5_5;UNITY_5;UNITY_64;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_GENERICS;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_SCRIPTING_NEW_CSHARP_COMPILER;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_VIDEO;ENABLE_VR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE</DefineConstants>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
@@ -154,6 +154,7 @@
     <Compile Include="Assets\Script\Tool\UI\ScrollRectPlus.cs" />
     <Compile Include="Assets\Script\Tool\UI\SpriteAsset.cs" />
     <Compile Include="Assets\Script\Tool\UI\TextPlus.cs" />
+    <Compile Include="Assets\Script\Tool\UI\UIPartical.cs" />
     <Compile Include="Assets\Script\Utils\DGFileUtil.cs" />
     <Compile Include="Assets\Script\Utils\JsonUtil.cs" />
     <Compile Include="Assets\Script\Utils\MD5Util.cs" />
@@ -161,20 +162,21 @@
     <Compile Include="Assets\Script\Utils\StringUtil.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="Assets\Resource\Shader\Discard.shader" />
     <None Include="Assets\Resource\Shader\Gray.shader" />
     <None Include="Assets\Resource\Shader\HighLight.shader" />
+    <None Include="Assets\Resource\XML\Config\ability_config.xml" />
+    <None Include="Assets\Resource\XML\Config\achieve_config.xml" />
+    <None Include="Assets\Resource\XML\Config\award_config.xml" />
+    <None Include="Assets\Resource\XML\Config\flower_config.xml" />
+    <None Include="Assets\Resource\XML\Config\offline_config.xml" />
+    <None Include="Assets\Resource\XML\Config\pack_config.xml" />
+    <None Include="Assets\Resource\XML\Config\signin_config.xml" />
+    <None Include="Assets\Resource\XML\Config\skill_config.xml" />
     <None Include="Assets\Resource\XML\PlayerConfig.xml" />
-    <None Include="Assets\Resources\xml\Config\ability_config.xml" />
-    <None Include="Assets\Resources\xml\Config\achieve_config.xml" />
-    <None Include="Assets\Resources\xml\Config\award_config.xml" />
-    <None Include="Assets\Resources\xml\Config\flower_config.xml" />
-    <None Include="Assets\Resources\xml\Config\offline_config.xml" />
-    <None Include="Assets\Resources\xml\Config\pack_config.xml" />
-    <None Include="Assets\Resources\xml\Config\signin_config.xml" />
-    <None Include="Assets\Resources\xml\Config\skill_config.xml" />
-    <None Include="Assets\Resources\xml\lan\ChineseSimplified.xml" />
-    <None Include="Assets\Resources\xml\lan\ChineseTraditional.xml" />
-    <None Include="Assets\Resources\xml\lan\English.xml" />
+    <None Include="Assets\Resource\XML\lan\ChineseSimplified.xml" />
+    <None Include="Assets\Resource\XML\lan\ChineseTraditional.xml" />
+    <None Include="Assets\Resource\XML\lan\English.xml" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="GenerateTargetFrameworkMonikerAttribute" />

MyLovelyGarden.txt

@@ -1,10 +1,10 @@
-成就
+FlowerG的tab放大与泡泡
 
-Confine与InForward与InBackward(外部修改动画值)
+切换后台后功能(音效 收入 技能)
 
-配置的导出目录
+改变PageView效果
 
-Hud的默认Parent
+成就
 
 Shake脚本
 
@@ -14,7 +14,7 @@ Shake
 
 语言切换功能
 
-合并语言文档中的重复项
+Regist机制
 
 
 字体
@@ -29,6 +29,8 @@ OverFlow
 
 RaycastTarget
 
+语言文档中的多余项
+
 DisableButton的颜色
 
 Auxiliary中的测试按键