Update 3.31

Assets/Resources/Animations/Rotate.controller.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 34cc0759bb3f4324382dcc26f2e595c5
+timeCreated: 1490923247
+licenseType: Pro
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Animations/rotate.anim.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 728f401c8f98ff740b0efc4d0ee72cc7
+timeCreated: 1490923285
+licenseType: Pro
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Prefab/Object/DropDiamond.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e71b00d758f7c8341ac775c8694a411a
+timeCreated: 1490943613
+licenseType: Pro
+NativeFormatImporter:
+  userData: 
+  assetBundleName: ui
+  assetBundleVariant: 

Assets/Resources/Prefab/Object/DropGold.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a10d06e0f5f691943b242f354e65d756
+timeCreated: 1490943609
+licenseType: Pro
+NativeFormatImporter:
+  userData: 
+  assetBundleName: ui
+  assetBundleVariant: 

Assets/Resources/Shader/HighLight.shader

@@ -4,6 +4,7 @@
 	{
 		[PerRendererData] _MainTex("Sprite Texture", 2D) = "white" {}
 		_Scale("Scale", float) = 0.02
+		_Color("Tint", Color) = (1,1,1,1)
 		[MaterialToggle] PixelSnap("Pixel snap", Float) = 0
 	}
 
@@ -47,11 +48,13 @@
 
 			struct v2f
 			{
+				fixed4 color : COLOR;
 				float4 vertex   : SV_POSITION;
 				float2 texcoord  : TEXCOORD0;
 			};
 
 			float _Scale;
+			fixed4 _Color;
 
 			v2f vert(appdata_t IN)
 			{
@@ -59,6 +62,7 @@
 
 				OUT.vertex = UnityObjectToClipPos(IN.vertex);
 				OUT.texcoord = IN.texcoord;
+				OUT.color = IN.color * _Color;
 
 				return OUT;
 			}
