浏览代码

Temp 4.10

LiuQilin 8 年之前
父节点
当前提交
b6479360bf
共有 34 个文件被更改,包括 1088 次插入62 次删除
  1. 二进制
      .vs/MyLovelyGarden/v14/.suo
  2. 二进制
      Assets/Resource/Animations/Star.anim
  3. 8 0
      Assets/Resource/Animations/Star.anim.meta
  4. 二进制
      Assets/Resource/Animations/Star.controller
  5. 8 0
      Assets/Resource/Animations/Star.controller.meta
  6. 二进制
      Assets/Resource/Prefab/PrefabUI/Canvas.prefab
  7. 97 0
      Assets/Resource/Shader/Mask.shader
  8. 9 0
      Assets/Resource/Shader/Mask.shader.meta
  9. 二进制
      Assets/Resource/Shader/MaskMat.mat
  10. 8 0
      Assets/Resource/Shader/MaskMat.mat.meta
  11. 二进制
      Assets/Resource/Sprite/Reference/Clipboard Image (1).png
  12. 68 0
      Assets/Resource/Sprite/Reference/Clipboard Image (1).png.meta
  13. 二进制
      Assets/Resource/Sprite/SpriteUI/新手指引箭头.png
  14. 68 0
      Assets/Resource/Sprite/SpriteUI/新手指引箭头.png.meta
  15. 二进制
      Assets/Resource/Sprite/SpriteUI/游戏等级评分.png
  16. 68 0
      Assets/Resource/Sprite/SpriteUI/游戏等级评分.png.meta
  17. 3 3
      Assets/Resource/XML/PlayerConfig.xml
  18. 2 2
      Assets/Resource/XML/lan/ChineseSimplified.xml
  19. 2 2
      Assets/Resource/XML/lan/ChineseTraditional.xml
  20. 2 2
      Assets/Resource/XML/lan/English.xml
  21. 二进制
      Assets/Resource/Xlsx/language_config.xlsx
  22. 116 0
      Assets/Script/Manage/ManaAnim.cs
  23. 214 22
      Assets/Script/Manage/ManaMiniGame.cs
  24. 68 7
      Assets/Script/Manage/ManaUI.cs
  25. 17 2
      Assets/Script/Object/Tutorial.cs
  26. 16 8
      Assets/Script/Tool/Anim/TweenCG.cs
  27. 198 0
      Assets/Script/Tool/Anim/TweenNumber.cs
  28. 12 0
      Assets/Script/Tool/Anim/TweenNumber.cs.meta
  29. 35 1
      Assets/Script/Tool/Extension.cs
  30. 39 0
      Assets/Script/Tool/SceneMask.cs
  31. 12 0
      Assets/Script/Tool/SceneMask.cs.meta
  32. 16 13
      MyLovelyGarden.sln
  33. 二进制
      ProjectSettings/TagManager.asset
  34. 2 0
      ToList.txt

二进制
.vs/MyLovelyGarden/v14/.suo


二进制
Assets/Resource/Animations/Star.anim


+ 8 - 0
Assets/Resource/Animations/Star.anim.meta

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

二进制
Assets/Resource/Animations/Star.controller


+ 8 - 0
Assets/Resource/Animations/Star.controller.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 10b8223293c15894f881629f9d100d57
+timeCreated: 1491790622
+licenseType: Pro
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

二进制
Assets/Resource/Prefab/PrefabUI/Canvas.prefab


+ 97 - 0
Assets/Resource/Shader/Mask.shader

@@ -0,0 +1,97 @@
+Shader "DashGame/Mask"
+{
+	Properties
+	{
+		[PerRendererData] _MainTex("Sprite Texture", 2D) = "white" {}
+		_Color("Tint", Color) = (1,1,1,1)
+		[MaterialToggle] PixelSnap("Pixel snap", Float) = 0
+	}
+
+		SubShader
+	{
+		Tags
+	{
+		"Queue" = "Transparent"
+		"IgnoreProjector" = "True"
+		"RenderType" = "Transparent"
+		"PreviewType" = "Plane"
+		"CanUseSpriteAtlas" = "True"
+	}
+
+		Cull Off
+		Lighting Off
+		ZWrite Off
+
+		Pass
+	{
+		Blend SrcAlpha OneMinusSrcAlpha
+
+		CGPROGRAM
+
+#pragma vertex vert
+#pragma fragment frag
+
+#pragma target 2.0
+
+#pragma multi_compile _ PIXELSNAP_ON
+#pragma multi_compile _ ETC1_EXTERNAL_ALPHA
+
+#include "UnityCG.cginc"
+
+	struct appdata_t
+	{
+		float4 vertex   : POSITION;
+		float4 color    : COLOR;
+		float2 texcoord : TEXCOORD0;
+	};
+
+	struct v2f
+	{
+		fixed4 color : COLOR;
+		float4 vertex   : SV_POSITION;
+		float2 texcoord  : TEXCOORD0;
+	};
+
+	float _RadiusX;
+	float _RadiusY;
+	float2 _Center;
+	fixed4 _Color;
+
+	v2f vert(appdata_t IN)
+	{
+		v2f OUT;
+
+		OUT.vertex = UnityObjectToClipPos(IN.vertex);
+		OUT.texcoord = IN.texcoord;
+		OUT.color = IN.color * _Color;
+
+		return OUT;
+	}
+
+	sampler2D _MainTex;
+
+	fixed4 SampleSpriteTexture(float2 uv)
+	{
+		fixed4 color = tex2D(_MainTex, uv);
+
+		return color;
+	}
+
+	fixed4 frag(v2f IN) : SV_Target
+	{
+		fixed4 c = SampleSpriteTexture(IN.texcoord) * IN.color;
+
+	float x = IN.vertex.x - _Center.x;
+	float y = IN.vertex.y - _Center.y;
+
+		if (abs(x) < _RadiusX && abs(y) < _RadiusY)
+		{
+			c.a = 0;
+		}
+
+		return c;
+	}
+		ENDCG
+	}
+	}
+}

