Temp 5.11

.gitignore

@@ -4,6 +4,7 @@
 **/[Bb]uild/
 **/[Bb]uilds/
 **/[Ii]OS/
+**/Assets/Advertisements/
 **/Assets/StreamingAssets/
 **/Assets/AssetStoreTools*
 

Assets/Advertisements/Editor/Resources/Android/builds.meta

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

Assets/Advertisements/Editor/Resources/iOS.meta

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

Assets/Plugins/UnityPurchasing/iOS.meta

@@ -1,5 +0,0 @@
-fileFormatVersion: 2
-guid: b722e2504dd3140409a9beb9c8d1b6b6
-folderAsset: yes
-DefaultImporter:
-  userData: 

Assets/Resource/DragonBones/DragonBones/src/DragonBones/armature/IArmatureProxy.cs

@@ -37,7 +37,7 @@ namespace DragonBones
          * @see DragonBones.Animation
          * @version DragonBones 4.5
          */
-        Animation animation
+        Animation anim
         {
             get;
         }

Assets/Resource/DragonBones/Unity/src/DragonBones/unity/Editor/UnityEditor.cs

@@ -292,7 +292,7 @@ namespace DragonBones
                 // Play animation.
                 if (!string.IsNullOrEmpty(_armatureComponent.animationName))
                 {
-                    _armatureComponent.animation.Play(_armatureComponent.animationName);
+                    _armatureComponent.anim.Play(_armatureComponent.animationName);
                 }
             }
 