@@ -74,7 +78,7 @@
 
 			fixed4 frag(v2f IN) : SV_Target
 			{
-				fixed4 c = SampleSpriteTexture(IN.texcoord);
+				fixed4 c = SampleSpriteTexture(IN.texcoord) * IN.color;
 
 				if (c.a == 0) 
 				{

Assets/Resources/Sprite/Reference/Clipboard Image.png.meta

@@ -0,0 +1,68 @@
+fileFormatVersion: 2
+guid: 44b55b5b9bc85d94297c4b06b2918c17
+timeCreated: 1490928076
+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/Resources/Sprite/SpriteUI/Health Wheel.png.meta

@@ -1,15 +1,15 @@
 fileFormatVersion: 2
-guid: c7dd97e9cd879304795b366cbf187bfe
+guid: 4426a5039b01c114984c32d315877ab4
 timeCreated: 1431337672
 licenseType: Store
 TextureImporter:
   fileIDToRecycleName: {}
-  serializedVersion: 2
+  serializedVersion: 4
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
+    sRGBTexture: 1
     linearTexture: 0
-    correctGamma: 0
     fadeOut: 0
     borderMipMap: 0
     mipMapFadeDistanceStart: 1
@@ -17,14 +17,12 @@ TextureImporter:
   bumpmap:
     convertToNormalMap: 0
     externalNormalMap: 0
-    heightScale: .25
+    heightScale: 0.25
     normalMapFilter: 0
   isReadable: 0
   grayScaleToAlpha: 0
-  generateCubemap: 0
+  generateCubemap: 6
   cubemapConvolution: 0
-  cubemapConvolutionSteps: 8
-  cubemapConvolutionExponent: 1.5
   seamlessCubemap: 0
   textureFormat: -1
   maxTextureSize: 2048
@@ -35,20 +33,35 @@ TextureImporter:
     wrapMode: 1
   nPOTScale: 0
   lightmap: 0
-  rGBM: 0
   compressionQuality: 50
   spriteMode: 1
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
-  spritePivot: {x: .5, y: .5}
+  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
-  buildTargetSettings: []
+  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: 

Assets/Resources/Sprite/SpriteUI/钻石大图标.png.meta

@@ -0,0 +1,68 @@
+fileFormatVersion: 2
+guid: 1799afa399060a4499f948da25246ccc
+timeCreated: 1490943384
+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/Resources/Sprite/SpriteUI/领取物品发光转动.png.meta

@@ -0,0 +1,68 @@
+fileFormatVersion: 2
+guid: 6203259be0d695c4e93c56cefcc42d3d
+timeCreated: 1490923203
+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/Resources/Temp.meta

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

Assets/Resources/XML/Config/PlayerConfig.xml

@@ -1,5 +1,5 @@
 <PlayerConfig>
-  <Version value="1" />
+  <Version value="3" />
   <Slot value="7" />
   <Sign value="0" />
   <Coin value="0" />
@@ -10,8 +10,9 @@
   <MiniTimer value="0" />
   <CircleTimer value="10" />
   <CoinPerson value="0" />
+  <MiniGameAmt value="0" />
   <PlantList SlotA1="0" SlotA2="1" SlotA3="2" SlotA4="3" SlotA5="4" SlotA6="5" SlotA7="6" />
-  <FlowerList ID="1 2 3 4 5 6 7 8 9 10" />
+  <FlowerList ID="0 1 2 3 4 5 6 7 8 9" />
   <SkillList>
     <免费获取金币 SkillType="Skill" ItemStatus="Lock" Level="0" CdTimer="0" EffectTimer="0" />
     <免费获取钻石 SkillType="Skill" ItemStatus="Lock" Level="0" CdTimer="0" EffectTimer="0" />

Assets/Resources/XML/lan/ChineseSimplified.xml

@@ -42,6 +42,17 @@
     <Bb_GetLab desc=""><![CDATA[收取]]></Bb_GetLab>
     <Bb_Title desc=""><![CDATA[每日签到]]></Bb_Title>
     <Bb_ConfirmLab desc=""><![CDATA[确定]]></Bb_ConfirmLab>
+    <L_UserTit desc=""><![CDATA[用户]]></L_UserTit>
+    <L_ChangeLab desc=""><![CDATA[←这不是我]]></L_ChangeLab>
+    <L_AudioTit desc=""><![CDATA[音效]]></L_AudioTit>
+    <L_MusicLab desc=""><![CDATA[音乐]]></L_MusicLab>
+    <L_ReportTit desc=""><![CDATA[支持]]></L_ReportTit>
+    <L_ReportLab desc=""><![CDATA[提交问题]]></L_ReportLab>
+    <L_ConfirmLab desc=""><![CDATA[确定]]></L_ConfirmLab>
+    <L_LanguageTit desc=""><![CDATA[语言]]></L_LanguageTit>
+    <L_TraChiLab desc=""><![CDATA[繁体中文]]></L_TraChiLab>
+    <L_EnglishLab desc=""><![CDATA[English]]></L_EnglishLab>
+    <L_SimChiLab desc=""><![CDATA[简体中文]]></L_SimChiLab>
   </UI>
   <FlowerName>
     <Flower1 desc=""><![CDATA[粉色小花]]></Flower1>

Assets/Resources/XML/lan/ChineseTraditional.xml

@@ -42,6 +42,17 @@
     <Bb_GetLab desc=""><![CDATA[]]></Bb_GetLab>
     <Bb_Title desc=""><![CDATA[]]></Bb_Title>
     <Bb_ConfirmLab desc=""><![CDATA[]]></Bb_ConfirmLab>
+    <L_UserTit desc=""><![CDATA[]]></L_UserTit>
+    <L_ChangeLab desc=""><![CDATA[]]></L_ChangeLab>
+    <L_AudioTit desc=""><![CDATA[]]></L_AudioTit>
+    <L_MusicLab desc=""><![CDATA[]]></L_MusicLab>
+    <L_ReportTit desc=""><![CDATA[]]></L_ReportTit>
+    <L_ReportLab desc=""><![CDATA[]]></L_ReportLab>
+    <L_ConfirmLab desc=""><![CDATA[]]></L_ConfirmLab>
+    <L_LanguageTit desc=""><![CDATA[]]></L_LanguageTit>
+    <L_TraChiLab desc=""><![CDATA[]]></L_TraChiLab>
+    <L_EnglishLab desc=""><![CDATA[]]></L_EnglishLab>
+    <L_SimChiLab desc=""><![CDATA[]]></L_SimChiLab>
   </UI>
   <FlowerName>
     <Flower1 desc=""><![CDATA[]]></Flower1>

Assets/Resources/XML/lan/English.xml

@@ -42,6 +42,17 @@
     <Bb_GetLab desc=""><![CDATA[]]></Bb_GetLab>
     <Bb_Title desc=""><![CDATA[]]></Bb_Title>
     <Bb_ConfirmLab desc=""><![CDATA[]]></Bb_ConfirmLab>
+    <L_UserTit desc=""><![CDATA[]]></L_UserTit>
+    <L_ChangeLab desc=""><![CDATA[]]></L_ChangeLab>
+    <L_AudioTit desc=""><![CDATA[]]></L_AudioTit>
+    <L_MusicLab desc=""><![CDATA[]]></L_MusicLab>
+    <L_ReportTit desc=""><![CDATA[]]></L_ReportTit>
+    <L_ReportLab desc=""><![CDATA[]]></L_ReportLab>
+    <L_ConfirmLab desc=""><![CDATA[]]></L_ConfirmLab>
+    <L_LanguageTit desc=""><![CDATA[]]></L_LanguageTit>
+    <L_TraChiLab desc=""><![CDATA[]]></L_TraChiLab>
+    <L_EnglishLab desc=""><![CDATA[]]></L_EnglishLab>
+    <L_SimChiLab desc=""><![CDATA[]]></L_SimChiLab>
   </UI>
   <FlowerName>
     <Flower1 desc=""><![CDATA[]]></Flower1>

Assets/Script/Manage/Initializer.cs.meta

@@ -1,11 +1,11 @@
 fileFormatVersion: 2
 guid: f1828554d8ffa12449b221fe29b2c32c
-timeCreated: 1486436299
+timeCreated: 1490922960
 licenseType: Pro
 MonoImporter:
   serializedVersion: 2
   defaultReferences: []
-  executionOrder: 0
+  executionOrder: 200
   icon: {instanceID: 0}
   userData: 
   assetBundleName: 

Assets/Script/Manage/ManaAudio.cs

@@ -6,6 +6,9 @@ public class ManaAudio : Regist
 {
     #region 变量
 
+    public static bool Music;
+    public static bool Audio;
+
     public Coroutine CoroTheme;
     public Coroutine CoroMiniGame;
     public AudioSource MusicMini;
@@ -23,7 +26,10 @@ public class ManaAudio : Regist
 
 
     public override void RegistValueA()
-	{
+    {
+        Music = true;
+        Audio = true;
+
         #region MusicMini
 
         Transform tra = MusicMini.transform;
@@ -72,6 +78,43 @@ public class ManaAudio : Regist
     }
 
 
+    public static void MusicSwitch()
+    {
+        if (Music)
+        {
+            Music = false;
+
+            ManaReso.SetActive("L_MusicOn", false);
+            ManaReso.SetActive("L_MusicOff", true);
+        }
+        else
+        {
+            Music = true;
+
+            ManaReso.SetActive("L_MusicOn", true);
+            ManaReso.SetActive("L_MusicOff", false);
+        }
+    }
+
+    public static void AudioSwitch()
+    {
+        if (Audio)
+        {
+            Audio = false;
+
+            ManaReso.SetActive("L_AudioOn", false);
+            ManaReso.SetActive("L_AudioOff", true);
+        }
+        else
+        {
+            Audio = true;
+
+            ManaReso.SetActive("L_AudioOn", true);
+            ManaReso.SetActive("L_AudioOff", false);
+        }
+    }
+
+
     private IEnumerator Loop(AudioSource audioSource)
     {
         while (true)

Assets/Script/Manage/ManaColor.cs

@@ -0,0 +1,10 @@
+using UnityEngine;
+
+using System.Collections;
+using System.Collections.Generic;
+
+public class ManaColor : MonoBehaviour
+{
+	public static Color Orange = new Color(233/255f, 63/255f, 20/255f, 1);
+	public static Color LightGray = new Color(165/255f, 192/255f, 200/255f, 1);
+}

Assets/Script/Manage/ManaColor.cs.meta

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

Assets/Script/Manage/ManaData.cs

@@ -218,7 +218,7 @@ public class ManaData : Regist
         if (Auxiliary.AnyKeyUp)
         {
             OpTimer = 0;
-            
+
             if (Main == 0)
             {
                 ManaReso.Get("C_Main").TweenForCG();
@@ -312,6 +312,22 @@ public class ManaData : Regist
 
         #endregion
 
+        #region 读数据存档
+
+        Sign = int.Parse(Data.PlayerNode.SelectSingleNode("Sign").Attributes[0].Value);
+        ManaMiniGame.MiniGameAmt = int.Parse(Data.PlayerNode.SelectSingleNode("MiniGameAmt").Attributes[0].Value);
+
+        CircleTimer = float.Parse(Data.PlayerNode.SelectSingleNode("CircleTimer").Attributes[0].Value);
+
+        int slot = int.Parse(Data.PlayerNode.SelectSingleNode("Slot").Attributes[0].Value);
+
+        for (int i = 0; i < slot; i++)
+        {
+            ManaGarden.UnlockSlot();
+        }
+
+        #endregion
+
         #region 读花朵存档
 
         XmlAttributeCollection attributes = Data.PlayerNode.SelectSingleNode("FlowerList").Attributes;
@@ -338,13 +354,6 @@ public class ManaData : Regist
         }
 
         #endregion
-
-        #region 读数据存档
-
-        Sign = int.Parse(Data.PlayerNode.SelectSingleNode("Sign").Attributes[0].Value);
-        CircleTimer = float.Parse(Data.PlayerNode.SelectSingleNode("CircleTimer").Attributes[0].Value);
-
-        #endregion
     }
 
     public override void RegistValueC()
@@ -457,13 +466,6 @@ public class ManaData : Regist
         Coin = double.Parse(Data.PlayerNode.SelectSingleNode("Coin").Attributes[0].Value);
         Diamond = double.Parse(Data.PlayerNode.SelectSingleNode("Diamond").Attributes[0].Value);
 
-        int slot = int.Parse(Data.PlayerNode.SelectSingleNode("Slot").Attributes[0].Value);
-
-        for (int i = 0; i < slot; i++)
-        {
-            ManaGarden.UnlockSlot();
-        }
-
         #endregion
 
         #region 计算离线收入

Assets/Script/Manage/ManaGarden.cs

@@ -201,6 +201,7 @@ public class ManaGarden : Regist
                 ManaData.Slot++;
 
                 SlotList[i].Valid = true;
+                SlotList[i].Available = true;
 
                 return;
             }
@@ -263,6 +264,11 @@ public class ManaGarden : Regist
     public static void RetriveFlower()
     {
         SeleSlot.Retrieve();
+
+        if (PlantList.Count == 0)
+        {
+            Award = false;
+        }
     }
 
     public static void RetriveFlowerAll()
@@ -273,12 +279,14 @@ public class ManaGarden : Regist
 
             i--;
         }
+
+        Award = false;
     }
 
 
     public static void PlantFlower()
     {
-        SeleSlot.Plant(SeleFlowerInfo);
+        SeleSlot.Plant(SeleFlowerInfo, true);
     }
 
     public static void PlantFlower(FlowerInfo flowerInfo)
@@ -307,7 +315,7 @@ public class ManaGarden : Regist
             }
             else
             {
-                slot.Plant(flowerInfo);
+                slot.Plant(flowerInfo, true);
             }
         }
     }