+ 9 - 0
Assets/Resource/Shader/Mask.shader.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 31909e78665c0ad4d9b29dabc53c63fd
+timeCreated: 1491812984
+licenseType: Pro
+ShaderImporter:
+  defaultTextures: []
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

二进制
Assets/Resource/Shader/MaskMat.mat


+ 8 - 0
Assets/Resource/Shader/MaskMat.mat.meta

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

二进制
Assets/Resource/Sprite/Reference/Clipboard Image (1).png


+ 68 - 0
Assets/Resource/Sprite/Reference/Clipboard Image (1).png.meta

@@ -0,0 +1,68 @@
+fileFormatVersion: 2
+guid: c48be6b73d57b484f9f3662538a9c8ce
+timeCreated: 1491788367
+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/新手指引箭头.png


+ 68 - 0
Assets/Resource/Sprite/SpriteUI/新手指引箭头.png.meta

@@ -0,0 +1,68 @@
+fileFormatVersion: 2
+guid: c7191a1432f270943b55034379d7d5dd
+timeCreated: 1491818481
+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/游戏等级评分.png


+ 68 - 0
Assets/Resource/Sprite/SpriteUI/游戏等级评分.png.meta

@@ -0,0 +1,68 @@
+fileFormatVersion: 2
+guid: b5792498de291e44fbc1f8ad9c8448f9
+timeCreated: 1491787922
+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: 

+ 3 - 3
Assets/Resource/XML/PlayerConfig.xml

@@ -1,5 +1,5 @@
 <PlayerConfig>
-  <Version value="31" />
+  <Version value="33" />
   
   <Player value="PlayerBlond" />
   <QuitTime value="2/3/2017 09:30:00 AM" />
@@ -8,7 +8,7 @@
   <Coin value="0" />
   <Level value="0" />
   <Person value="0" />
-  <Tutorial value="0" />
+  <Tutorial value="1" />
   <Diamond value="0" />
   <SignIndex value="0" />
   <MiniTimer value="0" />
@@ -17,7 +17,7 @@
   <MiniGameIndex value="0" />
   
   <PlantList value =""/>
-  <FlowerList value="" />
+  <FlowerList value="1" />
   <AchieveList value="" />
   <AchieveData AD="0" Skill="0" Sign="0" Share="0" MiniGame="0" FlowerCoin="0"/>
   

+ 2 - 2
Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -27,8 +27,8 @@
     <D_PrepareLab desc=""><![CDATA[开始]]></D_PrepareLab>
     <Da_Tit0 desc=""><![CDATA[退出游戏]]></Da_Tit0>
     <Da_Tit1 desc=""><![CDATA[游戏结束]]></Da_Tit1>
-    <Da_Lab0 desc=""><![CDATA[打理完花园可能获得以下奖励,确定要退出?]]></Da_Lab0>
-    <Da_Lab1 desc=""><![CDATA[得分 : ]]></Da_Lab1>
+    <Da_Lab desc=""><![CDATA[打理完花园可能获得以下奖励,确定要退出?]]></Da_Lab>
+    <Da_ScoreTit desc=""><![CDATA[得分 : ]]></Da_ScoreTit>
     <Da_QuitLab desc=""><![CDATA[退出游戏]]></Da_QuitLab>
     <Da_CancelLab desc=""><![CDATA[取消]]></Da_CancelLab>
     <Da_GetAwardLab desc=""><![CDATA[领取奖励]]></Da_GetAwardLab>

+ 2 - 2
Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -27,8 +27,8 @@
     <D_PrepareLab desc=""><![CDATA[]]></D_PrepareLab>
     <Da_Tit0 desc=""><![CDATA[]]></Da_Tit0>
     <Da_Tit1 desc=""><![CDATA[]]></Da_Tit1>
-    <Da_Lab0 desc=""><![CDATA[]]></Da_Lab0>
-    <Da_Lab1 desc=""><![CDATA[]]></Da_Lab1>
+    <Da_Lab desc=""><![CDATA[]]></Da_Lab>
+    <Da_ScoreTit desc=""><![CDATA[]]></Da_ScoreTit>
     <Da_QuitLab desc=""><![CDATA[]]></Da_QuitLab>
     <Da_CancelLab desc=""><![CDATA[]]></Da_CancelLab>
     <Da_GetAwardLab desc=""><![CDATA[]]></Da_GetAwardLab>

+ 2 - 2
Assets/Resource/XML/lan/English.xml

@@ -27,8 +27,8 @@
     <D_PrepareLab desc=""><![CDATA[]]></D_PrepareLab>
     <Da_Tit0 desc=""><![CDATA[]]></Da_Tit0>
     <Da_Tit1 desc=""><![CDATA[]]></Da_Tit1>
-    <Da_Lab0 desc=""><![CDATA[]]></Da_Lab0>
-    <Da_Lab1 desc=""><![CDATA[]]></Da_Lab1>
+    <Da_Lab desc=""><![CDATA[]]></Da_Lab>
+    <Da_ScoreTit desc=""><![CDATA[]]></Da_ScoreTit>
     <Da_QuitLab desc=""><![CDATA[]]></Da_QuitLab>
     <Da_CancelLab desc=""><![CDATA[]]></Da_CancelLab>
     <Da_GetAwardLab desc=""><![CDATA[]]></Da_GetAwardLab>

二进制
Assets/Resource/Xlsx/language_config.xlsx


+ 116 - 0
Assets/Script/Manage/ManaAnim.cs

@@ -53,6 +53,7 @@ public class ManaAnim : Regist
     public static Dictionary<Transform, TweenRect> TweenRectDic;
     public static Dictionary<Transform, TweenScale> TweenScaleDic;
     public static Dictionary<Transform, TweenAudio> TweenAudioDic;
