Browse Source

Update 5.11

LiuQilin 8 years ago
parent
commit
cc4df847be
100 changed files with 661 additions and 1406 deletions
  1. 0 1
      .gitignore
  2. BIN
      .vs/MyLovelyGarden/v14/.suo
  3. 0 9
      Assets/Advertisements/Editor/Resources/Android.meta
  4. 0 1
      Assets/Advertisements/Editor/Resources/Android/builds.zip.last_extracted_md5
  5. 0 8
      Assets/Advertisements/Editor/Resources/Android/builds.zip.last_extracted_md5.meta
  6. 0 9
      Assets/Advertisements/Editor/Resources/Editor.meta
  7. BIN
      Assets/Advertisements/Editor/Resources/Editor/landscape.jpg
  8. 0 68
      Assets/Advertisements/Editor/Resources/Editor/landscape.jpg.meta
  9. BIN
      Assets/Advertisements/Editor/Resources/Editor/portrait.jpg
  10. 0 68
      Assets/Advertisements/Editor/Resources/Editor/portrait.jpg.meta
  11. BIN
      Assets/Advertisements/Editor/UnityEditor.Advertisements.dll
  12. BIN
      Assets/Advertisements/Editor/UnityEditor.Advertisements.dll.mdb
  13. 0 8
      Assets/Advertisements/Editor/UnityEditor.Advertisements.dll.mdb.meta
  14. 0 25
      Assets/Advertisements/Editor/UnityEditor.Advertisements.dll.meta
  15. 0 8
      Assets/Advertisements/Editor/UnityEditor.Advertisements.xml
  16. 0 8
      Assets/Advertisements/Editor/UnityEditor.Advertisements.xml.meta
  17. BIN
      Assets/Advertisements/Editor/UnityEditor.iOS.Extensions.Xcode.dll
  18. 0 25
      Assets/Advertisements/Editor/UnityEditor.iOS.Extensions.Xcode.dll.meta
  19. 0 670
      Assets/Advertisements/Editor/UnityEditor.iOS.Extensions.Xcode.xml
  20. 0 8
      Assets/Advertisements/Editor/UnityEditor.iOS.Extensions.Xcode.xml.meta
  21. BIN
      Assets/Advertisements/UnityEngine.Advertisements.dll
  22. BIN
      Assets/Advertisements/UnityEngine.Advertisements.dll.mdb
  23. 0 8
      Assets/Advertisements/UnityEngine.Advertisements.dll.mdb.meta
  24. 0 25
      Assets/Advertisements/UnityEngine.Advertisements.dll.meta
  25. 0 266
      Assets/Advertisements/UnityEngine.Advertisements.xml
  26. 0 8
      Assets/Advertisements/UnityEngine.Advertisements.xml.meta
  27. 0 8
      Assets/Advertisements/ivy.xml
  28. 0 8
      Assets/Advertisements/ivy.xml.meta
  29. 1 1
      Assets/Plugins.meta
  30. 1 1
      Assets/Plugins/UnityPurchasing.meta
  31. 2 2
      Assets/Plugins/UnityPurchasing/Bin.meta
  32. BIN
      Assets/Plugins/UnityPurchasing/Bin/Android/AmazonAppStore.aar
  33. 10 3
      Assets/Plugins/UnityPurchasing/Bin/Android/AmazonAppStore.aar.meta
  34. BIN
      Assets/Plugins/UnityPurchasing/Bin/Android/CloudMoolah.aar
  35. 11 3
      Assets/Plugins/UnityPurchasing/Bin/Android/CloudMoolah.aar.meta
  36. BIN
      Assets/Plugins/UnityPurchasing/Bin/Android/GoogleAIDL.aar
  37. 10 3
      Assets/Plugins/UnityPurchasing/Bin/Android/GoogleAIDL.aar.meta
  38. BIN
      Assets/Plugins/UnityPurchasing/Bin/Android/GooglePlay.aar
  39. 10 3
      Assets/Plugins/UnityPurchasing/Bin/Android/GooglePlay.aar.meta
  40. BIN
      Assets/Plugins/UnityPurchasing/Bin/Android/SamsungApps.aar
  41. 10 3
      Assets/Plugins/UnityPurchasing/Bin/Android/SamsungApps.aar.meta
  42. BIN
      Assets/Plugins/UnityPurchasing/Bin/Android/common.aar
  43. 10 3
      Assets/Plugins/UnityPurchasing/Bin/Android/common.aar.meta
  44. BIN
      Assets/Plugins/UnityPurchasing/Bin/Apple/Apple.dll
  45. BIN
      Assets/Plugins/UnityPurchasing/Bin/Apple/live/Apple.dll
  46. BIN
      Assets/Plugins/UnityPurchasing/Bin/Editor.dll
  47. 2 2
      Assets/Plugins/UnityPurchasing/Bin/Facebook.meta
  48. BIN
      Assets/Plugins/UnityPurchasing/Bin/Facebook/Facebook.dll
  49. 82 0
      Assets/Plugins/UnityPurchasing/Bin/Facebook/Facebook.dll.meta
  50. 2 2
      Assets/Plugins/UnityPurchasing/Bin/Facebook/live.meta
  51. BIN
      Assets/Plugins/UnityPurchasing/Bin/Facebook/live/Facebook.dll
  52. 79 0
      Assets/Plugins/UnityPurchasing/Bin/Facebook/live/Facebook.dll.meta
  53. BIN
      Assets/Plugins/UnityPurchasing/Bin/Purchasing.Common.dll
  54. BIN
      Assets/Plugins/UnityPurchasing/Bin/Security.dll
  55. BIN
      Assets/Plugins/UnityPurchasing/Bin/Stores.dll
  56. BIN
      Assets/Plugins/UnityPurchasing/Bin/Tizen/Tizen.dll
  57. BIN
      Assets/Plugins/UnityPurchasing/Bin/Tizen/live/Tizen.dll
  58. 4 4
      Assets/Plugins/UnityPurchasing/Bin/unitypurchasing.bundle/Contents/Info.plist
  59. 2 2
      Assets/Plugins/UnityPurchasing/Bin/unitypurchasing.bundle/Contents/MacOS.meta
  60. BIN
      Assets/Plugins/UnityPurchasing/Bin/unitypurchasing.bundle/Contents/MacOS/unitypurchasing
  61. 2 2
      Assets/Plugins/UnityPurchasing/Bin/unitypurchasing.bundle/Contents/Resources.meta
  62. 2 2
      Assets/Plugins/UnityPurchasing/Bin/unitypurchasing.bundle/Contents/Resources/en.lproj.meta
  63. 22 0
      Assets/Plugins/UnityPurchasing/Changelog.md
  64. 1 1
      Assets/Plugins/UnityPurchasing/ETag
  65. 1 1
      Assets/Plugins/UnityPurchasing/ETag.meta
  66. 1 1
      Assets/Plugins/UnityPurchasing/Resources/BillingMode.json.meta
  67. 0 1
      Assets/Plugins/UnityPurchasing/Resources/IAPProductCatalog.json
  68. 0 8
      Assets/Plugins/UnityPurchasing/Resources/IAPProductCatalog.json.meta
  69. 5 0
      Assets/Plugins/UnityPurchasing/iOS.meta
  70. 33 9
      Assets/Plugins/UnityPurchasing/script/IAPDemo.cs
  71. BIN
      Assets/Resource/Prefab/PrefabUI/GroupB.prefab
  72. BIN
      Assets/Resource/Prefab/PrefabUI/GroupD.prefab
  73. 1 1
      Assets/Resource/Shader/Timer.shader.meta
  74. 1 1
      Assets/Resource/Shader/TimerMat.mat.meta
  75. 1 1
      Assets/Resource/XML/PlayerConfig.xml
  76. 1 0
      Assets/Resource/XML/lan/ChineseSimplified.xml
  77. 6 5
      Assets/Resource/XML/lan/ChineseTraditional.xml
  78. 6 5
      Assets/Resource/XML/lan/English.xml
  79. BIN
      Assets/Resource/Xlsx/language_config.xlsx
  80. 1 1
      Assets/Script/Manage/ManaMiniGame.cs
  81. 16 4
      Assets/Script/Manage/ManaReso.cs
  82. 3 3
      Assets/Script/Manage/ManaServer.cs
  83. 9 5
      Assets/Script/Manage/ManaTutorial.cs
  84. 7 1
      Assets/Script/Manage/ManaUI.cs
  85. 24 46
      Assets/Script/Manage/ManagerIAP.cs
  86. 10 10
      Assets/Script/Object/Tutorial.cs
  87. 3 1
      Assets/Script/Tool/Auxiliary.cs
  88. 2 2
      Assets/UnityAds.meta
  89. BIN
      Assets/UnityAds/UnityAdsApiReference.pdf
  90. 2 0
      Assets/UnityAds/UnityAdsApiReference.pdf.meta
  91. BIN
      Assets/UnityAds/UnityEngine.Advertisements.Android.dll
  92. 57 0
      Assets/UnityAds/UnityEngine.Advertisements.Android.dll.meta
  93. BIN
      Assets/UnityAds/UnityEngine.Advertisements.Editor.dll
  94. 57 0
      Assets/UnityAds/UnityEngine.Advertisements.Editor.dll.meta
  95. BIN
      Assets/UnityAds/UnityEngine.Advertisements.Unsupported.dll
  96. 78 0
      Assets/UnityAds/UnityEngine.Advertisements.Unsupported.dll.meta
  97. BIN
      Assets/UnityAds/UnityEngine.Advertisements.iOS.dll
  98. 57 0
      Assets/UnityAds/UnityEngine.Advertisements.iOS.dll.meta
  99. 8 15
      MyLovelyGarden.Editor.csproj
  100. 8 9
      MyLovelyGarden.csproj

