LiuQilin 8 anos atrás
pai
commit
4874017716
84 arquivos alterados com 2032 adições e 847 exclusões
  1. BIN
      .vs/MyLovelyGarden/v14/.suo
  2. 2 2
      Assets/Advertisements.meta
  3. 9 0
      Assets/Advertisements/Editor.meta
  4. 9 0
      Assets/Advertisements/Editor/Resources.meta
  5. 2 2
      Assets/Advertisements/Editor/Resources/Android.meta
  6. 9 0
      Assets/Advertisements/Editor/Resources/Android/builds.meta
  7. 1 0
      Assets/Advertisements/Editor/Resources/Android/builds.zip.last_extracted_md5
  8. 2 2
      Assets/Advertisements/Editor/Resources/Android/builds.zip.last_extracted_md5.meta
  9. 8 0
      Assets/Advertisements/Editor/Resources/Android/builds.zip.meta
  10. 9 0
      Assets/Advertisements/Editor/Resources/Editor.meta
  11. BIN
      Assets/Advertisements/Editor/Resources/Editor/landscape.jpg
  12. 68 0
      Assets/Advertisements/Editor/Resources/Editor/landscape.jpg.meta
  13. BIN
      Assets/Advertisements/Editor/Resources/Editor/portrait.jpg
  14. 68 0
      Assets/Advertisements/Editor/Resources/Editor/portrait.jpg.meta
  15. 2 2
      Assets/Advertisements/Editor/Resources/iOS.meta
  16. BIN
      Assets/Advertisements/Editor/UnityEditor.Advertisements.dll
  17. BIN
      Assets/Advertisements/Editor/UnityEditor.Advertisements.dll.mdb
  18. 8 0
      Assets/Advertisements/Editor/UnityEditor.Advertisements.dll.mdb.meta
  19. 25 0
      Assets/Advertisements/Editor/UnityEditor.Advertisements.dll.meta
  20. 8 0
      Assets/Advertisements/Editor/UnityEditor.Advertisements.xml
  21. 8 0
      Assets/Advertisements/Editor/UnityEditor.Advertisements.xml.meta
  22. BIN
      Assets/Advertisements/Editor/UnityEditor.iOS.Extensions.Xcode.dll
  23. 25 0
      Assets/Advertisements/Editor/UnityEditor.iOS.Extensions.Xcode.dll.meta
  24. 670 0
      Assets/Advertisements/Editor/UnityEditor.iOS.Extensions.Xcode.xml
  25. 8 0
      Assets/Advertisements/Editor/UnityEditor.iOS.Extensions.Xcode.xml.meta
  26. BIN
      Assets/Advertisements/UnityEngine.Advertisements.dll
  27. BIN
      Assets/Advertisements/UnityEngine.Advertisements.dll.mdb
  28. 8 0
      Assets/Advertisements/UnityEngine.Advertisements.dll.mdb.meta
  29. 25 0
      Assets/Advertisements/UnityEngine.Advertisements.dll.meta
  30. 266 0
      Assets/Advertisements/UnityEngine.Advertisements.xml
  31. 8 0
      Assets/Advertisements/UnityEngine.Advertisements.xml.meta
  32. 8 0
      Assets/Advertisements/ivy.xml
  33. 8 0
      Assets/Advertisements/ivy.xml.meta
  34. 2 2
      Assets/Plugins.meta
  35. BIN
      Assets/Plugins/Android/UnityAds.aar
  36. 0 7
      Assets/Plugins/Android/UnityAds.aar.meta
  37. 2 2
      Assets/Plugins/UnityPurchasing.meta
  38. 2 2
      Assets/Plugins/UnityPurchasing/ETag.meta
  39. 2 2
      Assets/Plugins/UnityPurchasing/Resources/BillingMode.json.meta
  40. 1 0
      Assets/Plugins/UnityPurchasing/Resources/IAPProductCatalog.json
  41. 8 0
      Assets/Plugins/UnityPurchasing/Resources/IAPProductCatalog.json.meta
  42. 1 1
      Assets/Resource/DragonBones/Unity/src/DragonBones/unity/UnityArmatureComponent.cs
  43. BIN
      Assets/Resource/Prefab/PrefabUI/GroupA.prefab
  44. BIN
      Assets/Resource/Prefab/PrefabUI/GroupB.prefab
  45. BIN
      Assets/Resource/Prefab/PrefabUI/GroupD.prefab
  46. 10 0
      Assets/Resource/XML/Config/achieve_config.xml
  47. 1 1
      Assets/Resource/XML/Config/flower_config.xml
  48. 2 2
      Assets/Resource/XML/PlayerConfig.xml
  49. 32 5
      Assets/Resource/XML/lan/ChineseSimplified.xml
  50. 220 190
      Assets/Resource/XML/lan/ChineseTraditional.xml
  51. 210 180
      Assets/Resource/XML/lan/English.xml
  52. BIN
      Assets/Resource/Xlsx/achieve_config.xlsx
  53. BIN
      Assets/Resource/Xlsx/language_config.xlsx
  54. 2 0
      Assets/Script/Manage/Initializer.cs
  55. 21 20
      Assets/Script/Manage/ManaData.cs
  56. 2 2
      Assets/Script/Manage/ManaGarden.cs
  57. 3 1
      Assets/Script/Manage/ManaMiniGame.cs
  58. 1 1
      Assets/Script/Manage/ManaReso.cs
  59. 1 1
      Assets/Script/Manage/ManaServer.cs
  60. 3 3
      Assets/Script/Manage/ManaUI.cs
  61. 89 9
      Assets/Script/Manage/ManagerIAP.cs
  62. 3 0
      Assets/Script/Object/Flower.cs
  63. 33 38
      Assets/Script/Object/Skill/Ability.cs
  64. 36 40
      Assets/Script/Object/Skill/BigSkill.cs
  65. 14 10
      Assets/Script/Object/Skill/Pack.cs
  66. 19 23
      Assets/Script/Object/Skill/Skill.cs
  67. 3 26
      Assets/Script/Tool/Auxiliary.cs
  68. 4 4
      Assets/Script/Tool/Bundle.cs
  69. 6 3
      Assets/Script/Tool/Data.cs
  70. 16 3
      Assets/Script/Tool/UI/Bubble.cs
  71. 1 1
      Assets/Script/Tool/UI/TextPlus.cs
  72. BIN
      Assets/Test.unity
  73. BIN
      Assets/UnityAds/UnityAdsApiReference.pdf
  74. 0 2
      Assets/UnityAds/UnityAdsApiReference.pdf.meta
  75. BIN
      Assets/UnityAds/UnityEngine.Advertisements.Android.dll
  76. 0 57
      Assets/UnityAds/UnityEngine.Advertisements.Android.dll.meta
  77. BIN
      Assets/UnityAds/UnityEngine.Advertisements.Editor.dll
  78. 0 57
      Assets/UnityAds/UnityEngine.Advertisements.Editor.dll.meta
  79. BIN
      Assets/UnityAds/UnityEngine.Advertisements.Unsupported.dll
  80. 0 78
      Assets/UnityAds/UnityEngine.Advertisements.Unsupported.dll.meta
  81. BIN
      Assets/UnityAds/UnityEngine.Advertisements.iOS.dll
  82. 0 57
      Assets/UnityAds/UnityEngine.Advertisements.iOS.dll.meta
  83. BIN
      ProjectSettings/GraphicsSettings.asset
  84. 18 9
      ToList.txt

BIN
.vs/MyLovelyGarden/v14/.suo


+ 2 - 2
Assets/UnityAds.meta → Assets/Advertisements.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: 9a95838d317ec1d4483be0358e822bc2
+guid: 2f772eda1dbb58c47b256a1693b65911
 folderAsset: yes
-timeCreated: 1494231456
+timeCreated: 1494301205
 licenseType: Pro
 DefaultImporter:
   userData: 

+ 9 - 0
Assets/Advertisements/Editor.meta

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

+ 9 - 0
Assets/Advertisements/Editor/Resources.meta

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

+ 2 - 2
Assets/Plugins/Android.meta → Assets/Advertisements/Editor/Resources/Android.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: 4c12d75033386524ca51ee8147866171
+guid: 34f35527a1d66ca48a1c8a28dec93f5b
 folderAsset: yes
-timeCreated: 1494231456
+timeCreated: 1494301205
 licenseType: Pro
 DefaultImporter:
   userData: 

+ 9 - 0
Assets/Advertisements/Editor/Resources/Android/builds.meta

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

+ 1 - 0
Assets/Advertisements/Editor/Resources/Android/builds.zip.last_extracted_md5

@@ -0,0 +1 @@
+8dd8f8c777453787c2eeb7b5d1f2efa6

+ 2 - 2
Assets/Test.unity.meta → Assets/Advertisements/Editor/Resources/Android/builds.zip.last_extracted_md5.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 17375c33079a1b146ab09ed7b173b204
-timeCreated: 1494230687
+guid: 56a12d9420f8d9b40aaee293c247e6d2
+timeCreated: 1494301205
 licenseType: Pro
 DefaultImporter:
   userData: 

+ 8 - 0
Assets/Advertisements/Editor/Resources/Android/builds.zip.meta

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

+ 9 - 0
Assets/Advertisements/Editor/Resources/Editor.meta

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

BIN
Assets/Advertisements/Editor/Resources/Editor/landscape.jpg


+ 68 - 0
Assets/Advertisements/Editor/Resources/Editor/landscape.jpg.meta

@@ -0,0 +1,68 @@
+fileFormatVersion: 2
+guid: 479d4ee0b30009841897fadc8ad2b87d
+timeCreated: 1494301213
+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: 

BIN
Assets/Advertisements/Editor/Resources/Editor/portrait.jpg


+ 68 - 0
Assets/Advertisements/Editor/Resources/Editor/portrait.jpg.meta

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

+ 2 - 2
Assets/Plugins/iOS.meta → Assets/Advertisements/Editor/Resources/iOS.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: f454f54a56112124fbbb0f3d218a59f4
+guid: a5e10dc911691a844b899edb78584282
 folderAsset: yes
-timeCreated: 1494231456
+timeCreated: 1494301205
 licenseType: Pro
 DefaultImporter:
   userData: 

BIN
Assets/Advertisements/Editor/UnityEditor.Advertisements.dll


BIN
Assets/Advertisements/Editor/UnityEditor.Advertisements.dll.mdb


+ 8 - 0
Assets/Advertisements/Editor/UnityEditor.Advertisements.dll.mdb.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 20cf6ef30f58352429e38f4affb6d1c0
+timeCreated: 1494301205
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 25 - 0
Assets/Advertisements/Editor/UnityEditor.Advertisements.dll.meta

@@ -0,0 +1,25 @@
+fileFormatVersion: 2
+guid: b287f925fb5881648b6fe5d435b97f85
+timeCreated: 1494301209
+licenseType: Pro
+PluginImporter:
+  serializedVersion: 1
+  iconMap: {}
+  executionOrder: {}
+  isPreloaded: 0
+  isOverridable: 0
+  platformData:
+    Any:
+      enabled: 0
+      settings: {}
+    Editor:
+      enabled: 1
+      settings:
+        DefaultValueInitialized: true
+    WindowsStoreApps:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Assets/Advertisements/Editor/UnityEditor.Advertisements.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<doc>
+  <members>
+    <assembly>
+      <name>UnityEditor.Advertisements</name>
+    </assembly>
+  </members>
+</doc>

+ 8 - 0
Assets/Advertisements/Editor/UnityEditor.Advertisements.xml.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: de8e93b9a47a1094ca14a4a583299456
+timeCreated: 1494301214
+licenseType: Pro
+TextScriptImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/Advertisements/Editor/UnityEditor.iOS.Extensions.Xcode.dll


+ 25 - 0
Assets/Advertisements/Editor/UnityEditor.iOS.Extensions.Xcode.dll.meta

@@ -0,0 +1,25 @@
+fileFormatVersion: 2
+guid: 6473073119d803b4782c9ae4705ecf66
+timeCreated: 1494301207
+licenseType: Pro
+PluginImporter:
+  serializedVersion: 1
+  iconMap: {}
+  executionOrder: {}
+  isPreloaded: 0
+  isOverridable: 0
+  platformData:
+    Any:
+      enabled: 0
+      settings: {}
+    Editor:
+      enabled: 1
+      settings:
+        DefaultValueInitialized: true
+    WindowsStoreApps:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 670 - 0
Assets/Advertisements/Editor/UnityEditor.iOS.Extensions.Xcode.xml