+    public static Dictionary<Transform, TweenNumber> TweenNumberDic;
 
     #endregion
 
@@ -110,6 +111,7 @@ public class ManaAnim : Regist
         TweenRectDic = new Dictionary<Transform, TweenRect>();
         TweenScaleDic = new Dictionary<Transform, TweenScale>();
         TweenAudioDic = new Dictionary<Transform, TweenAudio>();
+        TweenNumberDic = new Dictionary<Transform, TweenNumber>();
 
         ShakeFuncDicF.Add(Curve.Linear, ShakeLinear);
         ShakeFuncDicF.Add(Curve.EaseOutQuad, ShakeEaseOutQuad);
@@ -568,6 +570,20 @@ public class ManaAnim : Regist
         }
     }
 
+    public static void TweenForNumber(Transform target)
+    {
+        TweenNumber tween;
+
+        if (TweenNumberDic.TryGetValue(target, out tween))
+        {
+            tween.StartForward();
+        }
+        else
+        {
+            throw new Exception();
+        }
+    }
+
 
     public static void TweenBacSr(Transform target)
     {
@@ -681,6 +697,20 @@ public class ManaAnim : Regist
         }
     }
 
+    public static void TweenBacNumber(Transform target)
+    {
+        TweenNumber tween;
+
+        if (TweenNumberDic.TryGetValue(target, out tween))
+        {
+            tween.StartBackward();
+        }
+        else
+        {
+            throw new Exception();
+        }
+    }
+
 
     public static void TweenConForSr(Transform target)
     {
@@ -794,6 +824,20 @@ public class ManaAnim : Regist
         }
     }
 
+    public static void TweenConForNumber(Transform target)
+    {
+        TweenNumber tween;
+
+        if (TweenNumberDic.TryGetValue(target, out tween))
+        {
+            tween.ConfineForward();
+        }
+        else
+        {
+            throw new Exception();
+        }
+    }
+
 
     public static void TweenConBacSr(Transform target)
     {
@@ -907,6 +951,20 @@ public class ManaAnim : Regist
         }
     }
 
+    public static void TweenConBacNumber(Transform target)
+    {
+        TweenNumber tween;
+
+        if (TweenNumberDic.TryGetValue(target, out tween))
+        {
+            tween.ConfineBackward();
+        }
+        else
+        {
+            throw new Exception();
+        }
+    }
+
     #endregion
 
     #region 得到动画
@@ -1066,6 +1124,20 @@ public class ManaAnim : Regist
         }
     }
 
+    public static TweenNumber GetTweenNumber(Transform target)
+    {
+        TweenNumber tween;
+
+        if (TweenNumberDic.TryGetValue(target, out tween))
+        {
+            return tween;
+        }
+        else
+        {
+            throw new Exception();
+        }
+    }
+
     #endregion
 
     #region 创建动画
@@ -1684,5 +1756,49 @@ public class ManaAnim : Regist
         }
     }
 
+    public static TweenNumber CreateTweenNumber(Transform target, int origin, int destination, float duration, bool originActive, bool destActive, Curve curve)
+    {
+        if (TweenNumberDic.ContainsKey(target))
+        {
+            TweenNumber tween = TweenNumberDic[target];
+
+            tween = new TweenNumber(target.GetComponent<Text>(), origin, destination, duration, originActive, destActive, curve);
+
+            return tween;
+        }
+        else
+        {
+            TweenNumber tween = new TweenNumber(target.GetComponent<Text>(), origin, destination, duration, originActive, destActive, curve);
+
+            TweenNumberDic.Add(target, tween);
+
+            return tween;
+        }
+    }
+
+    public static TweenNumber CreateTweenNumber(Transform target, int destination, float duration, bool originActive, bool destActive, Curve curve)
+    {
+        if (TweenNumberDic.ContainsKey(target))
+        {
+            Text text = target.GetComponent<Text>();
+
+            TweenNumber tween = TweenNumberDic[target];
+
+            tween = new TweenNumber(text, int.Parse(text.text), destination, duration, originActive, destActive, curve);
+
+            return tween;
+        }
+        else
+        {
+            Text text = target.GetComponent<Text>();
+
+            TweenNumber tween = new TweenNumber(text, int.Parse(text.text), destination, duration, originActive, destActive, curve);
+
+            TweenNumberDic.Add(target, tween);
+
+            return tween;
+        }
+    }
+
     #endregion
 }

+ 214 - 22
Assets/Script/Manage/ManaMiniGame.cs