+ 0 - 1
.gitignore

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

BIN
.vs/MyLovelyGarden/v14/.suo


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

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

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

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

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

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

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

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

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


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

@@ -1,68 +0,0 @@
-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


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

@@ -1,68 +0,0 @@
-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: 

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


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


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

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

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

@@ -1,25 +0,0 @@
-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: 

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

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

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

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

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


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

@@ -1,25 +0,0 @@
-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: 

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

@@ -1,670 +0,0 @@
-<?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>

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

@@ -1,8 +0,0 @@
-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


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

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

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

@@ -1,25 +0,0 @@
-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: 

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

@@ -1,266 +0,0 @@
-<?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>

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

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

+ 0 - 8
Assets/Advertisements/ivy.xml

@@ -1,8 +0,0 @@
-<?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>

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

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

+ 1 - 1
Assets/Plugins.meta

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

+ 1 - 1
Assets/Plugins/UnityPurchasing.meta

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

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

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: 5ddd7562cc3ac4c6794335b7d2856fc6
+guid: 1432b9b0fbc00433aaf3a79d1b41c89d
 folderAsset: yes
-timeCreated: 1491846148
+timeCreated: 1494459473
 licenseType: Pro
 DefaultImporter:
   userData: 

BIN
Assets/Plugins/UnityPurchasing/Bin/Android/AmazonAppStore.aar


+ 10 - 3
Assets/Plugins/UnityPurchasing/Bin/Android/AmazonAppStore.aar.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: f2728b90e6c204b4e85463dd0ae55729
-timeCreated: 1491846157
+guid: 509a80bd0fc9a40d19edc9da425b6b02
+timeCreated: 1444211129
 licenseType: Pro
 PluginImporter:
   serializedVersion: 1
@@ -8,9 +8,16 @@ PluginImporter:
   executionOrder: {}
   isPreloaded: 0
   platformData:
-    Any:
+    Android:
       enabled: 1
       settings: {}
+    Any:
+      enabled: 0
+      settings: {}
+    Editor:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
   userData: 
   assetBundleName: 
   assetBundleVariant: 

BIN
Assets/Plugins/UnityPurchasing/Bin/Android/CloudMoolah.aar


+ 11 - 3
Assets/Plugins/UnityPurchasing/Bin/Android/CloudMoolah.aar.meta

@@ -1,16 +1,24 @@
 fileFormatVersion: 2
-guid: e5c6ef2d416104b4fabd67c45556ccc0
-timeCreated: 1491846157
+guid: 1b2e1f539bbe74d46baa369ea1ba1385
+timeCreated: 1487787625
 licenseType: Pro
 PluginImporter:
   serializedVersion: 1
   iconMap: {}
   executionOrder: {}
   isPreloaded: 0
+  isOverridable: 0
   platformData:
-    Any:
+    Android:
       enabled: 1
       settings: {}
+    Any:
+      enabled: 0
+      settings: {}
+    Editor:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
   userData: 
   assetBundleName: 
   assetBundleVariant: 

BIN
Assets/Plugins/UnityPurchasing/Bin/Android/GoogleAIDL.aar


+ 10 - 3
Assets/Plugins/UnityPurchasing/Bin/Android/GoogleAIDL.aar.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 17fbd279d0b4e44509c1ae54f6e7e80d
-timeCreated: 1491846157
+guid: db98ac102475d4252bf5bdd33412ce89
+timeCreated: 1457537878
 licenseType: Pro
 PluginImporter:
   serializedVersion: 1
@@ -8,9 +8,16 @@ PluginImporter:
   executionOrder: {}
   isPreloaded: 0
   platformData:
-    Any:
+    Android:
       enabled: 1
       settings: {}
+    Any:
+      enabled: 0
+      settings: {}
+    Editor:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
   userData: 
   assetBundleName: 
   assetBundleVariant: 

BIN
Assets/Plugins/UnityPurchasing/Bin/Android/GooglePlay.aar


+ 10 - 3
Assets/Plugins/UnityPurchasing/Bin/Android/GooglePlay.aar.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: f7281a6d3552e431290faf063556e3fe
-timeCreated: 1491846157
+guid: 98d66c1b5065d4153bd60a0654860861
+timeCreated: 1444211129
 licenseType: Pro
 PluginImporter:
   serializedVersion: 1
@@ -8,9 +8,16 @@ PluginImporter:
   executionOrder: {}
   isPreloaded: 0
   platformData:
-    Any:
+    Android:
       enabled: 1
       settings: {}
+    Any:
+      enabled: 0
+      settings: {}
+    Editor:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
   userData: 
   assetBundleName: 
   assetBundleVariant: 

BIN
Assets/Plugins/UnityPurchasing/Bin/Android/SamsungApps.aar


+ 10 - 3
Assets/Plugins/UnityPurchasing/Bin/Android/SamsungApps.aar.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 426c532d09809442bb3985e6c439ecfe
-timeCreated: 1491846157
+guid: 96d2cf26bed484e33bcc7cefc49c4611
+timeCreated: 1472509203
 licenseType: Pro
 PluginImporter:
   serializedVersion: 1
@@ -8,9 +8,16 @@ PluginImporter:
   executionOrder: {}
   isPreloaded: 0
   platformData:
-    Any:
+    Android:
       enabled: 1
       settings: {}
+    Any:
+      enabled: 0
+      settings: {}
+    Editor:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
   userData: 
   assetBundleName: 
   assetBundleVariant: 

BIN
Assets/Plugins/UnityPurchasing/Bin/Android/common.aar


+ 10 - 3
Assets/Plugins/UnityPurchasing/Bin/Android/common.aar.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: dac9d361921b545598346d53df466681
-timeCreated: 1491846157
+guid: 3419c00222876481ca0d7314c37dad87
+timeCreated: 1444211128
 licenseType: Pro
 PluginImporter:
   serializedVersion: 1
@@ -8,9 +8,16 @@ PluginImporter:
   executionOrder: {}
   isPreloaded: 0
   platformData:
-    Any:
+    Android:
       enabled: 1
       settings: {}
+    Any:
+      enabled: 0
+      settings: {}
+    Editor:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
   userData: 
   assetBundleName: 
   assetBundleVariant: 

BIN
Assets/Plugins/UnityPurchasing/Bin/Apple/Apple.dll


BIN
Assets/Plugins/UnityPurchasing/Bin/Apple/live/Apple.dll


BIN
Assets/Plugins/UnityPurchasing/Bin/Editor.dll


+ 2 - 2
Assets/Advertisements.meta → Assets/Plugins/UnityPurchasing/Bin/Facebook.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: 2f772eda1dbb58c47b256a1693b65911
+guid: 336e77a7750be46198293fb5700e1492
 folderAsset: yes
-timeCreated: 1494301205
+timeCreated: 1494459474
 licenseType: Pro
 DefaultImporter:
   userData: 

BIN
Assets/Plugins/UnityPurchasing/Bin/Facebook/Facebook.dll


+ 82 - 0
Assets/Plugins/UnityPurchasing/Bin/Facebook/Facebook.dll.meta

@@ -0,0 +1,82 @@
+fileFormatVersion: 2
+guid: 282e7a4569d314342849ac78f7305a4a
+timeCreated: 1473188566
+licenseType: Pro
+PluginImporter:
+  serializedVersion: 1
+  iconMap: {}
+  executionOrder: {}
+  isPreloaded: 0
+  platformData:
+    Android:
+      enabled: 1
+      settings:
+        CPU: AnyCPU
+    Any:
+      enabled: 1
+      settings: {}
+    Editor:
+      enabled: 1
+      settings:
+        CPU: AnyCPU
+        DefaultValueInitialized: true
+        OS: AnyOS
+    Linux:
+      enabled: 1
+      settings:
+        CPU: x86
+    Linux64:
+      enabled: 1
+      settings:
+        CPU: x86_64
+    LinuxUniversal:
+      enabled: 1
+      settings:
+        CPU: AnyCPU
+    OSXIntel:
+      enabled: 1
+      settings:
+        CPU: AnyCPU
+    OSXIntel64:
+      enabled: 1
+      settings:
+        CPU: AnyCPU
+    OSXUniversal:
+      enabled: 1
+      settings:
+        CPU: AnyCPU
+    SamsungTV:
+      enabled: 1
+      settings:
+        STV_MODEL: STANDARD_13
+    Tizen:
+      enabled: 1
+      settings: {}
+    WebGL:
+      enabled: 1
+      settings: {}
+    Win:
+      enabled: 1
+      settings:
+        CPU: AnyCPU
+    Win64:
+      enabled: 1
+      settings:
+        CPU: AnyCPU
+    WindowsStoreApps:
+      enabled: 1
+      settings:
+        CPU: AnyCPU
+    iOS:
+      enabled: 1
+      settings:
+        CompileFlags: 
+        FrameworkDependencies: 
+    tvOS:
+      enabled: 1
+      settings:
+        CompileFlags: 
+        FrameworkDependencies: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 2
Assets/Advertisements/Editor.meta → Assets/Plugins/UnityPurchasing/Bin/Facebook/live.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: 24d7daa3b096afe44acb2aeffccfe48b
+guid: 72be7065f111e4a648792a8eda126e51
 folderAsset: yes
-timeCreated: 1494301205
+timeCreated: 1494459474
 licenseType: Pro
 DefaultImporter:
   userData: 

BIN
Assets/Plugins/UnityPurchasing/Bin/Facebook/live/Facebook.dll


+ 79 - 0
Assets/Plugins/UnityPurchasing/Bin/Facebook/live/Facebook.dll.meta

@@ -0,0 +1,79 @@
+fileFormatVersion: 2
+guid: 97e43e86f5dfe4cb4a0eeee600af6b43
+timeCreated: 1473188568
+licenseType: Pro
+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: None
+    Linux64:
+      enabled: 0
+      settings:
+        CPU: None
+    LinuxUniversal:
+      enabled: 0
+      settings:
+        CPU: None
+    OSXIntel:
+      enabled: 0
+      settings:
+        CPU: None
+    OSXIntel64:
+      enabled: 0
+      settings:
+        CPU: None
+    OSXUniversal:
+      enabled: 0
+      settings:
+        CPU: None
+    SamsungTV:
+      enabled: 0
+      settings:
+        STV_MODEL: STANDARD_13
+    WebGL:
+      enabled: 0
+      settings: {}
+    Win:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+    Win64:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+    WindowsStoreApps:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+    iOS:
+      enabled: 0
+      settings:
+        CompileFlags: 
+        FrameworkDependencies: 
+    tvOS:
+      enabled: 0
+      settings:
+        CompileFlags: 
+        FrameworkDependencies: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/Plugins/UnityPurchasing/Bin/Purchasing.Common.dll


BIN
Assets/Plugins/UnityPurchasing/Bin/Security.dll


BIN
Assets/Plugins/UnityPurchasing/Bin/Stores.dll


BIN
Assets/Plugins/UnityPurchasing/Bin/Tizen/Tizen.dll


BIN
Assets/Plugins/UnityPurchasing/Bin/Tizen/live/Tizen.dll


+ 4 - 4
Assets/Plugins/UnityPurchasing/Bin/unitypurchasing.bundle/Contents/Info.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>16D32</string>
+	<string>16E195</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
@@ -47,7 +47,7 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>8E1000a</string>
+	<string>8E2002</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
@@ -55,9 +55,9 @@
 	<key>DTSDKName</key>
 	<string>macosx10.12</string>
 	<key>DTXcode</key>