@@ -392,7 +392,7 @@ namespace DragonBones
                     {
                         _animationIndex = animationIndex;
                         _armatureComponent.animationName = _animationNames[animationIndex];
-                        _armatureComponent.animation.Play(_armatureComponent.animationName);
+                        _armatureComponent.anim.Play(_armatureComponent.animationName);
 
                         _updateParameters();
 
@@ -401,18 +401,18 @@ namespace DragonBones
 
                     if (_animationIndex >= 0)
                     {
-                        if (_armatureComponent.animation.isPlaying)
+                        if (_armatureComponent.anim.isPlaying)
                         {
                             if (GUILayout.Button("Stop"))
                             {
-                                _armatureComponent.animation.Stop();
+                                _armatureComponent.anim.Stop();
                             }
                         }
                         else
                         {
                             if (GUILayout.Button("Play"))
                             {
-                                _armatureComponent.animation.Play();
+                                _armatureComponent.anim.Play();
                             }
                         }
                     }
@@ -447,7 +447,7 @@ namespace DragonBones
 
                 // TimeScale
                 EditorGUILayout.BeginHorizontal();
-                _armatureComponent.animation.timeScale = EditorGUILayout.Slider("Time Scale", _armatureComponent.animation.timeScale, 0.0f, 2.0f);
+                _armatureComponent.anim.timeScale = EditorGUILayout.Slider("Time Scale", _armatureComponent.anim.timeScale, 0.0f, 2.0f);
                 EditorGUILayout.EndHorizontal();
 
                 // Flip

Assets/Resource/DragonBones/Unity/src/DragonBones/unity/UnityArmatureComponent.cs

@@ -61,7 +61,7 @@ namespace DragonBones
          * @see DragonBones.Animation
          * @version DragonBones 4.5
          */
-        public Animation animation
+        public Animation anim
         {
             get { return _armature != null ? _armature.animation : null; }
         }

Assets/Resource/Shader/Mask.shader

@@ -82,91 +82,91 @@
 			{
 				fixed4 col = SampleSpriteTexture(i.texcoord) * i.color;
 
-			float AngleX = _RadiusY / 4;
-			float AngleY = AngleX / (_ScreenParams.y / _ScreenParams.x);
+				float AngleX = _RadiusY / 4;
+				float AngleY = AngleX / (_ScreenParams.y / _ScreenParams.x);
 
-			float x = i.screenPos.x - _Center.x;
-			float y = i.screenPos.y - _Center.y;
+				float x = i.screenPos.x - _Center.x;
+				float y = i.screenPos.y - _Center.y;
 
-			if (abs(x) < _RadiusX && abs(y) < _RadiusY)
-			{
-				float2 ulo = _Center + float2(-_RadiusX, _RadiusY);
-				float2 uli = ulo + float2(AngleX, -AngleY);
-
-				float2 uro = _Center + float2(_RadiusX, _RadiusY);
-				float2 uri = uro + float2(-AngleX, -AngleY);
+				if (abs(x) < _RadiusX && abs(y) < _RadiusY)
+				{
+					float2 ulo = _Center + float2(-_RadiusX, _RadiusY);
+					float2 uli = ulo + float2(AngleX, -AngleY);
 
-				float2 lro = _Center + float2(_RadiusX, -_RadiusY);
-				float2 lri = lro + float2(-AngleX, AngleY);
+					float2 uro = _Center + float2(_RadiusX, _RadiusY);
+					float2 uri = uro + float2(-AngleX, -AngleY);
 
-				float2 llo = _Center + float2(-_RadiusX, -_RadiusY);
-				float2 lli = llo + float2(AngleX, AngleY);
+					float2 lro = _Center + float2(_RadiusX, -_RadiusY);
+					float2 lri = lro + float2(-AngleX, AngleY);
 
-				float ulix = i.screenPos.x - uli.x;
-				float uliy = i.screenPos.y - uli.y;
-				float ulox = i.screenPos.x - ulo.x;
-				float uloy = i.screenPos.y - ulo.y;
+					float2 llo = _Center + float2(-_RadiusX, -_RadiusY);
+					float2 lli = llo + float2(AngleX, AngleY);
 
-				float urix = i.screenPos.x - uri.x;
-				float uriy = i.screenPos.y - uri.y;
-				float urox = i.screenPos.x - uro.x;
-				float uroy = i.screenPos.y - uro.y;
+					float ulix = i.screenPos.x - uli.x;
+					float uliy = i.screenPos.y - uli.y;
+					float ulox = i.screenPos.x - ulo.x;
+					float uloy = i.screenPos.y - ulo.y;
 
-				float lrix = i.screenPos.x - lri.x;
-				float lriy = i.screenPos.y - lri.y;
-				float lrox = i.screenPos.x - lro.x;
-				float lroy = i.screenPos.y - lro.y;
+					float urix = i.screenPos.x - uri.x;
+					float uriy = i.screenPos.y -uri.y;
+					float urox = i.screenPos.x - uro.x;
+					float uroy = i.screenPos.y - uro.y;
 
-				float llix = i.screenPos.x - lli.x;
-				float lliy = i.screenPos.y - lli.y;
-				float llox = i.screenPos.x - llo.x;
-				float lloy = i.screenPos.y - llo.y;
+					float lrix = i.screenPos.x - lri.x;
+					float lriy = i.screenPos.y - lri.y;
+					float lrox = i.screenPos.x - lro.x;
+					float lroy = i.screenPos.y - lro.y;
 
-				if (ulix < 0 && uliy > 0 && ulox > 0 && uloy < 0)
-				{
-					float2 vec = uli - i.screenPos;
-					vec.y *= _ScreenParams.y / _ScreenParams.x;
+					float llix = i.screenPos.x - lli.x;
+					float lliy = i.screenPos.y - lli.y;
+					float llox = i.screenPos.x - llo.x;
+					float lloy = i.screenPos.y - llo.y;
 
-					if (length(vec) < AngleX)
+					if(ulix < 0 && uliy > 0 && ulox > 0 && uloy < 0)
 					{
-						col.a = 0;
-					}
-				}
-				else if (urix > 0 && uriy > 0 && urox < 0 && uroy < 0)
-				{
-					float2 vec = uri - i.screenPos;
-					vec.y *= _ScreenParams.y / _ScreenParams.x;
+						float2 vec = uli - i.screenPos;
+						vec.y *= _ScreenParams.y / _ScreenParams.x;
 
-					if (length(vec) < AngleX)
-					{
-						col.a = 0;
+						if (length(vec) < AngleX)
+						{
+							col.a = 0;
+						}
 					}
-				}
-				else if (lrix > 0 && lriy < 0 && lrox < 0 && lroy > 0)
-				{
-					float2 vec = lri - i.screenPos;
-					vec.y *= _ScreenParams.y / _ScreenParams.x;
+					else if(urix > 0 && uriy > 0 && urox < 0 && uroy < 0)
+					{
+						float2 vec = uri - i.screenPos;
+						vec.y *= _ScreenParams.y / _ScreenParams.x;
 
-					if (length(vec) < AngleX)
+						if (length(vec) < AngleX)
+						{
+							col.a = 0;
+						}
+					}
+					else if (lrix > 0 && lriy < 0 && lrox < 0 && lroy > 0)
 					{
-						col.a = 0;
+						float2 vec = lri - i.screenPos;
+						vec.y *= _ScreenParams.y / _ScreenParams.x;
+
+						if (length(vec) < AngleX)
+						{
+							col.a = 0;
+						}
 					}
-				}
-				else if (llix < 0 && lliy < 0 && llox > 0 && lloy > 0)
-				{
-					float2 vec = lli - i.screenPos;
-					vec.y *= _ScreenParams.y / _ScreenParams.x;
+					else if (llix < 0 && lliy < 0 && llox > 0 && lloy > 0)
+					{
+						float2 vec = lli - i.screenPos;
+						vec.y *= _ScreenParams.y / _ScreenParams.x;
 
-					if (length(vec) < AngleX)
+						if (length(vec) < AngleX)
+						{
+							col.a = 0;
+						}
+					}
+					else
 					{
 						col.a = 0;
 					}
 				}
-				else
-				{
-					col.a = 0;
-				}
-			}
 
 				return col;
 			}

Assets/Resource/Shader/Timer.shader

@@ -0,0 +1,120 @@
+Shader "DashGame/Timer"
+{
+	Properties
+	{
+		_MainTex ("Texture", 2D) = "white" {}
+
+		[Toggle(UNITY_UI_ALPHACLIP)] _UseUIAlphaClip("Use Alpha Clip", Float) = 0
+	}
+
+	SubShader
+	{
+		Tags
+		{
+			"Queue" = "Transparent"
+			"RenderType" = "Transparent"
+			"PreviewType" = "Plane"
+			"IgnoreProjector" = "True"
+			"CanUseSpriteAtlas" = "True"
+		}
+
+		Lighting Off
+		Blend SrcAlpha OneMinusSrcAlpha
+
+		Pass
+		{
+			CGPROGRAM
+
+			#pragma vertex vert
+			#pragma fragment frag
+
+			#include "UnityUI.cginc"
+			#include "UnityCG.cginc"
+
+			struct appdata
+			{
+				float2 uv : TEXCOORD0;
+				float4 color : COLOR;
+				float4 vertex : POSITION;
+			};
+
+			struct v2f
+			{
+				float2 uv : TEXCOORD0;
+				float4 color : COLOR;
+				float4 vertex : SV_POSITION;
+			};
+
+			float _Fill;
+			float4 _MainTex_ST;
+			sampler2D _MainTex;
+			
+			v2f vert (appdata v)
+			{
+				v2f o;
+
+				o.uv = TRANSFORM_TEX(v.uv, _MainTex);
+				o.color = v.color;
+				o.vertex = UnityObjectToClipPos(v.vertex);
+
+				return o;
+			}
+			
+			fixed4 frag (v2f i) : SV_Target
+			{
+				fixed4 col = tex2D(_MainTex, i.uv);
+
+				col.a *= i.color.a;
+
+				float angleF;
+				float angleR;
+
+
+				if(_Fill>=1)
+				{
+					col.a=0;
+				}
+				else if(i.uv.x <= 0.5 && i.uv.y >= 0.5)
+				{
+					float x = 0.5-i.uv.x;
+					float y = i.uv.y - 0.5;
+
+				 	angleR = degrees(atan(x/y));
+				}
+				else if(i.uv.x <= 0.5 && i.uv.y <= 0.5)
+				{
+					float x = 0.5-i.uv.x;
+					float y = 0.5-i.uv.y;
+
+				 	angleR = 90 + degrees(atan(y/x));
+				}
+				else if(i.uv.x >= 0.5 && i.uv.y <= 0.5)
+				{
+					float x = i.uv.x-0.5;
+					float y = 0.5-i.uv.y;
+
+				 	angleR = 180 + degrees(atan(x/y));
+				}
+				else if(i.uv.x >= 0.5 && i.uv.y >= 0.5)
+				{
+					float x = i.uv.x-0.5;
+					float y = i.uv.y-0.5;
+
+				 	angleR = 270 + degrees(atan(y/x));
+				}
+
+				angleF = 360*_Fill;
+
+				float angleOffset = angleF - angleR;
+
+				if(angleF >= 45 && angleOffset > 45)
+				{
+					col.a*=1-(angleOffset-45)/45;
+				}
+
+				return col;
+			}
+			ENDCG
+		}
+	}
+}

Assets/Resource/Shader/Timer.shader.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 7d3cfed4392d21542869d4cbc6419063
+timeCreated: 1494464703
+licenseType: Pro
+ShaderImporter:
+  defaultTextures: []
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Advertisements/Editor/Resources/Android/builds.zip.meta → Assets/Resource/Shader/TimerMat.mat.meta

@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: 9cb5c3e4dd0dd574ba655453ad15edfa
-timeCreated: 1494301205
+guid: 489ee99286fddfb47963a865d961aea0
+timeCreated: 1494464712
 licenseType: Pro
-DefaultImporter:
+NativeFormatImporter:
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Sprite/SpriteUI/Health Wheel.png.meta → Assets/Resource/Sprite/Garden/描边2.png.meta

@@ -1,13 +1,13 @@
 fileFormatVersion: 2
-guid: 4426a5039b01c114984c32d315877ab4
-timeCreated: 1431337672
-licenseType: Store
+guid: a1d0f8c1a27a9bd479b941f36dd761a1
+timeCreated: 1494408106
+licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 1
+    enableMipMap: 0
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -24,11 +24,11 @@ TextureImporter:
   generateCubemap: 6
   cubemapConvolution: 0
   seamlessCubemap: 0
-  textureFormat: -1
+  textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
     filterMode: -1
-    aniso: 16
+    aniso: -1
     mipBias: -1
     wrapMode: 1
   nPOTScale: 0

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

@@ -0,0 +1,68 @@
+fileFormatVersion: 2
+guid: 9a33dbc2fbc8d4b40a9e65ef6b0b3309
+timeCreated: 1494463405
+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/XML/PlayerConfig.xml

@@ -1,5 +1,5 @@
 <PlayerConfig>
-  <Version value="136" />
+  <Version value="141" />
 
   <ID value="Default" />
   <TutorialA value="1" />

Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -14,7 +14,6 @@
     <Fe_BtnLab2 desc=""><![CDATA[升级]]></Fe_BtnLab2>
     <Fe_BtnLab3 desc=""><![CDATA[购买]]></Fe_BtnLab3>
     <Fe_BtnLab4 desc=""><![CDATA[等级]]></Fe_BtnLab4>
-    <Fe_BtnLab5 desc=""><![CDATA[]]></Fe_BtnLab5>
     <Fe_BtnLab6 desc=""><![CDATA[冷却中]]></Fe_BtnLab6>
     <Fe_BtnLab7 desc=""><![CDATA[剩余时间]]></Fe_BtnLab7>
     <Fg_Tit desc=""><![CDATA[提示]]></Fg_Tit>
@@ -43,13 +42,13 @@
     <G_SpecialLab desc=""><![CDATA[特殊花朵]]></G_SpecialLab>
     <G_RegularLab desc=""><![CDATA[普通花朵]]></G_RegularLab>
     <G_RetrieveLab desc=""><![CDATA[收回所有花]]></G_RetrieveLab>
-    <H_PlaceLab desc=""><![CDATA[种下]]></H_PlaceLab>
     <H_RetrieveLab desc=""><![CDATA[收回]]></H_RetrieveLab>
     <Ba_Lab desc=""><![CDATA[离开期间获得]]></Ba_Lab>
     <Ba_ConfirmLab desc=""><![CDATA[收取]]></Ba_ConfirmLab>
     <Bb_GetLab desc=""><![CDATA[收取]]></Bb_GetLab>
     <Bb_Title desc=""><![CDATA[每日签到]]></Bb_Title>
     <Bb_ConfirmLab desc=""><![CDATA[确定]]></Bb_ConfirmLab>
+    <L_Tit desc=""><![CDATA[设置]]></L_Tit>
     <L_UserTit desc=""><![CDATA[用户]]></L_UserTit>
     <L_ChangeLab desc=""><![CDATA[←这不是我]]></L_ChangeLab>
     <L_AudioTit desc=""><![CDATA[音效]]></L_AudioTit>
@@ -171,7 +170,6 @@
     <Skill4 desc=""><![CDATA[所有金币产出提升[&coin_person&]，持续[&duration&/60]分钟]]></Skill4>
     <Skill5 desc=""><![CDATA[免费获取每人次收入的[&coin_once&]倍]]></Skill5>
     <Skill6 desc=""><![CDATA[免费获取钻石[&diamond_once&]]]></Skill6>
-    <Skill7 desc=""><![CDATA[]]></Skill7>
   </SkillDesc>
   <Object>
     <FlowerItemG_Lab desc=""><![CDATA[已放置]]></FlowerItemG_Lab>
@@ -193,6 +191,7 @@
     <NavigateDiamond desc=""><![CDATA[您可以点击确定前往获取钻石]]></NavigateDiamond>
     <UnlockSlot desc=""><![CDATA[解锁精灵可以开放]]></UnlockSlot>
     <QuitGame desc=""><![CDATA[退出游戏?]]></QuitGame>
+    <NoValidSlot desc=""><![CDATA[已经没有空地了]]></NoValidSlot>
   </Common>
   <AchieveName>
     <Achieve1 desc=""><![CDATA[美丽花园-1]]></Achieve1>

Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -14,7 +14,6 @@
     <Fe_BtnLab2 desc=""><![CDATA[升級]]></Fe_BtnLab2>
     <Fe_BtnLab3 desc=""><![CDATA[購買]]></Fe_BtnLab3>
     <Fe_BtnLab4 desc=""><![CDATA[等級]]></Fe_BtnLab4>
-    <Fe_BtnLab5 desc=""><![CDATA[]]></Fe_BtnLab5>
     <Fe_BtnLab6 desc=""><![CDATA[冷卻中]]></Fe_BtnLab6>
     <Fe_BtnLab7 desc=""><![CDATA[剩餘時間]]></Fe_BtnLab7>
     <Fg_Tit desc=""><![CDATA[提示]]></Fg_Tit>
@@ -43,13 +42,13 @@
     <G_SpecialLab desc=""><![CDATA[特殊花朵]]></G_SpecialLab>
     <G_RegularLab desc=""><![CDATA[普通花朵]]></G_RegularLab>
     <G_RetrieveLab desc=""><![CDATA[收回所有花]]></G_RetrieveLab>
-    <H_PlaceLab desc=""><![CDATA[種下]]></H_PlaceLab>
     <H_RetrieveLab desc=""><![CDATA[收回]]></H_RetrieveLab>
     <Ba_Lab desc=""><![CDATA[離開期間獲得]]></Ba_Lab>
     <Ba_ConfirmLab desc=""><![CDATA[收取]]></Ba_ConfirmLab>
     <Bb_GetLab desc=""><![CDATA[收取]]></Bb_GetLab>
     <Bb_Title desc=""><![CDATA[每日簽到]]></Bb_Title>
     <Bb_ConfirmLab desc=""><![CDATA[確定]]></Bb_ConfirmLab>
+    <L_Tit desc=""><![CDATA[設置]]></L_Tit>
     <L_UserTit desc=""><![CDATA[用戶]]></L_UserTit>
     <L_ChangeLab desc=""><![CDATA[←這不是我]]></L_ChangeLab>
     <L_AudioTit desc=""><![CDATA[音效]]></L_AudioTit>
@@ -171,7 +170,6 @@
     <Skill4 desc=""><![CDATA[所有金幣產出提升[&coin_person&]，持續[&duration&/60]分鐘]]></Skill4>
     <Skill5 desc=""><![CDATA[免費獲取每人次收入的[&coin_once&]倍]]></Skill5>
     <Skill6 desc=""><![CDATA[免費獲取鑽石[&diamond_once&]]]></Skill6>
-    <Skill7 desc=""><![CDATA[]]></Skill7>
   </SkillDesc>
   <Object>
     <FlowerItemG_Lab desc=""><![CDATA[已放置]]></FlowerItemG_Lab>
@@ -193,6 +191,7 @@
     <NavigateDiamond desc=""><![CDATA[您可以點擊確定前往獲取鑽石]]></NavigateDiamond>
     <UnlockSlot desc=""><![CDATA[解鎖精靈可以開放]]></UnlockSlot>
     <QuitGame desc=""><![CDATA[退出遊戲?]]></QuitGame>
+    <NoValidSlot desc=""><![CDATA[已經沒有空地了]]></NoValidSlot>
   </Common>
   <AchieveName>
     <Achieve1 desc=""><![CDATA[美麗花園-1]]></Achieve1>

Assets/Resource/XML/lan/English.xml

@@ -14,7 +14,6 @@
     <Fe_BtnLab2 desc=""><![CDATA[Upgrade]]></Fe_BtnLab2>
     <Fe_BtnLab3 desc=""><![CDATA[Buy]]></Fe_BtnLab3>
     <Fe_BtnLab4 desc=""><![CDATA[Level]]></Fe_BtnLab4>
-    <Fe_BtnLab5 desc=""><![CDATA[]]></Fe_BtnLab5>
     <Fe_BtnLab6 desc=""><![CDATA[CD]]></Fe_BtnLab6>
     <Fe_BtnLab7 desc=""><![CDATA[Left]]></Fe_BtnLab7>
     <Fg_Tit desc=""><![CDATA[Alert]]></Fg_Tit>
@@ -42,21 +41,21 @@
     <G_Tit desc=""><![CDATA[Flowers]]></G_Tit>
     <G_SpecialLab desc=""><![CDATA[Special]]></G_SpecialLab>
     <G_RegularLab desc=""><![CDATA[Normal]]></G_RegularLab>
-    <G_RetrieveLab desc=""><![CDATA[Take All back]]></G_RetrieveLab>
-    <H_PlaceLab desc=""><![CDATA[Plant]]></H_PlaceLab>
-    <H_RetrieveLab desc=""><![CDATA[Take Back]]></H_RetrieveLab>
+    <G_RetrieveLab desc=""><![CDATA[Take all back]]></G_RetrieveLab>
+    <H_RetrieveLab desc=""><![CDATA[Take back]]></H_RetrieveLab>
     <Ba_Lab desc=""><![CDATA[During absence acquired ]]></Ba_Lab>
     <Ba_ConfirmLab desc=""><![CDATA[Get]]></Ba_ConfirmLab>
     <Bb_GetLab desc=""><![CDATA[Get]]></Bb_GetLab>
     <Bb_Title desc=""><![CDATA[Sign In]]></Bb_Title>
     <Bb_ConfirmLab desc=""><![CDATA[Confirm]]></Bb_ConfirmLab>
+    <L_Tit desc=""><![CDATA[Setting]]></L_Tit>
     <L_UserTit desc=""><![CDATA[User]]></L_UserTit>
     <L_ChangeLab desc=""><![CDATA[←Not Me]]></L_ChangeLab>
     <L_AudioTit desc=""><![CDATA[Audio]]></L_AudioTit>
     <L_MusicLab desc=""><![CDATA[Music]]></L_MusicLab>
     <L_AudioLab desc=""><![CDATA[Audio]]></L_AudioLab>
     <L_ReportTit desc=""><![CDATA[Support]]></L_ReportTit>
-    <L_ReportLab desc=""><![CDATA[ReportIssue]]></L_ReportLab>
+    <L_ReportLab desc=""><![CDATA[Report issue]]></L_ReportLab>
     <L_ConfirmLab desc=""><![CDATA[Confirm]]></L_ConfirmLab>
     <L_LanguageTit desc=""><![CDATA[Language]]></L_LanguageTit>
     <L_TraChiLab desc=""><![CDATA[繁體中文]]></L_TraChiLab>
@@ -66,7 +65,7 @@
     <La_Lab0 desc=""><![CDATA[Connect successful, please wait]]></La_Lab0>
     <La_Lab1 desc=""><![CDATA[Connect failed]]></La_Lab1>
     <La_Placeholder desc=""><![CDATA[Enter ID]]></La_Placeholder>
-    <Lb_Tit desc=""><![CDATA[Report Issue]]></Lb_Tit>
+    <Lb_Tit desc=""><![CDATA[Report issue]]></Lb_Tit>
     <Lb_Placeholder desc=""><![CDATA[Issue detail]]></Lb_Placeholder>
     <Lb_Send0 desc=""><![CDATA[Report successful]]></Lb_Send0>
     <Lb_Send1 desc=""><![CDATA[Please submit only once]]></Lb_Send1>
@@ -137,9 +136,9 @@
     <Skill7 desc=""><![CDATA[Recharge]]></Skill7>
   </SkillName>
   <SkillDesc>
-    <Pack1 desc=""><![CDATA[Get [%coin%] Coins immediately]]></Pack1>
-    <Pack2 desc=""><![CDATA[Get [%coin%] Coins immediately]]></Pack2>
-    <Pack3 desc=""><![CDATA[Get [%coin%] Coins immediately]]></Pack3>
+    <Pack1 desc=""><![CDATA[Get [&coin&] Coins immediately]]></Pack1>
+    <Pack2 desc=""><![CDATA[Get [&coin&] Coins immediately]]></Pack2>
+    <Pack3 desc=""><![CDATA[Get [&coin&] Coins immediately]]></Pack3>
     <Pack4 desc=""><![CDATA[Get [&flower&], [&diamond&] Diamonds
 Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack4>
     <Pack5 desc=""><![CDATA[Get [&flower&], [&diamond&] Diamonds
@@ -171,7 +170,6 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack6>
     <Skill4 desc=""><![CDATA[Increase all Coin prudoction by [&coin_person&] for [&duration&/60][lv] minutes]]></Skill4>
     <Skill5 desc=""><![CDATA[Get [&coin_once&] times of Ticket's Coins for free]]></Skill5>
     <Skill6 desc=""><![CDATA[Get [&diamond_once&] Diamonds]]></Skill6>
-    <Skill7 desc=""><![CDATA[]]></Skill7>
   </SkillDesc>
   <Object>
     <FlowerItemG_Lab desc=""><![CDATA[Planted]]></FlowerItemG_Lab>
@@ -193,6 +191,7 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack6>
     <NavigateDiamond desc=""><![CDATA[Click confirm to get Diamonds]]></NavigateDiamond>
     <UnlockSlot desc=""><![CDATA[Get Elfs to unlock it]]></UnlockSlot>
     <QuitGame desc=""><![CDATA[Are you sure to quit?]]></QuitGame>
+    <NoValidSlot desc=""><![CDATA[There is no valid slot]]></NoValidSlot>
   </Common>
   <AchieveName>
     <Achieve1 desc=""><![CDATA[Lovely Garden 1]]></Achieve1>

Assets/Script/Manage/Initializer.cs

@@ -23,8 +23,6 @@ public class Initializer : MonoBehaviour
     {
         DontDestroyOnLoad(gameObject);
 
-        new ManagerIAP();
-
         ManaServer.Login(ManaData.LoginCallbackInitial);
 
         Instance = this;
@@ -95,6 +93,8 @@ public class Initializer : MonoBehaviour
         ManaReso.Get("I_BlackMask").TweenForCG();
 
         ManaReso.SetActive("I_Lab", false);
+
+        new ManagerIAP();
     }
 
 

Assets/Script/Manage/ManaData.cs

@@ -513,11 +513,6 @@ public class ManaData : Regist
             {
                 ManaReso.Get("C_Main").TweenConBacCG();
                 ManaReso.Get("B_SignIn").TweenConForCG();
-
-                if (ManaMiniGame.Game || ManaMiniGame.Prepare)
-                {
-                    ManaReso.Get<Button>("D_Quit").onClick.Invoke();
-                }
             }
         }
     }

Assets/Script/Manage/ManaGarden.cs

@@ -376,7 +376,6 @@ public class ManaGarden : Regist
         }
         else
         {
-            ManaAudio.PlayClip(Clip.FlowerClip);
             Slot slot = null;
 
             for (int i = 0; i < SlotList.Count; i++)
@@ -391,11 +390,12 @@ public class ManaGarden : Regist
 
             if (slot == null)
             {
-                ManaDebug.Log("已经没有空地了");
+                Bubble.Show(null, Language.GetStr("Common", "NoValidSlot"));
             }
             else
             {
                 slot.Plant(flowerInfo, true);
+                ManaAudio.PlayClip(Clip.FlowerClip);
             }
         }
     }

Assets/Script/Manage/ManaMiniGame.cs

@@ -194,6 +194,7 @@ public class Award
 
         ManaReso.Get("Da_Info").TweenForCG();
 
+        ManaReso.SetText("Da_Tit", Language.GetStr("UI", "Da_Tit1"));
         ManaReso.SetText("Da_CoinLab", "0");
         ManaReso.SetText("Da_DiamondLab", "0");
 
@@ -540,6 +541,17 @@ public class ManaMiniGame : Regist
                     ManaReso.SetText("D_StatusLab", Language.GetStr("UI", "D_StatusLab1"));
                 }
             }
+            else if (Prepare)
+            {
+                if (_Pause)
+                {
+                    PrepareLab.GetStreamScale().Pause();
+                }
+                else
+                {
+                    PrepareLab.GetStreamScale().Resume();
+                }
+            }
         }
     }
     public static bool Panalty