@@ -318,6 +326,6 @@ public class ManaGarden : Regist
 
         FlowerInfo flowerInfo = FlowerInfoList[id];
 
-        slot.Plant(flowerInfo);
+        slot.Plant(flowerInfo, false);
     }
 }

Assets/Script/Manage/ManaMiniGame.cs

@@ -13,6 +13,9 @@ public class Award
 {
     #region 变量
 
+    public static int BonusCoin;
+    public static int BonusDiamond;
+
     public int DiamondMin;
     public int DiamondMax;
     public string CoinFml;
@@ -61,22 +64,32 @@ public class Award
         ManaReso.SetActive("Da_Diamond", false);
 
         int coin = (int) Auxiliary.FmlParse(CoinFml, "s", score.ToString());
-        coin = (int) (coin * ManaData.SkillPlus);
-
+        coin = (int) (coin * ManaData.SkillPlus) + BonusCoin;
+        
         ManaData.Coin += coin;
         ManaReso.SetText("Da_CoinLab", coin.ToString());
         
         float diamondRate = (float) Auxiliary.FmlParse(DiamondFml, "l", Mathf.Clamp(ManaData.Level, 1, 1000).ToString());
-
+        
         if (Random.Range(0, 1f) <= diamondRate)
         {
             ManaReso.SetActive("Da_Diamond", true);
 
-            int diamond = (int) Mathf.Lerp(DiamondMin, DiamondMax, Random.Range(0, 1f));
-
+            int diamond = (int) Mathf.Lerp(DiamondMin, DiamondMax, Random.Range(0, 1f)) + BonusDiamond;
+            
             ManaReso.SetText("Da_DiamondLab", diamond.ToString());
             ManaData.Diamond += diamond;
         }
+        else
+        {
+            if (BonusDiamond > 0)
+            {
+                ManaReso.SetActive("Da_Diamond", true);
+
+                ManaReso.SetText("Da_DiamondLab", BonusDiamond.ToString());
+                ManaData.Diamond += BonusDiamond;
+            }
+        }
 
         int grade;
 
@@ -236,7 +249,11 @@ public class ManaMiniGame : Regist
     private static float _GameTimer;
     private static float _PrepareTimer;
 
+    public static int MiniGameAmt;
+    public static bool DropDiamond;
     public static string PrepareStr;
+    public static List<DropGold> GoldList;
+    public static List<DropDiamond> DiamondList;
 
     public static Text BtnLab;
     public static Text TimerLab;
@@ -247,9 +264,11 @@ public class ManaMiniGame : Regist
 
     private static float OpTime;
     private static float OpTimer;
+    private static float GoldTimer;
     private static float GameTime;
     private static float PanaltyTime;
     private static float PanaltyTimer;
+    private static float DIamondTimer;
 
     #endregion
 
@@ -270,8 +289,26 @@ public class ManaMiniGame : Regist
             return;
         }
 
-        GameTimer -= Time.fixedDeltaTime;
+        GoldTimer -= Time.fixedDeltaTime;
+        if (GoldTimer < 0)
+        {
+            GoldTimer = Random.Range(3f, 6f);
+
+            GoldList.Add(ManaReso.GetGold());
+        }
+
+        if (DropDiamond)
+        {
+            DIamondTimer -= Time.fixedDeltaTime;
+            if (DIamondTimer < 0)
+            {
+                DropDiamond = false;
+                
+                DiamondList.Add(ManaReso.GetDiamond());
+            }
+        }
 