-	<string>0831</string>
+	<string>0832</string>
 	<key>DTXcodeBuild</key>
-	<string>8E1000a</string>
+	<string>8E2002</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2013 Alex McAusland. All rights reserved.</string>
 </dict>

+ 2 - 2
Assets/Plugins/UnityPurchasing/Bin/unitypurchasing.bundle/Contents/MacOS.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: 8cbca56cffb104036be45ec1e8a6bcdd
+guid: 77eff1e96a9f54f269bc6a116d60ce11
 folderAsset: yes
-timeCreated: 1491846148
+timeCreated: 1494459474
 licenseType: Pro
 DefaultImporter:
   userData: 

BIN
Assets/Plugins/UnityPurchasing/Bin/unitypurchasing.bundle/Contents/MacOS/unitypurchasing


+ 2 - 2
Assets/Plugins/UnityPurchasing/Bin/unitypurchasing.bundle/Contents/Resources.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: 634f6c56a9e3b491680e59c767bc21a6
+guid: 55b14d6bb14a845c6b0783cbb202a71e
 folderAsset: yes
-timeCreated: 1491846148
+timeCreated: 1494459474
 licenseType: Pro
 DefaultImporter:
   userData: 

+ 2 - 2
Assets/Plugins/UnityPurchasing/Bin/unitypurchasing.bundle/Contents/Resources/en.lproj.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: 79b622518fe88478587c98af840f9cf6
+guid: c3de3e645b8b94838baa534f236dcf7f
 folderAsset: yes
-timeCreated: 1491846148
+timeCreated: 1494459474
 licenseType: Pro
 DefaultImporter:
   userData: 

+ 22 - 0
Assets/Plugins/UnityPurchasing/Changelog.md

@@ -1,3 +1,25 @@
+## [1.11.0] - 2017-05-01
+### Added
+- FacebookStore - Facebook Gameroom Payments Lite support. Available on Unity 5.6+ when building for Facebook Platform on Gameroom (Windows) and WebGL. Preliminary documentation is available [here](https://docs.google.com/document/d/1FaYwKvdnMHxkh47YVuXx9dMbc6ZtLX53mtgyAIn6WfU/)
+- Apple platforms - Added experimental support for setting "simulatesAskToBuyInSandbox". Please let us know how this impacts ask-to-buy testability for you.
+```csharp
+extensions.GetExtension<IAppleExtensions>().simulateAskToBuy = true;
+```
+- Apple platforms - Added support for setting "applicationUsername" field which will be added to every payment request to help the store detect fraud.
+```csharp
+// Set the applicationUsername to help Apple detect fraud
+extensions.GetExtension<IAppleExtensions>().SetApplicationUsername(hashedUsername);
+```
+
+### Requirement
+- GooglePlay - "Android SDK API Level 24 (7.0)" (or higher) must now be installed. To upgrade, either perform the one-time step of setting the project's "Android Player Settings > Other Settings > Minimum API Level" to 24, building an APK, then resetting to the project's previous value. Or, run the `android` Android SDK Manager tool manually and install "Android 7.0 (API 24)". Addresses build error messages: "Unable to merge android manifests." and "Main manifest has \<uses-sdk android:targetSdkVersion='23'> but library uses targetSdkVersion='24'". Note the Minimum API Level support is unchanged; merely the installation of API 24 SDK is now required for Daydream VR.
+
+### Fixed
+- GooglePlay Daydream VR - Uses decoration-free Activity for purchasing
+- GooglePlay - Avoids sporadic price serialization exception
+- Apple App Stores - Improve handling of the situation where an attempt to finish a transaction fails (if the user is signed out of the store and cancels the sign in dialog, for example). The Apple store implementation will now remember that the transaction should be finished, and attempt to call finishTransaction again if the transaction is retrieved from the queue again. When this happens, the store will call OnPurchaseFailed with the reason "DuplicateTransaction"—this prevents a situation where a call to InitiatePurchase could result in no call to ProcessPurchase or OnPurchaseFailed.
+- Amazon - Fix for a crash when loading product metadata for subscription parent products
+
 ## [1.10.1] - 2017-03-29
 ### Fixed
 - GooglePlay - Suspending and resuming from app-icon while purchase dialog displayed no longer generates both OnPurchaseFailed then ProcessPurchase messages, only whichever callback is correct.

+ 1 - 1
Assets/Plugins/UnityPurchasing/ETag

@@ -1 +1 @@
-"26f46597fa31235cfc86335f685056ae"
+"759c4f9870edfe53cb66f37a4d2078c4"

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

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

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

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

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

@@ -1 +0,0 @@
-{"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":[]}]}

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

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

+ 5 - 0
Assets/Plugins/UnityPurchasing/iOS.meta

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

+ 33 - 9
Assets/Plugins/UnityPurchasing/script/IAPDemo.cs

@@ -3,8 +3,10 @@
 // before receipt validation will compile in this sample.
 // #define RECEIPT_VALIDATION
 #endif
+//#define DELAY_CONFIRMATION // Returns PurchaseProcessingResult.Pending from ProcessPurchase, then calls ConfirmPendingPurchase after a delay
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
 
 using UnityEngine;
@@ -122,9 +124,6 @@ public class IAPDemo : MonoBehaviour, IStoreListener
 		m_LastReceipt = e.purchasedProduct.receipt;
 		m_PurchaseInProgress = false;
 
-		// Now that my purchase history has changed, update its UI
-		UpdateHistoryUI();
-
 		#if RECEIPT_VALIDATION
 		// Local validation is available for GooglePlay and Apple stores
 		if (m_IsGooglePlayStoreSelected ||
@@ -191,9 +190,33 @@ public class IAPDemo : MonoBehaviour, IStoreListener
 		//     m_Controller.ConfirmPendingPurchase(Product) to complete handling
 		//     this purchase. Use to transactionally save purchases to a cloud
 		//     game service. 
+#if DELAY_CONFIRMATION
+		StartCoroutine(ConfirmPendingPurchaseAfterDelay(e.purchasedProduct));
+		return PurchaseProcessingResult.Pending;
+#else
+		UpdateHistoryUI();
 		return PurchaseProcessingResult.Complete;
+#endif
 	}
 
+#if DELAY_CONFIRMATION
+	private HashSet<string> m_PendingProducts = new HashSet<string>();
+
+	private IEnumerator ConfirmPendingPurchaseAfterDelay(Product p)
+	{
+		m_PendingProducts.Add(p.definition.id);
+		Debug.Log("Delaying confirmation of " + p.definition.id + " for 5 seconds.");
+		UpdateHistoryUI();
+
+		yield return new WaitForSeconds(5f);
+
+		Debug.Log("Confirming purchase of " + p.definition.id);
+		m_Controller.ConfirmPendingPurchase(p);
+		m_PendingProducts.Remove(p.definition.id);
+		UpdateHistoryUI();
+	}
+#endif
+
 	/// <summary>
 	/// This will be called is an attempted purchase fails.
 	/// </summary>