@@ -0,0 +1,670 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<doc>
+  <members>
+    <assembly>
+      <name>UnityEditor.iOS.Extensions.Xcode</name>
+    </assembly>
+    <member name="T:UnityEditor.iOS.Xcode.PBXProject">
+      <summary>
+        <para>Represents an Xcode project (pbxproj file).</para>
+      </summary>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PBXProject.AddBuildProperty(System.String,System.String,System.String)">
+      <summary>
+        <para>Adds a value to build property in all build configurations for the specified target(s).</para>
+      </summary>
+      <param name="targetGuid">The GUID of the target as returned by TargetGuidByName.</param>
+      <param name="name">The name of the build property.</param>
+      <param name="value">The value of the build property.</param>
+      <param name="targetGuids">An array of target GUIDs.</param>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PBXProject.AddBuildProperty">
+      <summary>
+        <para>Adds a value to build property in all build configurations for the specified target(s).</para>
+      </summary>
+      <param name="targetGuid">The GUID of the target as returned by TargetGuidByName.</param>
+      <param name="name">The name of the build property.</param>
+      <param name="value">The value of the build property.</param>
+      <param name="targetGuids">An array of target GUIDs.</param>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PBXProject.AddBuildPropertyForConfig(System.String,System.String,System.String)">
+      <summary>
+        <para>Adds a value to build property for the specific build configuration.</para>
+      </summary>
+      <param name="configGuid">The GUID of the build configuration as returned by BuildConfigByName().</param>
+      <param name="name">The name of the build property.</param>
+      <param name="value">The value of the build property.</param>
+      <param name="configGuids">An array of GUIDs of build configurations.</param>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PBXProject.AddBuildPropertyForConfig">
+      <summary>
+        <para>Adds a value to build property for the specific build configuration.</para>
+      </summary>
+      <param name="configGuid">The GUID of the build configuration as returned by BuildConfigByName().</param>
+      <param name="name">The name of the build property.</param>
+      <param name="value">The value of the build property.</param>
+      <param name="configGuids">An array of GUIDs of build configurations.</param>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PBXProject.AddFile(System.String,System.String)">
+      <summary>
+        <para>Adds file to the project.</para>
+      </summary>
+      <param name="path">The physical path of the file.</param>
+      <param name="projectPath">The project path of the file.</param>
+      <param name="sourceTree">The source tree the path is relative to. By default it's PBXSourceTree.Group.</param>
+      <returns>
+        <para>The GUID of the added file.</para>
+      </returns>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PBXProject.AddFile(System.String,System.String,UnityEditor.iOS.Xcode.PBXSourceTree)">
+      <summary>
+        <para>Adds file to the project.</para>
+      </summary>
+      <param name="path">The physical path of the file.</param>
+      <param name="projectPath">The project path of the file.</param>
+      <param name="sourceTree">The source tree the path is relative to. By default it's PBXSourceTree.Group.</param>
+      <returns>
+        <para>The GUID of the added file.</para>
+      </returns>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PBXProject.AddFileToBuild(System.String,System.String)">
+      <summary>
+        <para>Configures file for building for the given target.</para>
+      </summary>
+      <param name="targetGuid">The GUID of the target as returned by TargetGuidByName.</param>
+      <param name="fileGuid">The file guid returned by AddFile.</param>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PBXProject.AddFileToBuildWithFlags(System.String,System.String,System.String)">
+      <summary>
+        <para>Configures file for building for the given target with specific compiler flags.</para>
+      </summary>
+      <param name="targetGuid">The GUID of the target as returned by TargetGuidByName.</param>
+      <param name="fileGuid">The file guid returned by AddFile.</param>
+      <param name="compileFlags">Compile flags to use.</param>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PBXProject.AddFrameworkToProject(System.String,System.String,System.Boolean)">
+      <summary>
+        <para>Adds a framework dependency for the specified target.</para>
+      </summary>
+      <param name="targetGuid">The GUID of the build configuration as returned by TargetGuidByName.</param>
+      <param name="framework">The name of the framework. The extension must be ".framework".</param>
+      <param name="weak">True if the framework is required, false if optional.</param>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PBXProject.BuildConfigByName(System.String,System.String)">
+      <summary>
+        <para>Returns the GUID of build configuration with the given name for the specific target. null is returned if such configuration does not exist.</para>
+      </summary>
+      <param name="targetGuid">The GUID of the target as returned by TargetGuidByName.</param>
+      <param name="name">The name of the build configuration.</param>
+      <returns>
+        <para>The GUID of the build configuration or null if it does not exist.</para>
+      </returns>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PBXProject.ContainsFileByProjectPath(System.String)">
+      <summary>
+        <para>Checks if the project contains a file with the given project path.</para>
+      </summary>
+      <param name="path">The project path of the file.</param>
+      <returns>
+        <para>Returns true if the project contains the file, false otherwise.</para>
+      </returns>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PBXProject.ContainsFileByRealPath(System.String)">
+      <summary>
+        <para>Checks if the project contains a file with the given physical path.</para>
+      </summary>
+      <param name="path">The physical path of the file.</param>
+      <param name="sourceTree">The source tree pah is relative to.</param>
+      <returns>
+        <para>Returns true if the project contains the file, false otherwise.</para>
+      </returns>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PBXProject.ContainsFileByRealPath(System.String,UnityEditor.iOS.Xcode.PBXSourceTree)">
+      <summary>
+        <para>Checks if the project contains a file with the given physical path.</para>
+      </summary>
+      <param name="path">The physical path of the file.</param>
+      <param name="sourceTree">The source tree pah is relative to.</param>
+      <returns>
+        <para>Returns true if the project contains the file, false otherwise.</para>
+      </returns>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PBXProject.#ctor">
+      <summary>
+        <para>Creates a new instance of PBXProject class.</para>
+      </summary>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PBXProject.FindFileGuidByProjectPath(System.String)">
+      <summary>
+        <para>Finds file GUID by project path.</para>
+      </summary>
+      <param name="path">The project path of the file.</param>
+      <returns>
+        <para>The file GUID or null if the file could not be found.</para>
+      </returns>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PBXProject.FindFileGuidByRealPath(System.String,UnityEditor.iOS.Xcode.PBXSourceTree)">
+      <summary>
+        <para>Finds file GUID by physical path.</para>
+      </summary>
+      <param name="path">The physical path of the file.</param>
+      <param name="sourceTree">The source tree path is relative to.</param>
+      <returns>
+        <para>The file GUID or null if the file could not be found.</para>
+      </returns>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PBXProject.FindFileGuidByRealPath(System.String)">
+      <summary>
+        <para>Finds file GUID by physical path.</para>
+      </summary>
+      <param name="path">The physical path of the file.</param>
+      <param name="sourceTree">The source tree path is relative to.</param>
+      <returns>
+        <para>The file GUID or null if the file could not be found.</para>
+      </returns>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PBXProject.GetCompileFlagsForFile(System.String,System.String)">
+      <summary>
+        <para>Returns compile flags set for the specific file.</para>
+      </summary>
+      <param name="targetGuid">The GUID of the target as returned by TargetGuidByName().</param>
+      <param name="fileGuid">The file GUID.</param>
+      <returns>
+        <para>The compile flags for the specified file.</para>
+      </returns>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PBXProject.GetPBXProjectPath(System.String)">
+      <summary>
+        <para>Returns the path to PBX project in the given build path.</para>
+      </summary>
+      <param name="buildPath">The project build path.</param>
+      <returns>
+        <para>The path of the PBX project.</para>
+      </returns>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PBXProject.GetUnityTargetName">
+      <summary>
+        <para>Returns the default app target name.</para>
+      </summary>
+      <returns>
+        <para>The default app target name.</para>
+      </returns>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PBXProject.GetUnityTestTargetName">
+      <summary>
+        <para>Returns the default test target name.</para>
+      </summary>
+      <returns>
+        <para>The default test target name.</para>
+      </returns>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PBXProject.IsBuildable(System.String)">
+      <summary>
+        <para>Checks if a file with the given extension can be built by Xcode.</para>
+      </summary>
+      <param name="ext">The extension of the file including the dot.</param>
+      <returns>
+        <para>Returns true of the file can be built, false otherwise.</para>
+      </returns>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PBXProject.IsKnownExtension(System.String)">
+      <summary>
+        <para>Checks if files with the given extension are known to PBXProject.</para>
+      </summary>
+      <param name="ext">The extension including the dot.</param>
+      <returns>
+        <para>Returns true of the extension is known, false otherwise.</para>
+      </returns>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PBXProject.ReadFromFile(System.String)">
+      <summary>
+        <para>Reads the project from a file identified by the given path.</para>
+      </summary>
+      <param name="path">Path of the file.</param>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PBXProject.ReadFromStream(System.IO.TextReader)">
+      <summary>
+        <para>Reads the project from the given text reader.</para>
+      </summary>
+      <param name="sr">The project contents.</param>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PBXProject.ReadFromString(System.String)">
+      <summary>
+        <para>Reads the project from the given string.</para>
+      </summary>
+      <param name="src">The project contents.</param>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PBXProject.RemoveFile(System.String)">
+      <summary>
+        <para>Removes the given file from project.</para>
+      </summary>
+      <param name="fileGuid">The file GUID.</param>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PBXProject.RemoveFileFromBuild(System.String,System.String)">
+      <summary>
+        <para>Removes given file from the list of files to build for the given target.</para>
+      </summary>
+      <param name="targetGuid">The GUID of the target as returned by TargetGuidByName.</param>
+      <param name="fileGuid">The GUID of the file to remove.</param>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PBXProject.RemoveFrameworkFromProject(System.String,System.String)">
+      <summary>
+        <para>Removes the given framework from the given target build.</para>
+      </summary>
+      <param name="targetGuid">The GUID of the target as returned by TargetGuidByName.</param>
+      <param name="framework">The name of the framework. The extension must be ".framework".</param>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PBXProject.SetBuildProperty(System.String,System.String,System.String)">
+      <summary>
+        <para>Sets the build property to the given value in all build configurations for the specified targets.</para>
+      </summary>
+      <param name="targetGuid">The target GUID as returned by NativeTargetByName().</param>
+      <param name="targetGuids">An array of target GUIDs.</param>
+      <param name="name">The name of the build property.</param>
+      <param name="value">The value of the build property.</param>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PBXProject.SetBuildProperty">
+      <summary>
+        <para>Sets the build property to the given value in all build configurations for the specified targets.</para>
+      </summary>
+      <param name="targetGuid">The target GUID as returned by NativeTargetByName().</param>
+      <param name="targetGuids">An array of target GUIDs.</param>
+      <param name="name">The name of the build property.</param>
+      <param name="value">The value of the build property.</param>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PBXProject.SetBuildPropertyForConfig(System.String,System.String,System.String)">
+      <summary>
+        <para>Sets the build property to the given value in the given build property.</para>
+      </summary>
+      <param name="configGuid">The GUID of the build configuration as returned by BuildConfigByName.</param>
+      <param name="configGuids">An array of GUIDs of build configurations.</param>
+      <param name="name">The name of the build property.</param>
+      <param name="value">The value of the build property.</param>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PBXProject.SetBuildPropertyForConfig">
+      <summary>
+        <para>Sets the build property to the given value in the given build property.</para>
+      </summary>
+      <param name="configGuid">The GUID of the build configuration as returned by BuildConfigByName.</param>
+      <param name="configGuids">An array of GUIDs of build configurations.</param>
+      <param name="name">The name of the build property.</param>
+      <param name="value">The value of the build property.</param>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PBXProject.SetCompileFlagsForFile(System.String,System.String,System.Collections.Generic.List`1&lt;System.String&gt;)">
+      <summary>
+        <para>Sets the compilation flags for the given file in the given target.</para>
+      </summary>
+      <param name="targetGuid">The GUID of the target as returned by TargetGuidByName.</param>
+      <param name="fileGuid">The file guid.</param>
+      <param name="compileFlags">The list of compile flags.</param>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PBXProject.TargetGuidByName(System.String)">
+      <summary>
+        <para>Returns the GUID of the native target with the given name.</para>
+      </summary>
+      <param name="name">The name of the native target.</param>
+      <returns>
+        <para>The GUID identifying the native target.</para>
+      </returns>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PBXProject.UpdateBuildProperty">
+      <summary>
+        <para>Adds and removes values from build property in all build configurations for the specified target(s).</para>
+      </summary>
+      <param name="targetGuid">The target GUID as returned by NativeTargetByName.</param>
+      <param name="targetGuids">An array of target GUIDs.</param>
+      <param name="name">The name of the build property.</param>
+      <param name="addValues">The values to add to the build property.</param>
+      <param name="removeValues">The values to remove from the build property.</param>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PBXProject.UpdateBuildProperty">
+      <summary>
+        <para>Adds and removes values from build property in all build configurations for the specified target(s).</para>
+      </summary>
+      <param name="targetGuid">The target GUID as returned by NativeTargetByName.</param>
+      <param name="targetGuids">An array of target GUIDs.</param>
+      <param name="name">The name of the build property.</param>
+      <param name="addValues">The values to add to the build property.</param>
+      <param name="removeValues">The values to remove from the build property.</param>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PBXProject.UpdateBuildPropertyForConfig">
+      <summary>
+        <para>Adds and removes values from build property in the given build configuration.</para>
+      </summary>
+      <param name="configGuid">The GUID of the build configuration as returned by BuildConfigByName.</param>
+      <param name="configGuids">An array of GUIDs of build configurations.</param>
+      <param name="name">The name of the build property.</param>
+      <param name="addValues">The values to add to the build property.</param>
+      <param name="removeValues">The values to remove from the build property.</param>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PBXProject.UpdateBuildPropertyForConfig">
+      <summary>
+        <para>Adds and removes values from build property in the given build configuration.</para>
+      </summary>
+      <param name="configGuid">The GUID of the build configuration as returned by BuildConfigByName.</param>
+      <param name="configGuids">An array of GUIDs of build configurations.</param>
+      <param name="name">The name of the build property.</param>
+      <param name="addValues">The values to add to the build property.</param>
+      <param name="removeValues">The values to remove from the build property.</param>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PBXProject.WriteToFile(System.String)">
+      <summary>
+        <para>Writes the project contents to the specified file.</para>
+      </summary>
+      <param name="path">Path to write the project contents to.</param>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PBXProject.WriteToStream(System.IO.TextWriter)">
+      <summary>
+        <para>Writes the project contents to the specified text writer.</para>
+      </summary>
+      <param name="sw">Text writer to write to.</param>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PBXProject.WriteToString">
+      <summary>
+        <para>Writes the contents of the project to string.</para>
+      </summary>
+      <returns>
+        <para>The project contents converted to string.</para>
+      </returns>
+    </member>
+    <member name="T:UnityEditor.iOS.Xcode.PBXSourceTree">
+      <summary>
+        <para>Specifies source trees for files.</para>
+      </summary>
+    </member>
+    <member name="F:UnityEditor.iOS.Xcode.PBXSourceTree.Absolute">
+      <summary>
+        <para>The file path is absolute path.</para>
+      </summary>
+    </member>
+    <member name="F:UnityEditor.iOS.Xcode.PBXSourceTree.Build">
+      <summary>
+        <para>The file path is relative to build products path.</para>
+      </summary>
+    </member>
+    <member name="F:UnityEditor.iOS.Xcode.PBXSourceTree.Developer">
+      <summary>
+        <para>The file path is relative to the developer directory.</para>
+      </summary>
+    </member>
+    <member name="F:UnityEditor.iOS.Xcode.PBXSourceTree.Group">
+      <summary>
+        <para>The file path is relative to the group the file is in.</para>
+      </summary>
+    </member>
+    <member name="F:UnityEditor.iOS.Xcode.PBXSourceTree.Sdk">
+      <summary>
+        <para>The file path is relative to SDK path.</para>
+      </summary>
+    </member>
+    <member name="F:UnityEditor.iOS.Xcode.PBXSourceTree.Source">
+      <summary>
+        <para>The file path is relative to the project path.</para>
+      </summary>
+    </member>
+    <member name="T:UnityEditor.iOS.Xcode.PlistDocument">
+      <summary>
+        <para>Represents an Apple's plist document.</para>
+      </summary>
+    </member>
+    <member name="F:UnityEditor.iOS.Xcode.PlistDocument.root">
+      <summary>
+        <para>The root element of the plist document.</para>
+      </summary>
+    </member>
+    <member name="F:UnityEditor.iOS.Xcode.PlistDocument.version">
+      <summary>
+        <para>The version of the plist document. At the moment Apple uses '1.0' for all plist files.</para>
+      </summary>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PlistDocument.#ctor">
+      <summary>
+        <para>Creates a new plist document instance.</para>
+      </summary>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PlistDocument.ReadFromFile(System.String)">
+      <summary>
+        <para>Reads the document from a file identified by the given path.</para>
+      </summary>
+      <param name="path">Path of the file.</param>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PlistDocument.ReadFromStream(System.IO.TextReader)">
+      <summary>
+        <para>Reads the project from the given text reader.</para>
+      </summary>
+      <param name="tr">The project contents.</param>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PlistDocument.ReadFromString(System.String)">
+      <summary>
+        <para>Reads the document from the given string.</para>
+      </summary>
+      <param name="text">The project contents.</param>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PlistDocument.WriteToFile(System.String)">
+      <summary>
+        <para>Writes the project contents to the specified file.</para>
+      </summary>
+      <param name="path">Path to write the document contents to.</param>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PlistDocument.WriteToStream(System.IO.TextWriter)">
+      <summary>
+        <para>Writes the document contents to the specified text writer.</para>
+      </summary>
+      <param name="tw">Text writer to write to.</param>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PlistDocument.WriteToString">
+      <summary>
+        <para>Writes the document contents to a string.</para>
+      </summary>
+      <returns>
+        <para>The project contents converted to string.</para>
+      </returns>
+    </member>
+    <member name="T:UnityEditor.iOS.Xcode.PlistElement">
+      <summary>
+        <para>Represents a plist element.</para>
+      </summary>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PlistElement.AsArray">
+      <summary>
+        <para>Convenience method to convert to array element.</para>
+      </summary>
+      <returns>
+        <para>The element as PlistElementArray.</para>
+      </returns>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PlistElement.AsBoolean">
+      <summary>
+        <para>Convenience method to convert to bool.</para>
+      </summary>
+      <returns>
+        <para>The value of the boolean element.</para>
+      </returns>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PlistElement.AsDict">
+      <summary>
+        <para>Convenience method to convert to dictionary element.</para>
+      </summary>
+      <returns>
+        <para>The element as PlistElementDict.</para>
+      </returns>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PlistElement.AsInteger">
+      <summary>
+        <para>Convenience method to convert to integer.</para>
+      </summary>
+      <returns>
+        <para>The value of the integer element.</para>
+      </returns>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PlistElement.AsString">
+      <summary>
+        <para>Convenience method to convert to string.</para>
+      </summary>
+      <returns>
+        <para>The value of the string element.</para>
+      </returns>
+    </member>
+    <member name="P:UnityEditor.iOS.Xcode.PlistElement.this">
+      <summary>
+        <para>Convenience method to access properties of a dictionary element.</para>
+      </summary>
+    </member>
+    <member name="T:UnityEditor.iOS.Xcode.PlistElementArray">
+      <summary>
+        <para>Represents an array element in plist document.</para>
+      </summary>
+    </member>
+    <member name="F:UnityEditor.iOS.Xcode.PlistElementArray.values">
+      <summary>
+        <para>The values stored in the array element.</para>
+      </summary>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PlistElementArray.AddArray">
+      <summary>
+        <para>Convenience method to append new array to values.</para>
+      </summary>
+      <returns>
+        <para>The new array element.</para>
+      </returns>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PlistElementArray.AddBoolean(System.Boolean)">
+      <summary>
+        <para>Convenience method to append new boolean element to values.</para>
+      </summary>
+      <param name="val">The value of the new boolean element.</param>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PlistElementArray.AddDict">
+      <summary>
+        <para>Convenience method to append new dictionary to values.</para>
+      </summary>
+      <returns>
+        <para>The new dictionary element.</para>
+      </returns>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PlistElementArray.AddInteger(System.Int32)">
+      <summary>
+        <para>Convenience method to append new integer element to values.</para>
+      </summary>
+      <param name="val">The value of the new integer element.</param>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PlistElementArray.AddString(System.String)">
+      <summary>
+        <para>Convenience method to append new string element to values.</para>
+      </summary>
+      <param name="val">The value of the new string element.</param>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PlistElementArray.#ctor">
+      <summary>
+        <para>Creates new array element.</para>
+      </summary>
+    </member>
+    <member name="T:UnityEditor.iOS.Xcode.PlistElementBoolean">
+      <summary>
+        <para>Represents a boolean element in plist document.</para>
+      </summary>
+    </member>
+    <member name="F:UnityEditor.iOS.Xcode.PlistElementBoolean.value">
+      <summary>
+        <para>The value stored in the boolean element.</para>
+      </summary>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PlistElementBoolean.#ctor(System.Boolean)">
+      <summary>
+        <para>Creates new boolean element.</para>
+      </summary>
+      <param name="v">The value of the element.</param>
+    </member>
+    <member name="T:UnityEditor.iOS.Xcode.PlistElementDict">
+      <summary>
+        <para>Represents a dictionary element in plist document.</para>
+      </summary>
+    </member>
+    <member name="P:UnityEditor.iOS.Xcode.PlistElementDict.values">
+      <summary>
+        <para>The values stored in the dictionary element.</para>
+      </summary>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PlistElementDict.CreateArray(System.String)">
+      <summary>
+        <para>Convenience method to set a property to a new array element.</para>
+      </summary>
+      <param name="key">The key of the property.</param>
+      <returns>
+        <para>The new array element.</para>
+      </returns>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PlistElementDict.CreateDict(System.String)">
+      <summary>
+        <para>Convenience method to set a property to a new dictionary element.</para>
+      </summary>
+      <param name="key">The key of the property.</param>
+      <returns>
+        <para>The new dictionary element.</para>
+      </returns>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PlistElementDict.#ctor">
+      <summary>
+        <para>Creates new dictionary element.</para>
+      </summary>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PlistElementDict.SetBoolean(System.String,System.Boolean)">
+      <summary>
+        <para>Convenience method to set a boolean property.</para>
+      </summary>
+      <param name="key">The key of the property.</param>
+      <param name="val">The value of the property.</param>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PlistElementDict.SetInteger(System.String,System.Int32)">
+      <summary>
+        <para>Convenience method to set an integer property.</para>
+      </summary>
+      <param name="key">The key of the property.</param>
+      <param name="val">The value of the property.</param>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PlistElementDict.SetString(System.String,System.String)">
+      <summary>
+        <para>Convenience method to set a string property.</para>
+      </summary>
+      <param name="key">The key of the property.</param>
+      <param name="val">The value of the property.</param>
+    </member>
+    <member name="P:UnityEditor.iOS.Xcode.PlistElementDict.this">
+      <summary>
+        <para>Convenience method to access the stored values.</para>
+      </summary>
+    </member>
+    <member name="T:UnityEditor.iOS.Xcode.PlistElementInteger">
+      <summary>
+        <para>Represents an integer element in plist document.</para>
+      </summary>
+    </member>
+    <member name="F:UnityEditor.iOS.Xcode.PlistElementInteger.value">
+      <summary>
+        <para>The value stored in the integer element.</para>
+      </summary>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PlistElementInteger.#ctor(System.Int32)">
+      <summary>
+        <para>Creates new integer element.</para>
+      </summary>
+      <param name="v">The value of the element.</param>
+    </member>
+    <member name="T:UnityEditor.iOS.Xcode.PlistElementString">
+      <summary>
+        <para>Represents a string element in plist document.</para>
+      </summary>
+    </member>
+    <member name="F:UnityEditor.iOS.Xcode.PlistElementString.value">
+      <summary>
+        <para>The value stored in the string element.</para>
+      </summary>
+    </member>
+    <member name="M:UnityEditor.iOS.Xcode.PlistElementString.#ctor(System.String)">
+      <summary>
+        <para>Creates new string element.</para>
+      </summary>
+      <param name="v">The value of the element.</param>
+    </member>
+  </members>
+</doc>

+ 8 - 0
Assets/Advertisements/Editor/UnityEditor.iOS.Extensions.Xcode.xml.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 419d3b47dafefc24bb396d66cbd0d1d1
+timeCreated: 1494301214
+licenseType: Pro
+TextScriptImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/Advertisements/UnityEngine.Advertisements.dll


BIN
Assets/Advertisements/UnityEngine.Advertisements.dll.mdb


+ 8 - 0
Assets/Advertisements/UnityEngine.Advertisements.dll.mdb.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c56f7110518da8642b30b485ddd210b6
+timeCreated: 1494301205
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 25 - 0
Assets/Advertisements/UnityEngine.Advertisements.dll.meta

@@ -0,0 +1,25 @@
+fileFormatVersion: 2
+guid: 112dd4548b664f8468529760f44d1e4c
+timeCreated: 1494301206
+licenseType: Pro
+PluginImporter:
+  serializedVersion: 1
+  iconMap: {}
+  executionOrder: {}
+  isPreloaded: 0
+  isOverridable: 0
+  platformData:
+    Any:
+      enabled: 1
+      settings: {}
+    Editor:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+    WindowsStoreApps:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 266 - 0
Assets/Advertisements/UnityEngine.Advertisements.xml

@@ -0,0 +1,266 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<doc>
+  <members>
+    <assembly>
+      <name>UnityEngine.Advertisements</name>
+    </assembly>
+    <member name="T:UnityEngine.Advertisements.Advertisement">
+      <summary>
+        <para>Unity Ads.</para>
+      </summary>
+    </member>
+    <member name="P:UnityEngine.Advertisements.Advertisement.debugLevel">
+      <summary>
+        <para>Controls the amount of logging output from the advertisement system.</para>
+      </summary>
+    </member>
+    <member name="P:UnityEngine.Advertisements.Advertisement.debugMode">
+      <summary>
+        <para>Controls the amount of logging output from the advertisement system.</para>
+      </summary>
+    </member>
+    <member name="P:UnityEngine.Advertisements.Advertisement.gameId">
+      <summary>
+        <para>Returns the game identifier for the current platform.</para>
+      </summary>
+    </member>
+    <member name="P:UnityEngine.Advertisements.Advertisement.isInitialized">
+      <summary>
+        <para>Returns whether the advertisement system is initialized successfully.</para>
+      </summary>
+    </member>
+    <member name="P:UnityEngine.Advertisements.Advertisement.isShowing">
+      <summary>
+        <para>Returns whether an advertisement is currently being shown.</para>
+      </summary>
+    </member>
+    <member name="P:UnityEngine.Advertisements.Advertisement.isSupported">
+      <summary>
+        <para>Returns if the current platform is supported by the advertisement system.</para>
+      </summary>
+    </member>
+    <member name="P:UnityEngine.Advertisements.Advertisement.testMode">
+      <summary>
+        <para>Returns whether the testing mode is enabled.</para>
+      </summary>
+    </member>
+    <member name="P:UnityEngine.Advertisements.Advertisement.version">
+      <summary>
+        <para>Returns the current Unity Ads version.</para>
+      </summary>
+    </member>
+    <member name="T:UnityEngine.Advertisements.Advertisement.DebugLevel">
+      <summary>
+        <para>Player debug message level.</para>
+      </summary>
+    </member>
+    <member name="F:UnityEngine.Advertisements.Advertisement.DebugLevel.Debug">
+      <summary>
+        <para>Prints all debugging messages.</para>
+      </summary>
+    </member>
+    <member name="F:UnityEngine.Advertisements.Advertisement.DebugLevel.Error">
+      <summary>
+        <para>Prints all error messages.</para>
+      </summary>
+    </member>
+    <member name="F:UnityEngine.Advertisements.Advertisement.DebugLevel.Info">
+      <summary>
+        <para>Prints all informational messages.</para>
+      </summary>
+    </member>
+    <member name="F:UnityEngine.Advertisements.Advertisement.DebugLevel.None">
+      <summary>
+        <para>Prints out no debugging output.</para>
+      </summary>
+    </member>
+    <member name="F:UnityEngine.Advertisements.Advertisement.DebugLevel.Warning">
+      <summary>
+        <para>Prints out warnings.</para>
+      </summary>
+    </member>
+    <member name="M:UnityEngine.Advertisements.Advertisement.GetPlacementState">
+      <summary>
+        <para>Returns the placement state.</para>
+      </summary>
+      <param name="placementId">Placement identifier.</param>
+      <returns>
+        <para>Placement state.</para>
+      </returns>
+    </member>
+    <member name="M:UnityEngine.Advertisements.Advertisement.GetPlacementState(System.String)">
+      <summary>
+        <para>Returns the placement state.</para>
+      </summary>
+      <param name="placementId">Placement identifier.</param>
+      <returns>
+        <para>Placement state.</para>
+      </returns>
+    </member>
+    <member name="M:UnityEngine.Advertisements.Advertisement.Initialize(System.String)">
+      <summary>
+        <para>Manually initializes the advertisement system. Normally this is done from editor, and you should only call this method if you are using UnityAds with automatic initialization disabled.</para>
+      </summary>
+      <param name="gameId">Your game id. You can see a list of your registered games at the UnityAds admin site.</param>
+      <param name="testMode">In test mode, you will see test advertisement. Can be overruled by settings in the admin site for game.</param>
+    </member>
+    <member name="M:UnityEngine.Advertisements.Advertisement.Initialize(System.String,System.Boolean)">
+      <summary>
+        <para>Manually initializes the advertisement system. Normally this is done from editor, and you should only call this method if you are using UnityAds with automatic initialization disabled.</para>
+      </summary>
+      <param name="gameId">Your game id. You can see a list of your registered games at the UnityAds admin site.</param>
+      <param name="testMode">In test mode, you will see test advertisement. Can be overruled by settings in the admin site for game.</param>
+    </member>
+    <member name="M:UnityEngine.Advertisements.Advertisement.IsReady">
+      <summary>
+        <para>Returns whether an advertisement is ready to be shown. Placements are configured per game in the UnityAds admin site, where you can also set your default placement.</para>
+      </summary>
+      <param name="placementId">Optional placement identifier. If not specified, your default placement specified in UnityAds server-side admin settings will be used.</param>
+      <returns>
+        <para>If the placement is ready.</para>
+      </returns>
+    </member>
+    <member name="M:UnityEngine.Advertisements.Advertisement.IsReady(System.String)">
+      <summary>
+        <para>Returns whether an advertisement is ready to be shown. Placements are configured per game in the UnityAds admin site, where you can also set your default placement.</para>
+      </summary>
+      <param name="placementId">Optional placement identifier. If not specified, your default placement specified in UnityAds server-side admin settings will be used.</param>
+      <returns>
+        <para>If the placement is ready.</para>
+      </returns>
+    </member>
+    <member name="M:UnityEngine.Advertisements.Advertisement.SetMetaData(UnityEngine.Advertisements.MetaData)">
+      <summary>
+        <para>Sets various metadata for Unity Ads.</para>
+      </summary>
+      <param name="metaData">MetaData to be set.</param>
+    </member>
+    <member name="M:UnityEngine.Advertisements.Advertisement.Show">
+      <summary>
+        <para>Show an advertisement in your project.</para>
+      </summary>
+      <param name="placementId">Optional placement identifier. If not specified, your default placement specified in the admin settings will be used.</param>
+      <param name="showOptions">Specify e.g. callback handler to be called when video has finished.</param>
+    </member>
+    <member name="M:UnityEngine.Advertisements.Advertisement.Show(UnityEngine.Advertisements.ShowOptions)">
+      <summary>
+        <para>Show an advertisement in your project.</para>
+      </summary>
+      <param name="placementId">Optional placement identifier. If not specified, your default placement specified in the admin settings will be used.</param>
+      <param name="showOptions">Specify e.g. callback handler to be called when video has finished.</param>
+    </member>
+    <member name="M:UnityEngine.Advertisements.Advertisement.Show(System.String)">
+      <summary>
+        <para>Show an advertisement in your project.</para>
+      </summary>
+      <param name="placementId">Optional placement identifier. If not specified, your default placement specified in the admin settings will be used.</param>
+      <param name="showOptions">Specify e.g. callback handler to be called when video has finished.</param>
+    </member>
+    <member name="M:UnityEngine.Advertisements.Advertisement.Show(System.String,UnityEngine.Advertisements.ShowOptions)">
+      <summary>
+        <para>Show an advertisement in your project.</para>
+      </summary>
+      <param name="placementId">Optional placement identifier. If not specified, your default placement specified in the admin settings will be used.</param>
+      <param name="showOptions">Specify e.g. callback handler to be called when video has finished.</param>
+    </member>
+    <member name="T:UnityEngine.Advertisements.MetaData">
+      <summary>
+        <para>Class for sending various metadata to UnityAds.</para>
+      </summary>
+    </member>
+    <member name="P:UnityEngine.Advertisements.MetaData.category">
+      <summary>
+        <para>Metadata category.</para>
+      </summary>
+    </member>
+    <member name="M:UnityEngine.Advertisements.MetaData.Get(System.String)">
+      <summary>
+        <para></para>
+      </summary>
+      <param name="key">Metadata key.</param>
+      <returns>
+        <para>Stored metadata.</para>
+      </returns>
+    </member>
+    <member name="M:UnityEngine.Advertisements.MetaData.Set(System.String,System.Object)">
+      <summary>
+        <para>Sets new metadata fields.</para>
+      </summary>
+      <param name="key">Metadata key.</param>
+      <param name="value">Metadata value, needs to be JSON serializable.</param>
+    </member>
+    <member name="P:UnityEngine.Advertisements.MetaData.Values">
+      <summary>
+        <para></para>
+      </summary>
+      <returns>
+        <para>Stored metadata dictionary.</para>
+      </returns>
+    </member>
+    <member name="T:UnityEngine.Advertisements.PlacementState">
+      <summary>
+        <para>Various states that Unity Ads placements can be in.</para>
+      </summary>
+    </member>
+    <member name="F:UnityEngine.Advertisements.PlacementState.Disabled">
+      <summary>
+        <para>Placement has been disabled.</para>
+      </summary>
+    </member>
+    <member name="F:UnityEngine.Advertisements.PlacementState.NoFill">
+      <summary>
+        <para>Placement has no advertisements to show.</para>
+      </summary>
+    </member>
+    <member name="F:UnityEngine.Advertisements.PlacementState.NotAvailable">
+      <summary>
+        <para>Placement is not available.</para>
+      </summary>
+    </member>
+    <member name="F:UnityEngine.Advertisements.PlacementState.Ready">
+      <summary>
+        <para>Placement is ready to be shown an advertisement from.</para>
+      </summary>
+    </member>
+    <member name="F:UnityEngine.Advertisements.PlacementState.Waiting">
+      <summary>
+        <para>Placement is waiting to be ready.</para>
+      </summary>
+    </member>
+    <member name="T:UnityEngine.Advertisements.ShowOptions">
+      <summary>
+        <para>Collection of options that can be passed to Advertisements.Show to modify advertisement behaviour.</para>
+      </summary>
+    </member>
+    <member name="P:UnityEngine.Advertisements.ShowOptions.gamerSid">
+      <summary>
+        <para>Add a string to specify an identifier for a specific user in the game.</para>
+      </summary>
+    </member>
+    <member name="P:UnityEngine.Advertisements.ShowOptions.resultCallback">
+      <summary>
+        <para>Callback to recieve the result of the advertisement.</para>
+      </summary>
+    </member>
+    <member name="T:UnityEngine.Advertisements.ShowResult">
+      <summary>
+        <para>ShowResult is passed to ShowOptions.resultCallback after the advertisement has completed.</para>
+      </summary>
+    </member>
+    <member name="F:UnityEngine.Advertisements.ShowResult.Failed">
+      <summary>
+        <para>Indicates that the advertisement failed to complete.</para>
+      </summary>
+    </member>
+    <member name="F:UnityEngine.Advertisements.ShowResult.Finished">
+      <summary>
+        <para>Indicates that the advertisement completed successfully.</para>
+      </summary>
+    </member>
+    <member name="F:UnityEngine.Advertisements.ShowResult.Skipped">
+      <summary>
+        <para>Indicates that the advertisement was skipped.</para>
+      </summary>
+    </member>
+  </members>
+</doc>

+ 8 - 0
Assets/Advertisements/UnityEngine.Advertisements.xml.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 392dd58738aae8d4fb53e0f2b409c095
+timeCreated: 1494301214
+licenseType: Pro
+TextScriptImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Assets/Advertisements/ivy.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ivy-module version="2.0">
+  <info version="5.5.0" organisation="Unity" module="Advertisements" e:packageType="UnityExtension" e:unityVersion="5.5.0f3" xmlns:e="http://ant.apache.org/ivy/extra" />
+  <publications xmlns:e="http://ant.apache.org/ivy/extra">
+    <artifact name="UnityEngine.Advertisements" type="dll" ext="dll" e:guid="739bbd9f364b4268874f9fd86ab3beef" />
+    <artifact name="Editor/UnityEditor.Advertisements" type="dll" ext="dll" e:guid="97decbdab0634cdd991f8d23ddf0dead" />
+  </publications>
+</ivy-module>

+ 8 - 0
Assets/Advertisements/ivy.xml.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 909d6efbace2b3048a3af990b8113b6e
+timeCreated: 1494301214
+licenseType: Pro
+TextScriptImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 2
Assets/Plugins.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: 47a3ff93de247954fbf295df039a914c
+guid: f962fdf339a656e4e8395706a0833e4e
 folderAsset: yes
-timeCreated: 1494231456
+timeCreated: 1494301771
 licenseType: Pro
 DefaultImporter:
   userData: 

BIN
Assets/Plugins/Android/UnityAds.aar


+ 0 - 7
Assets/Plugins/Android/UnityAds.aar.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: c7905556f07564410bd4fb75975e28fa
-PluginImporter:
-  serializedVersion: 1
-  platformData:
-    Android:
-      enabled: 1

+ 2 - 2
Assets/Plugins/UnityPurchasing.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: d7fde8ccd0d6d2f41ae3dbc32e755494
+guid: 07c95e9d1deb9ae4b918385a72cb51a7
 folderAsset: yes
-timeCreated: 1494232786
+timeCreated: 1494301771
 licenseType: Pro
 DefaultImporter:
   userData: 

+ 2 - 2
Assets/Plugins/UnityPurchasing/ETag.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 1c7729b9fe16a69428ac4bccd7189159
-timeCreated: 1494232786
+guid: 7c1dbf73bc6c4804b8ef46d44ea4909e
+timeCreated: 1494301771
 licenseType: Pro
 DefaultImporter:
   userData: 

+ 2 - 2
Assets/Plugins/UnityPurchasing/Resources/BillingMode.json.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 55d8267fd353362448da8ad0cbef04b5
-timeCreated: 1494232812
+guid: 8e8c8e51e80ad9f49b878cec8e39e228
+timeCreated: 1494301798
 licenseType: Pro
 TextScriptImporter:
   userData: 

+ 1 - 0
Assets/Plugins/UnityPurchasing/Resources/IAPProductCatalog.json

@@ -0,0 +1 @@
+{"appleSKU":"","products":[{"id":"123","type":0,"storeIDs":[],"defaultDescription":{"googleLocale":4,"title":"","description":""},"screenshotPath":"","applePriceTier":2,"googlePrice":{"data":[0,0,0,0],"num":0.0},"pricingTemplateID":"","descriptions":[]}]}

+ 8 - 0
Assets/Plugins/UnityPurchasing/Resources/IAPProductCatalog.json.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 70749e00c37e29c48afad4f786a3423b
+timeCreated: 1494302035
+licenseType: Pro
+TextScriptImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 1 - 1
Assets/Resource/DragonBones/Unity/src/DragonBones/unity/UnityArmatureComponent.cs

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

BIN
Assets/Resource/Prefab/PrefabUI/GroupA.prefab


BIN
Assets/Resource/Prefab/PrefabUI/GroupB.prefab


BIN
Assets/Resource/Prefab/PrefabUI/GroupD.prefab


+ 10 - 0
Assets/Resource/XML/Config/achieve_config.xml

@@ -11,6 +11,16 @@
   <item id="24" index="2" name="鼓鼓的钱包-4" desc="拥有5000金币" type="2" value="5000" parent="23" del="1" diamond_once="20" coin_person="" person="" icon="成就按钮" />
   <item id="25" index="2" name="鼓鼓的钱包-5" desc="拥有8000金币" type="2" value="8000" parent="24" del="1" diamond_once="30" coin_person="" person="" icon="成就按钮" />
   <item id="26" index="2" name="鼓鼓的钱包-6" desc="拥有10000金币" type="2" value="10000" parent="25" del="0" diamond_once="40" coin_person="" person="" icon="成就按钮" />
+  <item id="31" index="3" name="总金币量" desc="总金币量3000" type="3" value="3000" parent="" del="0" diamond_once="1" coin_person="" person="" icon="成就按钮" />
+  <item id="41" index="4" name="精灵等级总和" desc="精灵等级总和5" type="4" value="5" parent="" del="0" diamond_once="1" coin_person="" person="" icon="成就按钮" />
+  <item id="51" index="5" name="花朵数量" desc="花朵数量3" type="5" value="3" parent="" del="0" diamond_once="1" coin_person="" person="" icon="成就按钮" />
+  <item id="61" index="6" name="参观人次总数" desc="参观人次总数500" type="6" value="500" parent="" del="0" diamond_once="1" coin_person="" person="" icon="成就按钮" />
+  <item id="71" index="7" name="使用技能次数" desc="使用技能2次" type="7" value="2" parent="" del="0" diamond_once="1" coin_person="" person="" icon="成就按钮" />
+  <item id="81" index="8" name="观看广告次数" desc="观看广告2次" type="8" value="2" parent="" del="0" diamond_once="1" coin_person="" person="" icon="成就按钮" />
+  <item id="91" index="9" name="签到次数" desc="签到2次" type="9" value="2" parent="" del="0" diamond_once="1" coin_person="" person="" icon="成就按钮" />
+  <item id="101" index="10" name="分享次数" desc="分享2次" type="10" value="2" parent="" del="0" diamond_once="1" coin_person="" person="" icon="成就按钮" />
+  <item id="111" index="11" name="完成小游戏次数" desc="完成小游戏2次" type="11" value="2" parent="" del="0" diamond_once="1" coin_person="" person="" icon="成就按钮" />
+  <item id="121" index="12" name="收集花朵产出金币次数" desc="收集花朵金币10次" type="12" value="10" parent="" del="0" diamond_once="1" coin_person="" person="" icon="成就按钮" />
   <comment>
     <id>
 

+ 1 - 1
Assets/Resource/XML/Config/flower_config.xml

@@ -16,7 +16,7 @@
   <item id="15" name="红掌" desc="" icon="Flower15" anim="" />
   <item id="16" name="桔梗花" desc="" icon="Flower16" anim="" />
   <item id="17" name="康乃馨(白)" desc="" icon="Flower17" anim="" />
-  <item id="18" name="郁金香(粉)" desc="" icon="Flower18" anim="" />
+  <item id="18" name="铃兰(粉)" desc="" icon="Flower18" anim="" />
   <item id="19" name="曼陀罗(橘)" desc="" icon="Flower19" anim="" />
   <item id="20" name="玫瑰花(红)" desc="" icon="Flower20" anim="" />
   <item id="21" name="茑萝" desc="" icon="Flower21" anim="" />

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

@@ -1,5 +1,5 @@
 <PlayerConfig>
-  <Version value="135" />
+  <Version value="136" />
 
   <ID value="Default" />
   <TutorialA value="1" />
@@ -25,7 +25,7 @@
   <PlantList value =""/>
   <FlowerList value="1" />
   <AchieveList value="" />
-  <AchieveData AD="0" Skill="0" Sign="0" Share="0" MiniGame="0" FlowerCoin="0" TotalPerson="0"/>
+  <AchieveData AD="0" Skill="0" Sign="0" Share="0" ElfLevel="0" MiniGame="0" FlowerCoin="0" TotalPerson="0"/>
 
   <SkillList>
     <Skill ID="Skill4" SkillType="Skill" ItemStatus="Lock" Level="0" CdTimer="0" EffectTimer="0" />

+ 32 - 5
Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -7,7 +7,7 @@
     <F_GardenLab desc=""><![CDATA[花园]]></F_GardenLab>
     <F_PersonBtn0 desc=""><![CDATA[参观人次]]></F_PersonBtn0>
     <F_PersonBtn1 desc=""><![CDATA[每分钟有多少人来参观花园]]></F_PersonBtn1>
-    <F_CoinPersonBtn0 desc=""><![CDATA[每人次收入]]></F_CoinPersonBtn0>
+    <F_CoinPersonBtn0 desc=""><![CDATA[门票]]></F_CoinPersonBtn0>
     <F_CoinPersonBtn1 desc=""><![CDATA[每位来访者参观花费]]></F_CoinPersonBtn1>
     <Fe_BtnLab0 desc=""><![CDATA[提前解锁]]></Fe_BtnLab0>
     <Fe_BtnLab1 desc=""><![CDATA[解锁]]></Fe_BtnLab1>
@@ -26,7 +26,7 @@
     <D_QuitLab desc=""><![CDATA[退出]]></D_QuitLab>
     <D_BeginLab0 desc=""><![CDATA[开始]]></D_BeginLab0>
     <D_BeginLab1 desc=""><![CDATA[准备]]></D_BeginLab1>
-    <D_ScoreTit desc=""><![CDATA[得分:]]></D_ScoreTit>
+    <D_ScoreLab desc=""><![CDATA[得分: ]]></D_ScoreLab>
     <D_StatusLab0 desc=""><![CDATA[未开始]]></D_StatusLab0>
     <D_StatusLab1 desc=""><![CDATA[进行中]]></D_StatusLab1>
     <D_StatusLab2 desc=""><![CDATA[已暂停]]></D_StatusLab2>
@@ -35,7 +35,7 @@
     <Da_Tit0 desc=""><![CDATA[退出游戏]]></Da_Tit0>
     <Da_Tit1 desc=""><![CDATA[游戏结束]]></Da_Tit1>
     <Da_Lab desc=""><![CDATA[打理完花园可能获得以下奖励,确定要退出?]]></Da_Lab>
-    <Da_ScoreTit desc=""><![CDATA[得分 : ]]></Da_ScoreTit>
+    <Da_ScoreTit desc=""><![CDATA[得分: ]]></Da_ScoreTit>
     <Da_QuitLab desc=""><![CDATA[退出游戏]]></Da_QuitLab>
     <Da_CancelLab desc=""><![CDATA[取消]]></Da_CancelLab>
     <Da_GetAwardLab desc=""><![CDATA[领取奖励]]></Da_GetAwardLab>
@@ -43,7 +43,7 @@
     <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_PlaceLab desc=""><![CDATA[种下]]></H_PlaceLab>
     <H_RetrieveLab desc=""><![CDATA[收回]]></H_RetrieveLab>
     <Ba_Lab desc=""><![CDATA[离开期间获得]]></Ba_Lab>
     <Ba_ConfirmLab desc=""><![CDATA[收取]]></Ba_ConfirmLab>
@@ -91,7 +91,7 @@
     <Flower15 desc=""><![CDATA[红掌]]></Flower15>
     <Flower16 desc=""><![CDATA[桔梗花]]></Flower16>
     <Flower17 desc=""><![CDATA[康乃馨(白)]]></Flower17>
-    <Flower18 desc=""><![CDATA[郁金香(粉)]]></Flower18>
+    <Flower18 desc=""><![CDATA[铃兰(粉)]]></Flower18>
     <Flower19 desc=""><![CDATA[曼陀罗(橘)]]></Flower19>
     <Flower20 desc=""><![CDATA[玫瑰花(红)]]></Flower20>
     <Flower21 desc=""><![CDATA[茑萝]]></Flower21>
@@ -207,6 +207,16 @@
     <Achieve24 desc=""><![CDATA[鼓鼓的钱包-4]]></Achieve24>
     <Achieve25 desc=""><![CDATA[鼓鼓的钱包-5]]></Achieve25>
     <Achieve26 desc=""><![CDATA[鼓鼓的钱包-6]]></Achieve26>
+    <Achieve31 desc=""><![CDATA[总金币量]]></Achieve31>
+    <Achieve41 desc=""><![CDATA[精灵等级总和]]></Achieve41>
+    <Achieve51 desc=""><![CDATA[花朵数量]]></Achieve51>
+    <Achieve61 desc=""><![CDATA[参观人次总数]]></Achieve61>
+    <Achieve71 desc=""><![CDATA[使用技能次数]]></Achieve71>
+    <Achieve81 desc=""><![CDATA[观看广告次数]]></Achieve81>
+    <Achieve91 desc=""><![CDATA[签到次数]]></Achieve91>
+    <Achieve101 desc=""><![CDATA[分享次数]]></Achieve101>
+    <Achieve111 desc=""><![CDATA[完成小游戏次数]]></Achieve111>
+    <Achieve121 desc=""><![CDATA[收集花朵产出金币次数]]></Achieve121>
   </AchieveName>
   <AchieveDesc>
     <Achieve1 desc=""><![CDATA[花园等级达到 30]]></Achieve1>
@@ -221,5 +231,22 @@
     <Achieve24 desc=""><![CDATA[拥有5000金币]]></Achieve24>
     <Achieve25 desc=""><![CDATA[拥有8000金币]]></Achieve25>
     <Achieve26 desc=""><![CDATA[拥有10000金币]]></Achieve26>
+    <Achieve31 desc=""><![CDATA[总金币量3000]]></Achieve31>
+    <Achieve41 desc=""><![CDATA[精灵等级总和5]]></Achieve41>
+    <Achieve51 desc=""><![CDATA[花朵数量3]]></Achieve51>
+    <Achieve61 desc=""><![CDATA[参观人次总数500]]></Achieve61>
+    <Achieve71 desc=""><![CDATA[使用技能2次]]></Achieve71>
+    <Achieve81 desc=""><![CDATA[观看广告2次]]></Achieve81>
+    <Achieve91 desc=""><![CDATA[签到2次]]></Achieve91>
+    <Achieve101 desc=""><![CDATA[分享2次]]></Achieve101>
+    <Achieve111 desc=""><![CDATA[完成小游戏2次]]></Achieve111>
+    <Achieve121 desc=""><![CDATA[收集花朵金币10次]]></Achieve121>
   </AchieveDesc>
+  <IAP>
+    <LoadAd desc=""><![CDATA[广告加载中,请稍后再试]]></LoadAd>
+    <IncompleteAd desc=""><![CDATA[广告没有完整播放]]></IncompleteAd>
+    <FailAd desc=""><![CDATA[广告播放失败]]></FailAd>
+    <PurchaseSuccess desc=""><![CDATA[购买成功]]></PurchaseSuccess>
+    <PurchaseFail desc=""><![CDATA[购买失败]]></PurchaseFail>
+  </IAP>
 </lan>

+ 220 - 190
Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -1,55 +1,55 @@
 <lan>
   <UI>
-    <C_MiniGameLab desc=""><![CDATA[]]></C_MiniGameLab>
-    <F_StoreLab desc=""><![CDATA[]]></F_StoreLab>
-    <F_MagicLab desc=""><![CDATA[]]></F_MagicLab>
-    <F_ElfLab desc=""><![CDATA[]]></F_ElfLab>
-    <F_GardenLab desc=""><![CDATA[]]></F_GardenLab>
-    <F_PersonBtn0 desc=""><![CDATA[]]></F_PersonBtn0>
-    <F_PersonBtn1 desc=""><![CDATA[]]></F_PersonBtn1>
-    <F_CoinPersonBtn0 desc=""><![CDATA[]]></F_CoinPersonBtn0>
-    <F_CoinPersonBtn1 desc=""><![CDATA[]]></F_CoinPersonBtn1>
-    <Fe_BtnLab0 desc=""><![CDATA[]]></Fe_BtnLab0>
-    <Fe_BtnLab1 desc=""><![CDATA[]]></Fe_BtnLab1>
-    <Fe_BtnLab2 desc=""><![CDATA[]]></Fe_BtnLab2>
-    <Fe_BtnLab3 desc=""><![CDATA[]]></Fe_BtnLab3>
-    <Fe_BtnLab4 desc=""><![CDATA[]]></Fe_BtnLab4>
+    <C_MiniGameLab desc=""><![CDATA[快來打理花園吧!]]></C_MiniGameLab>
+    <F_StoreLab desc=""><![CDATA[商店]]></F_StoreLab>
+    <F_MagicLab desc=""><![CDATA[魔法]]></F_MagicLab>
+    <F_ElfLab desc=""><![CDATA[精靈]]></F_ElfLab>
+    <F_GardenLab desc=""><![CDATA[花園]]></F_GardenLab>
+    <F_PersonBtn0 desc=""><![CDATA[參觀人次]]></F_PersonBtn0>
+    <F_PersonBtn1 desc=""><![CDATA[每分鐘有多少人來參觀花園]]></F_PersonBtn1>
+    <F_CoinPersonBtn0 desc=""><![CDATA[門票]]></F_CoinPersonBtn0>
+    <F_CoinPersonBtn1 desc=""><![CDATA[每位來訪者參觀花費]]></F_CoinPersonBtn1>
+    <Fe_BtnLab0 desc=""><![CDATA[提前解鎖]]></Fe_BtnLab0>
+    <Fe_BtnLab1 desc=""><![CDATA[解鎖]]></Fe_BtnLab1>
+    <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>
-    <Fg_BtnLab desc=""><![CDATA[]]></Fg_BtnLab>
-    <Fg_Lab0 desc=""><![CDATA[]]></Fg_Lab0>
-    <Fg_Lab1 desc=""><![CDATA[]]></Fg_Lab1>
-    <Fg_Lab2 desc=""><![CDATA[]]></Fg_Lab2>
-    <Fg_Lab3 desc=""><![CDATA[]]></Fg_Lab3>
-    <D_QuitLab desc=""><![CDATA[]]></D_QuitLab>
-    <D_BeginLab0 desc=""><![CDATA[]]></D_BeginLab0>
-    <D_BeginLab1 desc=""><![CDATA[]]></D_BeginLab1>
-    <D_ScoreTit desc=""><![CDATA[]]></D_ScoreTit>
-    <D_StatusLab0 desc=""><![CDATA[]]></D_StatusLab0>
-    <D_StatusLab1 desc=""><![CDATA[]]></D_StatusLab1>
-    <D_StatusLab2 desc=""><![CDATA[]]></D_StatusLab2>
-    <D_StatusLab3 desc=""><![CDATA[]]></D_StatusLab3>
-    <D_PrepareLab desc=""><![CDATA[]]></D_PrepareLab>
-    <Da_Tit0 desc=""><![CDATA[]]></Da_Tit0>
-    <Da_Tit1 desc=""><![CDATA[]]></Da_Tit1>
-    <Da_Lab desc=""><![CDATA[]]></Da_Lab>
-    <Da_ScoreTit desc=""><![CDATA[]]></Da_ScoreTit>
-    <Da_QuitLab desc=""><![CDATA[]]></Da_QuitLab>
-    <Da_CancelLab desc=""><![CDATA[]]></Da_CancelLab>
-    <Da_GetAwardLab desc=""><![CDATA[]]></Da_GetAwardLab>
-    <G_Tit desc=""><![CDATA[]]></G_Tit>
-    <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>
+    <Fe_BtnLab6 desc=""><![CDATA[冷卻中]]></Fe_BtnLab6>
+    <Fe_BtnLab7 desc=""><![CDATA[剩餘時間]]></Fe_BtnLab7>
+    <Fg_Tit desc=""><![CDATA[提示]]></Fg_Tit>
+    <Fg_BtnLab desc=""><![CDATA[連接伺服器]]></Fg_BtnLab>
+    <Fg_Lab0 desc=""><![CDATA[該功能僅在聯網時使用]]></Fg_Lab0>
+    <Fg_Lab1 desc=""><![CDATA[連接中]]></Fg_Lab1>
+    <Fg_Lab2 desc=""><![CDATA[連接成功]]></Fg_Lab2>
+    <Fg_Lab3 desc=""><![CDATA[連接失敗 請檢查你的網路設置]]></Fg_Lab3>
+    <D_QuitLab desc=""><![CDATA[退出]]></D_QuitLab>
+    <D_BeginLab0 desc=""><![CDATA[開始]]></D_BeginLab0>
+    <D_BeginLab1 desc=""><![CDATA[準備]]></D_BeginLab1>
+    <D_ScoreLab desc=""><![CDATA[得分: ]]></D_ScoreLab>
+    <D_StatusLab0 desc=""><![CDATA[未開始]]></D_StatusLab0>
+    <D_StatusLab1 desc=""><![CDATA[進行中]]></D_StatusLab1>
+    <D_StatusLab2 desc=""><![CDATA[已暫停]]></D_StatusLab2>
+    <D_StatusLab3 desc=""><![CDATA[操作被凍結]]></D_StatusLab3>
+    <D_PrepareLab desc=""><![CDATA[開始]]></D_PrepareLab>
+    <Da_Tit0 desc=""><![CDATA[退出遊戲]]></Da_Tit0>
+    <Da_Tit1 desc=""><![CDATA[遊戲結束]]></Da_Tit1>
+    <Da_Lab desc=""><![CDATA[打理完花園可能獲得以下獎勵,確定要退出?]]></Da_Lab>
+    <Da_ScoreTit desc=""><![CDATA[得分: ]]></Da_ScoreTit>
+    <Da_QuitLab desc=""><![CDATA[退出遊戲]]></Da_QuitLab>
+    <Da_CancelLab desc=""><![CDATA[取消]]></Da_CancelLab>
+    <Da_GetAwardLab desc=""><![CDATA[領取獎勵]]></Da_GetAwardLab>
+    <G_Tit desc=""><![CDATA[花朵管理]]></G_Tit>
+    <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_UserTit desc=""><![CDATA[用戶]]></L_UserTit>
     <L_ChangeLab desc=""><![CDATA[←這不是我]]></L_ChangeLab>
     <L_AudioTit desc=""><![CDATA[音效]]></L_AudioTit>
@@ -62,161 +62,191 @@
     <L_TraChiLab desc=""><![CDATA[繁體中文]]></L_TraChiLab>
     <L_EnglishLab desc=""><![CDATA[English]]></L_EnglishLab>
     <L_SimChiLab desc=""><![CDATA[简体中文]]></L_SimChiLab>
-    <La_Tit desc=""><![CDATA[]]></La_Tit>
-    <La_Lab0 desc=""><![CDATA[]]></La_Lab0>
-    <La_Lab1 desc=""><![CDATA[]]></La_Lab1>
-    <La_Placeholder desc=""><![CDATA[]]></La_Placeholder>
-    <Lb_Tit desc=""><![CDATA[]]></Lb_Tit>
-    <Lb_Placeholder desc=""><![CDATA[]]></Lb_Placeholder>
-    <Lb_Send0 desc=""><![CDATA[]]></Lb_Send0>
-    <Lb_Send1 desc=""><![CDATA[]]></Lb_Send1>
-    <Lb_Send2 desc=""><![CDATA[]]></Lb_Send2>
-    <M_Tit desc=""><![CDATA[]]></M_Tit>
+    <La_Tit desc=""><![CDATA[下載存檔]]></La_Tit>
+    <La_Lab0 desc=""><![CDATA[連接成功 請稍等]]></La_Lab0>
+    <La_Lab1 desc=""><![CDATA[連接失敗]]></La_Lab1>
+    <La_Placeholder desc=""><![CDATA[輸入您的ID]]></La_Placeholder>
+    <Lb_Tit desc=""><![CDATA[提交問題]]></Lb_Tit>
+    <Lb_Placeholder desc=""><![CDATA[問題描述]]></Lb_Placeholder>
+    <Lb_Send0 desc=""><![CDATA[提交成功]]></Lb_Send0>
+    <Lb_Send1 desc=""><![CDATA[請勿重複提交]]></Lb_Send1>
+    <Lb_Send2 desc=""><![CDATA[內容不能為空]]></Lb_Send2>
+    <M_Tit desc=""><![CDATA[成就]]></M_Tit>
   </UI>
   <FlowerName>
-    <Flower1 desc=""><![CDATA[]]></Flower1>
-    <Flower2 desc=""><![CDATA[]]></Flower2>
-    <Flower3 desc=""><![CDATA[]]></Flower3>
-    <Flower4 desc=""><![CDATA[]]></Flower4>
-    <Flower5 desc=""><![CDATA[]]></Flower5>
-    <Flower6 desc=""><![CDATA[]]></Flower6>
-    <Flower7 desc=""><![CDATA[]]></Flower7>
-    <Flower8 desc=""><![CDATA[]]></Flower8>
-    <Flower9 desc=""><![CDATA[]]></Flower9>
-    <Flower10 desc=""><![CDATA[]]></Flower10>
-    <Flower11 desc=""><![CDATA[]]></Flower11>
-    <Flower12 desc=""><![CDATA[]]></Flower12>
-    <Flower13 desc=""><![CDATA[]]></Flower13>
-    <Flower14 desc=""><![CDATA[]]></Flower14>
-    <Flower15 desc=""><![CDATA[]]></Flower15>
-    <Flower16 desc=""><![CDATA[]]></Flower16>
-    <Flower17 desc=""><![CDATA[]]></Flower17>
-    <Flower18 desc=""><![CDATA[]]></Flower18>
-    <Flower19 desc=""><![CDATA[]]></Flower19>
-    <Flower20 desc=""><![CDATA[]]></Flower20>
-    <Flower21 desc=""><![CDATA[]]></Flower21>
-    <Flower22 desc=""><![CDATA[]]></Flower22>
-    <Flower23 desc=""><![CDATA[]]></Flower23>
-    <Flower24 desc=""><![CDATA[]]></Flower24>
-    <Flower25 desc=""><![CDATA[]]></Flower25>
-    <Flower26 desc=""><![CDATA[]]></Flower26>
-    <Flower27 desc=""><![CDATA[]]></Flower27>
+    <Flower1 desc=""><![CDATA[粉色小花]]></Flower1>
+    <Flower2 desc=""><![CDATA[紫色小花]]></Flower2>
+    <Flower3 desc=""><![CDATA[波斯菊(粉)]]></Flower3>
+    <Flower4 desc=""><![CDATA[康乃馨(紅)]]></Flower4>
+    <Flower5 desc=""><![CDATA[鈴蘭(白)]]></Flower5>
+    <Flower6 desc=""><![CDATA[馬蹄蓮(白)]]></Flower6>
+    <Flower7 desc=""><![CDATA[蒲公英]]></Flower7>
+    <Flower8 desc=""><![CDATA[牽牛花(藍)]]></Flower8>
+    <Flower9 desc=""><![CDATA[三色堇(紫)]]></Flower9>
+    <Flower10 desc=""><![CDATA[三葉草(粉)]]></Flower10>
+    <Flower11 desc=""><![CDATA[向日葵]]></Flower11>
+    <Flower12 desc=""><![CDATA[鬱金香(粉)]]></Flower12>
+    <Flower13 desc=""><![CDATA[百合花(白)]]></Flower13>
+    <Flower14 desc=""><![CDATA[非洲菊(粉)]]></Flower14>
+    <Flower15 desc=""><![CDATA[紅掌]]></Flower15>
+    <Flower16 desc=""><![CDATA[桔梗花]]></Flower16>
+    <Flower17 desc=""><![CDATA[康乃馨(白)]]></Flower17>
+    <Flower18 desc=""><![CDATA[鈴蘭(粉)]]></Flower18>
+    <Flower19 desc=""><![CDATA[曼陀羅(橘)]]></Flower19>
+    <Flower20 desc=""><![CDATA[玫瑰花(紅)]]></Flower20>
+    <Flower21 desc=""><![CDATA[蔦蘿]]></Flower21>
+    <Flower22 desc=""><![CDATA[牽牛花(紫)]]></Flower22>
+    <Flower23 desc=""><![CDATA[虞美人(紅)]]></Flower23>
+    <Flower24 desc=""><![CDATA[鬱金香(黃)]]></Flower24>
+    <Flower25 desc=""><![CDATA[鳶尾(紫)]]></Flower25>
+    <Flower26 desc=""><![CDATA[朱槿(粉)]]></Flower26>
+    <Flower27 desc=""><![CDATA[朱槿(黃)]]></Flower27>
   </FlowerName>
   <SkillName>
-    <Pack1 desc=""><![CDATA[]]></Pack1>
-    <Pack2 desc=""><![CDATA[]]></Pack2>
-    <Pack3 desc=""><![CDATA[]]></Pack3>
-    <Pack4 desc=""><![CDATA[]]></Pack4>
-    <Pack5 desc=""><![CDATA[]]></Pack5>
-    <Pack6 desc=""><![CDATA[]]></Pack6>
-    <Pack7 desc=""><![CDATA[]]></Pack7>
-    <Pack8 desc=""><![CDATA[]]></Pack8>
-    <Pack9 desc=""><![CDATA[]]></Pack9>
-    <Pack10 desc=""><![CDATA[]]></Pack10>
-    <Pack11 desc=""><![CDATA[]]></Pack11>
-    <Ability1 desc=""><![CDATA[]]></Ability1>
-    <Ability2 desc=""><![CDATA[]]></Ability2>
-    <Ability3 desc=""><![CDATA[]]></Ability3>
-    <Ability4 desc=""><![CDATA[]]></Ability4>
-    <Ability5 desc=""><![CDATA[]]></Ability5>
-    <Ability6 desc=""><![CDATA[]]></Ability6>
-    <Ability7 desc=""><![CDATA[]]></Ability7>
-    <Ability8 desc=""><![CDATA[]]></Ability8>
-    <Ability9 desc=""><![CDATA[]]></Ability9>
-    <Ability10 desc=""><![CDATA[]]></Ability10>
-    <Ability11 desc=""><![CDATA[]]></Ability11>
-    <Ability12 desc=""><![CDATA[]]></Ability12>
-    <Ability13 desc=""><![CDATA[]]></Ability13>
-    <Ability14 desc=""><![CDATA[]]></Ability14>
-    <Skill1 desc=""><![CDATA[]]></Skill1>
-    <Skill2 desc=""><![CDATA[]]></Skill2>
-    <Skill3 desc=""><![CDATA[]]></Skill3>
-    <Skill4 desc=""><![CDATA[]]></Skill4>
-    <Skill5 desc=""><![CDATA[]]></Skill5>
-    <Skill6 desc=""><![CDATA[]]></Skill6>
-    <Skill7 desc=""><![CDATA[]]></Skill7>
+    <Pack1 desc=""><![CDATA[金幣大禮包]]></Pack1>
+    <Pack2 desc=""><![CDATA[天賜大禮包]]></Pack2>
+    <Pack3 desc=""><![CDATA[花神大禮包]]></Pack3>
+    <Pack4 desc=""><![CDATA[新手禮包]]></Pack4>
+    <Pack5 desc=""><![CDATA[中級禮包]]></Pack5>
+    <Pack6 desc=""><![CDATA[高級禮包]]></Pack6>
+    <Pack7 desc=""><![CDATA[鑽石100]]></Pack7>
+    <Pack8 desc=""><![CDATA[鑽石500 贈送50]]></Pack8>
+    <Pack9 desc=""><![CDATA[鑽石2000 贈送500]]></Pack9>
+    <Pack10 desc=""><![CDATA[鑽石6000 贈送600]]></Pack10>
+    <Pack11 desc=""><![CDATA[鑽石10000 贈送2000]]></Pack11>
+    <Ability1 desc=""><![CDATA[花園]]></Ability1>
+    <Ability2 desc=""><![CDATA[繽紛彩虹]]></Ability2>
+    <Ability3 desc=""><![CDATA[玉樹櫻花]]></Ability3>
+    <Ability4 desc=""><![CDATA[滴哩哩的小黃鸝]]></Ability4>
+    <Ability5 desc=""><![CDATA[黃色小蜜蜂]]></Ability5>
+    <Ability6 desc=""><![CDATA[紫色小蜜蜂]]></Ability6>
+    <Ability7 desc=""><![CDATA[藍色小蜜蜂]]></Ability7>
+    <Ability8 desc=""><![CDATA[紅色小蜜蜂]]></Ability8>
+    <Ability9 desc=""><![CDATA[白色小蜜蜂]]></Ability9>
+    <Ability10 desc=""><![CDATA[黃色小蝴蝶]]></Ability10>
+    <Ability11 desc=""><![CDATA[紫色小蝴蝶]]></Ability11>
+    <Ability12 desc=""><![CDATA[藍色小蝴蝶]]></Ability12>
+    <Ability13 desc=""><![CDATA[紅色小蝴蝶]]></Ability13>
+    <Ability14 desc=""><![CDATA[白色小蝴蝶]]></Ability14>
+    <Skill1 desc=""><![CDATA[人潮湧動]]></Skill1>
+    <Skill2 desc=""><![CDATA[大亨光臨]]></Skill2>
+    <Skill3 desc=""><![CDATA[花之祝福]]></Skill3>
+    <Skill4 desc=""><![CDATA[繁花似錦]]></Skill4>
+    <Skill5 desc=""><![CDATA[免費獲取金幣]]></Skill5>
+    <Skill6 desc=""><![CDATA[免費獲取鑽石]]></Skill6>
+    <Skill7 desc=""><![CDATA[技能冷卻]]></Skill7>
   </SkillName>
   <SkillDesc>
-    <Pack1 desc=""><![CDATA[]]></Pack1>
-    <Pack2 desc=""><![CDATA[]]></Pack2>
-    <Pack3 desc=""><![CDATA[]]></Pack3>
-    <Pack4 desc=""><![CDATA[]]></Pack4>
-    <Pack5 desc=""><![CDATA[]]></Pack5>
-    <Pack6 desc=""><![CDATA[]]></Pack6>
-    <Pack7 desc=""><![CDATA[]]></Pack7>
-    <Pack8 desc=""><![CDATA[]]></Pack8>
-    <Pack9 desc=""><![CDATA[]]></Pack9>
-    <Pack10 desc=""><![CDATA[]]></Pack10>
-    <Pack11 desc=""><![CDATA[]]></Pack11>
-    <Ability1 desc=""><![CDATA[]]></Ability1>
-    <Ability2 desc=""><![CDATA[]]></Ability2>
-    <Ability3 desc=""><![CDATA[]]></Ability3>
-    <Ability4 desc=""><![CDATA[]]></Ability4>
-    <Ability5 desc=""><![CDATA[]]></Ability5>
-    <Ability6 desc=""><![CDATA[]]></Ability6>
-    <Ability7 desc=""><![CDATA[]]></Ability7>
-    <Ability8 desc=""><![CDATA[]]></Ability8>
-    <Ability9 desc=""><![CDATA[]]></Ability9>
-    <Ability10 desc=""><![CDATA[]]></Ability10>
-    <Ability11 desc=""><![CDATA[]]></Ability11>
-    <Ability12 desc=""><![CDATA[]]></Ability12>
-    <Ability13 desc=""><![CDATA[]]></Ability13>
-    <Ability14 desc=""><![CDATA[]]></Ability14>
-    <Skill1 desc=""><![CDATA[]]></Skill1>
-    <Skill2 desc=""><![CDATA[]]></Skill2>
-    <Skill3 desc=""><![CDATA[]]></Skill3>
-    <Skill4 desc=""><![CDATA[]]></Skill4>
-    <Skill5 desc=""><![CDATA[]]></Skill5>
-    <Skill6 desc=""><![CDATA[]]></Skill6>
+    <Pack1 desc=""><![CDATA[立即獲得金幣[&coin&]]]></Pack1>
+    <Pack2 desc=""><![CDATA[立即獲得金幣[&coin&]]]></Pack2>
+    <Pack3 desc=""><![CDATA[立即獲得金幣[&coin&]]]></Pack3>
+    <Pack4 desc=""><![CDATA[獲得[&flower&],[&diamond&]鑽石
+所有金幣產出提升[&coin_person&],永久有效]]></Pack4>
+    <Pack5 desc=""><![CDATA[獲得[&flower&],[&diamond&]鑽石
+所有金幣產出提升[&coin_person&],永久有效]]></Pack5>
+    <Pack6 desc=""><![CDATA[獲得[&flower&],[&diamond&]鑽石
+所有金幣產出提升[&coin_person&],永久有效]]></Pack6>
+    <Pack7 desc=""><![CDATA[購買[&diamond&]鑽石]]></Pack7>
+    <Pack8 desc=""><![CDATA[共計[&diamond&]鑽石]]></Pack8>
+    <Pack9 desc=""><![CDATA[共計[&diamond&]鑽石]]></Pack9>
+    <Pack10 desc=""><![CDATA[共計[&diamond&]鑽石]]></Pack10>
+    <Pack11 desc=""><![CDATA[共計[&diamond&]鑽石]]></Pack11>
+    <Ability1 desc=""><![CDATA[每人次收入金幣[&coin_person&][lv],每分鐘來訪[&person&*60][lv]人]]></Ability1>
+    <Ability2 desc=""><![CDATA[每分鐘來訪增加[&person&*60][lv]人參觀,永久有效]]></Ability2>
+    <Ability3 desc=""><![CDATA[每人次收入提升[&coin_person&][lv],永久有效]]></Ability3>
+    <Ability4 desc=""><![CDATA[技能冷卻時間減少[&skill_cd&][lv],永久有效]]></Ability4>
+    <Ability5 desc=""><![CDATA[每人次參觀獲得[&coin_person&][lv]金幣]]></Ability5>
+    <Ability6 desc=""><![CDATA[每人次參觀獲得[&coin_person&][lv]金幣]]></Ability6>
+    <Ability7 desc=""><![CDATA[每人次參觀獲得[&coin_person&][lv]金幣]]></Ability7>
+    <Ability8 desc=""><![CDATA[每人次參觀獲得[&coin_person&][lv]金幣]]></Ability8>
+    <Ability9 desc=""><![CDATA[每人次參觀獲得[&coin_person&][lv]金幣]]></Ability9>
+    <Ability10 desc=""><![CDATA[每人次參觀獲得[&coin_person&][lv]金幣]]></Ability10>
+    <Ability11 desc=""><![CDATA[每人次參觀獲得[&coin_person&][lv]金幣]]></Ability11>
+    <Ability12 desc=""><![CDATA[每人次參觀獲得[&coin_person&][lv]金幣]]></Ability12>
+    <Ability13 desc=""><![CDATA[每人次參觀獲得[&coin_person&][lv]金幣]]></Ability13>
+    <Ability14 desc=""><![CDATA[每人次參觀獲得[&coin_person&][lv]金幣]]></Ability14>
+    <Skill1 desc=""><![CDATA[每分鐘增加來訪[&person&*60]人,持續[&duration&/60][lv]分鐘]]></Skill1>
+    <Skill2 desc=""><![CDATA[立即獲得每人次收入的[&coin_once&][lv]倍]]></Skill2>
+    <Skill3 desc=""><![CDATA[所有收入提升[&coin_person&],持續[&duration&/60][lv]分鐘]]></Skill3>
+    <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>
-    <AchieveItem_BtnLab0 desc=""><![CDATA[]]></AchieveItem_BtnLab0>
-    <AchieveItem_BtnLab1 desc=""><![CDATA[]]></AchieveItem_BtnLab1>
-    <AchieveItem_BtnLab2 desc=""><![CDATA[]]></AchieveItem_BtnLab2>
-    <SlotSign desc=""><![CDATA[]]></SlotSign>
+    <FlowerItemG_Lab desc=""><![CDATA[已放置]]></FlowerItemG_Lab>
+    <AchieveItem_BtnLab0 desc=""><![CDATA[獎勵]]></AchieveItem_BtnLab0>
+    <AchieveItem_BtnLab1 desc=""><![CDATA[領取獎勵]]></AchieveItem_BtnLab1>
+    <AchieveItem_BtnLab2 desc=""><![CDATA[已完成]]></AchieveItem_BtnLab2>
+    <SlotSign desc=""><![CDATA[未開墾]]></SlotSign>
   </Object>
   <Common>
-    <Confirm desc=""><![CDATA[]]></Confirm>
-    <Cancel desc=""><![CDATA[]]></Cancel>
-    <AD desc=""><![CDATA[]]></AD>
-    <Cash desc=""><![CDATA[]]></Cash>
-    <Person desc=""><![CDATA[]]></Person>
-    <CoinPerson desc=""><![CDATA[]]></CoinPerson>
-    <ShortCoin desc=""><![CDATA[]]></ShortCoin>
-    <NavigateCoin desc=""><![CDATA[]]></NavigateCoin>
-    <ShortDiamond desc=""><![CDATA[]]></ShortDiamond>
-    <NavigateDiamond desc=""><![CDATA[]]></NavigateDiamond>
-    <UnlockSlot desc=""><![CDATA[]]></UnlockSlot>
-    <QuitGame desc=""><![CDATA[]]></QuitGame>
+    <Confirm desc=""><![CDATA[確定]]></Confirm>
+    <Cancel desc=""><![CDATA[取消]]></Cancel>
+    <AD desc=""><![CDATA[觀看]]></AD>
+    <Cash desc=""><![CDATA[$]]></Cash>
+    <Person desc=""><![CDATA[參觀人次]]></Person>
+    <CoinPerson desc=""><![CDATA[每人次金幣]]></CoinPerson>
+    <ShortCoin desc=""><![CDATA[金幣不夠]]></ShortCoin>
+    <NavigateCoin desc=""><![CDATA[您可以點擊確定前往獲取金幣]]></NavigateCoin>
+    <ShortDiamond desc=""><![CDATA[鑽石不夠]]></ShortDiamond>
+    <NavigateDiamond desc=""><![CDATA[您可以點擊確定前往獲取鑽石]]></NavigateDiamond>
+    <UnlockSlot desc=""><![CDATA[解鎖精靈可以開放]]></UnlockSlot>
+    <QuitGame desc=""><![CDATA[退出遊戲?]]></QuitGame>
   </Common>
   <AchieveName>
-    <Achieve1 desc=""><![CDATA[]]></Achieve1>
-    <Achieve2 desc=""><![CDATA[]]></Achieve2>
-    <Achieve3 desc=""><![CDATA[]]></Achieve3>
-    <Achieve4 desc=""><![CDATA[]]></Achieve4>
-    <Achieve5 desc=""><![CDATA[]]></Achieve5>
-    <Achieve6 desc=""><![CDATA[]]></Achieve6>
-    <Achieve21 desc=""><![CDATA[]]></Achieve21>
-    <Achieve22 desc=""><![CDATA[]]></Achieve22>
-    <Achieve23 desc=""><![CDATA[]]></Achieve23>
-    <Achieve24 desc=""><![CDATA[]]></Achieve24>
-    <Achieve25 desc=""><![CDATA[]]></Achieve25>
-    <Achieve26 desc=""><![CDATA[]]></Achieve26>
+    <Achieve1 desc=""><![CDATA[美麗花園-1]]></Achieve1>
+    <Achieve2 desc=""><![CDATA[美麗花園-2]]></Achieve2>
+    <Achieve3 desc=""><![CDATA[美麗花園-3]]></Achieve3>
+    <Achieve4 desc=""><![CDATA[美麗花園-4]]></Achieve4>
+    <Achieve5 desc=""><![CDATA[美麗花園-5]]></Achieve5>
+    <Achieve6 desc=""><![CDATA[美麗花園-6]]></Achieve6>
+    <Achieve21 desc=""><![CDATA[鼓鼓的錢包-1]]></Achieve21>
+    <Achieve22 desc=""><![CDATA[鼓鼓的錢包-2]]></Achieve22>
+    <Achieve23 desc=""><![CDATA[鼓鼓的錢包-3]]></Achieve23>
+    <Achieve24 desc=""><![CDATA[鼓鼓的錢包-4]]></Achieve24>
+    <Achieve25 desc=""><![CDATA[鼓鼓的錢包-5]]></Achieve25>
+    <Achieve26 desc=""><![CDATA[鼓鼓的錢包-6]]></Achieve26>
+    <Achieve31 desc=""><![CDATA[]]></Achieve31>
+    <Achieve41 desc=""><![CDATA[]]></Achieve41>
+    <Achieve51 desc=""><![CDATA[]]></Achieve51>
+    <Achieve61 desc=""><![CDATA[]]></Achieve61>
+    <Achieve71 desc=""><![CDATA[]]></Achieve71>
+    <Achieve81 desc=""><![CDATA[]]></Achieve81>
+    <Achieve91 desc=""><![CDATA[]]></Achieve91>
+    <Achieve101 desc=""><![CDATA[]]></Achieve101>
+    <Achieve111 desc=""><![CDATA[]]></Achieve111>
+    <Achieve121 desc=""><![CDATA[]]></Achieve121>
   </AchieveName>
   <AchieveDesc>
-    <Achieve1 desc=""><![CDATA[]]></Achieve1>
-    <Achieve2 desc=""><![CDATA[]]></Achieve2>
-    <Achieve3 desc=""><![CDATA[]]></Achieve3>
-    <Achieve4 desc=""><![CDATA[]]></Achieve4>
-    <Achieve5 desc=""><![CDATA[]]></Achieve5>
-    <Achieve6 desc=""><![CDATA[]]></Achieve6>
-    <Achieve21 desc=""><![CDATA[]]></Achieve21>
-    <Achieve22 desc=""><![CDATA[]]></Achieve22>
-    <Achieve23 desc=""><![CDATA[]]></Achieve23>
-    <Achieve24 desc=""><![CDATA[]]></Achieve24>
-    <Achieve25 desc=""><![CDATA[]]></Achieve25>
-    <Achieve26 desc=""><![CDATA[]]></Achieve26>
+    <Achieve1 desc=""><![CDATA[花園等級達到 30]]></Achieve1>
+    <Achieve2 desc=""><![CDATA[花園等級達到 50]]></Achieve2>
+    <Achieve3 desc=""><![CDATA[花園等級達到 100]]></Achieve3>
+    <Achieve4 desc=""><![CDATA[花園等級達到 200]]></Achieve4>
+    <Achieve5 desc=""><![CDATA[花園等級達到 300]]></Achieve5>
+    <Achieve6 desc=""><![CDATA[花園等級達到 400]]></Achieve6>
+    <Achieve21 desc=""><![CDATA[擁有1000金幣]]></Achieve21>
+    <Achieve22 desc=""><![CDATA[擁有2000金幣]]></Achieve22>
+    <Achieve23 desc=""><![CDATA[擁有3000金幣]]></Achieve23>
+    <Achieve24 desc=""><![CDATA[擁有5000金幣]]></Achieve24>
+    <Achieve25 desc=""><![CDATA[擁有8000金幣]]></Achieve25>
+    <Achieve26 desc=""><![CDATA[擁有10000金幣]]></Achieve26>
+    <Achieve31 desc=""><![CDATA[]]></Achieve31>
+    <Achieve41 desc=""><![CDATA[]]></Achieve41>
+    <Achieve51 desc=""><![CDATA[]]></Achieve51>
+    <Achieve61 desc=""><![CDATA[]]></Achieve61>
+    <Achieve71 desc=""><![CDATA[]]></Achieve71>
+    <Achieve81 desc=""><![CDATA[]]></Achieve81>
+    <Achieve91 desc=""><![CDATA[]]></Achieve91>
+    <Achieve101 desc=""><![CDATA[]]></Achieve101>
+    <Achieve111 desc=""><![CDATA[]]></Achieve111>
+    <Achieve121 desc=""><![CDATA[]]></Achieve121>
   </AchieveDesc>
+  <IAP>
+    <LoadAd desc=""><![CDATA[]]></LoadAd>
+    <IncompleteAd desc=""><![CDATA[]]></IncompleteAd>
+    <FailAd desc=""><![CDATA[]]></FailAd>
+    <PurchaseSuccess desc=""><![CDATA[]]></PurchaseSuccess>
+    <PurchaseFail desc=""><![CDATA[]]></PurchaseFail>
+  </IAP>
 </lan>

+ 210 - 180
Assets/Resource/XML/lan/English.xml

@@ -1,55 +1,55 @@
 <lan>
   <UI>
-    <C_MiniGameLab desc=""><![CDATA[]]></C_MiniGameLab>
-    <F_StoreLab desc=""><![CDATA[]]></F_StoreLab>
-    <F_MagicLab desc=""><![CDATA[]]></F_MagicLab>
-    <F_ElfLab desc=""><![CDATA[]]></F_ElfLab>
-    <F_GardenLab desc=""><![CDATA[]]></F_GardenLab>
-    <F_PersonBtn0 desc=""><![CDATA[]]></F_PersonBtn0>
-    <F_PersonBtn1 desc=""><![CDATA[]]></F_PersonBtn1>
-    <F_CoinPersonBtn0 desc=""><![CDATA[]]></F_CoinPersonBtn0>
-    <F_CoinPersonBtn1 desc=""><![CDATA[]]></F_CoinPersonBtn1>
+    <C_MiniGameLab desc=""><![CDATA[Come to play!]]></C_MiniGameLab>
+    <F_StoreLab desc=""><![CDATA[Shop]]></F_StoreLab>
+    <F_MagicLab desc=""><![CDATA[Mag]]></F_MagicLab>
+    <F_ElfLab desc=""><![CDATA[Elf]]></F_ElfLab>
+    <F_GardenLab desc=""><![CDATA[Garden]]></F_GardenLab>
+    <F_PersonBtn0 desc=""><![CDATA[Visitors]]></F_PersonBtn0>
+    <F_PersonBtn1 desc=""><![CDATA[Visitors per minute]]></F_PersonBtn1>
+    <F_CoinPersonBtn0 desc=""><![CDATA[Ticket]]></F_CoinPersonBtn0>
+    <F_CoinPersonBtn1 desc=""><![CDATA[Ticket per visitor]]></F_CoinPersonBtn1>
     <Fe_BtnLab0 desc=""><![CDATA[UnlockAhead]]></Fe_BtnLab0>
     <Fe_BtnLab1 desc=""><![CDATA[Unlock]]></Fe_BtnLab1>
     <Fe_BtnLab2 desc=""><![CDATA[Upgrade]]></Fe_BtnLab2>
-    <Fe_BtnLab3 desc=""><![CDATA[Purchase]]></Fe_BtnLab3>
+    <Fe_BtnLab3 desc=""><![CDATA[Buy]]></Fe_BtnLab3>
     <Fe_BtnLab4 desc=""><![CDATA[Level]]></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>
-    <Fg_BtnLab desc=""><![CDATA[]]></Fg_BtnLab>
-    <Fg_Lab0 desc=""><![CDATA[]]></Fg_Lab0>
-    <Fg_Lab1 desc=""><![CDATA[]]></Fg_Lab1>
-    <Fg_Lab2 desc=""><![CDATA[]]></Fg_Lab2>
-    <Fg_Lab3 desc=""><![CDATA[]]></Fg_Lab3>
-    <D_QuitLab desc=""><![CDATA[]]></D_QuitLab>
-    <D_BeginLab0 desc=""><![CDATA[]]></D_BeginLab0>
-    <D_BeginLab1 desc=""><![CDATA[]]></D_BeginLab1>
-    <D_ScoreTit desc=""><![CDATA[]]></D_ScoreTit>
-    <D_StatusLab0 desc=""><![CDATA[]]></D_StatusLab0>
-    <D_StatusLab1 desc=""><![CDATA[]]></D_StatusLab1>
-    <D_StatusLab2 desc=""><![CDATA[]]></D_StatusLab2>
-    <D_StatusLab3 desc=""><![CDATA[]]></D_StatusLab3>
-    <D_PrepareLab desc=""><![CDATA[]]></D_PrepareLab>
-    <Da_Tit0 desc=""><![CDATA[]]></Da_Tit0>
-    <Da_Tit1 desc=""><![CDATA[]]></Da_Tit1>
-    <Da_Lab desc=""><![CDATA[]]></Da_Lab>
-    <Da_ScoreTit desc=""><![CDATA[]]></Da_ScoreTit>
-    <Da_QuitLab desc=""><![CDATA[]]></Da_QuitLab>
-    <Da_CancelLab desc=""><![CDATA[]]></Da_CancelLab>
-    <Da_GetAwardLab desc=""><![CDATA[]]></Da_GetAwardLab>
-    <G_Tit desc=""><![CDATA[]]></G_Tit>
-    <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>
+    <Fe_BtnLab6 desc=""><![CDATA[CD]]></Fe_BtnLab6>
+    <Fe_BtnLab7 desc=""><![CDATA[Left]]></Fe_BtnLab7>
+    <Fg_Tit desc=""><![CDATA[Alert]]></Fg_Tit>
+    <Fg_BtnLab desc=""><![CDATA[Connet]]></Fg_BtnLab>
+    <Fg_Lab0 desc=""><![CDATA[Internet required]]></Fg_Lab0>
+    <Fg_Lab1 desc=""><![CDATA[Conneting]]></Fg_Lab1>
+    <Fg_Lab2 desc=""><![CDATA[Connet successful]]></Fg_Lab2>
+    <Fg_Lab3 desc=""><![CDATA[Connet fail, please check your network]]></Fg_Lab3>
+    <D_QuitLab desc=""><![CDATA[Quit]]></D_QuitLab>
+    <D_BeginLab0 desc=""><![CDATA[Start]]></D_BeginLab0>
+    <D_BeginLab1 desc=""><![CDATA[Ready]]></D_BeginLab1>
+    <D_ScoreLab desc=""><![CDATA[Score: ]]></D_ScoreLab>
+    <D_StatusLab0 desc=""><![CDATA[Stopped]]></D_StatusLab0>
+    <D_StatusLab1 desc=""><![CDATA[Playing]]></D_StatusLab1>
+    <D_StatusLab2 desc=""><![CDATA[Paused]]></D_StatusLab2>
+    <D_StatusLab3 desc=""><![CDATA[Operation denied]]></D_StatusLab3>
+    <D_PrepareLab desc=""><![CDATA[Start]]></D_PrepareLab>
+    <Da_Tit0 desc=""><![CDATA[Quit]]></Da_Tit0>
+    <Da_Tit1 desc=""><![CDATA[Game Over]]></Da_Tit1>
+    <Da_Lab desc=""><![CDATA[You won't get these rewards if you quit the game]]></Da_Lab>
+    <Da_ScoreTit desc=""><![CDATA[Score: ]]></Da_ScoreTit>
+    <Da_QuitLab desc=""><![CDATA[Quit]]></Da_QuitLab>
+    <Da_CancelLab desc=""><![CDATA[Cancel]]></Da_CancelLab>
+    <Da_GetAwardLab desc=""><![CDATA[Get Reward]]></Da_GetAwardLab>
+    <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>
+    <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_UserTit desc=""><![CDATA[User]]></L_UserTit>
     <L_ChangeLab desc=""><![CDATA[←Not Me]]></L_ChangeLab>
     <L_AudioTit desc=""><![CDATA[Audio]]></L_AudioTit>
@@ -62,112 +62,115 @@
     <L_TraChiLab desc=""><![CDATA[繁體中文]]></L_TraChiLab>
     <L_EnglishLab desc=""><![CDATA[English]]></L_EnglishLab>
     <L_SimChiLab desc=""><![CDATA[简体中文]]></L_SimChiLab>
-    <La_Tit desc=""><![CDATA[]]></La_Tit>
-    <La_Lab0 desc=""><![CDATA[]]></La_Lab0>
-    <La_Lab1 desc=""><![CDATA[]]></La_Lab1>
-    <La_Placeholder desc=""><![CDATA[]]></La_Placeholder>
-    <Lb_Tit desc=""><![CDATA[]]></Lb_Tit>
-    <Lb_Placeholder desc=""><![CDATA[]]></Lb_Placeholder>
-    <Lb_Send0 desc=""><![CDATA[]]></Lb_Send0>
-    <Lb_Send1 desc=""><![CDATA[]]></Lb_Send1>
-    <Lb_Send2 desc=""><![CDATA[]]></Lb_Send2>
+    <La_Tit desc=""><![CDATA[Restore]]></La_Tit>
+    <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_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>
+    <Lb_Send2 desc=""><![CDATA[Content must not be empty]]></Lb_Send2>
     <M_Tit desc=""><![CDATA[Achievement]]></M_Tit>
   </UI>
   <FlowerName>
-    <Flower1 desc=""><![CDATA[PinkFlower]]></Flower1>
-    <Flower2 desc=""><![CDATA[]]></Flower2>
-    <Flower3 desc=""><![CDATA[]]></Flower3>
-    <Flower4 desc=""><![CDATA[]]></Flower4>
-    <Flower5 desc=""><![CDATA[]]></Flower5>
-    <Flower6 desc=""><![CDATA[]]></Flower6>
-    <Flower7 desc=""><![CDATA[]]></Flower7>
-    <Flower8 desc=""><![CDATA[]]></Flower8>
-    <Flower9 desc=""><![CDATA[]]></Flower9>
-    <Flower10 desc=""><![CDATA[]]></Flower10>
-    <Flower11 desc=""><![CDATA[]]></Flower11>
-    <Flower12 desc=""><![CDATA[]]></Flower12>
-    <Flower13 desc=""><![CDATA[]]></Flower13>
-    <Flower14 desc=""><![CDATA[]]></Flower14>
-    <Flower15 desc=""><![CDATA[]]></Flower15>
-    <Flower16 desc=""><![CDATA[]]></Flower16>
-    <Flower17 desc=""><![CDATA[]]></Flower17>
-    <Flower18 desc=""><![CDATA[]]></Flower18>
-    <Flower19 desc=""><![CDATA[]]></Flower19>
-    <Flower20 desc=""><![CDATA[]]></Flower20>
-    <Flower21 desc=""><![CDATA[]]></Flower21>
-    <Flower22 desc=""><![CDATA[]]></Flower22>
-    <Flower23 desc=""><![CDATA[]]></Flower23>
-    <Flower24 desc=""><![CDATA[]]></Flower24>
-    <Flower25 desc=""><![CDATA[]]></Flower25>
-    <Flower26 desc=""><![CDATA[]]></Flower26>
-    <Flower27 desc=""><![CDATA[]]></Flower27>
+    <Flower1 desc=""><![CDATA[Pink Flower]]></Flower1>
+    <Flower2 desc=""><![CDATA[Purple Flower]]></Flower2>
+    <Flower3 desc=""><![CDATA[Calliopsis(Pink)]]></Flower3>
+    <Flower4 desc=""><![CDATA[Carnation(Red)]]></Flower4>
+    <Flower5 desc=""><![CDATA[Lily of the Valley(White)]]></Flower5>
+    <Flower6 desc=""><![CDATA[Calla(White)]]></Flower6>
+    <Flower7 desc=""><![CDATA[Dandelion]]></Flower7>
+    <Flower8 desc=""><![CDATA[Morning Glory(Blue)]]></Flower8>
+    <Flower9 desc=""><![CDATA[Pansy(Purple)]]></Flower9>
+    <Flower10 desc=""><![CDATA[Clover(Pink)]]></Flower10>
+    <Flower11 desc=""><![CDATA[Sunflower]]></Flower11>
+    <Flower12 desc=""><![CDATA[Tulip(Pink)]]></Flower12>
+    <Flower13 desc=""><![CDATA[Lily(White)]]></Flower13>
+    <Flower14 desc=""><![CDATA[Gerbera Hybrida(Pink)]]></Flower14>
+    <Flower15 desc=""><![CDATA[Anthura]]></Flower15>
+    <Flower16 desc=""><![CDATA[Platycodon Grandiflorum]]></Flower16>
+    <Flower17 desc=""><![CDATA[Carnation(White)]]></Flower17>
+    <Flower18 desc=""><![CDATA[Lily of the Valley(Pink)]]></Flower18>
+    <Flower19 desc=""><![CDATA[Datura(Orange)]]></Flower19>
+    <Flower20 desc=""><![CDATA[Rose(Red)]]></Flower20>
+    <Flower21 desc=""><![CDATA[Crpress Vine]]></Flower21>
+    <Flower22 desc=""><![CDATA[Morning Glory(Purple)]]></Flower22>
+    <Flower23 desc=""><![CDATA[Corn Poppy(Red)]]></Flower23>
+    <Flower24 desc=""><![CDATA[Tulip(Yellow)]]></Flower24>
+    <Flower25 desc=""><![CDATA[Iris(Purple)]]></Flower25>
+    <Flower26 desc=""><![CDATA[China Rose(Pink)]]></Flower26>
+    <Flower27 desc=""><![CDATA[China Rose(Yellow)]]></Flower27>
   </FlowerName>
   <SkillName>
-    <Pack1 desc=""><![CDATA[]]></Pack1>
-    <Pack2 desc=""><![CDATA[]]></Pack2>
-    <Pack3 desc=""><![CDATA[]]></Pack3>
-    <Pack4 desc=""><![CDATA[]]></Pack4>
-    <Pack5 desc=""><![CDATA[]]></Pack5>
-    <Pack6 desc=""><![CDATA[]]></Pack6>
-    <Pack7 desc=""><![CDATA[]]></Pack7>
-    <Pack8 desc=""><![CDATA[]]></Pack8>
-    <Pack9 desc=""><![CDATA[]]></Pack9>
-    <Pack10 desc=""><![CDATA[]]></Pack10>
-    <Pack11 desc=""><![CDATA[]]></Pack11>
+    <Pack1 desc=""><![CDATA[Gift of Coins]]></Pack1>
+    <Pack2 desc=""><![CDATA[Gift of Heaven]]></Pack2>
+    <Pack3 desc=""><![CDATA[Gift of Flower]]></Pack3>
+    <Pack4 desc=""><![CDATA[Beginner Package]]></Pack4>
+    <Pack5 desc=""><![CDATA[Junior Package]]></Pack5>
+    <Pack6 desc=""><![CDATA[Senior Package]]></Pack6>
+    <Pack7 desc=""><![CDATA[100 Diamonds]]></Pack7>
+    <Pack8 desc=""><![CDATA[500 Diamonds(gains 50 more)]]></Pack8>
+    <Pack9 desc=""><![CDATA[2000 Diamonds(gains 500 more)]]></Pack9>
+    <Pack10 desc=""><![CDATA[6000 Diamonds(gains 600 more)]]></Pack10>
+    <Pack11 desc=""><![CDATA[10000 Diamonds(gains 2000 more)]]></Pack11>
     <Ability1 desc=""><![CDATA[Garden]]></Ability1>
-    <Ability2 desc=""><![CDATA[]]></Ability2>
-    <Ability3 desc=""><![CDATA[]]></Ability3>
-    <Ability4 desc=""><![CDATA[]]></Ability4>
-    <Ability5 desc=""><![CDATA[]]></Ability5>
-    <Ability6 desc=""><![CDATA[]]></Ability6>
-    <Ability7 desc=""><![CDATA[]]></Ability7>
-    <Ability8 desc=""><![CDATA[]]></Ability8>
-    <Ability9 desc=""><![CDATA[]]></Ability9>
-    <Ability10 desc=""><![CDATA[]]></Ability10>
-    <Ability11 desc=""><![CDATA[]]></Ability11>
-    <Ability12 desc=""><![CDATA[]]></Ability12>
-    <Ability13 desc=""><![CDATA[]]></Ability13>
-    <Ability14 desc=""><![CDATA[]]></Ability14>
-    <Skill1 desc=""><![CDATA[]]></Skill1>
-    <Skill2 desc=""><![CDATA[]]></Skill2>
-    <Skill3 desc=""><![CDATA[]]></Skill3>
-    <Skill4 desc=""><![CDATA[]]></Skill4>
-    <Skill5 desc=""><![CDATA[]]></Skill5>
-    <Skill6 desc=""><![CDATA[]]></Skill6>
-    <Skill7 desc=""><![CDATA[]]></Skill7>
+    <Ability2 desc=""><![CDATA[Rainbow]]></Ability2>
+    <Ability3 desc=""><![CDATA[Cherry Blossoms]]></Ability3>
+    <Ability4 desc=""><![CDATA[Singing Yellowbird]]></Ability4>
+    <Ability5 desc=""><![CDATA[Yellow Bee]]></Ability5>
+    <Ability6 desc=""><![CDATA[Purple Bee]]></Ability6>
+    <Ability7 desc=""><![CDATA[Blue Bee]]></Ability7>
+    <Ability8 desc=""><![CDATA[Red Bee]]></Ability8>
+    <Ability9 desc=""><![CDATA[White Bee]]></Ability9>
+    <Ability10 desc=""><![CDATA[Yellow Butterfly]]></Ability10>
+    <Ability11 desc=""><![CDATA[Purple Butterfly]]></Ability11>
+    <Ability12 desc=""><![CDATA[Blue Butterfly]]></Ability12>
+    <Ability13 desc=""><![CDATA[Red Butterfly]]></Ability13>
+    <Ability14 desc=""><![CDATA[White Butterfly]]></Ability14>
+    <Skill1 desc=""><![CDATA[Surging Crowds]]></Skill1>
+    <Skill2 desc=""><![CDATA[Magnate Big]]></Skill2>
+    <Skill3 desc=""><![CDATA[Bless of Flowers]]></Skill3>
+    <Skill4 desc=""><![CDATA[Bloomy Flowers]]></Skill4>
+    <Skill5 desc=""><![CDATA[Get free coins]]></Skill5>
+    <Skill6 desc=""><![CDATA[Get free diamonds]]></Skill6>
+    <Skill7 desc=""><![CDATA[Recharge]]></Skill7>
   </SkillName>
   <SkillDesc>
-    <Pack1 desc=""><![CDATA[]]></Pack1>
-    <Pack2 desc=""><![CDATA[]]></Pack2>
-    <Pack3 desc=""><![CDATA[]]></Pack3>
-    <Pack4 desc=""><![CDATA[]]></Pack4>
-    <Pack5 desc=""><![CDATA[]]></Pack5>
-    <Pack6 desc=""><![CDATA[]]></Pack6>
-    <Pack7 desc=""><![CDATA[]]></Pack7>
-    <Pack8 desc=""><![CDATA[]]></Pack8>
-    <Pack9 desc=""><![CDATA[]]></Pack9>
-    <Pack10 desc=""><![CDATA[]]></Pack10>
-    <Pack11 desc=""><![CDATA[]]></Pack11>
-    <Ability1 desc=""><![CDATA[Ticket is [&coin_person&][lv],Visitor is [&person&*60][lv]]]></Ability1>
-    <Ability2 desc=""><![CDATA[]]></Ability2>
-    <Ability3 desc=""><![CDATA[]]></Ability3>
-    <Ability4 desc=""><![CDATA[]]></Ability4>
-    <Ability5 desc=""><![CDATA[]]></Ability5>
-    <Ability6 desc=""><![CDATA[]]></Ability6>
-    <Ability7 desc=""><![CDATA[]]></Ability7>
-    <Ability8 desc=""><![CDATA[]]></Ability8>
-    <Ability9 desc=""><![CDATA[]]></Ability9>
-    <Ability10 desc=""><![CDATA[]]></Ability10>
-    <Ability11 desc=""><![CDATA[]]></Ability11>
-    <Ability12 desc=""><![CDATA[]]></Ability12>
-    <Ability13 desc=""><![CDATA[]]></Ability13>
-    <Ability14 desc=""><![CDATA[]]></Ability14>
-    <Skill1 desc=""><![CDATA[]]></Skill1>
-    <Skill2 desc=""><![CDATA[]]></Skill2>
-    <Skill3 desc=""><![CDATA[]]></Skill3>
-    <Skill4 desc=""><![CDATA[]]></Skill4>
-    <Skill5 desc=""><![CDATA[]]></Skill5>
-    <Skill6 desc=""><![CDATA[]]></Skill6>
+    <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
+Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack5>
+    <Pack6 desc=""><![CDATA[Get [&flower&], [&diamond&] Diamonds
+Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack6>
+    <Pack7 desc=""><![CDATA[Buy [&diamond&] Diamonds]]></Pack7>
+    <Pack8 desc=""><![CDATA[Buy [&diamond&] Diamonds]]></Pack8>
+    <Pack9 desc=""><![CDATA[Buy [&diamond&] Diamonds]]></Pack9>
+    <Pack10 desc=""><![CDATA[Buy [&diamond&] Diamonds]]></Pack10>
+    <Pack11 desc=""><![CDATA[Buy [&diamond&] Diamonds]]></Pack11>
+    <Ability1 desc=""><![CDATA[[&coin_person&][lv] Coins per Ticket,[&person&*60][lv] Visitors per minute]]></Ability1>
+    <Ability2 desc=""><![CDATA[Increase [&person&*60][lv] Visitors  per minute(permanently)]]></Ability2>
+    <Ability3 desc=""><![CDATA[Increase [&coin_person&][lv] Ticket's Coins per Visitor(permanently)]]></Ability3>
+    <Ability4 desc=""><![CDATA[Shorten Skill Cooldown Time by [&skill_cd&][lv](permanently)]]></Ability4>
+    <Ability5 desc=""><![CDATA[[&coin_person&][lv] Coins per Ticket]]></Ability5>
+    <Ability6 desc=""><![CDATA[[&coin_person&][lv] Coins per Ticket]]></Ability6>
+    <Ability7 desc=""><![CDATA[[&coin_person&][lv] Coins per Ticket]]></Ability7>
+    <Ability8 desc=""><![CDATA[[&coin_person&][lv] Coins per Ticket]]></Ability8>
+    <Ability9 desc=""><![CDATA[[&coin_person&][lv] Coins per Ticket]]></Ability9>
+    <Ability10 desc=""><![CDATA[[&coin_person&][lv] Coins per Ticket]]></Ability10>
+    <Ability11 desc=""><![CDATA[[&coin_person&][lv] Coins per Ticket]]></Ability11>
+    <Ability12 desc=""><![CDATA[[&coin_person&][lv] Coins per Ticket]]></Ability12>
+    <Ability13 desc=""><![CDATA[[&coin_person&][lv] Coins per Ticket]]></Ability13>
+    <Ability14 desc=""><![CDATA[[&coin_person&][lv] Coins per Ticket]]></Ability14>
+    <Skill1 desc=""><![CDATA[Increase [&person&*60][lv] Visitors  per minute for [&duration&/60][lv] minutes]]></Skill1>
+    <Skill2 desc=""><![CDATA[Get [&coin_once&][lv] times of Ticket's Coins immediately]]></Skill2>
+    <Skill3 desc=""><![CDATA[Increase all Coin prudoction by [&coin_person&] for [&duration&/60][lv] minutes]]></Skill3>
+    <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>
@@ -175,48 +178,75 @@
     <AchieveItem_BtnLab0 desc=""><![CDATA[Reward]]></AchieveItem_BtnLab0>
     <AchieveItem_BtnLab1 desc=""><![CDATA[Get Reward]]></AchieveItem_BtnLab1>
     <AchieveItem_BtnLab2 desc=""><![CDATA[Completed]]></AchieveItem_BtnLab2>
-    <SlotSign desc=""><![CDATA[]]></SlotSign>
+    <SlotSign desc=""><![CDATA[Locked]]></SlotSign>
   </Object>
   <Common>
-    <Confirm desc=""><![CDATA[]]></Confirm>
-    <Cancel desc=""><![CDATA[]]></Cancel>
-    <AD desc=""><![CDATA[]]></AD>
-    <Cash desc=""><![CDATA[]]></Cash>
-    <Person desc=""><![CDATA[]]></Person>
-    <CoinPerson desc=""><![CDATA[]]></CoinPerson>
-    <ShortCoin desc=""><![CDATA[]]></ShortCoin>
-    <NavigateCoin desc=""><![CDATA[]]></NavigateCoin>
-    <ShortDiamond desc=""><![CDATA[]]></ShortDiamond>
-    <NavigateDiamond desc=""><![CDATA[]]></NavigateDiamond>
-    <UnlockSlot desc=""><![CDATA[]]></UnlockSlot>
-    <QuitGame desc=""><![CDATA[]]></QuitGame>
+    <Confirm desc=""><![CDATA[Confirm]]></Confirm>
+    <Cancel desc=""><![CDATA[Cancel]]></Cancel>
+    <AD desc=""><![CDATA[Watch]]></AD>
+    <Cash desc=""><![CDATA[$]]></Cash>
+    <Person desc=""><![CDATA[Visitor]]></Person>
+    <CoinPerson desc=""><![CDATA[Ticket]]></CoinPerson>
+    <ShortCoin desc=""><![CDATA[Not enough Coins]]></ShortCoin>
+    <NavigateCoin desc=""><![CDATA[Click confirm to get Coins]]></NavigateCoin>
+    <ShortDiamond desc=""><![CDATA[Not enough Diamonds]]></ShortDiamond>
+    <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>
   </Common>
   <AchieveName>
-    <Achieve1 desc=""><![CDATA[LovelyGarden-1]]></Achieve1>
-    <Achieve2 desc=""><![CDATA[]]></Achieve2>
-    <Achieve3 desc=""><![CDATA[]]></Achieve3>
-    <Achieve4 desc=""><![CDATA[]]></Achieve4>
-    <Achieve5 desc=""><![CDATA[]]></Achieve5>
-    <Achieve6 desc=""><![CDATA[]]></Achieve6>
-    <Achieve21 desc=""><![CDATA[]]></Achieve21>
-    <Achieve22 desc=""><![CDATA[]]></Achieve22>
-    <Achieve23 desc=""><![CDATA[]]></Achieve23>
-    <Achieve24 desc=""><![CDATA[]]></Achieve24>
-    <Achieve25 desc=""><![CDATA[]]></Achieve25>
-    <Achieve26 desc=""><![CDATA[]]></Achieve26>
+    <Achieve1 desc=""><![CDATA[Lovely Garden 1]]></Achieve1>
+    <Achieve2 desc=""><![CDATA[Lovely Garden 2]]></Achieve2>
+    <Achieve3 desc=""><![CDATA[Lovely Garden 3]]></Achieve3>
+    <Achieve4 desc=""><![CDATA[Lovely Garden 4]]></Achieve4>
+    <Achieve5 desc=""><![CDATA[Lovely Garden 5]]></Achieve5>
+    <Achieve6 desc=""><![CDATA[Lovely Garden 6]]></Achieve6>
+    <Achieve21 desc=""><![CDATA[Fat Wallet 1]]></Achieve21>
+    <Achieve22 desc=""><![CDATA[Fat Wallet 2]]></Achieve22>
+    <Achieve23 desc=""><![CDATA[Fat Wallet 3]]></Achieve23>
+    <Achieve24 desc=""><![CDATA[Fat Wallet 4]]></Achieve24>
+    <Achieve25 desc=""><![CDATA[Fat Wallet 5]]></Achieve25>
+    <Achieve26 desc=""><![CDATA[Fat Wallet 6]]></Achieve26>
+    <Achieve31 desc=""><![CDATA[]]></Achieve31>
+    <Achieve41 desc=""><![CDATA[]]></Achieve41>
+    <Achieve51 desc=""><![CDATA[]]></Achieve51>
+    <Achieve61 desc=""><![CDATA[]]></Achieve61>
+    <Achieve71 desc=""><![CDATA[]]></Achieve71>
+    <Achieve81 desc=""><![CDATA[]]></Achieve81>
+    <Achieve91 desc=""><![CDATA[]]></Achieve91>
+    <Achieve101 desc=""><![CDATA[]]></Achieve101>
+    <Achieve111 desc=""><![CDATA[]]></Achieve111>
+    <Achieve121 desc=""><![CDATA[]]></Achieve121>
   </AchieveName>
   <AchieveDesc>
-    <Achieve1 desc=""><![CDATA[GardenLevel Rreach 30]]></Achieve1>
-    <Achieve2 desc=""><![CDATA[]]></Achieve2>
-    <Achieve3 desc=""><![CDATA[]]></Achieve3>
-    <Achieve4 desc=""><![CDATA[]]></Achieve4>
-    <Achieve5 desc=""><![CDATA[]]></Achieve5>
-    <Achieve6 desc=""><![CDATA[]]></Achieve6>
-    <Achieve21 desc=""><![CDATA[Possess 1000 Coin]]></Achieve21>
-    <Achieve22 desc=""><![CDATA[]]></Achieve22>
-    <Achieve23 desc=""><![CDATA[]]></Achieve23>
-    <Achieve24 desc=""><![CDATA[]]></Achieve24>
-    <Achieve25 desc=""><![CDATA[]]></Achieve25>
-    <Achieve26 desc=""><![CDATA[]]></Achieve26>
+    <Achieve1 desc=""><![CDATA[Garden Level 30]]></Achieve1>
+    <Achieve2 desc=""><![CDATA[Garden Level 50]]></Achieve2>
+    <Achieve3 desc=""><![CDATA[Garden Level 100]]></Achieve3>
+    <Achieve4 desc=""><![CDATA[Garden Level 200]]></Achieve4>
+    <Achieve5 desc=""><![CDATA[Garden Level 300]]></Achieve5>
+    <Achieve6 desc=""><![CDATA[Garden Level 400]]></Achieve6>
+    <Achieve21 desc=""><![CDATA[Own 1000 Coins]]></Achieve21>
+    <Achieve22 desc=""><![CDATA[Own 2000 Coins]]></Achieve22>
+    <Achieve23 desc=""><![CDATA[Own 3000 Coins]]></Achieve23>
+    <Achieve24 desc=""><![CDATA[Own 5000 Coins]]></Achieve24>
+    <Achieve25 desc=""><![CDATA[Own 8000 Coins]]></Achieve25>
+    <Achieve26 desc=""><![CDATA[Own 10000 Coins]]></Achieve26>
+    <Achieve31 desc=""><![CDATA[]]></Achieve31>
+    <Achieve41 desc=""><![CDATA[]]></Achieve41>
+    <Achieve51 desc=""><![CDATA[]]></Achieve51>
+    <Achieve61 desc=""><![CDATA[]]></Achieve61>
+    <Achieve71 desc=""><![CDATA[]]></Achieve71>
+    <Achieve81 desc=""><![CDATA[]]></Achieve81>
+    <Achieve91 desc=""><![CDATA[]]></Achieve91>
+    <Achieve101 desc=""><![CDATA[]]></Achieve101>
+    <Achieve111 desc=""><![CDATA[]]></Achieve111>
+    <Achieve121 desc=""><![CDATA[]]></Achieve121>
   </AchieveDesc>
+  <IAP>
+    <LoadAd desc=""><![CDATA[]]></LoadAd>
+    <IncompleteAd desc=""><![CDATA[]]></IncompleteAd>
+    <FailAd desc=""><![CDATA[]]></FailAd>
+    <PurchaseSuccess desc=""><![CDATA[]]></PurchaseSuccess>
+    <PurchaseFail desc=""><![CDATA[]]></PurchaseFail>
+  </IAP>
 </lan>

BIN
Assets/Resource/Xlsx/achieve_config.xlsx


BIN
Assets/Resource/Xlsx/language_config.xlsx


+ 2 - 0
Assets/Script/Manage/Initializer.cs

@@ -23,6 +23,8 @@ public class Initializer : MonoBehaviour
     {
         DontDestroyOnLoad(gameObject);
 
+        new ManagerIAP();
+
         ManaServer.Login(ManaData.LoginCallbackInitial);
 
         Instance = this;

+ 21 - 20
Assets/Script/Manage/ManaData.cs

@@ -23,7 +23,7 @@ public class ManaData : Regist
         {
             TotalPerson_ = value;
 
-            ManaAchieve.UpdateStatus(AchieveType.TotalPerson, FlowerCoin_);
+            ManaAchieve.UpdateStatus(AchieveType.TotalPerson, TotalPerson_);
         }
     }
     public static double ElfLevel
@@ -397,7 +397,7 @@ public class ManaData : Regist
     private void IncomeThread()
     {
         CircleTimer -= Time.deltaTime;
-
+        
         if (CircleTimer < 0)
         {
             CircleTimer = CircleTime;
@@ -405,7 +405,7 @@ public class ManaData : Regist
             NewPerson = Person * (1 + SkillPersonBuff) + SkillPerson;
             NewCoinPerson = CoinPerson + SkillCoinPerson;
 
-            TotalPerson += NewPerson;
+            TotalPerson += NewPerson * CircleTime;
 
             float temp = (NewPerson * NewCoinPerson * CircleTime) * (1 + SkillPlus);
 
@@ -616,12 +616,13 @@ public class ManaData : Regist
         List<double> dataList = Data.GetAchieveData();
 
         AdAmt = dataList[0];
+        ElfLevel = dataList[4];
         SkillAmt = dataList[1];
         SignAmt = dataList[2];
         ShareAmt = dataList[3];
-        MiniGameAmt = dataList[4];
-        FlowerCoin = dataList[5];
-        TotalPerson = dataList[6];
+        FlowerCoin = dataList[6];
+        TotalPerson = dataList[7];
+        MiniGameAmt = dataList[5];
     }
 
 
@@ -680,7 +681,7 @@ public class ManaData : Regist
     public static void RegistIncome()
     {
         double coin = 0;
-
+        
         if (FFUseList.Count > 0)
         {
             for (int i = 0; i < FFUseList.Count; i++)
@@ -700,9 +701,11 @@ public class ManaData : Regist
                 NewPerson = Person * (1 + SkillPersonBuff) + SkillPerson;
                 NewCoinPerson = CoinPerson + SkillCoinPerson;
 
+                TotalPerson += NewPerson * CircleTime;
+
                 coin += (NewPerson * NewCoinPerson * CircleTime) * (1 + SkillPlus);
             }
-
+            
             CircleTimer = (Elapse - CircleTimer) % CircleTime;
 
             for (int j = 0; j < FFCoolList.Count; j++)
@@ -735,26 +738,28 @@ public class ManaData : Regist
         Diamond = Diamond;
     }
 
-    public static bool Pay(double amt, Current current)
+    public static void Pay(string id, double amt, Current current, UnityAction callback)
     {
         if (ManaTutorial.PayExempt)
         {
-            return true;
+            callback.Invoke();
+
+            return;
         }
 
         amt = Auxiliary.ShrinkNumber(amt);
 
         if (current == Current.Free)
         {
-            return true;
+            callback.Invoke();
         }
         else if (current == Current.AD)
         {
-            return true;
+            ManagerIAP.PlayAd(callback);
         }
         else if (current == Current.Cash)
         {
-            return true;
+            ManagerIAP.Purchase(id);
         }
         else if (current == Current.Coin)
         {
@@ -762,7 +767,7 @@ public class ManaData : Regist
             {
                 Coin -= amt;
 
-                return true;
+                callback.Invoke();
             }
             else
             {
@@ -798,8 +803,6 @@ public class ManaData : Regist
                         );
                     }
                 );
-
-                return false;
             }
         }
         else if (current == Current.Diamond)
@@ -808,7 +811,7 @@ public class ManaData : Regist
             {
                 Diamond -= amt;
 
-                return true;
+                callback.Invoke();
             }
             else
             {
@@ -844,8 +847,6 @@ public class ManaData : Regist
                         );
                     }
                 );
-
-                return false;
             }
         }
         else
@@ -861,7 +862,7 @@ public class ManaData : Regist
         {
             return;
         }
-        
+
         if (ManaServer.Connect)
         {
             if (Data.GetPlayerString("ID") == "Default")

+ 2 - 2
Assets/Script/Manage/ManaGarden.cs

@@ -140,7 +140,7 @@ public class ManaGarden : Regist
 
             if (AwardTimer <= 0)
             {
-                AwardTimer = Random.Range(20, 60);
+                AwardTimer = Random.Range(5, 15);
 
                 List<Flower> spareList = new List<Flower>();
 
@@ -242,7 +242,7 @@ public class ManaGarden : Regist
         Instance = this;
 
         ElfTimer = Random.Range(0f, 30f);
-        AwardTimer = Random.Range(20f, 60f);
+        AwardTimer = Random.Range(5, 15);
 
         #region 读花朵存档
 

+ 3 - 1
Assets/Script/Manage/ManaMiniGame.cs

@@ -502,7 +502,7 @@ public class ManaMiniGame : Regist
         {
             _Score = value;
 
-            ManaReso.SetText("D_ScoreLab", _Score.ToString());
+            ManaReso.SetText("D_ScoreLab", ScoreLab + _Score.ToString());
         }
     }
     public static bool Game
@@ -631,6 +631,7 @@ public class ManaMiniGame : Regist
     public static float NewOpTime;
     public static float PanaltyTimer;
     public static float DiamondTimer;
+    public static string ScoreLab;
 
     #endregion
 
@@ -911,6 +912,7 @@ public class ManaMiniGame : Regist
             }
         }
 
+        ScoreLab = Language.GetStr("UI", "D_ScoreLab");
         TimerBk.fillAmount = 1;
         TimerLab.text = GameTime.ToString("0");
 

+ 1 - 1
Assets/Script/Manage/ManaReso.cs

@@ -264,7 +264,7 @@ public class ManaReso : Regist
     public static Transform Get(ObjType objType)
     {
         List<Transform> traList;
-
+        
         if (ObjectPool.TryGetValue(objType, out traList))
         {
             if (traList.Count > 0)

+ 1 - 1
Assets/Script/Manage/ManaServer.cs

@@ -67,7 +67,7 @@ public class ManaServer : Regist
 
     private void Update()
     {
-        if (!ManaData.InitiateComplete)
+        if (!LoginComplete)
         {
             Timer += UnityEngine.Time.fixedDeltaTime;
             

+ 3 - 3
Assets/Script/Manage/ManaUI.cs

@@ -269,13 +269,13 @@ public class ManaUI : Regist
 
         #region D
 
-        ManaReso.SetText("D_ScoreTit");
+        ManaReso.SetText("D_ScoreLab");
         ManaReso.SetText("D_BeginLab", Language.GetStr("UI", "D_BeginLab0"));
         ManaReso.SetText("D_StatusLab", Language.GetStr("UI", "D_StatusLab0"));
 
         ManaLan.Add(ManaReso.Get<Text>("Da_Lab"), new LanStr("UI", "Da_Lab"));
-        ManaLan.Add(ManaReso.Get<Text>("Da_ScoreTit"), new LanStr("UI", "Da_ScoreTit"));
         ManaLan.Add(ManaReso.Get<Text>("Da_QuitLab"), new LanStr("UI", "Da_QuitLab"));
+        ManaLan.Add(ManaReso.Get<Text>("Da_ScoreTit"), new LanStr("UI", "Da_ScoreTit"));
         ManaLan.Add(ManaReso.Get<Text>("Da_CancelLab"), new LanStr("UI", "Da_CancelLab"));
         ManaLan.Add(ManaReso.Get<Text>("Da_GetAwardLab"), new LanStr("UI", "Da_GetAwardLab"));
 
@@ -429,7 +429,7 @@ public class ManaUI : Regist
 
             ManaAudio.MusicTheme.TweenBacAudio();
 
-            ManaReso.SetText("D_ScoreTit");
+            ManaReso.SetText("D_ScoreLab");
             ManaReso.SetText("D_BeginLab", Language.GetStr("UI", "D_BeginLab0"));
             ManaReso.SetText("D_StatusLab", Language.GetStr("UI", "D_StatusLab0"));
 

+ 89 - 9
Assets/Script/Manage/ManagerIAP.cs

@@ -2,21 +2,28 @@
 
 using System.Collections;
 using System.Collections.Generic;
+using UnityEngine.Advertisements;
+using UnityEngine.Events;
 using UnityEngine.Purchasing;
 
 public class ManagerIAP : IStoreListener
 {
-	#region 变量
+    #region 变量
 
+    public static bool LoadComplete;
+    public static UnityAction AdAction;
     public static ManagerIAP Instance;
-
     public static IStoreController IStoreController;
     public static IExtensionProvider IExtensionProvider;
 
+    public static Dictionary<string, UnityAction> ProductDic = new Dictionary<string, UnityAction>();
+
     #endregion
 
     public ManagerIAP()
     {
+        InitializeAd();
+
         ConfigurationBuilder cb = ConfigurationBuilder.Instance(StandardPurchasingModule.Instance());
 
         cb.AddProduct("Test", ProductType.Consumable);
@@ -26,25 +33,98 @@ public class ManagerIAP : IStoreListener
         Instance = this;
     }
 
-    public void OnInitializeFailed(InitializationFailureReason error)
+    public static void InitializeAd()
     {
-        
+        if (Application.platform == RuntimePlatform.IPhonePlayer)
+        {
+            Advertisement.Initialize("1408492");
+        }
+        else if (Application.isMobilePlatform)
+        {
+            Advertisement.Initialize("1408493");
+        }
+        else if (Application.isEditor)
+        {
+            Advertisement.Initialize("1408493");
+        }
     }
 
-    public PurchaseProcessingResult ProcessPurchase(PurchaseEventArgs e)
+
+    public static void PlayAd(UnityAction action)
     {
-        return PurchaseProcessingResult.Complete;
+        if (Advertisement.IsReady())
+        {
+            AdAction = action;
+
+            ShowOptions showOptions = new ShowOptions();
+            showOptions.resultCallback = AdCallback;
+            
+            Advertisement.Show(showOptions);
+        }
+        else
+        {
+            Bubble.Show(null, Language.GetStr("IAP", "LoadAd"));
+            
+            if (!Advertisement.isInitialized)
+            {
+                InitializeAd();
+            }
+        }
     }
 
-    public void OnPurchaseFailed(Product i, PurchaseFailureReason p)
+    public static void Purchase(string id)
+    {
+        if (!LoadComplete)
+        {
+            Bubble.Show(null, Language.GetStr("IAP", "PurchaseFail"));
+        }
+
+        IStoreController.InitiatePurchase(id);
+    }
+
+    public static void AdCallback(ShowResult showResult)
     {
-        
+        if (showResult == ShowResult.Finished)
+        {
+            AdAction.Invoke();
+
+            ManaData.AdAmt++;
+        }
+        else if (showResult == ShowResult.Skipped)
+        {
+            Bubble.Show(null, Language.GetStr("IAP", "IncompleteAd"));
+        }
+        else if (showResult == ShowResult.Failed)
+        {
+            Bubble.Show(null, Language.GetStr("IAP", "FailAd"));
+        }
     }
 
+
+    public PurchaseProcessingResult ProcessPurchase(PurchaseEventArgs e)
+    {
+        Bubble.Show(null, Language.GetStr("IAP", "PurchaseSuccess"));
+
+        ProductDic[e.purchasedProduct.definition.id].Invoke();
+
+        return PurchaseProcessingResult.Complete;
+    }
+
+
     public void OnInitialized(IStoreController controller, IExtensionProvider extensions)
     {
+        LoadComplete = true;
         IStoreController = controller;
         IExtensionProvider = extensions;
-        Debug.Log("Initialized");
+    }
+
+    public void OnInitializeFailed(InitializationFailureReason error)
+    {
+        LoadComplete = false;
+    }
+
+    public void OnPurchaseFailed(Product i, PurchaseFailureReason p)
+    {
+        Bubble.Show(null, Language.GetStr("IAP", "PurchaseFail"));
     }
 }

+ 3 - 0
Assets/Script/Object/Flower.cs

@@ -470,6 +470,8 @@ public class Flower : ObjRoot, IPointerClickHandler
         ManaReso.GetHudText("+" + coin, Color.white, 25, ChildDic["GoldPosTra"], ManaReso.Get("A_HudParent"), true);
 
         GoldBk.SetActive(false);
+        GoldBk.GetTweenSr().InOrigin = true;
+        GoldIcon.GetTweenSr().InOrigin = true;
     }
 
     public void ShowAward()
@@ -482,6 +484,7 @@ public class Flower : ObjRoot, IPointerClickHandler
         GoldBk.TweenForSr();
         GoldIcon.TweenForSr();
 
+        
         GoldBk.MoveOffset2D
         (
             new Vector3(0, 0.5f, 0),

+ 33 - 38
Assets/Script/Object/Skill/Ability.cs

@@ -349,27 +349,25 @@ public class Ability : SkillRoot
 
     protected void Unlock()
     {
-        if (!ManaData.Pay(UnlockAmt, UnlockCur))
+        ManaData.Pay(ID, UnlockAmt, UnlockCur, () =>
         {
-            return;
-        }
+            ItemStatus = SkillStatus.Upgrade;
 
-        ItemStatus = SkillStatus.Upgrade;
+            ManaAudio.PlayClip(Clip.SkillClip);
 
-        ManaAudio.PlayClip(Clip.SkillClip);
+            Level = 1;
 
-        Level = 1;
+            if (ID == "Ability1")
+            {
+                ManaData.Level += 1;
+            }
 
-        if (ID == "Ability1")
-        {
-            ManaData.Level += 1;
-        }
-        
 
-        UseA();
-        UseB();
+            UseA();
+            UseB();
 
-        Zoom();
+            Zoom();
+        });
     }
 
     protected void OnClick()
@@ -453,34 +451,32 @@ public class Ability : SkillRoot
 
     protected void Upgrade()
     {
-        if (!ManaData.Pay(NewUpgradeAmt, UpgradeCur))
+        ManaData.Pay(ID, NewUpgradeAmt, UpgradeCur, () =>
         {
-            return;
-        }
-       
-        Level += 1;
+            Level += 1;
 
-        ManaAudio.PlayClip(Clip.SkillClip);
+            ManaAudio.PlayClip(Clip.SkillClip);
 
-        if (ID == "Ability1")
-        {
-            ManaData.Level += 1;
-        }
+            if (ID == "Ability1")
+            {
+                ManaData.Level += 1;
+            }
 
-        Annul();
+            Annul();
 
-        NewUpgradeAmt = Auxiliary.FmlParse(UpgradeFml, "a", NewUpgradeAmt.ToString());
+            NewUpgradeAmt = Auxiliary.FmlParse(UpgradeFml, "a", NewUpgradeAmt.ToString());
 
-        UpgradeValue(ref NewPerson, Person, UpgradePerson, 1);
-        UpgradeValue(ref NewSkillCD, SkillCD, UpgradeCD, 1);
-        UpgradeValue(ref NewCoinPerson, CoinPerson, UpgradePlus, 1);
+            UpgradeValue(ref NewPerson, Person, UpgradePerson, 1);
+            UpgradeValue(ref NewSkillCD, SkillCD, UpgradeCD, 1);
+            UpgradeValue(ref NewCoinPerson, CoinPerson, UpgradePlus, 1);
 
-        UpgradeValue(ref NewPlus, Plus, UpgradePlus, 1);
-        UpgradeValue(ref NewSkillCdBuff, UpgradeCD, 1);
-        UpgradeValue(ref NewPersonBuff, PersonBuff, UpgradePerson, 1);
+            UpgradeValue(ref NewPlus, Plus, UpgradePlus, 1);
+            UpgradeValue(ref NewSkillCdBuff, UpgradeCD, 1);
+            UpgradeValue(ref NewPersonBuff, PersonBuff, UpgradePerson, 1);
 
-        UseA();
-        UseB();
+            UseA();
+            UseB();
+        });
     }
 
     protected void UnlockAhead()
@@ -492,13 +488,12 @@ public class Ability : SkillRoot
             return;
         }
 
-        if (ManaData.Pay(UnlockAheadAmt, UnlockAheadCur))
+        ManaData.Pay(ID, UnlockAheadAmt, UnlockAheadCur, () =>
         {
-        ManaAudio.PlayClip(Clip.SkillClip);
-            ManaData.ElfLevel++;
+            ManaAudio.PlayClip(Clip.SkillClip);
 
             ItemStatus = SkillStatus.UnLock;
-        }
+        });
     }
 
 

+ 36 - 40
Assets/Script/Object/Skill/BigSkill.cs

@@ -361,7 +361,7 @@ public class BigSkill : Skill
 
     protected void Unlock()
     {
-        if (ManaData.Pay(UnlockAmt, UnlockCur))
+        ManaData.Pay(ID, UnlockAmt, UnlockCur, () =>
         {
             ManaAudio.PlayClip(Clip.SkillClip);
 
@@ -371,42 +371,40 @@ public class BigSkill : Skill
             Level = 1;
 
             BarBk1.material = null;
-        }
+        });
     }
 
     protected void Upgrade()
     {
-        if (!ManaData.Pay(NewUpgradeAmt, UpgradeCur))
+        ManaData.Pay(ID, NewUpgradeAmt, UpgradeCur, () =>
         {
-            return;
-        }
-
-        ManaAudio.PlayClip(Clip.SkillClip);
+            ManaAudio.PlayClip(Clip.SkillClip);
 
-        Level++;
+            Level++;
 
-        if (BarStatus == SkillStatus.Use)
-        {
-            AnnulA();
-        }
+            if (BarStatus == SkillStatus.Use)
+            {
+                AnnulA();
+            }
 
-        NewUpgradeAmt = Auxiliary.FmlParse(UpgradeFml, "a", NewUpgradeAmt.ToString());
+            NewUpgradeAmt = Auxiliary.FmlParse(UpgradeFml, "a", NewUpgradeAmt.ToString());
 
-        UpgradeValue(ref NewPlus, Plus, UpgradePlus, 1);
-        UpgradeValue(ref NewSkillCdBuff, UpgradeCD, 1);
-        UpgradeValue(ref NewPersonBuff, PersonBuff, UpgradePerson, 1);
-        UpgradeValue(ref NewCoinOnceBuff, UpgradeCoinOnce, 1);
+            UpgradeValue(ref NewPlus, Plus, UpgradePlus, 1);
+            UpgradeValue(ref NewSkillCdBuff, UpgradeCD, 1);
+            UpgradeValue(ref NewPersonBuff, PersonBuff, UpgradePerson, 1);
+            UpgradeValue(ref NewCoinOnceBuff, UpgradeCoinOnce, 1);
 
-        UpgradeValue(ref NewPerson, Person, UpgradePerson, 1);
-        UpgradeValue(ref NewSkillCD, SkillCD, UpgradeCD, 1);
-        UpgradeValue(ref NewDuration, Duration, UpgradeDuration, 1);
-        UpgradeValue(ref NewCoinOnce, CoinOnce, UpgradeCoinOnce, 1);
-        UpgradeValue(ref NewCoinPerson, CoinPerson, UpgradePlus, 1);
+            UpgradeValue(ref NewPerson, Person, UpgradePerson, 1);
+            UpgradeValue(ref NewSkillCD, SkillCD, UpgradeCD, 1);
+            UpgradeValue(ref NewDuration, Duration, UpgradeDuration, 1);
+            UpgradeValue(ref NewCoinOnce, CoinOnce, UpgradeCoinOnce, 1);
+            UpgradeValue(ref NewCoinPerson, CoinPerson, UpgradePlus, 1);
 
-        if (BarStatus == SkillStatus.Use)
-        {
-            UseA();
-        }
+            if (BarStatus == SkillStatus.Use)
+            {
+                UseA();
+            }
+        });
     }
 
 
@@ -419,25 +417,23 @@ public class BigSkill : Skill
             return;
         }
 
-        if (!ManaData.Pay(UseAmt, BuyCur))
+        ManaData.Pay(ID, UseAmt, BuyCur, () =>
         {
-            return;
-        }
-
-        ManaReso.GetLightwall();
+            ManaReso.GetLightwall();
 
-        ManaAudio.PlayClip(Clip.SkillClip);
+            ManaAudio.PlayClip(Clip.SkillClip);
 
-        ManaData.SkillAmt++;
+            ManaData.SkillAmt++;
 
-        UseTimer = NewDuration;
+            UseTimer = NewDuration;
 
-        BarStatus = SkillStatus.Use;
+            BarStatus = SkillStatus.Use;
 
-        BarLab.color = Color.blue;
+            BarLab.color = Color.blue;
 
-        UseA();
-        UseB();
+            UseA();
+            UseB();
+        });
     }
 
     protected override void UseA()
@@ -558,11 +554,11 @@ public class BigSkill : Skill
             return;
         }
 
-        if (ManaData.Pay(UnlockAheadAmt, UnlockAheadCur))
+        ManaData.Pay(ID, UnlockAheadAmt, UnlockAheadCur, () =>
         {
             ManaAudio.PlayClip(Clip.SkillClip);
 
             ItemStatus = SkillStatus.UnLock;
-        }
+        });
     }
 }

+ 14 - 10
Assets/Script/Object/Skill/Pack.cs

@@ -166,6 +166,8 @@ public class Pack : SkillRoot
         ManaLan.Add(ItemTit, new LanStr("SkillName", ID));
 
         ItemStatus = ItemStatus;
+
+        ManagerIAP.ProductDic.UniqueAdd(ID, PurchaseResult);
     }
 
     public override void UpdateStatus()
@@ -256,7 +258,7 @@ public class Pack : SkillRoot
                 "Fe_Btn",
                 () =>
                 {
-                    Buy();
+                    Purchase();
 
                     ManaReso.Get("Fe_Info").TweenBacCG();
                 }
@@ -264,19 +266,21 @@ public class Pack : SkillRoot
         }
     }
 
-    protected virtual void Buy()
+    protected void Purchase()
     {
-        if (ManaData.Pay(UseAmt, BuyCur))
-        {
-            ManaAudio.PlayClip(Clip.SkillClip);
+        ManaAudio.PlayClip(Clip.SkillClip);
 
-            ManaData.SkillAmt++;
+        ManaData.Pay(ID, UseAmt, Current.Cash, PurchaseResult);
+    }
 
-            UseA();
-            UseB();
+    protected void PurchaseResult()
+    {
+        ManaData.SkillAmt++;
 
-            Level++;
-        }
+        UseA();
+        UseB();
+
+        Level++;
     }
 
 

+ 19 - 23
Assets/Script/Object/Skill/Skill.cs

@@ -284,28 +284,26 @@ public class Skill : SkillRoot
 
     protected virtual void Buy()
     {
-        if (!ManaData.Pay(UseAmt, BuyCur))
+        ManaData.Pay(ID, UseAmt, BuyCur, () =>
         {
-            return;
-        }
-
-        ManaAudio.PlayClip(Clip.SkillClip);
+            ManaAudio.PlayClip(Clip.SkillClip);
 
-        ManaData.SkillAmt++;
+            ManaData.SkillAmt++;
 
-        UseTimer = NewDuration;
+            UseTimer = NewDuration;
 
-        if (Math.Abs(Duration) < 0.0005f)
-        {
-            ItemStatus = SkillStatus.Cool;
-        }
-        else
-        {
-            ItemStatus = SkillStatus.Use;
-        }
+            if (Math.Abs(Duration) < 0.0005f)
+            {
+                ItemStatus = SkillStatus.Cool;
+            }
+            else
+            {
+                ItemStatus = SkillStatus.Use;
+            }
 
-        UseA();
-        UseB();
+            UseA();
+            UseB();
+        });
     }
 
     protected virtual void OnClick()
@@ -380,14 +378,12 @@ public class Skill : SkillRoot
             return;
         }
 
-        if (!ManaData.Pay(UnlockAheadAmt, UnlockAheadCur))
+        ManaData.Pay(ID, UnlockAheadAmt, UnlockAheadCur, () =>
         {
-            return;
-        }
-
-        ManaAudio.PlayClip(Clip.BtnClip);
+            ManaAudio.PlayClip(Clip.BtnClip);
 
-        ItemStatus = SkillStatus.Buy;
+            ItemStatus = SkillStatus.Buy;
+        });
     }
 
 

+ 3 - 26
Assets/Script/Tool/Auxiliary.cs

@@ -102,35 +102,10 @@ public class Auxiliary : Regist
     private void Awake()
     {
         Instance = this;
-
-        Advertisement.Initialize("1408493");
-
-        new ManagerIAP();
-    }
-
-    private void TestCallback(ShowResult showResult)
-    {
-        if (showResult == ShowResult.Finished)
-        {
-            Debug.Log("Finished");
-        }
     }
 
     private void Update()
     {
-        if (Input.GetKeyDown(KeyCode.Space))
-        {
-            ManagerIAP.IStoreController.InitiatePurchase("Test1");
-
-            //if (Advertisement.IsReady() && !Advertisement.isShowing)
-            //{
-            //    ShowOptions showOptions = new ShowOptions();
-            //    showOptions.resultCallback = TestCallback;
-
-            //    Advertisement.Show(showOptions);
-            //}
-        }
-
         #region 调试
 
         //if (Input.GetKeyDown(KeyCode.P))
@@ -171,7 +146,9 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.Escape))
         {
-            Bubble.Show(Language.GetStr("Common", "QuitGame"), null, null, Application.Quit);
+            ManaMiniGame.Pause = true;
+
+            Bubble.Show(Language.GetStr("Common", "QuitGame"), null, null, Application.Quit, ()=>{ ManaMiniGame.Pause = false; });
         }
 
         #endregion

+ 4 - 4
Assets/Script/Tool/Bundle.cs

@@ -77,10 +77,10 @@ public class Bundle : Regist
         {
             ManaReso.AddAsyncLoad<ObjRoot>("Canvas",1,Folder.UI,ObjType.Canvas);
 
-            ManaReso.AddAsyncLoad<ObjRoot>("GroupA", 1, Folder.UI, ObjType.GroupA, true, true);
-            ManaReso.AddAsyncLoad<ObjRoot>("GroupB", 1, Folder.UI, ObjType.GroupB, true, true);
-            ManaReso.AddAsyncLoad<ObjRoot>("GroupC", 1, Folder.UI, ObjType.GroupC, true, true);
-            ManaReso.AddAsyncLoad<ObjRoot>("GroupD", 1, Folder.UI, ObjType.GroupD, true, true);
+            ManaReso.AddAsyncLoad<ObjRoot>("GroupA", 1, Folder.UI, ObjType.GroupA, true);
+            ManaReso.AddAsyncLoad<ObjRoot>("GroupB", 1, Folder.UI, ObjType.GroupB, true);
+            ManaReso.AddAsyncLoad<ObjRoot>("GroupC", 1, Folder.UI, ObjType.GroupC, true);
+            ManaReso.AddAsyncLoad<ObjRoot>("GroupD", 1, Folder.UI, ObjType.GroupD, true);
 
             ManaReso.AddAsyncLoad<ObjRoot>("EventSystem", 1, Folder.UI, ObjType.EventSystem);
             ManaReso.AddAsyncLoad<ObjRoot>("MainCamera", 1, Folder.UI, ObjType.MainCamera);

+ 6 - 3
Assets/Script/Tool/Data.cs

@@ -277,9 +277,10 @@ public class Data
         PlayerNode.SelectSingleNode("AchieveData").Attributes[1].Value = ManaData.SkillAmt.ToString("0");
         PlayerNode.SelectSingleNode("AchieveData").Attributes[2].Value = ManaData.SignAmt.ToString("0");
         PlayerNode.SelectSingleNode("AchieveData").Attributes[3].Value = ManaData.ShareAmt.ToString("0");
-        PlayerNode.SelectSingleNode("AchieveData").Attributes[4].Value = ManaData.MiniGameAmt.ToString("0");
-        PlayerNode.SelectSingleNode("AchieveData").Attributes[5].Value = ManaData.FlowerCoin.ToString("0");
-        PlayerNode.SelectSingleNode("AchieveData").Attributes[6].Value = ManaData.TotalPerson.ToString("0");
+        PlayerNode.SelectSingleNode("AchieveData").Attributes[4].Value = ManaData.ElfLevel.ToString("0");
+        PlayerNode.SelectSingleNode("AchieveData").Attributes[5].Value = ManaData.MiniGameAmt.ToString("0");
+        PlayerNode.SelectSingleNode("AchieveData").Attributes[6].Value = ManaData.FlowerCoin.ToString("0");
+        PlayerNode.SelectSingleNode("AchieveData").Attributes[7].Value = ManaData.TotalPerson.ToString("0");
     }
 
     private static void SavePlantList()
@@ -512,6 +513,7 @@ public class Data
         PlayerNode.SelectSingleNode("AchieveData").Attributes[4].Value = "0";
         PlayerNode.SelectSingleNode("AchieveData").Attributes[5].Value = "0";
         PlayerNode.SelectSingleNode("AchieveData").Attributes[6].Value = "0";
+        PlayerNode.SelectSingleNode("AchieveData").Attributes[7].Value = "0";
     }
 
     private static void ResetPlantList()
@@ -684,6 +686,7 @@ public class Data
         dataList.Add(double.Parse(PlayerNode.SelectSingleNode("AchieveData").Attributes[4].Value));
         dataList.Add(double.Parse(PlayerNode.SelectSingleNode("AchieveData").Attributes[5].Value));
         dataList.Add(double.Parse(PlayerNode.SelectSingleNode("AchieveData").Attributes[6].Value));
+        dataList.Add(double.Parse(PlayerNode.SelectSingleNode("AchieveData").Attributes[7].Value));
 
         return dataList;
     }

+ 16 - 3
Assets/Script/Tool/UI/Bubble.cs

@@ -36,7 +36,7 @@ public class Bubble : Regist
     }
 
 
-    public static void Show(string tit = null, string lab = null, Sprite sprite = null, UnityAction action = null)
+    public static void Show(string tit = null, string lab = null, Sprite sprite = null, UnityAction confirmAction = null, UnityAction cancelAction = null)
     {
         ManaAudio.PlayClip(Clip.BubbleClip);
 
@@ -74,7 +74,7 @@ public class Bubble : Regist
             Icon.sprite = sprite;
         }
 
-        if (action == null)
+        if (cancelAction == null && confirmAction == null)
         {
             Cancel.SetActive(false);
 
@@ -85,9 +85,22 @@ public class Bubble : Regist
             Cancel.SetActive(true);
 
             Cancel.SetButtonEvent(Close);
+            Cancel.AddButtonEvent
+            (
+                () =>
+                {
+                    ManaAudio.PlayClip(Clip.BtnClip);
+                }
+            );
+
+            if (cancelAction != null)
+            {
+                Cancel.AddButtonEvent(cancelAction);
+            }
+
 
             Confirm.SetButtonEvent(Close);
-            Confirm.AddButtonEvent(action);
+            Confirm.AddButtonEvent(confirmAction);
             Confirm.AddButtonEvent
             (
                 () =>

+ 1 - 1
Assets/Script/Tool/UI/TextPlus.cs

@@ -109,7 +109,7 @@ public class TextPlus : Text
     protected override void Awake()
     {
         base.Awake();
-
+        
         verticalOverflow = VerticalWrapMode.Overflow;
         horizontalOverflow = HorizontalWrapMode.Overflow;
     }

BIN
Assets/Test.unity


BIN
Assets/UnityAds/UnityAdsApiReference.pdf


+ 0 - 2
Assets/UnityAds/UnityAdsApiReference.pdf.meta

@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: 624a8ed4930d04bc98ded03fe4910465

BIN
Assets/UnityAds/UnityEngine.Advertisements.Android.dll


+ 0 - 57
Assets/UnityAds/UnityEngine.Advertisements.Android.dll.meta

@@ -1,57 +0,0 @@
-fileFormatVersion: 2
-guid: cad99f482ce25421196533fe02e6a13e
-PluginImporter:
-  serializedVersion: 1
-  iconMap: {}
-  executionOrder: {}
-  isPreloaded: 0
-  platformData:
-    Android:
-      enabled: 1
-      settings:
-        CPU: AnyCPU
-    Any:
-      enabled: 0
-      settings: {}
-    Editor:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-        DefaultValueInitialized: true
-        OS: AnyOS
-    Linux:
-      enabled: 0
-      settings:
-        CPU: x86
-    Linux64:
-      enabled: 0
-      settings:
-        CPU: x86_64
-    OSXIntel:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-    OSXIntel64:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-    SamsungTV:
-      enabled: 0
-      settings:
-        STV_MODEL: STANDARD_13
-    Win:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-    Win64:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-    iOS:
-      enabled: 0
-      settings:
-        CompileFlags:
-        FrameworkDependencies:
-  userData:
-  assetBundleName:
-  assetBundleVariant:

BIN
Assets/UnityAds/UnityEngine.Advertisements.Editor.dll


+ 0 - 57
Assets/UnityAds/UnityEngine.Advertisements.Editor.dll.meta

@@ -1,57 +0,0 @@
-fileFormatVersion: 2
-guid: 56921141d53fd4a5888445107b1b1286
-PluginImporter:
-  serializedVersion: 1
-  iconMap: {}
-  executionOrder: {}
-  isPreloaded: 0
-  platformData:
-    Android:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-    Any:
-      enabled: 0
-      settings: {}
-    Editor:
-      enabled: 1
-      settings:
-        CPU: AnyCPU
-        DefaultValueInitialized: true
-        OS: AnyOS
-    Linux:
-      enabled: 0
-      settings:
-        CPU: x86
-    Linux64:
-      enabled: 0
-      settings:
-        CPU: x86_64
-    OSXIntel:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-    OSXIntel64:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-    SamsungTV:
-      enabled: 0
-      settings:
-        STV_MODEL: STANDARD_13
-    Win:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-    Win64:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-    iOS:
-      enabled: 0
-      settings:
-        CompileFlags:
-        FrameworkDependencies:
-  userData:
-  assetBundleName:
-  assetBundleVariant:

BIN
Assets/UnityAds/UnityEngine.Advertisements.Unsupported.dll


+ 0 - 78
Assets/UnityAds/UnityEngine.Advertisements.Unsupported.dll.meta

@@ -1,78 +0,0 @@
-fileFormatVersion: 2
-guid: 7166c387502014892b69bef26f88b978
-PluginImporter:
-  serializedVersion: 1
-  iconMap: {}
-  executionOrder: {}
-  isPreloaded: 0
-  platformData:
-    Android:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-    Any:
-      enabled: 0
-      settings: {}
-    BlackBerry:
-      enabled: 1
-      settings: {}
-    Editor:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-        DefaultValueInitialized: true
-        OS: AnyOS
-    Linux:
-      enabled: 1
-      settings:
-        CPU: x86
-    Linux64:
-      enabled: 1
-      settings:
-        CPU: x86_64
-    LinuxUniversal:
-      enabled: 1
-      settings: {}
-    OSXIntel:
-      enabled: 1
-      settings:
-        CPU: AnyCPU
-    OSXIntel64:
-      enabled: 1
-      settings:
-        CPU: AnyCPU
-    OSXUniversal:
-      enabled: 1
-      settings: {}
-    SamsungTV:
-      enabled: 1
-      settings:
-        STV_MODEL: STANDARD_13
-    Tizen:
-      enabled: 1
-      settings: {}
-    Web:
-      enabled: 1
-      settings: {}
-    WebGL:
-      enabled: 1
-      settings: {}
-    WebStreamed:
-      enabled: 1
-      settings: {}
-    Win:
-      enabled: 1
-      settings:
-        CPU: AnyCPU
-    Win64:
-      enabled: 1
-      settings:
-        CPU: AnyCPU
-    iOS:
-      enabled: 0
-      settings:
-        CompileFlags:
-        FrameworkDependencies:
-  userData:
-  assetBundleName:
-  assetBundleVariant:

BIN
Assets/UnityAds/UnityEngine.Advertisements.iOS.dll


+ 0 - 57
Assets/UnityAds/UnityEngine.Advertisements.iOS.dll.meta

@@ -1,57 +0,0 @@
-fileFormatVersion: 2
-guid: d6f3e2ade30154a80a137e0079f66a08
-PluginImporter:
-  serializedVersion: 1
-  iconMap: {}
-  executionOrder: {}
-  isPreloaded: 0
-  platformData:
-    Android:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-    Any:
-      enabled: 0
-      settings: {}
-    Editor:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-        DefaultValueInitialized: true
-        OS: AnyOS
-    Linux:
-      enabled: 0
-      settings:
-        CPU: x86
-    Linux64:
-      enabled: 0
-      settings:
-        CPU: x86_64
-    OSXIntel:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-    OSXIntel64:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-    SamsungTV:
-      enabled: 0
-      settings:
-        STV_MODEL: STANDARD_13
-    Win:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-    Win64:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-    iOS:
-      enabled: 1
-      settings:
-        CompileFlags:
-        FrameworkDependencies: AdSupport;CoreTelephony;StoreKit;
-  userData:
-  assetBundleName:
-  assetBundleVariant:

BIN
ProjectSettings/GraphicsSettings.asset


+ 18 - 9
ToList.txt

@@ -1,19 +1,33 @@
-超时的Bug
+对象池脱离脚本
 
 ObjRoot(和其他脚本分离 Destroy掉多余的Player)
 
 ScrollRect的Locate好像有点误差(金币不够时的导航)
 
 
-开启成就
+收益控制
 
-收益减半 种花奖励时间缩短
+退出小游戏时D_StatusLab显示为进行中
+
+IAP的语言文档
+
+成就的语言文档
+
+Font Anchor Encrypt RichText OverFlow bestfit RaycastTarget 带宽优化
+
+Auxiliary中的测试按键 DisableButton的颜色
 
 
 动画
 (
 完善Stream
 
+TweenSr需要改善(alpha相乘的问题)
+
+Loop功能 Return功能
+
+Move缺少一个DestinationActive
+
 Stream进入Delay时也应该有事件
 
 TweenScale和StreamScale增加一个浮点数重载,方便统一Scale 
@@ -24,9 +38,4 @@ TweenScale
 InDestination和InOrigin也可以改用Timer,Timer清零的位置需要改变 
 
 Tween的第一帧也需要执行一次
-)
-
-
-Font Anchor Encrypt RichText OverFlow bestfit RaycastTarget 带宽优化
-
-语言文档中的多余项 Auxiliary中的测试按键 DisableButton的颜色
+)