@@ -60,46 +60,60 @@ public class Award
 
     public void GetAward(int score)
     {
-        ManaReso.SetActive("Da_Flower", false);
-        ManaReso.SetActive("Da_Diamond", false);
+        ManaReso.Get("Da_Info").TweenForCG();
+
+        ManaReso.SetActive("Da_Lab", false);
+        ManaReso.SetActive("Da_Quit", false);
+        ManaReso.SetActive("Da_Cancel", false);
+        ManaReso.SetActive("Da_VGroup", false);
+        ManaReso.SetActive("Da_HGroup", false);
+        ManaReso.SetActive("Da_ScoreTit", false);
+        ManaReso.SetActive("Da_GetAward", false);
+        ManaReso.SetActive("Da_FlowerGroup", false);
+        ManaReso.SetActive("Da_DiamondGroup", false);
+
+        bool flowerFlag = false;
+        bool diamondFlag = false;
 
         int coin = (int) Auxiliary.FmlParse(CoinFml, "s", score.ToString());
-        coin = (int) (coin * ManaData.SkillPlus) + BonusCoin;
+        coin = (int) (coin * (1 + ManaData.SkillPlus)) + BonusCoin;
         
         ManaData.Coin += coin;
-        ManaReso.SetText("Da_CoinLab", coin.ToString());
-        
 
+
+        int diamond = 0;
         float diamondRate = (float) Auxiliary.FmlParse(DiamondFml, "l", Mathf.Clamp(ManaData.Level, 1, 1000).ToString());
         
         if (Random.Range(0, 1f) <= diamondRate)
         {
+            diamondFlag = true;
+
             ManaReso.SetActive("Da_Diamond", true);
 
-            int diamond = (int) Mathf.Lerp(DiamondMin, DiamondMax, Random.Range(0, 1f)) + BonusDiamond;
+            diamond = (int) Mathf.Lerp(DiamondMin, DiamondMax, Random.Range(0, 1f)) + BonusDiamond;
             
             ManaData.Diamond += diamond;
-            ManaReso.SetText("Da_DiamondLab", diamond.ToString());
         }
         else
         {
             if (BonusDiamond > 0)
             {
+                diamondFlag = true;
+
                 ManaReso.SetActive("Da_Diamond", true);
 
                 ManaData.Diamond += BonusDiamond;
-                ManaReso.SetText("Da_DiamondLab", BonusDiamond.ToString());
             }
         }
 
 
         int standard;
 
-        if (score < Standard[0])
+        if (score < Standard[1])
         {
             standard = 0;
         }
-        else if (score < Standard[1])
+        else if (score < Standard[2])
         {
             standard = 1;
         }
@@ -110,13 +124,11 @@ public class Award
 
 
         float flowerRate = (float) Auxiliary.FmlParse(DiamondFml, "l", ManaData.Level.ToString(), "f", ManaGarden.MyFlower.ToString());
-
+        
         if (Random.Range(0, 1f) <= flowerRate)
         {
             if (Random.Range(0, 1f) <= Odds[standard])
             {
-                ManaReso.SetActive("Da_Flower", true);
-
                 int Anti = 0;
                 FlowerInfo flowerInfo;
 
@@ -126,15 +138,22 @@ public class Award
 
                     if (Anti > 1000)
                     {
-                        ManaReso.SetText("Da_FlowerLab", "没有可用的花朵");
-
-                        break;
+                        throw new Exception();
                     }
 
                     flowerInfo = ManaGarden.FlowerInfoList.Random();
 
                     if (flowerInfo.Unlock)
                     {
+                        flowerFlag = true;
+
+                        Vector2 newSize = flowerInfo.Sprite.rect.size;
+                        newSize.x *= 0.2f;
+                        newSize.y *= 0.2f;
+
+                        ManaReso.Get<Image>("Da_FlowerIcon").sprite = flowerInfo.Sprite;
+                        ManaReso.Get<Image>("Da_FlowerIcon").rectTransform.sizeDelta = newSize;
+
                         ManaReso.SetText("Da_FlowerLab", Language.GetStr("FlowerName", "Flower" + flowerInfo.ID));
 
                         break;
@@ -145,6 +164,185 @@ public class Award
 
         BonusCoin = 0;
         BonusDiamond = 0;
+
+
+        ManaReso.SetActive("Da_VGroup", true);
+        ManaReso.SetActive("Da_CoinGroup", true);
+
+        if (diamondFlag)
+        {
+            ManaReso.SetActive("Da_DiamondGroup", true);
+        }
+
+        if (flowerFlag)
+        {
+            ManaReso.SetActive("Da_FlowerGroup", true);
+        }
+
+        Auxiliary.Instance.DelayCall
+        (
+            () =>
+            {
+                ManaReso.SetActive("Da_FlowerGroup", false);
+                ManaReso.SetActive("Da_DiamondGroup", false);
+
+                ManaReso.Get("Da_VGroup").GetComponent<VerticalLayoutGroup>().enabled = false;
+            },
+            1
+        );
+        
+        Tween tween = ManaReso.Get("Da_Info").GetTweenCG();
+    
+        tween.OnForwardFinish = () =>
+        {
+            ManaReso.SetActive("Da_HGroup", true);
+            ManaReso.Get("Da_Star1").TweenForScale();
+        };
+
+        ManaReso.SetText("Da_CoinLab", "");
+        ManaReso.SetText("Da_ScoreLab", "");
+        ManaReso.SetText("Da_DiamondLab", "");
+
+        ManaReso.Get("Da_CoinLab").CreateTweenNumber(0, coin, 1.5f, true, true, Curve.EaseOutQuad);
+        ManaReso.Get("Da_ScoreLab").CreateTweenNumber(0, score, 1.5f, true, true, Curve.EaseOutQuad);
+        ManaReso.Get("Da_DiamondLab").CreateTweenNumber(0, diamond, 1.5f, true, true, Curve.EaseOutQuad);
+
+        tween = ManaReso.Get("Da_ScoreTit").GetTweenText();
+        tween.InOrigin = true;
+
+        tween = ManaReso.Get("Da_Star3").GetTweenScale();
+        tween.InOrigin = true;
+        tween.OnForwardFinish = null;
+
+        tween = ManaReso.Get("Da_Star2").GetTweenScale();
+        tween.InOrigin = true;
+        tween.OnForwardFinish = null;
+
+        tween = ManaReso.Get("Da_Star1").GetTweenScale();
+        tween.InOrigin = true;
+        tween.OnForwardFinish = null;
+
+        if (standard == 0)
+        {
+            ManaReso.SetActive("Da_Star2", false);
+            ManaReso.SetActive("Da_Star3", false);
+        }
+        else if (standard == 1)
+        {
+            ManaReso.SetActive("Da_Star2", true);
+            ManaReso.SetActive("Da_Star3", false);
+
+            tween = ManaReso.Get("Da_Star1").GetTweenScale();
+
+            tween.OnForwardFinish += () =>
+            {
+                ManaReso.Get("Da_Star2").TweenForScale();
+            };
+
+            tween = ManaReso.Get("Da_Star2").GetTweenScale();
+        }
+        else if (standard == 2)
+        {
+            ManaReso.SetActive("Da_Star2", true);
+            ManaReso.SetActive("Da_Star3", true);
+
+            tween = ManaReso.Get("Da_Star1").GetTweenScale();
+
+            tween.OnForwardFinish += () =>
+            {
+                ManaReso.Get("Da_Star2").TweenForScale();
+            };
+
+            tween = ManaReso.Get("Da_Star2").GetTweenScale();
+
+            tween.OnForwardFinish += () =>
+            {
+                ManaReso.Get("Da_Star3").TweenForScale();
+            };
+
+            tween = ManaReso.Get("Da_Star3").GetTweenScale();
+        }
+
+        tween.OnForwardFinish = () =>
+        {
+            ManaReso.Get("Da_ScoreTit").TweenForText();
+        };
+
+        tween = ManaReso.Get("Da_ScoreTit").GetTweenText();
+
+        tween.OnForwardFinish = () =>
+        {
+            ManaReso.Get("Da_ScoreLab").TweenForNumber();
+        };
+
+        tween = ManaReso.Get("Da_ScoreLab").GetTweenNumber();
+
+        tween.OnForwardFinish = () =>
+        {
+            ManaReso.Get<CanvasGroup>("Da_VGroup").alpha = 1;
+            ManaReso.SetActive("Da_VGroup", true);
+
+            ManaReso.Get("Da_CoinGroup").TweenForScale();
+
+            if (diamondFlag)
+            {
+                ManaReso.Get("Da_DiamondGroup").TweenForScale();
+            }
+        };
+
+        tween = ManaReso.Get("Da_CoinGroup").GetTweenScale();
+
+        tween.OnForwardFinish = () =>
+        {
+            ManaReso.Get("Da_CoinLab").TweenForNumber();
+        };
+
+        tween = ManaReso.Get("Da_CoinLab").GetTweenNumber();
+
+        if (diamondFlag)
+        {
+            tween = ManaReso.Get("Da_DiamondGroup").GetTweenScale();
+
+            tween.OnForwardFinish = () =>
+            {
+                ManaReso.Get("Da_DiamondLab").TweenForNumber();
+            };
+
+            tween = ManaReso.Get("Da_DiamondLab").GetTweenNumber();
+        }
+        else
+        {
+            ManaReso.Get("Da_DiamondGroup").GetTweenScale().OnForwardFinish = () =>
+            {
+
+            };
+        }
+
+        if (flowerFlag)
+        {
+            tween = ManaReso.Get("Da_CoinLab").GetTweenNumber();
+            
+            tween.OnForwardFinish = () =>
+            {
+                ManaReso.SetActive("Da_FlowerGroup", true);
+
+                ManaReso.Get("Da_FlowerGroup").TweenForScale();
+            };
+
+            tween = ManaReso.Get("Da_FlowerGroup").GetTweenScale();
+        }
+        else
+        {
+            ManaReso.Get("Da_CoinLab").GetTweenNumber().OnForwardFinish = () =>
+            {
+
+            };
+        }
+
+        tween.OnForwardFinish = () =>
+        {
+            ManaReso.Get("Da_GetAward").TweenForCG();
+        };
     }
 }
 
@@ -510,11 +708,6 @@ public class ManaMiniGame : Regist
 
         Award.GetAward(Score);
 
-        ManaReso.SetActive("Da_Info", true);
-        ManaReso.SetActive("Da_Quit", false);
-        ManaReso.SetActive("Da_Cancel", false);
-        ManaReso.SetActive("Da_GetAward", true);
-
         GameAbort();
     }
 
@@ -595,7 +788,6 @@ public class ManaMiniGame : Regist
         ManaReso.SetActive("D_Begin", true);
 
         ManaReso.SetText("Da_Tit", string.Format(Language.GetStr("UI", "Da_Tit1")));
-        ManaReso.SetText("Da_Lab", string.Format("{0}{1}", Language.GetStr("UI", "Da_Lab1"), Score));
 
         Score = 0;
 

+ 68 - 7
Assets/Script/Manage/ManaUI.cs

@@ -201,6 +201,8 @@ public class ManaUI : Regist
         ManaReso.SetText("D_BeginLab", Language.GetStr("UI", "D_BeginLab0"));
         ManaReso.SetText("D_StatusLab", Language.GetStr("UI", "D_StatusLab0"));
 
+        ManaText.Add(ManaReso.Get<Text>("Da_Lab"), new LanStr("UI", "Da_Lab"));
+        ManaText.Add(ManaReso.Get<Text>("Da_ScoreTit"), new LanStr("UI", "Da_ScoreTit"));
         ManaText.Add(ManaReso.Get<Text>("Da_QuitLab"), new LanStr("UI", "Da_QuitLab"));
         ManaText.Add(ManaReso.Get<Text>("Da_CancelLab"), new LanStr("UI", "Da_CancelLab"));
         ManaText.Add(ManaReso.Get<Text>("Da_GetAwardLab"), new LanStr("UI", "Da_GetAwardLab"));
@@ -234,15 +236,40 @@ public class ManaUI : Regist
             "D_Quit",
             () =>
             {
+                FlowerInfo flowerInfo = ManaGarden.FlowerInfoList.Random();
+
+                Vector2 newSize = flowerInfo.Sprite.rect.size;
+                newSize.x *= 0.2f;
+                newSize.y *= 0.2f;
+
+                ManaReso.Get<Image>("Da_FlowerIcon").sprite = flowerInfo.Sprite;
+                ManaReso.Get<Image>("Da_FlowerIcon").rectTransform.sizeDelta = newSize;
+
+                ManaReso.SetText("Da_FlowerLab", Language.GetStr("FlowerName", "Flower" + flowerInfo.ID));
+
+
                 ManaReso.SetText("Da_Tit", Language.GetStr("UI", "Da_Tit0"));
-                ManaReso.SetText("Da_Lab", Language.GetStr("UI", "Da_Lab0"));
 
-                ManaReso.SetActive("Da_Info", true);
+                ManaReso.SetActive("Da_Lab", true);
+                ManaReso.SetActive("Da_HGroup", false);
+                ManaReso.SetActive("Da_ScoreTit", false);
+
+                ManaReso.Get("Da_Info").TweenForCG();
+
                 ManaReso.SetActive("Da_Quit", true);
                 ManaReso.SetActive("Da_Cancel", true);
                 ManaReso.SetActive("Da_GetAward", false);
 
                 ManaMiniGame.Pause = true;
+
+                Auxiliary.Instance.DelayCall
+                (
+                    () =>
+                    {
+                        ManaReso.Get<Text>("Da_FlowerLab").SetLayoutDirty();
+                    },
+                    1
+                );
             }
         );
 