@@ -514,14 +537,15 @@ public class IAPDemo : MonoBehaviour, IStoreListener
 		var itemText = "Item\n\n";
 		var countText = "Purchased\n\n";
 
-		for (int t = 0; t < m_Controller.products.all.Length; t++)
-		{
-			var item = m_Controller.products.all [t];
-
+		foreach (var item in m_Controller.products.all) {
 			// Collect history status report
-
 			itemText += "\n\n" + item.definition.id;
-			countText += "\n\n" + item.hasReceipt.ToString();
+			countText += "\n\n";
+#if DELAY_CONFIRMATION
+			if (m_PendingProducts.Contains(item.definition.id))
+				countText += "(Pending) ";
+#endif
+			countText += item.hasReceipt.ToString();
 		}
 
 		// Show history

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


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


+ 1 - 1
Assets/Resource/Shader/Timer.shader.meta

@@ -5,5 +5,5 @@ licenseType: Pro
 ShaderImporter:
   defaultTextures: []
   userData: 
-  assetBundleName: 
+  assetBundleName: effect
   assetBundleVariant: 

+ 1 - 1
Assets/Resource/Shader/TimerMat.mat.meta

@@ -4,5 +4,5 @@ timeCreated: 1494464712
 licenseType: Pro
 NativeFormatImporter:
   userData: 
-  assetBundleName: 
+  assetBundleName: effect
   assetBundleVariant: 

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

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

+ 1 - 0
Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -247,5 +247,6 @@
     <FailAd desc=""><![CDATA[广告播放失败]]></FailAd>
     <PurchaseSuccess desc=""><![CDATA[购买成功]]></PurchaseSuccess>
     <PurchaseFail desc=""><![CDATA[购买失败]]></PurchaseFail>
+    <UnvalidCommodity desc=""><![CDATA[该商品不存在]]></UnvalidCommodity>
   </IAP>
 </lan>

+ 6 - 5
Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -242,10 +242,11 @@
     <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>
+    <LoadAd desc=""><![CDATA[廣告加載中,請稍後再試]]></LoadAd>
+    <IncompleteAd desc=""><![CDATA[廣告沒有完整播放]]></IncompleteAd>
+    <FailAd desc=""><![CDATA[廣告播放失敗]]></FailAd>
+    <PurchaseSuccess desc=""><![CDATA[購買成功]]></PurchaseSuccess>
+    <PurchaseFail desc=""><![CDATA[購買失敗]]></PurchaseFail>
+    <UnvalidCommodity desc=""><![CDATA[該商品不存在]]></UnvalidCommodity>
   </IAP>
 </lan>

+ 6 - 5
Assets/Resource/XML/lan/English.xml

@@ -242,10 +242,11 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack6>
     <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>
+    <LoadAd desc=""><![CDATA[AD is loading,please try again later]]></LoadAd>
+    <IncompleteAd desc=""><![CDATA[AD is incomplete]]></IncompleteAd>
+    <FailAd desc=""><![CDATA[Failed to play AD]]></FailAd>
+    <PurchaseSuccess desc=""><![CDATA[Purchase success]]></PurchaseSuccess>
+    <PurchaseFail desc=""><![CDATA[Purchase failed]]></PurchaseFail>
+    <UnvalidCommodity desc=""><![CDATA[No such commodity]]></UnvalidCommodity>
   </IAP>
 </lan>

BIN
Assets/Resource/Xlsx/language_config.xlsx


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

@@ -980,7 +980,7 @@ public class ManaMiniGame : Regist
 
     public void OnApplicationPause(bool pause)
     {
-        if (pause)
+        if (!pause)
         {
             if (!ManaTutorial.TutorialA)
             {

+ 16 - 4
Assets/Script/Manage/ManaReso.cs

@@ -80,6 +80,7 @@ public class ManaReso : Regist
 {
     #region 变量
 
+    public static bool AsyncLoadLock;
     public static bool AsyncInstantiateLock;
     public static Coroutine CoroAsync;
     public static Coroutine CoroInstantiate;
@@ -938,7 +939,7 @@ public class ManaReso : Regist
     {
         while (true)
         {
-            if (RequestList.Count == 0)
+            if (RequestList.Count == 0 && !AsyncLoadLock)
             {
                 OnAsyncLoadFinish.SafeInvoke();
                 OnAsyncLoadFinish = null;
@@ -950,11 +951,22 @@ public class ManaReso : Regist
             }
             else
             {
-                if (AsyncList.Count > 0)
+                if (AsyncList.Count > 0 && !AsyncLoadLock)
                 {
-                    AsyncList[0].SafeInvoke();
+                    AsyncLoadLock = true;
 
-                    AsyncList.RemoveAt(0);
+                    Auxiliary.Instance.DelayCall
+                    (
+                        () =>
+                        {
+                            AsyncLoadLock = false;
+
+                            AsyncList[0].SafeInvoke();
+
+                            AsyncList.RemoveAt(0);
+                        },
+                        1
+                    );
 
                     yield return null;
                 }

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

@@ -70,7 +70,7 @@ public class ManaServer : Regist
         if (!LoginComplete)
         {
             Timer += UnityEngine.Time.fixedDeltaTime;
-            
+
             if (Timer >= 5)
             {
                 ManaData.LoginCallbackInitial(new JsonData());
@@ -84,7 +84,7 @@ public class ManaServer : Regist
         URLRequestData urlData = new URLRequestData();
 
         urlData.Add("u", SystemInfo.deviceUniqueIdentifier);
-        
+
         URLRequest.CreateURLRequest("https://garden.dashgame.com/index.php/home/user/login", urlData, LoginCallback + callback, URLRequest.Method.POST);
     }
 
@@ -92,7 +92,7 @@ public class ManaServer : Regist
     {
         LoginComplete = true;
 
-        if (jsonData["c"].ToJson() == "0")
+        if (jsonData.Inst_Object.ContainsKey("c") && jsonData["c"].ToJson() == "0")
         {
             Connect = true;
 

+ 9 - 5
Assets/Script/Manage/ManaTutorial.cs

@@ -99,11 +99,7 @@ public class ManaTutorial : Regist
             ManaReso.Get("PlayerBk1").CreateTweenScale(new Vector3(0.75f, 0.75f, 0.75f), new Vector3(0.9f, 0.9f, 0.9f), 1f, true, true, Curve.EaseOutQuad);
             ManaReso.Get("PlayerBk2").CreateTweenScale(new Vector3(0.75f, 0.75f, 0.75f), new Vector3(0.9f, 0.9f, 0.9f), 1f, true, true, Curve.EaseOutQuad);
             ManaReso.Get("PlayerBk3").CreateTweenScale(new Vector3(0.75f, 0.75f, 0.75f), new Vector3(0.9f, 0.9f, 0.9f), 1f, true, true, Curve.EaseOutQuad);
-            ManaReso.Get("TutorialMask").CreateTweenSr(0, 180 / 255f, 0.25f, false, true, Curve.EaseOutQuad);
-
-            ManaPlayer.PlayerPink.CreateTweenScale(new Vector3(0.9f, 0.9f, 0.9f), 1f, true, true, Curve.EaseOutQuad);
-            ManaPlayer.PlayerBlond.CreateTweenScale(new Vector3(0.9f, 0.9f, 0.9f), 1f, true, true, Curve.EaseOutQuad);
-            ManaPlayer.PlayerBrown.CreateTweenScale(new Vector3(0.9f, 0.9f, 0.9f), 1f, true, true, Curve.EaseOutQuad);
+            ManaReso.Get("TutorialMask").CreateTweenSr(0, 180 / 255f, 0.25f, true, true, Curve.EaseOutQuad);
 
             if (TutorialIndexA == 1)
             {
@@ -216,6 +212,10 @@ public class ManaTutorial : Regist
     {
         TutorialIndexA = 1;
 
+        ManaPlayer.PlayerPink.CreateTweenScale(new Vector3(0.9f, 0.9f, 0.9f), 1f, true, true, Curve.EaseOutQuad);
+        ManaPlayer.PlayerBlond.CreateTweenScale(new Vector3(0.9f, 0.9f, 0.9f), 1f, true, true, Curve.EaseOutQuad);
+        ManaPlayer.PlayerBrown.CreateTweenScale(new Vector3(0.9f, 0.9f, 0.9f), 1f, true, true, Curve.EaseOutQuad);
+
         ManaReso.Get("PlayerBk2").TweenForScale();
         ManaPlayer.PlayerBlond.TweenForScale();
 
@@ -244,6 +244,10 @@ public class ManaTutorial : Regist
                 ManaAudio.PlayClip(Clip.BtnClip);
 
 
+                ManaReso.Get("PlayerBk1").SetCollider(false);
+                ManaReso.Get("PlayerBk2").SetCollider(false);
+                ManaReso.Get("PlayerBk3").SetCollider(false);
+
                 tra.CreateTweenScale(ManaReso.Get("PlayerPosTra").localScale, 1f, true, true, Curve.EaseOutQuad);
                 tra.CreateTweenVec3D(ManaReso.Get("PlayerPosTra").position, 1f, false, true, true, Curve.EaseOutQuad);
 

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

@@ -352,7 +352,7 @@ public class ManaUI : Regist
                     {
                         ManaReso.Get<Text>("Da_FlowerLab").SetLayoutDirty();
                     },
-                    1
+                    2
                 );
             }
         );
@@ -421,6 +421,12 @@ public class ManaUI : Regist
 
         #endregion
 
+        #region D_TimerIcon
+
+        ManaReso.Get<Image>("D_TimerIcon").material = ManaReso.Load<Material>("TimerMat", Folder.Effect);
+
+        #endregion
+
         #region D_MiniGame
 
         tween = ManaReso.Get("D_MiniGame").CreateTweenCG(0, 1, 0.5f, false, true, Curve.EaseOutQuad);

+ 24 - 46
Assets/Script/Manage/ManagerIAP.cs

@@ -17,57 +17,22 @@ public class ManagerIAP : IStoreListener
     public static IStoreController IStoreController;
     public static IExtensionProvider IExtensionProvider;
 
+    public static List<string> ProductList = new List<string>();
     public static Dictionary<string, UnityAction> ProductDic = new Dictionary<string, UnityAction>();
 
     #endregion
 
     public ManagerIAP()
     {
+        InitializeAd();
+        
         ConfigurationBuilder cb = ConfigurationBuilder.Instance(StandardPurchasingModule.Instance());
-
-        //try
-        //{
-        //    ConfigurationBuilder cb = ConfigurationBuilder.Instance(StandardPurchasingModule.Instance());
-        //}
-        //catch (Exception)
-        //{
-        //    ManaDebug.Log("Debug5");
-        //}
-
-        try
-        {
-            InitializeAd();
-        }
-        catch (Exception)
-        {
-            ManaDebug.Log("Debug1");
-        }
-
-        try
-        {
-            cb = ConfigurationBuilder.Instance(StandardPurchasingModule.Instance());
-        }
-        catch (Exception)
-        {
-            ManaDebug.Log("Debug2");
-        }
-
-        try
-        {
-            if (cb == null)
-            {
-                ManaDebug.Log("Debug3");
-            }
-            else
-            {
-                UnityPurchasing.Initialize(this, cb);
-            }
-        }
-        catch (Exception)
-        {
-            ManaDebug.Log("Debug4");
-        }
-
+        
+        cb.AddProduct("Test", ProductType.Consumable);
+        ProductList.Add("Test");
+        
+        UnityPurchasing.Initialize(this, cb);
+        
         Instance = this;
     }
 
@@ -96,13 +61,13 @@ public class ManagerIAP : IStoreListener
 
             ShowOptions showOptions = new ShowOptions();
             showOptions.resultCallback = AdCallback;
-            
+
             Advertisement.Show(showOptions);
         }
         else
         {
             Bubble.Show(null, Language.GetStr("IAP", "LoadAd"));
-            
+
             if (!Advertisement.isInitialized)
             {
                 InitializeAd();
@@ -115,6 +80,15 @@ public class ManagerIAP : IStoreListener
         if (!LoadComplete)
         {
             Bubble.Show(null, Language.GetStr("IAP", "PurchaseFail"));
+
+            return;
+        }
+
+        if (!ProductList.Contains(id))
+        {
+            Bubble.Show(null, Language.GetStr("IAP", "UnvalidCommodity"));
+
+            return;
         }
 
         IStoreController.InitiatePurchase(id);
@@ -154,11 +128,15 @@ public class ManagerIAP : IStoreListener
         LoadComplete = true;
         IStoreController = controller;
         IExtensionProvider = extensions;
+        ManaDebug.Log("初始化IAP成功");
     }
 
     public void OnInitializeFailed(InitializationFailureReason error)
     {
         LoadComplete = false;
+
+        Debug.Log("初始化IAP失败");
+        ManaDebug.Log("初始化IAP失败");
     }
 
     public void OnPurchaseFailed(Product i, PurchaseFailureReason p)

+ 10 - 10
Assets/Script/Object/Tutorial.cs

@@ -176,10 +176,10 @@ public class Tutorial : Regist, IPointerClickHandler
             Vector3 offset = ManaReso.Get("PlayerBk1").position;
             offset.x = -offset.x;
             offset.y = 0;
-
-            ManaReso.Get("PlayerBk1").GetMove2D().Pause();
-            ManaReso.Get("PlayerBk2").GetMove2D().Pause();
-            ManaReso.Get("PlayerBk3").GetMove2D().Pause();
+            
+            //ManaReso.Get("PlayerBk1").GetMove2D().Pause();
+            //ManaReso.Get("PlayerBk2").GetMove2D().Pause();
+            //ManaReso.Get("PlayerBk3").GetMove2D().Pause();
 
             ManaReso.Get("PlayerBk1").MoveOffset2D(offset, 1f, false, Curve.EaseOutQuad);
             ManaReso.Get("PlayerBk2").MoveOffset2D(offset, 1f, false, Curve.EaseOutQuad);
@@ -202,9 +202,9 @@ public class Tutorial : Regist, IPointerClickHandler
             offset.x = -offset.x;
             offset.y = 0;
 
-            ManaReso.Get("PlayerBk1").GetMove2D().Pause();
-            ManaReso.Get("PlayerBk2").GetMove2D().Pause();
-            ManaReso.Get("PlayerBk3").GetMove2D().Pause();
+            //ManaReso.Get("PlayerBk1").GetMove2D().Pause();
+            //ManaReso.Get("PlayerBk2").GetMove2D().Pause();
+            //ManaReso.Get("PlayerBk3").GetMove2D().Pause();
 
             ManaReso.Get("PlayerBk1").MoveOffset2D(offset, 1f, false, Curve.EaseOutQuad);
             ManaReso.Get("PlayerBk2").MoveOffset2D(offset, 1f, false, Curve.EaseOutQuad);
@@ -227,9 +227,9 @@ public class Tutorial : Regist, IPointerClickHandler
             offset.x = -offset.x;
             offset.y = 0;
 
-            ManaReso.Get("PlayerBk1").GetMove2D().Pause();
-            ManaReso.Get("PlayerBk2").GetMove2D().Pause();
-            ManaReso.Get("PlayerBk3").GetMove2D().Pause();
+            //ManaReso.Get("PlayerBk1").GetMove2D().Pause();
+            //ManaReso.Get("PlayerBk2").GetMove2D().Pause();
+            //ManaReso.Get("PlayerBk3").GetMove2D().Pause();
 
             ManaReso.Get("PlayerBk1").MoveOffset2D(offset, 1f, false, Curve.EaseOutQuad);
             ManaReso.Get("PlayerBk2").MoveOffset2D(offset, 1f, false, Curve.EaseOutQuad);

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

@@ -280,8 +280,10 @@ public class Auxiliary : Regist
     {
         int count = 0;
 
-        if (count++ < frame)
+        while (count < frame)
         {
+            count++;
+
             yield return null;
         }
 

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

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: 8e855e813953022488d36ca7c9c47de5
+guid: 4bb139d230b49304092eea66b454005c
 folderAsset: yes
-timeCreated: 1494301205
+timeCreated: 1494485826
 licenseType: Pro
 DefaultImporter:
   userData: 

BIN
Assets/UnityAds/UnityAdsApiReference.pdf


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

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

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


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

@@ -0,0 +1,57 @@
+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


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

@@ -0,0 +1,57 @@
+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


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

@@ -0,0 +1,78 @@
+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


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

@@ -0,0 +1,57 @@
+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:

+ 8 - 15
MyLovelyGarden.Editor.csproj

@@ -27,7 +27,7 @@
     <IntermediateOutputPath>Temp\UnityVS_obj\Debug\</IntermediateOutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DefineConstants>DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_5_0;UNITY_5_5;UNITY_5;UNITY_PURCHASING;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_GENERICS;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;PLATFORM_SUPPORTS_MONO;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_SCRIPTING_NEW_CSHARP_COMPILER;UNITY_ANDROID;ENABLE_SUBSTANCE;UNITY_ANDROID_API;ENABLE_EGL;ENABLE_NETWORK;ENABLE_RUNTIME_GI;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;PLATFORM_SUPPORTS_ADS_ID;UNITY_CAN_SHOW_SPLASH_SCREEN;ENABLE_VIDEO;ENABLE_VR;ENABLE_UNITYADS_RUNTIME;UNITY_UNITYADS_API;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE</DefineConstants>
+    <DefineConstants>DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_5_0;UNITY_5_5;UNITY_5;UNITY_PURCHASING;UNITY_ANALYTICS;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_GENERICS;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;PLATFORM_SUPPORTS_MONO;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_SCRIPTING_NEW_CSHARP_COMPILER;UNITY_ANDROID;ENABLE_SUBSTANCE;UNITY_ANDROID_API;ENABLE_EGL;ENABLE_NETWORK;ENABLE_RUNTIME_GI;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;PLATFORM_SUPPORTS_ADS_ID;UNITY_CAN_SHOW_SPLASH_SCREEN;ENABLE_VIDEO;ENABLE_VR;ENABLE_UNITYADS_RUNTIME;UNITY_UNITYADS_API;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE</DefineConstants>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -37,7 +37,7 @@
     <IntermediateOutputPath>Temp\UnityVS_obj\Release\</IntermediateOutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DefineConstants>TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_5_0;UNITY_5_5;UNITY_5;UNITY_PURCHASING;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_GENERICS;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;PLATFORM_SUPPORTS_MONO;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_SCRIPTING_NEW_CSHARP_COMPILER;UNITY_ANDROID;ENABLE_SUBSTANCE;UNITY_ANDROID_API;ENABLE_EGL;ENABLE_NETWORK;ENABLE_RUNTIME_GI;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;PLATFORM_SUPPORTS_ADS_ID;UNITY_CAN_SHOW_SPLASH_SCREEN;ENABLE_VIDEO;ENABLE_VR;ENABLE_UNITYADS_RUNTIME;UNITY_UNITYADS_API;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE</DefineConstants>
+    <DefineConstants>TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_5_0;UNITY_5_5;UNITY_5;UNITY_PURCHASING;UNITY_ANALYTICS;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_GENERICS;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;PLATFORM_SUPPORTS_MONO;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_SCRIPTING_NEW_CSHARP_COMPILER;UNITY_ANDROID;ENABLE_SUBSTANCE;UNITY_ANDROID_API;ENABLE_EGL;ENABLE_NETWORK;ENABLE_RUNTIME_GI;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;PLATFORM_SUPPORTS_ADS_ID;UNITY_CAN_SHOW_SPLASH_SCREEN;ENABLE_VIDEO;ENABLE_VR;ENABLE_UNITYADS_RUNTIME;UNITY_UNITYADS_API;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE</DefineConstants>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
@@ -130,15 +130,6 @@
     <Reference Include="UnityEditor.iOS.Extensions.Common">
       <HintPath>Library\UnityAssemblies\UnityEditor.iOS.Extensions.Common.dll</HintPath>
     </Reference>
-    <Reference Include="UnityEngine.Advertisements">
-      <HintPath>Assets\Advertisements\UnityEngine.Advertisements.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEditor.Advertisements">
-      <HintPath>Assets\Advertisements\Editor\UnityEditor.Advertisements.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEditor.iOS.Extensions.Xcode">
-      <HintPath>Assets\Advertisements\Editor\UnityEditor.iOS.Extensions.Xcode.dll</HintPath>
-    </Reference>
     <Reference Include="Editor">
       <HintPath>Assets\Plugins\UnityPurchasing\Bin\Editor.dll</HintPath>
     </Reference>
@@ -154,6 +145,9 @@
     <Reference Include="Apple">
       <HintPath>Assets\Plugins\UnityPurchasing\Bin\Apple\Apple.dll</HintPath>
     </Reference>
+    <Reference Include="Facebook">
+      <HintPath>Assets\Plugins\UnityPurchasing\Bin\Facebook\Facebook.dll</HintPath>
+    </Reference>
     <Reference Include="Tizen">
       <HintPath>Assets\Plugins\UnityPurchasing\Bin\Tizen\Tizen.dll</HintPath>
     </Reference>
@@ -178,6 +172,9 @@
     <Reference Include="System.Data">
       <HintPath>Assets\Resource\Plugins\Xlsx\System.Data.dll</HintPath>
     </Reference>
+    <Reference Include="UnityEngine.Advertisements.Editor">
+      <HintPath>Assets\UnityAds\UnityEngine.Advertisements.Editor.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="MyLovelyGarden.Plugins.csproj">
@@ -203,10 +200,6 @@
     <Compile Include="Assets\Script\Editor\EditorSpriteAsste.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Assets\Advertisements\Editor\UnityEditor.Advertisements.xml" />
-    <None Include="Assets\Advertisements\Editor\UnityEditor.iOS.Extensions.Xcode.xml" />
-    <None Include="Assets\Advertisements\UnityEngine.Advertisements.xml" />
-    <None Include="Assets\Advertisements\ivy.xml" />
     <None Include="Assets\Resource\Effect\Cartoon FX\CartoonFX Readme.txt" />
     <None Include="Assets\Resource\Effect\Cartoon FX\CartoonFX Releases Notes.txt" />
     <None Include="Assets\Resource\Effect\Cartoon FX\Demo\Assets\CFX_Demo_WaterWiggle.shader" />

+ 8 - 9
MyLovelyGarden.csproj

@@ -27,7 +27,7 @@
     <IntermediateOutputPath>Temp\UnityVS_obj\Debug\</IntermediateOutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DefineConstants>DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_5_0;UNITY_5_5;UNITY_5;UNITY_PURCHASING;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_GENERICS;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;PLATFORM_SUPPORTS_MONO;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_SCRIPTING_NEW_CSHARP_COMPILER;UNITY_ANDROID;ENABLE_SUBSTANCE;UNITY_ANDROID_API;ENABLE_EGL;ENABLE_NETWORK;ENABLE_RUNTIME_GI;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;PLATFORM_SUPPORTS_ADS_ID;UNITY_CAN_SHOW_SPLASH_SCREEN;ENABLE_VIDEO;ENABLE_VR;ENABLE_UNITYADS_RUNTIME;UNITY_UNITYADS_API;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE</DefineConstants>
+    <DefineConstants>DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_5_0;UNITY_5_5;UNITY_5;UNITY_PURCHASING;UNITY_ANALYTICS;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_GENERICS;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;PLATFORM_SUPPORTS_MONO;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_SCRIPTING_NEW_CSHARP_COMPILER;UNITY_ANDROID;ENABLE_SUBSTANCE;UNITY_ANDROID_API;ENABLE_EGL;ENABLE_NETWORK;ENABLE_RUNTIME_GI;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;PLATFORM_SUPPORTS_ADS_ID;UNITY_CAN_SHOW_SPLASH_SCREEN;ENABLE_VIDEO;ENABLE_VR;ENABLE_UNITYADS_RUNTIME;UNITY_UNITYADS_API;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE</DefineConstants>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -37,7 +37,7 @@
     <IntermediateOutputPath>Temp\UnityVS_obj\Release\</IntermediateOutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DefineConstants>TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_5_0;UNITY_5_5;UNITY_5;UNITY_PURCHASING;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_GENERICS;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;PLATFORM_SUPPORTS_MONO;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_SCRIPTING_NEW_CSHARP_COMPILER;UNITY_ANDROID;ENABLE_SUBSTANCE;UNITY_ANDROID_API;ENABLE_EGL;ENABLE_NETWORK;ENABLE_RUNTIME_GI;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;PLATFORM_SUPPORTS_ADS_ID;UNITY_CAN_SHOW_SPLASH_SCREEN;ENABLE_VIDEO;ENABLE_VR;ENABLE_UNITYADS_RUNTIME;UNITY_UNITYADS_API;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE</DefineConstants>
+    <DefineConstants>TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_5_0;UNITY_5_5;UNITY_5;UNITY_PURCHASING;UNITY_ANALYTICS;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_GENERICS;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;PLATFORM_SUPPORTS_MONO;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_SCRIPTING_NEW_CSHARP_COMPILER;UNITY_ANDROID;ENABLE_SUBSTANCE;UNITY_ANDROID_API;ENABLE_EGL;ENABLE_NETWORK;ENABLE_RUNTIME_GI;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;PLATFORM_SUPPORTS_ADS_ID;UNITY_CAN_SHOW_SPLASH_SCREEN;ENABLE_VIDEO;ENABLE_VR;ENABLE_UNITYADS_RUNTIME;UNITY_UNITYADS_API;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE</DefineConstants>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
@@ -82,9 +82,6 @@
     <Reference Include="UnityEditor.iOS.Extensions.Common">
       <HintPath>Library\UnityAssemblies\UnityEditor.iOS.Extensions.Common.dll</HintPath>
     </Reference>
-    <Reference Include="UnityEngine.Advertisements">
-      <HintPath>Assets\Advertisements\UnityEngine.Advertisements.dll</HintPath>
-    </Reference>
     <Reference Include="Editor">
       <HintPath>Assets\Plugins\UnityPurchasing\Bin\Editor.dll</HintPath>
     </Reference>
@@ -100,6 +97,9 @@
     <Reference Include="Apple">
       <HintPath>Assets\Plugins\UnityPurchasing\Bin\Apple\Apple.dll</HintPath>
     </Reference>
+    <Reference Include="Facebook">
+      <HintPath>Assets\Plugins\UnityPurchasing\Bin\Facebook\Facebook.dll</HintPath>
+    </Reference>
     <Reference Include="Tizen">
       <HintPath>Assets\Plugins\UnityPurchasing\Bin\Tizen\Tizen.dll</HintPath>
     </Reference>
@@ -121,6 +121,9 @@
     <Reference Include="System.Data">
       <HintPath>Assets\Resource\Plugins\Xlsx\System.Data.dll</HintPath>
     </Reference>
+    <Reference Include="UnityEngine.Advertisements.Editor">
+      <HintPath>Assets\UnityAds\UnityEngine.Advertisements.Editor.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="MyLovelyGarden.Plugins.csproj">
@@ -255,10 +258,6 @@
     <Compile Include="Assets\Script\Utils\StringUtil.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Assets\Advertisements\Editor\UnityEditor.Advertisements.xml" />
-    <None Include="Assets\Advertisements\Editor\UnityEditor.iOS.Extensions.Xcode.xml" />
-    <None Include="Assets\Advertisements\UnityEngine.Advertisements.xml" />
-    <None Include="Assets\Advertisements\ivy.xml" />
     <None Include="Assets\Resource\Effect\Cartoon FX\CartoonFX Readme.txt" />
     <None Include="Assets\Resource\Effect\Cartoon FX\CartoonFX Releases Notes.txt" />
     <None Include="Assets\Resource\Effect\Cartoon FX\Demo\Assets\CFX_Demo_WaterWiggle.shader" />

Some files were not shown because too many files changed in this diff