+        GameTimer -= Time.fixedDeltaTime;
         if (GameTimer <= 0)
         {
             GameOver();
@@ -431,6 +468,35 @@ public class ManaMiniGame : Regist
 
     public static void GameBegin()
     {
+        MiniGameAmt++;
+
+        GoldList = new List<DropGold>();
+        DiamondList = new List<DropDiamond>();
+
+        GoldTimer = Random.Range(3f, 6f);
+        DIamondTimer = Random.Range(0f, 40f);
+
+        Award.BonusCoin = 0;
+        Award.BonusDiamond = 0;
+
+        if (Random.Range(5, 9) <= MiniGameAmt)
+        {
+            MiniGameAmt = 0;
+
+            DropDiamond = true;
+        }
+        else
+        {
+            if (Random.Range(0, 1f) <= 0.01f)
+            {
+                DropDiamond = true;
+            }
+            else
+            {
+                DropDiamond = false;
+            }
+        }
+
         ManaReso.Get("D_Rip1").SetActive(true);
         ManaReso.Get("D_Water1").SetActive(true);
         ManaReso.Get("D_Fertilize1").SetActive(true);
@@ -457,11 +523,23 @@ public class ManaMiniGame : Regist
     {
         ManaGarden.AwardLock = false;
 
+        for (int i = 0; i < GoldList.Count; i++)
+        {
+            GoldList[i].Retrieve();
+        }
+
+        for (int i = 0; i < DiamondList.Count; i++)
+        {
+            DiamondList[i].Retrieve();
+        }
+
         if (Game)
         {
             ManaData.Mini = false;
 
-            ManaData.MiniTimer = Mathf.Lerp(180, 300, Random.Range(0, 1f));
+            ManaData.MiniTimer = Mathf.Lerp(3, 5, Random.Range(0, 1f));
+
+            ManaReso.Get("C_MiniGame").TweenBacCG();
 
             ManaDebug.Log(string.Format("<color=red>{0:0}</color>秒后激活小游戏", ManaData.MiniTimer));
         }
@@ -498,6 +576,14 @@ public class ManaMiniGame : Regist
 
     public static void GamePrepare()
     {
+        ManaReso.SetText("Da_CoinLab", "");
+        ManaReso.SetText("Da_FlowerLab", "");
+        ManaReso.SetText("Da_DiamondLab", "");
+
+        ManaReso.SetActive("Da_Coin", true);
+        ManaReso.SetActive("Da_Flower", true);
+        ManaReso.SetActive("Da_Diamond", true);
+
         ManaGarden.AwardLock = true;
 
         OpList = new List<Flower>();

Assets/Script/Manage/ManaReso.cs

@@ -9,6 +9,7 @@ using System.ComponentModel;
 using System.Collections.Generic;
 
 using Object = UnityEngine.Object;
+using Random = UnityEngine.Random;
 using Component = UnityEngine.Component;
 
 public enum Folder
@@ -28,6 +29,8 @@ public enum ObjType
     Flower,
     HudText,
     FlowerItem,
+    DropGold,
+    DropDiamond,
 }
 
 public class ManaReso : Regist
@@ -206,6 +209,44 @@ public class ManaReso : Regist
     }
 
 
+    public static DropGold GetGold()
+    {
+        Vector3 pos = Vector3.Lerp(Get("LeftTraMini").position, Get("RightTraMini").position, Random.Range(0, 1f));
+        pos.z = -2;
+
+        Transform tra = Get("DropGold", Folder.UI, false, null, pos, ObjType.DropGold);
+
+        DropGold dropGold = tra.GetComponent<DropGold>();
+
+        if (dropGold == null)
+        {
+            dropGold = tra.AddComponent<DropGold>();
+        }
+
+        dropGold.ResetSta();
+
+        return dropGold;
+    }
+
+    public static DropDiamond GetDiamond()
+    {
+        Vector3 pos = Vector3.Lerp(Get("LeftTraMini").position, Get("RightTraMini").position, Random.Range(0, 1f));
+        pos.z = -2;
+
+        Transform tra = Get("DropDiamond", Folder.UI, false, null, pos, ObjType.DropDiamond);
+
+        DropDiamond dropDiamond = tra.GetComponent<DropDiamond>();
+
+        if (dropDiamond == null)
+        {
+            dropDiamond = tra.AddComponent<DropDiamond>();
+        }
+
+        dropDiamond.ResetSta();
+
+        return dropDiamond;
+    }
+
     public static Flower GetFlower(FlowerInfo flowerInfo, Slot slot, bool collider)
     {
         Transform tra = Get("Flower", Folder.Garden, false, slot.transform, false, ObjType.Flower);

Assets/Script/Manage/ManaUI.cs

@@ -198,6 +198,7 @@ public class ManaUI : Regist
 
                 ManaReso.SetActive("Bb_Get", false);
                 ManaReso.SetActive("Bb_Info", true);
+                ManaReso.SetActive("Bb_Rotate", true);
                 ManaReso.SetActive("Bb_Confirm", true);
             }
         );
@@ -284,13 +285,7 @@ public class ManaUI : Regist
 
         tween.OnForwardStart += () =>
         {
-            ManaReso.SetText("Da_CoinLab", "");
-            ManaReso.SetText("Da_FlowerLab", "");
-            ManaReso.SetText("Da_DiamondLab", "");
 
-            ManaReso.SetActive("Da_Coin", true);
-            ManaReso.SetActive("Da_Flower", true);
-            ManaReso.SetActive("Da_Diamond", true);
         };
 
         ManaReso.AddButtonEvent
@@ -310,6 +305,20 @@ public class ManaUI : Regist
 
         #endregion
 
+
+        #region C_Setting
+
+        ManaReso.SetButtonEvent
+        (
+            "C_Setting",
+            () =>
+            {
+                ManaReso.Get("L_Setting").TweenForCG();
+            }
+        );
+
+        #endregion
+
         #endregion
 
         #region D
@@ -328,9 +337,21 @@ public class ManaUI : Regist
         ManaReso.AddButtonEvent
         (
             "D_Rip2",
-            ManaMiniGame.Rip
+            () =>
+            {
+                ManaMiniGame.Rip();
+
+                ManaReso.Get("D_Rip2").TweenForScale();
+            }
         );
 
+        tween = ManaReso.Get("D_Rip2").CreateTweenScale(new Vector3(1, 1, 1), new Vector3(1.2f, 1.2f, 1.2f), 0.1f, true, true, Curve.EaseOutQuad);
+
+        tween.OnForwardFinish += () =>
+        {
+            ManaReso.Get("D_Rip2").TweenBacScale();
+        };
+
         #endregion
 
         #region D_Quit
@@ -372,9 +393,21 @@ public class ManaUI : Regist
         ManaReso.AddButtonEvent
         (
             "D_Water2",
-            ManaMiniGame.Water
+            () =>
+            {
+                ManaMiniGame.Water();
+
+                ManaReso.Get("D_Water2").TweenForScale();
+            }
         );
 
+        tween = ManaReso.Get("D_Water2").CreateTweenScale(new Vector3(1, 1, 1), new Vector3(1.2f, 1.2f, 1.2f), 0.1f, true, true, Curve.EaseOutQuad);
+
+        tween.OnForwardFinish += () =>
+        {
+            ManaReso.Get("D_Water2").TweenBacScale();
+        };
+
         #endregion
 
         #region D_Fertilize
@@ -382,9 +415,22 @@ public class ManaUI : Regist
         ManaReso.AddButtonEvent
         (
             "D_Fertilize2",
-            ManaMiniGame.Fertilize
+
+            () =>
+            {
+                ManaMiniGame.Fertilize();
+
+                ManaReso.Get("D_Fertilize2").TweenForScale();
+            }
         );
 
+        tween = ManaReso.Get("D_Fertilize2").CreateTweenScale(new Vector3(1, 1, 1), new Vector3(1.2f, 1.2f, 1.2f), 0.1f, true, true, Curve.EaseOutQuad);
+
+        tween.OnForwardFinish += () =>
+        {
+            ManaReso.Get("D_Fertilize2").TweenBacScale();
+        };
+
         #endregion
 
         #region D_MiniGame
@@ -415,11 +461,6 @@ public class ManaUI : Regist
         {
             ManaReso.SetText("D_BeginLab", Language.GetStr("UI", "D_BeginLab0"));
 
-            if (ManaData.Mini == false)
-            {
-                ManaReso.Get("C_MiniGame").TweenBacCG();
-            }
-
             ManaReso.Get("MusicMini").TweenBacAudio();
         };
 
@@ -478,8 +519,6 @@ public class ManaUI : Regist
             {
                 ManaReso.Get("C_Main").TweenForCG();
 
-                ManaReso.Get("C_MiniGame").TweenBacCG();
-
                 ManaReso.Get("D_MiniGame").TweenBacCG();
 
                 ManaReso.Get("GardenMini").TweenBacVec();
@@ -674,6 +713,11 @@ public class ManaUI : Regist
                 ManaReso.SetActive("Fb_Magic", false);
                 ManaReso.SetActive("Fa_Garden", false);
 
+                ManaReso.SetActive("F_ElfIcon", true);
+                ManaReso.SetActive("F_StoreIcon", false);
+                ManaReso.SetActive("F_MagicIcon", false);
+                ManaReso.SetActive("F_GardenIcon", false);
+
                 ManaReso.SetActive("Ff_SkillBar", false);
             }
         );