@@ -549,33 +561,16 @@ public class ManaMiniGame : Regist
         {
             _Panalty = value;
 
-            if (_Panalty)
-            {
-                ManaReso.SetText("D_StatusLab", Language.GetStr("UI", "D_StatusLab3"));
-            }
-            else
-            {
-                ManaReso.SetText("D_StatusLab", Language.GetStr("UI", "D_StatusLab1"));
-            }
-        }
-    }
-    public static bool Prepare
-    {
-        get { return _Prepare; }
-        set
-        {
-            _Prepare = value;
-
-            if (Prepare)
+            if (Game)
             {
-                PrepareTimer = 3;
-
-                ManaReso.Get("D_Rip1").SetActive(true);
-                ManaReso.Get("D_Water1").SetActive(true);
-                ManaReso.Get("D_Fertilize1").SetActive(true);
-                ManaReso.Get("D_Begin").SetActive(false);
-
-                PrepareLab.StreamForScale();
+                if (_Panalty)
+                {
+                    ManaReso.SetText("D_StatusLab", Language.GetStr("UI", "D_StatusLab3"));
+                }
+                else
+                {
+                    ManaReso.SetText("D_StatusLab", Language.GetStr("UI", "D_StatusLab1"));
+                }
             }
         }
     }
@@ -586,9 +581,10 @@ public class ManaMiniGame : Regist
         {
             _GameTimer = value;
 
-            TimerLab.text = _GameTimer.ToString("0.0");
+            TimerLab.text = (GameTime-_GameTimer).ToString("0.0");
 
             TimerBk.fillAmount = _GameTimer / GameTime;
+            TimerBk.material.SetFloat("_Fill", TimerBk.fillAmount);
         }
     }
     public static float PrepareTimer