@@ -364,14 +391,28 @@ public class ManaUI : Regist
 
                 ManaReso.Get("GardenMini").TweenBacVec();
 
-                ManaReso.SetActive("Da_Info", false);
-                
+                ManaReso.Get("Da_Info").TweenBacCG();
+
                 ManaMiniGame.GameAbort();
             }
         );
 
         #endregion
 
+        #region Da_Star
+
+        ManaReso.Get("Da_Star1").CreateTweenScale(new Vector3(), new Vector3(1, 1, 1), 0.25f, false, true, Curve.EaseOutQuad);
+        ManaReso.Get("Da_Star2").CreateTweenScale(new Vector3(), new Vector3(1, 1, 1), 0.25f, false, true, Curve.EaseOutQuad);
+        ManaReso.Get("Da_Star3").CreateTweenScale(new Vector3(), new Vector3(1, 1, 1), 0.25f, false, true, Curve.EaseOutQuad);
+
+        #endregion
+
+        #region Da_Info
+
+        ManaReso.Get("Da_Info").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
+
+        #endregion
+
         #region Da_Cancel
 
         ManaReso.AddButtonEvent
@@ -379,7 +420,7 @@ public class ManaUI : Regist
             "Da_Cancel",
             () =>
             {
-                ManaReso.SetActive("Da_Info", false);
+                ManaReso.Get("Da_Info").TweenBacCG();
 
                 ManaMiniGame.Pause = false;
             }