@@ -703,6 +747,11 @@ public class ManaUI : Regist
                 ManaReso.SetActive("Fb_Magic", false);
                 ManaReso.SetActive("Fa_Garden", false);
 
+                ManaReso.SetActive("F_ElfIcon", false);
+                ManaReso.SetActive("F_StoreIcon", true);
+                ManaReso.SetActive("F_MagicIcon", false);
+                ManaReso.SetActive("F_GardenIcon", false);
+
                 ManaReso.SetActive("Ff_SkillBar", false);
             }
         );
@@ -732,6 +781,11 @@ public class ManaUI : Regist
                 ManaReso.SetActive("Fb_Magic", true);
                 ManaReso.SetActive("Fa_Garden", false);
 
+                ManaReso.SetActive("F_ElfIcon", false);
+                ManaReso.SetActive("F_StoreIcon", false);
+                ManaReso.SetActive("F_MagicIcon", true);
+                ManaReso.SetActive("F_GardenIcon", false);
+
                 ManaReso.SetActive("Ff_SkillBar", false);
             }
         );
@@ -761,6 +815,11 @@ public class ManaUI : Regist
                 ManaReso.SetActive("Fb_Magic", false);
                 ManaReso.SetActive("Fa_Garden", true);
 
+                ManaReso.SetActive("F_ElfIcon", false);
+                ManaReso.SetActive("F_StoreIcon", false);
+                ManaReso.SetActive("F_MagicIcon", false);
+                ManaReso.SetActive("F_GardenIcon", true);
+
                 if (ManaData.SkillBar)
                 {
                     ManaReso.SetActive("Ff_SkillBar", true);
@@ -1121,5 +1180,89 @@ public class ManaUI : Regist
         );
 
         #endregion