@@ -606,7 +602,6 @@ public class ManaMiniGame : Regist
     private static bool _Game;
     private static bool _Pause;
     private static bool _Panalty;
-    private static bool _Prepare;
     private static float _GameTimer;
     private static float _PrepareTimer;
 
@@ -621,6 +616,7 @@ public class ManaMiniGame : Regist
 
     public static int Flower;
     public static int MiniGameIndex;
+    public static bool Prepare;
     public static bool TutorialValidA = true;
     public static bool DropDiamond;
     public static float OpTime = 1.5f;
@@ -656,8 +652,8 @@ public class ManaMiniGame : Regist
             return;
         }
 
-        GameTimer -= Time.fixedDeltaTime;
-        if (GameTimer <= 0)
+        GameTimer += Time.fixedDeltaTime;
+        if (GameTimer >= GameTime)
         {
             GameOver();
 
@@ -720,6 +716,11 @@ public class ManaMiniGame : Regist
 
     private void PrepareThread()
     {
+        if (Pause)
+        {
+            return;
+        }
+        
         PrepareTimer -= Time.fixedDeltaTime;
 
         if (PrepareTimer <= 0)
@@ -913,7 +914,7 @@ public class ManaMiniGame : Regist
         }
 
         ScoreLab = Language.GetStr("UI", "D_ScoreLab");
-        TimerBk.fillAmount = 1;
+        TimerBk.fillAmount = 0;
         TimerLab.text = GameTime.ToString("0");
 
         ManaReso.Get("C_MiniGame").TweenBacCG();
@@ -931,7 +932,7 @@ public class ManaMiniGame : Regist
 
         OpTimer = OpTime;
         GoldTimer = Random.Range(3f, 6f);
-        GameTimer = GameTime;
+        GameTimer = 0;
         NewOpTime = OpTime;
         DiamondTimer = Random.Range(0f, GameTime - 5);
 
@@ -961,6 +962,19 @@ public class ManaMiniGame : Regist
         }
     }
 
+    public static void GamePrepare()
+    {
+        Prepare = true;
+        PrepareTimer = 3;
+
+        ManaReso.Get("D_Rip1").SetActive(true);
+        ManaReso.Get("D_Water1").SetActive(true);
+        ManaReso.Get("D_Fertilize1").SetActive(true);
+        ManaReso.Get("D_Begin").SetActive(false);
+
+        PrepareLab.StreamForScale();
+    }
+
     #endregion
 
 

Assets/Script/Manage/ManaPlayer.cs