@@ -387,6 +428,12 @@ public class ManaUI : Regist
 
         #endregion
 
+        #region Da_Score
+
+        ManaReso.Get("Da_ScoreTit").CreateTweenText(1, 25, 0.25f, false, true, Curve.EaseOutQuad);
+
+        #endregion
+
         #region Da_GetAward
 
         ManaReso.AddButtonEvent
@@ -400,12 +447,26 @@ public class ManaUI : Regist
 
                 ManaReso.Get("GardenMini").TweenBacVec();
 
-                ManaReso.SetActive("Da_Info", false);
+                ManaReso.Get("Da_Info").TweenBacCG();
+
+                ManaReso.Get("Da_VGroup").GetComponent<VerticalLayoutGroup>().enabled = true;
+                ManaReso.Get<CanvasGroup>("Da_VGroup").alpha = 0;
+                ManaReso.SetActive("Da_HGroup", false);
+                ManaReso.Get("Da_Info").GetTweenCG().OnForwardFinish = () =>
+                {
+
+                };
             }
         );
 
         #endregion
 
+        ManaReso.Get("Da_GetAward").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
+
+        ManaReso.Get("Da_CoinGroup").CreateTweenScale(new Vector3(), new Vector3(1, 1, 1), 0.25f, false, true, Curve.EaseOutQuad);
+        ManaReso.Get("Da_FlowerGroup").CreateTweenScale(new Vector3(), new Vector3(1, 1, 1), 0.25f, false, true, Curve.EaseOutQuad);
+        ManaReso.Get("Da_DiamondGroup").CreateTweenScale(new Vector3(), new Vector3(1, 1, 1), 0.25f, false, true, Curve.EaseOutQuad);
+
         #endregion
 
         #region E