+
+        #region L
+
+        ManaReso.SetText("L_UserTit");
+        ManaReso.SetText("L_ChangeLab");
+        ManaReso.SetText("L_AudioTit");
+        ManaReso.SetText("L_MusicLab");
+        ManaReso.SetText("L_ReportTit");
+        ManaReso.SetText("L_ReportLab");
+        ManaReso.SetText("L_ConfirmLab");
+        ManaReso.SetText("L_LanguageTit");
+        ManaReso.SetText("L_TraChiLab");
+        ManaReso.SetText("L_EnglishLab");
+        ManaReso.SetText("L_SimChiLab");
+
+        ManaReso.Get("L_Setting").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
+
+        ManaReso.SetButtonEvent
+        (
+            "L_Confirm",
+            () =>
+            {
+                ManaReso.Get("L_Setting").TweenBacCG();
+            }
+        );
+
+        ManaReso.SetButtonEvent
+        (
+            "L_MusicBtn",
+            ManaAudio.MusicSwitch
+        );
+
+        ManaReso.SetButtonEvent
+        (
+            "L_AudioBtn",
+            ManaAudio.AudioSwitch
+        );
+
+        ManaReso.SetButtonEvent
+        (
+            "L_TraChi",
+            () =>
+            {
+                ManaReso.Get<Button>("L_TraChi").interactable = false;
+                ManaReso.Get<Button>("L_SimChi").interactable = true;
+                ManaReso.Get<Button>("L_English").interactable = true;
+
+                ManaReso.Get<Button>("L_TraChi").image.color = ManaColor.Orange;
+                ManaReso.Get<Button>("L_SimChi").image.color = ManaColor.LightGray;
+                ManaReso.Get<Button>("L_English").image.color = ManaColor.LightGray;
+            }
+        );
+
+        ManaReso.SetButtonEvent
+        (
+            "L_SimChi",
+            () =>
+            {
+                ManaReso.Get<Button>("L_TraChi").interactable = true;
+                ManaReso.Get<Button>("L_SimChi").interactable = false;
+                ManaReso.Get<Button>("L_English").interactable = true;
+
+                ManaReso.Get<Button>("L_TraChi").image.color = ManaColor.LightGray;
+                ManaReso.Get<Button>("L_SimChi").image.color = ManaColor.Orange;
+                ManaReso.Get<Button>("L_English").image.color = ManaColor.LightGray;
+            }
+        );
+
+        ManaReso.SetButtonEvent
+        (
+            "L_English",
+            () =>
+            {
+                ManaReso.Get<Button>("L_TraChi").interactable = true;
+                ManaReso.Get<Button>("L_SimChi").interactable = true;
+                ManaReso.Get<Button>("L_English").interactable = false;
+
+                ManaReso.Get<Button>("L_TraChi").image.color = ManaColor.LightGray;
+                ManaReso.Get<Button>("L_SimChi").image.color = ManaColor.LightGray;
+                ManaReso.Get<Button>("L_English").image.color = ManaColor.Orange;
+            }
+        );
+
+        #endregion
     }
 }

Assets/Script/Object/Drop.cs

@@ -0,0 +1,70 @@
+using UnityEngine;
+using UnityEngine.EventSystems;
+
+using System.Collections;
+using System.Collections.Generic;
+
+public class Drop : ObjRoot,IPointerClickHandler
+{
+    #region 变量
+
+    public float Timer;
+    public float Speed;
+    public bool Move;
+
+    #endregion
+
+    protected virtual void Awake()
+    {
+        Tween tween = transform.CreateTweenSr(new Color(1, 1, 1, 1), new Color(1, 1, 1, 0), 0.25f, true, false, Curve.EaseOutQuad);
+        transform.CreateTweenScale(new Vector3(0.8f, 0.8f, 0.8f), new Vector3(1.2f, 1.2f, 1.2f), 0.25f, true, false, Curve.EaseOutQuad);
+
+        tween.OnForwardFinish += () =>
+        {
+            ManaReso.Save(this);
+        };
+    }
+
+    private void FixedUpdate()
+    {
+        Timer += Time.fixedDeltaTime;
+
+        if (Timer > 15)
+        {
+            ManaReso.Save(this);
+        }
+
+        if (Move)
+        {
+            transform.Translate(Vector3.down * Time.fixedDeltaTime * Speed);
+        }
+    }
+
+
+    public void ResetSta()
+    {
+        Move = true;
+
+        Timer = 0;
+        Speed = Random.Range(3f, 5f);
+        transform.localScale = new Vector3(0.8f, 0.8f, 0.8f);
+
+        GetComponent<SpriteRenderer>().color = new Color(1, 1, 1, 1);
+    }
+
+    public void Retrieve()
+    {
+        if (transform.GetTweenSr().IsForward == false)
+        {
+            transform.TweenForSr();
+        }
+    }
+
+    public virtual void OnPointerClick(PointerEventData eventData)
+    {
+        Move = false;
+
+        transform.TweenForSr();
+        transform.TweenForScale();
+    }
+}

Assets/Script/Object/Drop.cs.meta

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

Assets/Script/Object/DropDiamond.cs

@@ -0,0 +1,25 @@
+using UnityEngine;
+using UnityEngine.EventSystems;
+
+using System.Collections;
+using System.Collections.Generic;
+
+public class DropDiamond : Drop
+{
+    protected override void Awake()
+    {
+        base.Awake();
+
+        ObjType = ObjType.DropDiamond;
+    }
+
+    public override void OnPointerClick(PointerEventData eventData)
+    {
+        base.OnPointerClick(eventData);
+
+        int diamond = Random.Range(1, 6);
+        Award.BonusDiamond += diamond;
+
+        ManaReso.GetHudText("+" + diamond, Color.red, 18, transform, ManaReso.Get("A_HudParent"), true);
+    }
+}

Assets/Script/Object/DropDiamond.cs.meta

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

Assets/Script/Object/DropGold.cs

@@ -0,0 +1,31 @@
+using UnityEngine;
+using UnityEngine.EventSystems;
+
+using System.Collections;
+using System.Collections.Generic;
+
+public class DropGold : Drop
+{
+	#region 变量
+
+    
+
+    #endregion
+
+	protected override void Awake()
+    {
+        base.Awake();
+
+	    ObjType = ObjType.DropGold;
+    }
+
+    public override void OnPointerClick(PointerEventData eventData)
+    {
+        base.OnPointerClick(eventData);
+
+        int coin = Random.Range(5, 16);
+        Award.BonusCoin += coin;
+
+        ManaReso.GetHudText("+" + coin, Color.red, 18, transform, ManaReso.Get("A_HudParent"), true);
+    }
+}

Assets/Script/Object/DropGold.cs.meta

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

Assets/Script/Object/Flower.cs

@@ -155,7 +155,7 @@ public class Flower : ObjRoot, IPointerClickHandler
     private int _Phase;
 
     private OpType OpType;
-    private SpriteRenderer FlowerSr;
+    private SpriteRenderer FlowerIcon;
     private SpriteRenderer OperateIcon;
 
     #endregion
@@ -184,7 +184,7 @@ public class Flower : ObjRoot, IPointerClickHandler
         {
             _FlowerInfo = value;
 
-            FlowerSr.sprite = FlowerInfo.Sprite;
+            FlowerIcon.sprite = FlowerInfo.Sprite;
         }
     }
 
@@ -194,6 +194,7 @@ public class Flower : ObjRoot, IPointerClickHandler
     public int Id;
     public Slot Slot;
     public Vector3 LocalPos;
+    public Animator Animator;
     public Transform GoldBk;
     public Transform GoldIcon;
 