@@ -58,9 +58,9 @@ public class ManaPlayer : Regist
         }
         else
         {
-            PlayerPink = ManaReso.Get<ObjRoot>("Player", Folder.Scene, false, ManaReso.Get("PlayerBk3"), false, ObjType.PlayerPink);
-            PlayerBlond = ManaReso.Get<ObjRoot>("Player", Folder.Scene, false, ManaReso.Get("PlayerBk2"), false, ObjType.PlayerBlond);
-            PlayerBrown = ManaReso.Get<ObjRoot>("Player", Folder.Scene, false, ManaReso.Get("PlayerBk1"), false, ObjType.PlayerBrown);
+            PlayerPink = ManaReso.Get<ObjRoot>("Player", Folder.Scene, false, ManaReso.Get("PlayerPos3"), false, ObjType.PlayerPink);
+            PlayerBlond = ManaReso.Get<ObjRoot>("Player", Folder.Scene, false, ManaReso.Get("PlayerPos2"), false, ObjType.PlayerBlond);
+            PlayerBrown = ManaReso.Get<ObjRoot>("Player", Folder.Scene, false, ManaReso.Get("PlayerPos1"), false, ObjType.PlayerBrown);
 
             if (PlayerPink.GetComponent<Player>() == null)
             {
@@ -77,9 +77,9 @@ public class ManaPlayer : Regist
                 PlayerBrown.AddScript<Player>().BuildBrown();
             }
 
-            PlayerPink.localScale = new Vector3(0.7f, 0.7f, 0.7f);
-            PlayerBlond.localScale = new Vector3(0.7f, 0.7f, 0.7f);
-            PlayerBrown.localScale = new Vector3(0.7f, 0.7f, 0.7f);
+            PlayerPink.localScale = new Vector3(0.8f, 0.8f, 0.8f);
+            PlayerBlond.localScale = new Vector3(0.8f, 0.8f, 0.8f);
+            PlayerBrown.localScale = new Vector3(0.8f, 0.8f, 0.8f);
 
             SelePlayer = "PlayerBlond";
             SelePlayerTra = PlayerBlond;

Assets/Script/Manage/ManaTutorial.cs

@@ -91,12 +91,20 @@ public class ManaTutorial : Regist
         {
             ManaReso.Get("TutorialMask").AddScript<SceneMask>();
 
+            ManaReso.Get("PlayerBk1").CreateMove2D();
+            ManaReso.Get("PlayerBk2").CreateMove2D();
+            ManaReso.Get("PlayerBk3").CreateMove2D();
+
             ManaReso.Get("Tutorial").CreateTweenSr(0, 1, 1f, true, true, Curve.EaseOutQuad, false, true);
-            ManaReso.Get("PlayerBk1").CreateTweenScale(new Vector3(0.75f, 0.75f, 0.75f), new Vector3(0.9f, 0.9f, 0.9f), 0.25f, true, true, Curve.EaseOutQuad);
-            ManaReso.Get("PlayerBk2").CreateTweenScale(new Vector3(0.75f, 0.75f, 0.75f), new Vector3(0.9f, 0.9f, 0.9f), 0.25f, true, true, Curve.EaseOutQuad);
-            ManaReso.Get("PlayerBk3").CreateTweenScale(new Vector3(0.75f, 0.75f, 0.75f), new Vector3(0.9f, 0.9f, 0.9f), 0.25f, true, true, Curve.EaseOutQuad);
+            ManaReso.Get("PlayerBk1").CreateTweenScale(new Vector3(0.75f, 0.75f, 0.75f), new Vector3(0.9f, 0.9f, 0.9f), 1f, true, true, Curve.EaseOutQuad);
+            ManaReso.Get("PlayerBk2").CreateTweenScale(new Vector3(0.75f, 0.75f, 0.75f), new Vector3(0.9f, 0.9f, 0.9f), 1f, true, true, Curve.EaseOutQuad);
+            ManaReso.Get("PlayerBk3").CreateTweenScale(new Vector3(0.75f, 0.75f, 0.75f), new Vector3(0.9f, 0.9f, 0.9f), 1f, true, true, Curve.EaseOutQuad);
             ManaReso.Get("TutorialMask").CreateTweenSr(0, 180 / 255f, 0.25f, false, true, Curve.EaseOutQuad);
 
+            ManaPlayer.PlayerPink.CreateTweenScale(new Vector3(0.9f, 0.9f, 0.9f), 1f, true, true, Curve.EaseOutQuad);
+            ManaPlayer.PlayerBlond.CreateTweenScale(new Vector3(0.9f, 0.9f, 0.9f), 1f, true, true, Curve.EaseOutQuad);
+            ManaPlayer.PlayerBrown.CreateTweenScale(new Vector3(0.9f, 0.9f, 0.9f), 1f, true, true, Curve.EaseOutQuad);
+
             if (TutorialIndexA == 1)
             {
                 PrepareStep1();
@@ -209,6 +217,7 @@ public class ManaTutorial : Regist
         TutorialIndexA = 1;
 
         ManaReso.Get("PlayerBk2").TweenForScale();
+        ManaPlayer.PlayerBlond.TweenForScale();
 
         ManaReso.SetActive("PlayerBk1", true);
         ManaReso.SetActive("PlayerBk2", true);

Assets/Script/Manage/ManaUI.cs

@@ -310,6 +310,7 @@ public class ManaUI : Regist
             () =>
             {
                 ManaAudio.PlayClip(Clip.CloseClip);
+
                 ManaMiniGame.Pause = true;
 
                 ManaReso.Get("Da_Info").TweenConForCG();
@@ -365,7 +366,8 @@ public class ManaUI : Regist
             "D_Begin",
             () =>
             {
-                ManaMiniGame.Prepare = true;
+                ManaMiniGame.GamePrepare();
+
                 ManaAudio.PlayClip(Clip.BtnClip);
             }
         );
@@ -1237,10 +1239,14 @@ public class ManaUI : Regist
 
         ManaReso.Get("K_Bubble").AddScript<Bubble>();
 
+        ManaLan.Add(ManaReso.Get<Text>("K_CancelLab"), new LanStr("Common", "Cancel"));
+        ManaLan.Add(ManaReso.Get<Text>("K_ConfirmLab"), new LanStr("Common", "Confirm"));
+
         #endregion
 
         #region L
 
+        ManaLan.Add(ManaReso.Get<Text>("L_Tit"), new LanStr("UI", "L_Tit"));
         ManaLan.Add(ManaReso.Get<Text>("L_UserTit"), new LanStr("UI", "L_UserTit"));
         ManaLan.Add(ManaReso.Get<Text>("L_AudioTit"), new LanStr("UI", "L_AudioTit"));
         ManaLan.Add(ManaReso.Get<Text>("L_ReportTit"), new LanStr("UI", "L_ReportTit"));

Assets/Script/Manage/ManagerIAP.cs

@@ -1,4 +1,5 @@
-using UnityEngine;
+using System;
+using UnityEngine;
 
 using System.Collections;
 using System.Collections.Generic;
@@ -22,13 +23,50 @@ public class ManagerIAP : IStoreListener
 
     public ManagerIAP()
     {
-        InitializeAd();
-
         ConfigurationBuilder cb = ConfigurationBuilder.Instance(StandardPurchasingModule.Instance());
 
-        cb.AddProduct("Test", ProductType.Consumable);
+        //try
+        //{
+        //    ConfigurationBuilder cb = ConfigurationBuilder.Instance(StandardPurchasingModule.Instance());
+        //}
+        //catch (Exception)
+        //{
+        //    ManaDebug.Log("Debug5");
+        //}
+
+        try
+        {
+            InitializeAd();
+        }
+        catch (Exception)
+        {
+            ManaDebug.Log("Debug1");
+        }
 
-        UnityPurchasing.Initialize(this, cb);
+        try
+        {
+            cb = ConfigurationBuilder.Instance(StandardPurchasingModule.Instance());
+        }
+        catch (Exception)
+        {
+            ManaDebug.Log("Debug2");
+        }
+
+        try
+        {
+            if (cb == null)
+            {
+                ManaDebug.Log("Debug3");
+            }
+            else
+            {
+                UnityPurchasing.Initialize(this, cb);
+            }
+        }
+        catch (Exception)
+        {
+            ManaDebug.Log("Debug4");
+        }
 
         Instance = this;
     }

Assets/Script/Object/DropDiamond.cs

@@ -35,6 +35,6 @@ public class DropDiamond : Drop
         int diamond = Random.Range(1, 6);
         Award.BonusDiamond += diamond;
 
-        ManaReso.GetHudText("+" + diamond, Color.white, 25, transform, ManaReso.Get("D_Status"), true);
+        ManaReso.GetHudText("+" + diamond, Color.white, 90, transform, ManaReso.Get("D_Status"), true);
     }
 }

Assets/Script/Object/DropGold.cs

@@ -35,6 +35,6 @@ public class DropGold : Drop
         int coin = Mathf.CeilToInt((float) Auxiliary.FmlParse(CoinFml, "l", Mathf.Clamp(ManaData.Level, 1, Mathf.Infinity).ToString(), "r", Random.Range(0f, 1f).ToString()));
         Award.BonusCoin += coin;
 
-        ManaReso.GetHudText("+" + coin, Color.white, 25, transform, ManaReso.Get("D_Status"), true);
+        ManaReso.GetHudText("+" + coin, Color.white, 90, transform, ManaReso.Get("D_Status"), true);
     }
 }

Assets/Script/Object/Flower.cs

@@ -274,7 +274,7 @@ public class Flower : ObjRoot, IPointerClickHandler
         FlowerIcon = ChildDic["FlowerIcon"].GetComponent<SpriteRenderer>();
         OperateBk = ChildDic["OperateBk"].GetComponent<SpriteRenderer>();
         OperateIcon = ChildDic["OperateIcon"].GetComponent<SpriteRenderer>();
-        OperateOutline = ChildDic["OperateOutline"].GetComponent<SpriteRenderer>();
+        OperateOutline = ChildDic["OperateOutline1"].GetComponent<SpriteRenderer>();
         
         Tween tween = FlowerIcon.CreateTweenSr(new Color(1, 1, 1), new Color(1, 0.5f, 0.5f), 0.2f, true, true, Curve.EaseOutQuad);
 