@@ -1306,7 +1367,7 @@ public class ManaUI : Regist
             () =>
             {
                 ManaReso.SetText("Da_Tit", Language.GetStr("UI", "Da_Tit0"));
-                ManaReso.SetText("Da_Lab", Language.GetStr("UI", "Da_Lab0"));
+                ManaReso.SetText("Da_Lab", Language.GetStr("UI", "Da_Lab"));
 
                 ManaReso.SetActive("Da_Info", true);
                 ManaReso.SetActive("Da_Quit", true);

+ 17 - 2
Assets/Script/Object/Tutorial.cs

@@ -1,8 +1,8 @@
 using UnityEngine;
+using UnityEngine.EventSystems;
 
 using System.Collections;
 using System.Collections.Generic;
-using UnityEngine.EventSystems;
 
 public class Tutorial : Regist, IPointerClickHandler
 {
@@ -38,6 +38,7 @@ public class Tutorial : Regist, IPointerClickHandler
     public static string _SelectPlayer;
     public static Transform _Player;
 
+    public static Transform Arrow;
     public static Transform PlayerPink;
     public static Transform PlayerBlond;
     public static Transform PlayerBrown;
@@ -55,12 +56,26 @@ public class Tutorial : Regist, IPointerClickHandler
 
     public override void TutorialRegistValue()
     {
-        ManaReso.Get("Tutorial").CreateTweenSr(new Color(0, 0, 0, 0), new Color(0, 0, 0, 1), 0.25f, true, true, true, Curve.EaseOutQuad);
+        ManaReso.Get("Tutorial").CreateTweenSr(0, 1, 5f, true, true, true, Curve.EaseOutQuad);
         ManaReso.Get("PlayerBk1").CreateTweenScale(new Vector3(0.8f, 0.8f, 0.8f), new Vector3(0.95f, 0.95f, 0.95f), 0.25f, true, true, Curve.EaseOutQuad);
         ManaReso.Get("PlayerBk2").CreateTweenScale(new Vector3(0.8f, 0.8f, 0.8f), new Vector3(0.95f, 0.95f, 0.95f), 0.25f, true, true, Curve.EaseOutQuad);
         ManaReso.Get("PlayerBk3").CreateTweenScale(new Vector3(0.8f, 0.8f, 0.8f), new Vector3(0.95f, 0.95f, 0.95f), 0.25f, true, true, Curve.EaseOutQuad);
+
+        Arrow = ManaReso.Get("TutorialArrow");
+    }
+
+
+    public void PointScene(Transform tra)
+    {
+        Vector3 pos = Camera.main.WorldToScreenPoint(tra.position);
+
+        Arrow.right = pos - Arrow.position;
     }
 
+    public void PointScreen(Transform tra)
+    {
+        Arrow.right = tra.position - Arrow.position;
+    }
 
     public void OnPointerClick(PointerEventData eventData)
     {

+ 16 - 8
Assets/Script/Tool/Anim/TweenCG.cs

@@ -88,26 +88,22 @@ public class TweenCG : Tween
 
         OnForwardStart += () =>
         {
-            Target.SetActive(true);
-            Target.interactable = false;
+            
         };
 
         OnForwardFinish += () =>
         {
-            Target.SetActive(DestActive);
-            Target.interactable = DestActive;
+            
         };
 
         OnBackwardStart += () =>
         {
-            Target.SetActive(true);
-            Target.interactable = false;
+            
         };
 
         OnBackwardFinish += () =>
         {
-            Target.SetActive(OriginActive);
-            Target.interactable = OriginActive;
+            
         };
     }
 
@@ -115,6 +111,9 @@ public class TweenCG : Tween
     {
         base.StartForward();
 
+        Target.SetActive(true);
+        Target.interactable = false;
+
         if (InBackward)
         {
             Timer = Duration - Timer;
@@ -129,6 +128,9 @@ public class TweenCG : Tween
     {
         base.StartBackward();
 
+        Target.SetActive(true);
+        Target.interactable = false;
+
         if (InForward)
         {
             Timer = Duration - Timer;
@@ -150,6 +152,9 @@ public class TweenCG : Tween
             InForward = false;
             InDestination = true;
 
+            Target.SetActive(DestActive);
+            Target.interactable = DestActive;
+
             OnForwardFinish.Invoke();
 
             ManaAnim.TweenForList.Remove(this);
@@ -175,6 +180,9 @@ public class TweenCG : Tween
             InBackward = false;
             InOrigin = true;
 
+            Target.SetActive(OriginActive);
+            Target.interactable = OriginActive;
+
             OnBackwardFinish.Invoke();
 
             ManaAnim.TweenBacList.Remove(this);

+ 198 - 0
Assets/Script/Tool/Anim/TweenNumber.cs

@@ -0,0 +1,198 @@
+using System;
+using UnityEngine;
+
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine.UI;
+
+public class TweenNumber : Tween
+{
+    #region 变量
+
+    public override bool InOrigin
+    {
+        get
+        {
+            if (int.Parse(Target.text) - Origin == 0)
+            {
+                _InOrigin = true;
+            }
+            else
+            {
+                _InOrigin = false;
+            }
+
+            return _InOrigin;
+        }
+
+        set
+        {
+            _InOrigin = value;
+
+            if (_InOrigin)
+            {
+                Target.text = Origin.ToString();
+            }
+
+        }
+    }
+
+    public override bool InDestination
+    {
+        get
+        {
+            if (int.Parse(Target.text) - Destination == 0)
+            {
+                _InDestination = true;
+            }
+            else
+            {
+                _InDestination = false;
+            }
+
+            return _InDestination;
+        }
+        set
+        {
+            _InDestination = value;
+
+            if (_InDestination)
+            {
+                Target.text = Destination.ToString();
+            }
+
+        }
+    }
+
+    protected int Delta;
+    protected int Origin;
+    protected int Destination;
+
+    protected Text Target;
+    protected CurveFunctionF Func;
+
+    #endregion
+
+    public TweenNumber(Text target, int origin, int destination, float duration, bool originActive, bool destActive, Curve curve)
+    {
+        Func = ManaAnim.CurveFuncDicF[curve];
+        Target = target;
+
+        InForward = false;
+        InBackward = false;
+
+        Delta = destination - origin;
+        Origin = origin;
+
+        if (origin == destination)
+        {
+            Duration = 0;
+        }
+        else
+        {
+            Duration = duration;
+        }
+
+        DestActive = destActive;
+        Destination = destination;
+        OriginActive = originActive;
+
+        OnForwardStart += () =>
+        {
+            Target.SetActive(true);
+        };
+
+        OnForwardFinish += () =>
+        {
+            Target.SetActive(DestActive);
+        };
+
+        OnBackwardStart += () =>
+        {
+            Target.SetActive(true);
+        };
+
+        OnBackwardFinish += () =>
+        {
+            Target.SetActive(OriginActive);
+        };
+    }
+
+    public override void StartForward()
+    {
+        base.StartForward();
+
+        if (InBackward)
+        {
+            Timer = Duration - Timer;
+        }
+        else
+        {
+            Target.text = Origin.ToString();
+        }
+    }
+
+    public override void StartBackward()
+    {
+        base.StartBackward();
+
+        if (InForward)
+        {
+            Timer = Duration - Timer;
+        }
+        else
+        {
+            Target.text = Destination.ToString();
+        }
+    }
+
+    public override bool DoForward()
+    {
+        Timer += Time.fixedDeltaTime;
+
+        if (Timer > Duration)
+        {
+            Timer = 0;
+
+            InForward = false;
+            InDestination = true;
+
+            OnForwardFinish.Invoke();
+
+            ManaAnim.TweenForList.Remove(this);
+
+            return true;
+        }
+        else
+        {
+            Target.text = ((int) Func(Timer, Duration, Origin, Delta)).ToString();
+
+            return false;
+        }
+    }
+
+    public override bool DoBackward()
+    {
+        Timer += Time.fixedDeltaTime;
+
+        if (Timer > Duration)
+        {
+            Timer = 0;
+
+            InBackward = false;
+            InOrigin = true;
+
+            OnBackwardFinish.Invoke();
+
+            ManaAnim.TweenBacList.Remove(this);
+
+            return true;
+        }
+        else
+        {
+            Target.text = ((int) Func(Timer, Duration, Destination, -Delta)).ToString();
+
+            return false;
+        }
+    }
+}

+ 12 - 0
Assets/Script/Tool/Anim/TweenNumber.cs.meta

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

+ 35 - 1
Assets/Script/Tool/Extension.cs

@@ -234,6 +234,11 @@ public static class Extension
         ManaAnim.TweenForAudio(comp.transform);
     }
 
+    public static void TweenForNumber(this Component comp)
+    {
+        ManaAnim.TweenForNumber(comp.transform);
+    }
+
 
     public static void TweenBacSr(this Component comp)
     {
@@ -275,6 +280,11 @@ public static class Extension
         ManaAnim.TweenBacAudio(comp.transform);
     }
 
+    public static void TweenBacNumber(this Component comp)
+    {
+        ManaAnim.TweenBacNumber(comp.transform);
+    }
+
 
     public static void TweenConForSr(this Component comp)
     {
@@ -316,6 +326,10 @@ public static class Extension
         ManaAnim.TweenConForAudio(comp.transform);
     }
 
+    public static void TweenConForNumber(this Component comp)
+    {
+        ManaAnim.TweenConForNumber(comp.transform);
+    }
 
     public static void TweenConBacSr(this Component comp)
     {
@@ -357,6 +371,11 @@ public static class Extension
         ManaAnim.TweenConBacAudio(comp.transform);
     }
 
+    public static void TweenConBacNumber(this Component comp)
+    {
+        ManaAnim.TweenConBacNumber(comp.transform);
+    }
+
 
     public static TweenSr GetTweenSr(this Component comp)
     {
@@ -398,6 +417,11 @@ public static class Extension
         return ManaAnim.GetTweenAudio(comp.transform);
     }
 
+    public static TweenNumber GetTweenNumber(this Component comp)
+    {
+        return ManaAnim.GetTweenNumber(comp.transform);
+    }
+
 
     public static TweenSr CreateTweenSr(this Component comp, float origin, float destination, float duration, bool group, bool originActive, bool destActive, Curve curve)
     {
@@ -508,7 +532,17 @@ public static class Extension
     {
         return ManaAnim.CreateTweenAudio(comp.transform, destination, duration, originActive, destActive, curve);
     }
-    
+
+    public static TweenNumber CreateTweenNumber(this Component comp, int origin, int destination, float duration, bool originActive, bool destActive, Curve curve)
+    {
+        return ManaAnim.CreateTweenNumber(comp.transform, origin, destination, duration, originActive, destActive, curve);
+    }
+
+    public static TweenNumber CreateTweenNumber(this Component comp, int destination, float duration, bool originActive, bool destActive, Curve curve)
+    {
+        return ManaAnim.CreateTweenNumber(comp.transform, destination, duration, originActive, destActive, curve);
+    }
+
     #endregion
 
     #region Collider

+ 39 - 0
Assets/Script/Tool/SceneMask.cs

@@ -0,0 +1,39 @@
+using UnityEngine;
+
+using System.Collections;
+using System.Collections.Generic;
+
+public class SceneMask : MonoBehaviour
+{
+    #region 变量
+
+    public Material Material
+    {
+        get
+        {
+            if (_Material == null)
+            {
+                _Material = GetComponent<SpriteRenderer>().material;
+            }
+
+            return _Material;
+        }
+        set { _Material = value; }
+    }
+
+    public Material _Material;
+
+    #endregion
+
+
+    public void SetArea(Transform tra, float radiusX, float radiusY)
+    {
+        Vector3 screenPos = Camera.main.WorldToScreenPoint(tra.position);
+        
+        screenPos = new Vector3(screenPos.x, Screen.height - screenPos.y, 0);
+        
+        Material.SetFloat("_RadiusX", radiusX*Screen.width/2);
+        Material.SetFloat("_RadiusY", radiusY*Screen.width/2);
+        Material.SetVector("_Center", screenPos);
+    }
+}

+ 12 - 0
Assets/Script/Tool/SceneMask.cs.meta

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

+ 16 - 13
MyLovelyGarden.sln

@@ -1,9 +1,9 @@
-
-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}"
+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}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyLovelyGarden.Editor", "MyLovelyGarden.Editor.csproj", "{B575449E-FD9A-1672-368B-EC1E1252F6E4}"
+Project("{8A8BB0A8-D809-F2DF-89D6-F26151FFF558}") = "MyLovelyGarden", "Assembly-CSharp-Editor.csproj", "{A08052E5-32CE-91C0-FF56-C60C901D6BEF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -11,16 +11,19 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{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
+		{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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(MonoDevelopProperties) = preSolution
+		StartupItem = Assembly-CSharp.csproj
+	EndGlobalSection
 EndGlobal

二进制
ProjectSettings/TagManager.asset


+ 2 - 0
ToList.txt

@@ -1,5 +1,7 @@
 ManaData ManaSkill ManaGarden 种花使用Dic
 
+动画(把On事件清空)
+
 
 切换后台