@@ -208,9 +209,26 @@ public class Flower : ObjRoot, IPointerClickHandler
         Auxiliary.CompileDic(transform, ChildDic);
 
         GoldBk = ChildDic["GoldBk"];
-        FlowerSr = ChildDic["FlowerIcon"].GetComponent<SpriteRenderer>();
         GoldIcon = ChildDic["GoldIcon"];
+        Animator = ChildDic["FlashLight"].GetComponent<Animator>();
+        FlowerIcon = ChildDic["FlowerIcon"].GetComponent<SpriteRenderer>();
         OperateIcon = ChildDic["OperateIcon"].GetComponent<SpriteRenderer>();
+
+        Animator.AddComponent<FlashLight>();
+
+        Tween tween = FlowerIcon.CreateTweenSr(new Color(1, 1, 1), new Color(1, 0.5f, 0.5f), 0.1f, true, true, Curve.EaseOutQuad);
+
+        tween.OnForwardFinish += () =>
+        {
+            FlowerIcon.TweenBacSr();
+        };
+
+        tween = OperateIcon.CreateTweenSr(new Color(1, 1, 1), new Color(1, 0.5f, 0.5f), 0.1f, true, true, Curve.EaseOutQuad);
+
+        tween.OnForwardFinish += () =>
+        {
+            OperateIcon.TweenBacSr();
+        };
     }
 
 
@@ -290,12 +308,50 @@ public class Flower : ObjRoot, IPointerClickHandler
     {
         if (opType != OpType) //错误的操作
         {
+            FlowerIcon.TweenForSr();
+            OperateIcon.TweenForSr();
+
+            MoveVec move = OperateIcon.CreateMoveVec();
+
+            move.StartMove(OperateIcon.transform.position + new Vector3(0.2f, 0), 0.1f, Curve.Linear);
+            move.OnFinish = () =>
+            {
+                move.StartMove(OperateIcon.transform.position + new Vector3(-0.4f, 0), 0.1f, Curve.Linear);
+
+                move.OnFinish = () =>
+                {
+                    move.StartMove(OperateIcon.transform.position + new Vector3(0.2f, 0), 0.1f, Curve.Linear);
+
+                    move.OnFinish = () =>
+                    {
+                        move.StartMove(OperateIcon.transform.position + new Vector3(0.1f, 0), 0.1f, Curve.Linear);
+
+                        move.OnFinish = () =>
+                        {
+                            move.StartMove(OperateIcon.transform.position + new Vector3(-0.2f, 0), 0.1f, Curve.Linear);
+
+                            move.OnFinish = () =>
+                            {
+                                move.StartMove(OperateIcon.transform.position + new Vector3(0.1f, 0), 0.1f, Curve.Linear);
+
+                                move.OnFinish = () =>
+                                {
+
+                                };
+                            };
+                        };
+                    };
+                };
+            };
+
             return false;
         }
         else //操作正确 植物升级
         {
             Phase++;
 
+            PlayAnim();
+
             OperateIcon.SetActive(false);
 
             return true;
@@ -305,8 +361,17 @@ public class Flower : ObjRoot, IPointerClickHandler
     #endregion
 
 
+    public void PlayAnim()
+    {
+        Animator.SetActive(true);
+        Animator.Play("FlashLight");
+    }
+
+
     public void GetAward()
     {
+        PlayAnim();
+
         ManaGarden.Award = true;
 
         int coin = Mathf.CeilToInt(ManaData.CoinPerson*Random.Range(0.05f, 0.08f)*ManaData.SkillPlus);

Assets/Script/Object/Garden.cs

@@ -172,8 +172,6 @@ public class Garden : Regist, IDragHandler, IPointerClickHandler, IEndDragHandle
             {
                 ManaReso.Save(ManaMiniGame.OpList[i]);
             }
-
-            ManaReso.SetActive("C_MiniGame", true);
         };
 
         #endregion
@@ -363,44 +361,46 @@ public class Garden : Regist, IDragHandler, IPointerClickHandler, IEndDragHandle
                 return;
             }
 
-            FlowerInfo flowerInfo = null;
-            FlowerCard flowerCard = ManaReso.Get<FlowerCard>("H_FlowerCard");
-
-            for (int i = 0; i < ManaGarden.FlowerInfoList.Count; i++)
-            {
-                FlowerInfo temp = ManaGarden.FlowerInfoList[i];
-
-                if (temp.Plant == false && temp.Unlock)
-                {
-                    flowerInfo = temp;
-
-                    flowerCard.Add(temp);
-                }
-            }
-
-            if (flowerInfo == null)
-            {
-                ManaReso.Get("G_Flower").TweenForCG();
-            }
-            else
-            {
-                ManaGarden.ShowPlantCard(slot, flowerInfo);
-
-                Auxiliary.Instance.DelayCall
-                (
-                    () =>
-                    {
-                        flowerCard.Select(0);
-
-                        flowerCard.LeftBorder = ManaReso.Get("H_Grid").position.x - Mathf.Abs(flowerCard.ItemList.Last(0).position.x - ManaReso.Get("H_Scrr").position.x);
-                        flowerCard.RightBorder = ManaReso.Get("H_Grid").position.x + Mathf.Abs(flowerCard.ItemList[0].position.x - ManaReso.Get("H_Scrr").position.x);
-
-                        ManaReso.Get<ContentSizeFitter>("H_Grid").enabled = false;
-                        ManaReso.Get<HorizontalLayoutGroup>("H_Grid").enabled = false;
-                    },
-                    1
-                );
-            }
+            ManaReso.Get("G_Flower").TweenForCG();
+
+            //FlowerInfo flowerInfo = null;
+            //FlowerCard flowerCard = ManaReso.Get<FlowerCard>("H_FlowerCard");
+
+            //for (int i = 0; i < ManaGarden.FlowerInfoList.Count; i++)
+            //{
+            //    FlowerInfo temp = ManaGarden.FlowerInfoList[i];
+
+            //    if (temp.Plant == false && temp.Unlock)
+            //    {
+            //        flowerInfo = temp;
+
+            //        flowerCard.Add(temp);
+            //    }
+            //}
+
+            //if (flowerInfo == null)
+            //{
+            //    ManaReso.Get("G_Flower").TweenForCG();
+            //}
+            //else
+            //{
+            //    ManaGarden.ShowPlantCard(slot, flowerInfo);
+
+            //    Auxiliary.Instance.DelayCall
+            //    (
+            //        () =>
+            //        {
+            //            flowerCard.Select(0);
+
+            //            flowerCard.LeftBorder = ManaReso.Get("H_Grid").position.x - Mathf.Abs(flowerCard.ItemList.Last(0).position.x - ManaReso.Get("H_Scrr").position.x);
+            //            flowerCard.RightBorder = ManaReso.Get("H_Grid").position.x + Mathf.Abs(flowerCard.ItemList[0].position.x - ManaReso.Get("H_Scrr").position.x);
+
+            //            ManaReso.Get<ContentSizeFitter>("H_Grid").enabled = false;
+            //            ManaReso.Get<HorizontalLayoutGroup>("H_Grid").enabled = false;
+            //        },
+            //        1
+            //    );
+            //}
         }
     }
 