@@ -422,7 +422,7 @@ public class Flower : ObjRoot, IPointerClickHandler
         }
         else //操作正确
         {
-            ManaReso.GetHudText("+15", Color.white, 25, ChildDic["ScorePosTra"], ManaReso.Get("D_Status"), true);
+            ManaReso.GetHudText("+15", Color.white, 90, ChildDic["ScorePosTra"], ManaReso.Get("D_Status"), true);
 
             ManaMiniGame.Score += 15;
 
@@ -467,7 +467,7 @@ public class Flower : ObjRoot, IPointerClickHandler
         ManaData.Coin += coin;
         ManaData.FlowerCoin++;
 
-        ManaReso.GetHudText("+" + coin, Color.white, 25, ChildDic["GoldPosTra"], ManaReso.Get("A_HudParent"), true);
+        ManaReso.GetHudText("+" + coin, Color.white, 90, ChildDic["GoldPosTra"], ManaReso.Get("A_HudParent"), true);
 
         GoldBk.SetActive(false);
         GoldBk.GetTweenSr().InOrigin = true;

Assets/Script/Object/Player.cs

@@ -81,7 +81,7 @@ public class Player : Regist
         UAC.transform.localScale = new Vector3(1, 1, 1);
         UAC.transform.localPosition = new Vector3();
 
-        UAC.animation.Play("newAnimation");
+        UAC.anim.Play("newAnimation");
 
 
         EyeList.Add("眼睛1");

Assets/Script/Object/Skill/Pack.cs

@@ -268,19 +268,19 @@ public class Pack : SkillRoot
 
     protected void Purchase()
     {
-        ManaAudio.PlayClip(Clip.SkillClip);
+        ManaAudio.PlayClip(Clip.BtnClip);
 
         ManaData.Pay(ID, UseAmt, Current.Cash, PurchaseResult);
     }
 
     protected void PurchaseResult()
     {
-        ManaData.SkillAmt++;
-
         UseA();
         UseB();
 
         Level++;
+
+        ManaAudio.PlayClip(Clip.SkillClip);
     }
 
 

Assets/Script/Object/Skill/Skill.cs

@@ -288,8 +288,11 @@ public class Skill : SkillRoot
         {
             ManaAudio.PlayClip(Clip.SkillClip);
 
-            ManaData.SkillAmt++;
-
+            if (BuyCur != Current.AD)
+            {
+                ManaData.SkillAmt++;
+            }
+            
             UseTimer = NewDuration;
 
             if (Math.Abs(Duration) < 0.0005f)

Assets/Script/Object/Tutorial.cs

@@ -173,28 +173,76 @@ public class Tutorial : Regist, IPointerClickHandler
         ManaAudio.PlayClip(Clip.BtnClip);
         if (eventData.rawPointerPress.name == "PlayerBk1")
         {
+            Vector3 offset = ManaReso.Get("PlayerBk1").position;
+            offset.x = -offset.x;
+            offset.y = 0;
+
+            ManaReso.Get("PlayerBk1").GetMove2D().Pause();
+            ManaReso.Get("PlayerBk2").GetMove2D().Pause();
+            ManaReso.Get("PlayerBk3").GetMove2D().Pause();
+
+            ManaReso.Get("PlayerBk1").MoveOffset2D(offset, 1f, false, Curve.EaseOutQuad);
+            ManaReso.Get("PlayerBk2").MoveOffset2D(offset, 1f, false, Curve.EaseOutQuad);
+            ManaReso.Get("PlayerBk3").MoveOffset2D(offset, 1f, false, Curve.EaseOutQuad);
+
             ManaReso.Get("PlayerBk1").TweenConForScale();
             ManaReso.Get("PlayerBk2").TweenConBacScale();
             ManaReso.Get("PlayerBk3").TweenConBacScale();
 
+            ManaPlayer.PlayerPink.TweenConBacScale();
+            ManaPlayer.PlayerBlond.TweenConBacScale();
+            ManaPlayer.PlayerBrown.TweenConForScale();
+
             ManaPlayer.SelePlayer = "PlayerBrown";
             ManaPlayer.SelePlayerTra = ManaPlayer.PlayerBrown;
         }
         else if (eventData.rawPointerPress.name == "PlayerBk2")
         {
+            Vector3 offset = ManaReso.Get("PlayerBk2").position;
+            offset.x = -offset.x;
+            offset.y = 0;
+
+            ManaReso.Get("PlayerBk1").GetMove2D().Pause();
+            ManaReso.Get("PlayerBk2").GetMove2D().Pause();
+            ManaReso.Get("PlayerBk3").GetMove2D().Pause();
+
+            ManaReso.Get("PlayerBk1").MoveOffset2D(offset, 1f, false, Curve.EaseOutQuad);
+            ManaReso.Get("PlayerBk2").MoveOffset2D(offset, 1f, false, Curve.EaseOutQuad);
+            ManaReso.Get("PlayerBk3").MoveOffset2D(offset, 1f, false, Curve.EaseOutQuad);
+
             ManaReso.Get("PlayerBk2").TweenConForScale();
             ManaReso.Get("PlayerBk1").TweenConBacScale();
             ManaReso.Get("PlayerBk3").TweenConBacScale();
 
+            ManaPlayer.PlayerPink.TweenConBacScale();
+            ManaPlayer.PlayerBlond.TweenConForScale();
+            ManaPlayer.PlayerBrown.TweenConBacScale();
+
             ManaPlayer.SelePlayer = "PlayerBlond";
             ManaPlayer.SelePlayerTra = ManaPlayer.PlayerBlond;
         }
         else if (eventData.rawPointerPress.name == "PlayerBk3")
         {
+            Vector3 offset = ManaReso.Get("PlayerBk3").position;
+            offset.x = -offset.x;
+            offset.y = 0;
+
+            ManaReso.Get("PlayerBk1").GetMove2D().Pause();
+            ManaReso.Get("PlayerBk2").GetMove2D().Pause();
+            ManaReso.Get("PlayerBk3").GetMove2D().Pause();
+
+            ManaReso.Get("PlayerBk1").MoveOffset2D(offset, 1f, false, Curve.EaseOutQuad);
+            ManaReso.Get("PlayerBk2").MoveOffset2D(offset, 1f, false, Curve.EaseOutQuad);
+            ManaReso.Get("PlayerBk3").MoveOffset2D(offset, 1f, false, Curve.EaseOutQuad);
+
             ManaReso.Get("PlayerBk3").TweenConForScale();
             ManaReso.Get("PlayerBk1").TweenConBacScale();
             ManaReso.Get("PlayerBk2").TweenConBacScale();
 
+            ManaPlayer.PlayerPink.TweenConForScale();
+            ManaPlayer.PlayerBlond.TweenConBacScale();
+            ManaPlayer.PlayerBrown.TweenConBacScale();
+
             ManaPlayer.SelePlayer = "PlayerPink";
             ManaPlayer.SelePlayerTra = ManaPlayer.PlayerPink;
         }

Assets/Script/Tool/Anim/Move.cs

@@ -23,6 +23,17 @@ public abstract class Move
     public abstract bool Do();
 
 
+    public void Pause()
+    {
+        ManaAnim.MoveList.Remove(this);
+    }
+
+    public void Resume()
+    {
+        ManaAnim.MoveList.Add(this);
+    }
+
+
     public void PushEvent(EventType type, UnityAction action)
     {
         if (type == EventType.ForwardStart)

Assets/Script/Tool/Anim/Move2D.cs

@@ -118,6 +118,8 @@ public class Move2D : Move
 
     public void StartMove(Vector3 destination, float duration, bool local, Curve curve)
     {
+        Timer = 0;
+
         InDestination = false;
         destination.z = Target.position.z;
 

Assets/Script/Tool/Anim/Move3D.cs

@@ -118,6 +118,8 @@ public class Move3D : Move
 
     public void StartMove(Vector3 destination, float duration, bool local, Curve curve)
     {
+        Timer = 0;
+
         InDestination = false;
 
         Local = local;

Assets/Script/Tool/Anim/Shake.cs

@@ -80,6 +80,8 @@ public class Shake : Move
 
     public void StartShake(int repeat, float duration, Vector3 strength, Curve curve)
     {
+        Timer = 0;
+
         InDestination = false;
 
         Repeat = repeat;

Assets/Script/Tool/Anim/Tween.cs

@@ -55,6 +55,31 @@ public abstract class Tween
     }
 
 
+    public void Pause()
+    {
+        if (InForward)
+        {
+            ManaAnim.TweenForList.Remove(this);
+        }
+        else if (InBackward)
+        {
+            ManaAnim.TweenBacList.Remove(this);
+        }
+    }
+
+    public void Resume()
+    {
+        if (InForward)
+        {
+            ManaAnim.TweenForList.Add(this);
+        }
+        else if (InBackward)
+        {
+            ManaAnim.TweenBacList.Add(this);
+        }
+    }
+
+
     public void ReForward()
     {
         Timer = 0;

Assets/Script/Tool/Anim/TweenScale.cs

@@ -93,20 +93,14 @@ public class TweenScale : Tween
     {
         base.StartForward();
 
-        if (InBackward)
-        {
-            Timer = ManaAnim.GetTimerVec3(Target.localScale, Duration, Origin, Delta, Curve);
-        }
+        Timer = ManaAnim.GetTimerVec3(Target.localScale, Duration, Origin, Delta, Curve);
     }
 
     public override void StartBackward()
     {
         base.StartBackward();
 
-        if (InForward)
-        {
-            Timer = ManaAnim.GetTimerVec3(Target.localScale, Duration, Destination, -Delta, Curve);
-        }
+        Timer = ManaAnim.GetTimerVec3(Target.localScale, Duration, Destination, -Delta, Curve);
     }
 
     public override bool DoForward()

Assets/Script/Tool/DashGame/Logo.cs

@@ -10,13 +10,13 @@ public class Logo : MonoBehaviour
 
     public static bool LogoComplete;
 
-    public static GameObject Cameta;
+    public static GameObject Camera;
 
     #endregion
 
     public void Awake()
     {
-        Cameta = GameObject.Find("Main Camera");
+        Camera = GameObject.Find("Main Camera");
     }
 
     public void Begin()
@@ -28,7 +28,7 @@ public class Logo : MonoBehaviour
     {
         LogoComplete = true;
 
-        Cameta.SetActive(false);
+        Camera.SetActive(false);
 
         ManaUI.InitialInstantiate();
 

Assets/Script/Tool/UI/TextPlus.cs

@@ -106,14 +106,6 @@ public class TextPlus : Text
 
     #endregion
 
-    protected override void Awake()
-    {
-        base.Awake();
-        
-        verticalOverflow = VerticalWrapMode.Overflow;
-        horizontalOverflow = HorizontalWrapMode.Overflow;
-    }
-
     protected override void OnPopulateMesh(VertexHelper toFill)
     {
         base.OnPopulateMesh(toFill);

MyLovelyGarden.Editor.csproj

@@ -27,7 +27,7 @@
     <IntermediateOutputPath>Temp\UnityVS_obj\Debug\</IntermediateOutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DefineConstants>DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_5_0;UNITY_5_5;UNITY_5;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_GENERICS;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;PLATFORM_SUPPORTS_MONO;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_SCRIPTING_NEW_CSHARP_COMPILER;UNITY_ANDROID;ENABLE_SUBSTANCE;UNITY_ANDROID_API;ENABLE_EGL;ENABLE_NETWORK;ENABLE_RUNTIME_GI;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;PLATFORM_SUPPORTS_ADS_ID;UNITY_CAN_SHOW_SPLASH_SCREEN;ENABLE_VIDEO;ENABLE_VR;ENABLE_UNITYADS_RUNTIME;UNITY_UNITYADS_API;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE</DefineConstants>
+    <DefineConstants>DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_5_0;UNITY_5_5;UNITY_5;UNITY_PURCHASING;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_GENERICS;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;PLATFORM_SUPPORTS_MONO;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_SCRIPTING_NEW_CSHARP_COMPILER;UNITY_ANDROID;ENABLE_SUBSTANCE;UNITY_ANDROID_API;ENABLE_EGL;ENABLE_NETWORK;ENABLE_RUNTIME_GI;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;PLATFORM_SUPPORTS_ADS_ID;UNITY_CAN_SHOW_SPLASH_SCREEN;ENABLE_VIDEO;ENABLE_VR;ENABLE_UNITYADS_RUNTIME;UNITY_UNITYADS_API;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE</DefineConstants>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -37,7 +37,7 @@
     <IntermediateOutputPath>Temp\UnityVS_obj\Release\</IntermediateOutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DefineConstants>TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_5_0;UNITY_5_5;UNITY_5;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_GENERICS;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;PLATFORM_SUPPORTS_MONO;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_SCRIPTING_NEW_CSHARP_COMPILER;UNITY_ANDROID;ENABLE_SUBSTANCE;UNITY_ANDROID_API;ENABLE_EGL;ENABLE_NETWORK;ENABLE_RUNTIME_GI;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;PLATFORM_SUPPORTS_ADS_ID;UNITY_CAN_SHOW_SPLASH_SCREEN;ENABLE_VIDEO;ENABLE_VR;ENABLE_UNITYADS_RUNTIME;UNITY_UNITYADS_API;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE</DefineConstants>
+    <DefineConstants>TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_5_0;UNITY_5_5;UNITY_5;UNITY_PURCHASING;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_GENERICS;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;PLATFORM_SUPPORTS_MONO;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_SCRIPTING_NEW_CSHARP_COMPILER;UNITY_ANDROID;ENABLE_SUBSTANCE;UNITY_ANDROID_API;ENABLE_EGL;ENABLE_NETWORK;ENABLE_RUNTIME_GI;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;PLATFORM_SUPPORTS_ADS_ID;UNITY_CAN_SHOW_SPLASH_SCREEN;ENABLE_VIDEO;ENABLE_VR;ENABLE_UNITYADS_RUNTIME;UNITY_UNITYADS_API;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE</DefineConstants>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
@@ -97,6 +97,9 @@
     <Reference Include="UnityEngine.HoloLens">
       <HintPath>Library\UnityAssemblies\UnityEngine.HoloLens.dll</HintPath>
     </Reference>
+    <Reference Include="UnityEngine.Purchasing">
+      <HintPath>Library\UnityAssemblies\UnityEngine.Purchasing.dll</HintPath>
+    </Reference>
     <Reference Include="UnityEditor.VR">
       <HintPath>Library\UnityAssemblies\UnityEditor.VR.dll</HintPath>
     </Reference>
@@ -127,6 +130,36 @@
     <Reference Include="UnityEditor.iOS.Extensions.Common">
       <HintPath>Library\UnityAssemblies\UnityEditor.iOS.Extensions.Common.dll</HintPath>
     </Reference>
+    <Reference Include="UnityEngine.Advertisements">
+      <HintPath>Assets\Advertisements\UnityEngine.Advertisements.dll</HintPath>
+    </Reference>
+    <Reference Include="UnityEditor.Advertisements">
+      <HintPath>Assets\Advertisements\Editor\UnityEditor.Advertisements.dll</HintPath>
+    </Reference>
+    <Reference Include="UnityEditor.iOS.Extensions.Xcode">
+      <HintPath>Assets\Advertisements\Editor\UnityEditor.iOS.Extensions.Xcode.dll</HintPath>
+    </Reference>
+    <Reference Include="Editor">
+      <HintPath>Assets\Plugins\UnityPurchasing\Bin\Editor.dll</HintPath>
+    </Reference>
+    <Reference Include="Purchasing.Common">
+      <HintPath>Assets\Plugins\UnityPurchasing\Bin\Purchasing.Common.dll</HintPath>
+    </Reference>
+    <Reference Include="Security">
+      <HintPath>Assets\Plugins\UnityPurchasing\Bin\Security.dll</HintPath>
+    </Reference>
+    <Reference Include="Stores">
+      <HintPath>Assets\Plugins\UnityPurchasing\Bin\Stores.dll</HintPath>
+    </Reference>
+    <Reference Include="Apple">
+      <HintPath>Assets\Plugins\UnityPurchasing\Bin\Apple\Apple.dll</HintPath>
+    </Reference>
+    <Reference Include="Tizen">
+      <HintPath>Assets\Plugins\UnityPurchasing\Bin\Tizen\Tizen.dll</HintPath>
+    </Reference>
+    <Reference Include="winrt">
+      <HintPath>Assets\Plugins\UnityPurchasing\winrt\winrt.dll</HintPath>
+    </Reference>
     <Reference Include="Debuger">
       <HintPath>Assets\Resource\Plugins\Debuger.dll</HintPath>
     </Reference>
@@ -147,10 +180,18 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="MyLovelyGarden.Plugins.csproj">
+      <Project>{6E74E584-9DFC-C050-676F-69A7C37E7E0C}</Project>
+      <Name>MyLovelyGarden.Plugins</Name>
+    </ProjectReference>
     <ProjectReference Include="MyLovelyGarden.csproj">
       <Project>{9F3A3259-D53B-F6C8-8878-C5B99621035A}</Project>
       <Name>MyLovelyGarden</Name>
     </ProjectReference>
+    <ProjectReference Include="MyLovelyGarden.Editor.Plugins.csproj">
+      <Project>{30FF29F4-DBAE-475C-A2D4-DCA87549A28A}</Project>
+      <Name>MyLovelyGarden.Editor.Plugins</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Assets\Resource\DragonBones\Unity\src\DragonBones\unity\Editor\UnityEditor.cs" />
@@ -162,6 +203,10 @@
     <Compile Include="Assets\Script\Editor\EditorSpriteAsste.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="Assets\Advertisements\Editor\UnityEditor.Advertisements.xml" />
+    <None Include="Assets\Advertisements\Editor\UnityEditor.iOS.Extensions.Xcode.xml" />
+    <None Include="Assets\Advertisements\UnityEngine.Advertisements.xml" />
+    <None Include="Assets\Advertisements\ivy.xml" />
     <None Include="Assets\Resource\Effect\Cartoon FX\CartoonFX Readme.txt" />
     <None Include="Assets\Resource\Effect\Cartoon FX\CartoonFX Releases Notes.txt" />
     <None Include="Assets\Resource\Effect\Cartoon FX\Demo\Assets\CFX_Demo_WaterWiggle.shader" />
@@ -172,6 +217,7 @@
     <None Include="Assets\Resource\Shader\Lightwall.shader" />
     <None Include="Assets\Resource\Shader\Mask.shader" />
     <None Include="Assets\Resource\Shader\Points.shader" />
+    <None Include="Assets\Resource\Shader\Timer.shader" />
     <None Include="Assets\Resource\Shader\UIMask.shader" />
     <None Include="Assets\Resource\XML\Config\ability_config.xml" />
     <None Include="Assets\Resource\XML\Config\achieve_config.xml" />

MyLovelyGarden.csproj

@@ -27,7 +27,7 @@
     <IntermediateOutputPath>Temp\UnityVS_obj\Debug\</IntermediateOutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DefineConstants>DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_5_0;UNITY_5_5;UNITY_5;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_GENERICS;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;PLATFORM_SUPPORTS_MONO;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_SCRIPTING_NEW_CSHARP_COMPILER;UNITY_ANDROID;ENABLE_SUBSTANCE;UNITY_ANDROID_API;ENABLE_EGL;ENABLE_NETWORK;ENABLE_RUNTIME_GI;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;PLATFORM_SUPPORTS_ADS_ID;UNITY_CAN_SHOW_SPLASH_SCREEN;ENABLE_VIDEO;ENABLE_VR;ENABLE_UNITYADS_RUNTIME;UNITY_UNITYADS_API;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE</DefineConstants>
+    <DefineConstants>DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_5_0;UNITY_5_5;UNITY_5;UNITY_PURCHASING;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_GENERICS;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;PLATFORM_SUPPORTS_MONO;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_SCRIPTING_NEW_CSHARP_COMPILER;UNITY_ANDROID;ENABLE_SUBSTANCE;UNITY_ANDROID_API;ENABLE_EGL;ENABLE_NETWORK;ENABLE_RUNTIME_GI;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;PLATFORM_SUPPORTS_ADS_ID;UNITY_CAN_SHOW_SPLASH_SCREEN;ENABLE_VIDEO;ENABLE_VR;ENABLE_UNITYADS_RUNTIME;UNITY_UNITYADS_API;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE</DefineConstants>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -37,7 +37,7 @@
     <IntermediateOutputPath>Temp\UnityVS_obj\Release\</IntermediateOutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DefineConstants>TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_5_0;UNITY_5_5;UNITY_5;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_GENERICS;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;PLATFORM_SUPPORTS_MONO;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_SCRIPTING_NEW_CSHARP_COMPILER;UNITY_ANDROID;ENABLE_SUBSTANCE;UNITY_ANDROID_API;ENABLE_EGL;ENABLE_NETWORK;ENABLE_RUNTIME_GI;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;PLATFORM_SUPPORTS_ADS_ID;UNITY_CAN_SHOW_SPLASH_SCREEN;ENABLE_VIDEO;ENABLE_VR;ENABLE_UNITYADS_RUNTIME;UNITY_UNITYADS_API;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE</DefineConstants>
+    <DefineConstants>TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_5_0;UNITY_5_5;UNITY_5;UNITY_PURCHASING;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_GENERICS;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;PLATFORM_SUPPORTS_MONO;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_SCRIPTING_NEW_CSHARP_COMPILER;UNITY_ANDROID;ENABLE_SUBSTANCE;UNITY_ANDROID_API;ENABLE_EGL;ENABLE_NETWORK;ENABLE_RUNTIME_GI;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;PLATFORM_SUPPORTS_ADS_ID;UNITY_CAN_SHOW_SPLASH_SCREEN;ENABLE_VIDEO;ENABLE_VR;ENABLE_UNITYADS_RUNTIME;UNITY_UNITYADS_API;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE</DefineConstants>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
@@ -67,6 +67,9 @@
     <Reference Include="UnityEngine.HoloLens">
       <HintPath>Library\UnityAssemblies\UnityEngine.HoloLens.dll</HintPath>
     </Reference>
+    <Reference Include="UnityEngine.Purchasing">
+      <HintPath>Library\UnityAssemblies\UnityEngine.Purchasing.dll</HintPath>
+    </Reference>
     <Reference Include="UnityEngine.VR">
       <HintPath>Library\UnityAssemblies\UnityEngine.VR.dll</HintPath>
     </Reference>
@@ -79,6 +82,30 @@
     <Reference Include="UnityEditor.iOS.Extensions.Common">
       <HintPath>Library\UnityAssemblies\UnityEditor.iOS.Extensions.Common.dll</HintPath>
     </Reference>
+    <Reference Include="UnityEngine.Advertisements">
+      <HintPath>Assets\Advertisements\UnityEngine.Advertisements.dll</HintPath>
+    </Reference>
+    <Reference Include="Editor">
+      <HintPath>Assets\Plugins\UnityPurchasing\Bin\Editor.dll</HintPath>
+    </Reference>
+    <Reference Include="Purchasing.Common">
+      <HintPath>Assets\Plugins\UnityPurchasing\Bin\Purchasing.Common.dll</HintPath>
+    </Reference>
+    <Reference Include="Security">
+      <HintPath>Assets\Plugins\UnityPurchasing\Bin\Security.dll</HintPath>
+    </Reference>
+    <Reference Include="Stores">
+      <HintPath>Assets\Plugins\UnityPurchasing\Bin\Stores.dll</HintPath>
+    </Reference>
+    <Reference Include="Apple">
+      <HintPath>Assets\Plugins\UnityPurchasing\Bin\Apple\Apple.dll</HintPath>
+    </Reference>
+    <Reference Include="Tizen">
+      <HintPath>Assets\Plugins\UnityPurchasing\Bin\Tizen\Tizen.dll</HintPath>
+    </Reference>
+    <Reference Include="winrt">
+      <HintPath>Assets\Plugins\UnityPurchasing\winrt\winrt.dll</HintPath>
+    </Reference>
     <Reference Include="Debuger">
       <HintPath>Assets\Resource\Plugins\Debuger.dll</HintPath>
     </Reference>
@@ -96,6 +123,12 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="MyLovelyGarden.Plugins.csproj">
+      <Project>{6E74E584-9DFC-C050-676F-69A7C37E7E0C}</Project>
+      <Name>MyLovelyGarden.Plugins</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
     <Compile Include="Assets\Resource\DragonBones\3rdParty\MiniJSON.cs" />
     <Compile Include="Assets\Resource\DragonBones\DragonBones\src\DragonBones\animation\Animation.cs" />
     <Compile Include="Assets\Resource\DragonBones\DragonBones\src\DragonBones\animation\AnimationState.cs" />
@@ -156,6 +189,7 @@
     <Compile Include="Assets\Script\Manage\ManaSign.cs" />
     <Compile Include="Assets\Script\Manage\ManaTutorial.cs" />
     <Compile Include="Assets\Script\Manage\ManaUI.cs" />
+    <Compile Include="Assets\Script\Manage\ManagerIAP.cs" />
     <Compile Include="Assets\Script\Object\Drop.cs" />
     <Compile Include="Assets\Script\Object\DropDiamond.cs" />
     <Compile Include="Assets\Script\Object\DropGold.cs" />
@@ -221,6 +255,10 @@
     <Compile Include="Assets\Script\Utils\StringUtil.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="Assets\Advertisements\Editor\UnityEditor.Advertisements.xml" />
+    <None Include="Assets\Advertisements\Editor\UnityEditor.iOS.Extensions.Xcode.xml" />
+    <None Include="Assets\Advertisements\UnityEngine.Advertisements.xml" />
+    <None Include="Assets\Advertisements\ivy.xml" />
     <None Include="Assets\Resource\Effect\Cartoon FX\CartoonFX Readme.txt" />
     <None Include="Assets\Resource\Effect\Cartoon FX\CartoonFX Releases Notes.txt" />
     <None Include="Assets\Resource\Effect\Cartoon FX\Demo\Assets\CFX_Demo_WaterWiggle.shader" />
@@ -231,6 +269,7 @@
     <None Include="Assets\Resource\Shader\Lightwall.shader" />
     <None Include="Assets\Resource\Shader\Mask.shader" />
     <None Include="Assets\Resource\Shader\Points.shader" />
+    <None Include="Assets\Resource\Shader\Timer.shader" />
     <None Include="Assets\Resource\Shader\UIMask.shader" />
     <None Include="Assets\Resource\XML\Config\ability_config.xml" />
     <None Include="Assets\Resource\XML\Config\achieve_config.xml" />

MyLovelyGarden.sln

@@ -1,13 +1,13 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2008
-
-Project("{8A8BB0A8-D809-F2DF-89D6-F26151FFF558}") = "MyLovelyGarden", "Assembly-CSharp-firstpass.csproj", "{76439BDA-6081-7FA3-9C3B-368968A7EA5E}"
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2015
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyLovelyGarden.Plugins", "MyLovelyGarden.Plugins.csproj", "{6E74E584-9DFC-C050-676F-69A7C37E7E0C}"
 EndProject
-Project("{8A8BB0A8-D809-F2DF-89D6-F26151FFF558}") = "MyLovelyGarden", "Assembly-CSharp.csproj", "{21BB93BC-2239-D8F5-1219-201F8DCBAF49}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyLovelyGarden", "MyLovelyGarden.csproj", "{9F3A3259-D53B-F6C8-8878-C5B99621035A}"
 EndProject
-Project("{8A8BB0A8-D809-F2DF-89D6-F26151FFF558}") = "MyLovelyGarden", "Assembly-CSharp-Editor-firstpass.csproj", "{527B5E1B-6A56-0EB9-22D1-0FE7785A959A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyLovelyGarden.Editor.Plugins", "MyLovelyGarden.Editor.Plugins.csproj", "{30FF29F4-DBAE-475C-A2D4-DCA87549A28A}"
 EndProject
-Project("{8A8BB0A8-D809-F2DF-89D6-F26151FFF558}") = "MyLovelyGarden", "Assembly-CSharp-Editor.csproj", "{A08052E5-32CE-91C0-FF56-C60C901D6BEF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyLovelyGarden.Editor", "MyLovelyGarden.Editor.csproj", "{B575449E-FD9A-1672-368B-EC1E1252F6E4}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -15,27 +15,24 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{76439BDA-6081-7FA3-9C3B-368968A7EA5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{76439BDA-6081-7FA3-9C3B-368968A7EA5E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{76439BDA-6081-7FA3-9C3B-368968A7EA5E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{76439BDA-6081-7FA3-9C3B-368968A7EA5E}.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
-		{527B5E1B-6A56-0EB9-22D1-0FE7785A959A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{527B5E1B-6A56-0EB9-22D1-0FE7785A959A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{527B5E1B-6A56-0EB9-22D1-0FE7785A959A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{527B5E1B-6A56-0EB9-22D1-0FE7785A959A}.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
+		{6E74E584-9DFC-C050-676F-69A7C37E7E0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6E74E584-9DFC-C050-676F-69A7C37E7E0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6E74E584-9DFC-C050-676F-69A7C37E7E0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6E74E584-9DFC-C050-676F-69A7C37E7E0C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9F3A3259-D53B-F6C8-8878-C5B99621035A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9F3A3259-D53B-F6C8-8878-C5B99621035A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9F3A3259-D53B-F6C8-8878-C5B99621035A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9F3A3259-D53B-F6C8-8878-C5B99621035A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{30FF29F4-DBAE-475C-A2D4-DCA87549A28A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{30FF29F4-DBAE-475C-A2D4-DCA87549A28A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{30FF29F4-DBAE-475C-A2D4-DCA87549A28A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{30FF29F4-DBAE-475C-A2D4-DCA87549A28A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B575449E-FD9A-1672-368B-EC1E1252F6E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B575449E-FD9A-1672-368B-EC1E1252F6E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B575449E-FD9A-1672-368B-EC1E1252F6E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B575449E-FD9A-1672-368B-EC1E1252F6E4}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(MonoDevelopProperties) = preSolution
-		StartupItem = Assembly-CSharp.csproj
-	EndGlobalSection
 EndGlobal

ToList.txt

@@ -5,13 +5,14 @@ ObjRoot(
 ScrollRect的Locate好像有点误差(金币不够时的导航)
 
 
-收益控制
+内购报错
+
+没有对应产品时的提示
 
-退出小游戏时D_StatusLab显示为进行中
+新手教程玩家点得太快怎么办
 
-IAP的语言文档
 
-成就的语言文档
+收益控制
 
 Font Anchor Encrypt RichText OverFlow bestfit RaycastTarget 带宽优化
 
@@ -34,7 +35,7 @@ TweenScale
 
 可以手动设置是否触发事件 
 
-取消掉ConfineTween Forward时Timer递加,Backward时Timer递减,免去了Timer的计算,判断
+取消掉ConfineTween,每次执行Forward和Backward时都进行一次Timer计算 Forward时Timer递加,Backward时Timer递减,免去了Timer的计算,判断
 InDestination和InOrigin也可以改用Timer,Timer清零的位置需要改变 
 
 Tween的第一帧也需要执行一次