Assets/Script/Object/Slot.cs

@@ -43,7 +43,7 @@ public class Slot : MonoBehaviour
 	}
 
 
-    public void Plant(FlowerInfo flowerInfo)
+    public void Plant(FlowerInfo flowerInfo, bool anim)
     {
         FlowerInfo = flowerInfo;
 
@@ -58,6 +58,11 @@ public class Slot : MonoBehaviour
 
         Flower = ManaReso.GetFlower(flowerInfo, this, true);
 
+        if (anim)
+        {
+            Flower.PlayAnim();
+        }
+
         ManaGarden.PlantList.Add(this);
     }
 

Assets/Script/Tool/Anim/Shake.cs

@@ -0,0 +1,23 @@
+using UnityEngine;
+
+using System.Collections;
+using System.Collections.Generic;
+
+public class Shake : MonoBehaviour
+{
+	#region 变量
+
+
+
+    #endregion
+
+	private void Awake()
+    {
+	    
+	}
+	
+	private void FixedUpdate()
+    {
+		
+	}
+}

Assets/Script/Tool/Anim/Shake.cs.meta

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

Assets/Script/Tool/Auxiliary.cs

@@ -83,7 +83,7 @@ public class Auxiliary : MonoBehaviour
                 ManaData.SkillList[i].ReceiveCool(1, true, true);
             }
         }
-
+        
         if (Input.GetKeyDown(KeyCode.I))
         {
             ManaData.Coin += 100000000000000;

Assets/Script/Tool/Auxiliary.cs.meta

@@ -1,11 +1,11 @@
 fileFormatVersion: 2
 guid: 3cac44ec7ca55734c9dd55ba09a4b72a
-timeCreated: 1486445057
+timeCreated: 1490922960
 licenseType: Pro
 MonoImporter:
   serializedVersion: 2
   defaultReferences: []
-  executionOrder: 0
+  executionOrder: 100
   icon: {instanceID: 0}
   userData: 
   assetBundleName: 

Assets/Script/Tool/Bundle.cs

@@ -44,7 +44,19 @@ public class Bundle : MonoBehaviour
 
     public static string GetStreamPath()
     {
-        return "file://" + Application.streamingAssetsPath + "/Bundle/Windows/";
+        if (Application.isEditor)
+            //			return "file://" +  System.Environment.CurrentDirectory.Replace("\\", "/"); // Use the build output folder directly.
+            return "file://" + Application.streamingAssetsPath + "/Bundle/Windows/";//user local stream
+        else if (Application.isWebPlayer)
+            return System.IO.Path.GetDirectoryName(Application.absoluteURL).Replace("\\", "/") + "/StreamingAssets";
+        else if (Application.platform == RuntimePlatform.IPhonePlayer)
+            return "file://" + Application.streamingAssetsPath + "/Bundle/IOS/";
+        else if (Application.isMobilePlatform || Application.isConsolePlatform)
+            return Application.streamingAssetsPath + "/Bundle/Andriod/";
+        else // For standalone player.
+            return "file://" + Application.streamingAssetsPath;
+
+        //return "file://" + Application.streamingAssetsPath + "/Bundle/Windows/";
     }
 
 

Assets/Script/Tool/Data.cs

@@ -240,7 +240,7 @@ public class Data
         {
             attributes.Append(PlayerDoc.CreateAttribute(ManaGarden.PlantList[i].name));
 
-            attributes[i].Value = ManaGarden.PlantList[i].Flower.FlowerInfo.Id.ToString();
+            attributes[i].Value = (ManaGarden.PlantList[i].Flower.FlowerInfo.Id - 1).ToString();
         }
     }
 
@@ -255,6 +255,7 @@ public class Data
         PlayerNode.SelectSingleNode("CoinPerson").Attributes[0].Value = ManaData.CoinPerson.ToString();
         PlayerNode.SelectSingleNode("MiniTimer").Attributes[0].Value = ManaData.MiniTimer.ToString();
         PlayerNode.SelectSingleNode("CircleTimer").Attributes[0].Value = ManaData.CircleTimer.ToString();
+        PlayerNode.SelectSingleNode("MiniGameAmt").Attributes[0].Value = ManaMiniGame.MiniGameAmt.ToString();
     }
 
     private static void SaveFlowerList()
@@ -445,6 +446,7 @@ public class Data
         PlayerNode.SelectSingleNode("CoinPerson").Attributes[0].Value = "0";
         PlayerNode.SelectSingleNode("MiniTimer").Attributes[0].Value = "0";
         PlayerNode.SelectSingleNode("CircleTimer").Attributes[0].Value = "10";
+        PlayerNode.SelectSingleNode("MiniGameAmt").Attributes[0].Value = "0";
     }
 
     private static void ResetFlowerList()

Assets/Script/Tool/FlashLight.cs

@@ -0,0 +1,21 @@
+using UnityEngine;
+
+using System.Collections;
+using System.Collections.Generic;
+
+public class FlashLight : MonoBehaviour
+{
+	#region 变量
+
+    #endregion
+
+	private void Awake()
+    {
+	    
+	}
+
+    public void EndAnim()
+    {
+        transform.SetActive(false);
+    }
+}

Assets/Script/Tool/FlashLight.cs.meta

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

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

MyLovelyGarden.txt

@@ -1,4 +1,20 @@
-美术文档
+成就
+
+Hud的默认Parent
+
+Shake动画
+
+蝴蝶动画
+
+在Logo场景中创建对象(以Deactive物体做Parent)
+
+音乐关闭
+
+语言切换功能
+
+资源移出Resources(PlayerConfig)
+
+合并语言文档中的重复项
 
 
 字体