瀏覽代碼

Update 6.8

LiuQilin 8 年之前
父節點
當前提交
07bf75dd68
共有 93 個文件被更改,包括 453 次插入624 次删除
  1. 二進制
      .vs/MyLovelyGarden/v14/.suo
  2. 0 8
      Assets/Advertisements/Editor/Resources/Android/builds.zip.meta
  3. 0 9
      Assets/Advertisements/Editor/Resources/iOS.meta
  4. 2 2
      Assets/Extension.meta
  5. 0 7
      Assets/Plugins/ShareSDK/iOS.meta
  6. 2 56
      Assets/Plugins/UnityPurchasing/Bin/Facebook/live/Facebook.dll.meta
  7. 52 11
      Assets/Plugins/UnityPurchasing/Icons/UnityEngine.Purchasing.IAPButtonIcon.png.meta
  8. 7 7
      Assets/Resource/Mobile/ICON2.png.meta
  9. 二進制
      Assets/Resource/Prefab/Object/DebugMode.prefab
  10. 1 1
      Assets/Resource/Prefab/Object/Star.prefab.meta
  11. 二進制
      Assets/Resource/Prefab/PrefabUI/GroupA.prefab
  12. 6 6
      Assets/Resource/Sprite/Garden/描边1.png.meta
  13. 6 6
      Assets/Resource/Sprite/Garden/提示图标底板.png.meta
  14. 6 6
      Assets/Resource/Sprite/Garden/未开垦图标.png.meta
  15. 6 6
      Assets/Resource/Sprite/Garden/种花光效1.png.meta
  16. 1 1
      Assets/Resource/Sprite/Logo/LOGO0001.png.meta
  17. 1 1
      Assets/Resource/Sprite/Logo/LOGO0003.png.meta
  18. 1 1
      Assets/Resource/Sprite/Logo/LOGO0004.png.meta
  19. 1 1
      Assets/Resource/Sprite/Logo/LOGO0005.png.meta
  20. 1 1
      Assets/Resource/Sprite/Logo/LOGO0006.png.meta
  21. 1 1
      Assets/Resource/Sprite/Logo/LOGO0007.png.meta
  22. 1 1
      Assets/Resource/Sprite/Logo/LOGO0008.png.meta
  23. 1 1
      Assets/Resource/Sprite/Logo/LOGO0009.png.meta
  24. 1 1
      Assets/Resource/Sprite/Logo/LOGO0010.png.meta
  25. 1 1
      Assets/Resource/Sprite/Logo/LOGO0011.png.meta
  26. 1 1
      Assets/Resource/Sprite/Logo/LOGO0012.png.meta
  27. 1 1
      Assets/Resource/Sprite/Logo/LOGO0013.png.meta
  28. 1 1
      Assets/Resource/Sprite/Logo/LOGO0028.png.meta
  29. 1 1
      Assets/Resource/Sprite/Logo/LOGO0029.png.meta
  30. 1 1
      Assets/Resource/Sprite/Logo/LOGO0030.png.meta
  31. 1 1
      Assets/Resource/Sprite/Logo/LOGO0031.png.meta
  32. 1 1
      Assets/Resource/Sprite/Logo/LOGO0032.png.meta
  33. 1 1
      Assets/Resource/Sprite/Logo/LOGO0033.png.meta
  34. 1 1
      Assets/Resource/Sprite/Logo/LOGO0034.png.meta
  35. 1 1
      Assets/Resource/Sprite/Logo/LOGO0035.png.meta
  36. 1 1
      Assets/Resource/Sprite/Logo/LOGO0036.png.meta
  37. 1 1
      Assets/Resource/Sprite/Logo/LOGO0037.png.meta
  38. 1 1
      Assets/Resource/Sprite/Logo/LOGO0038.png.meta
  39. 1 1
      Assets/Resource/Sprite/Logo/LOGO0039.png.meta
  40. 1 1
      Assets/Resource/Sprite/Logo/LOGO0041.png.meta
  41. 33 1
      Assets/Resource/Sprite/Reference/参考.jpg.meta
  42. 3 3
      Assets/Resource/Sprite/SpriteUI/Fertilize.png.meta
  43. 二進制
      Assets/Resource/Sprite/SpriteUI/Skill/红-灌木.png
  44. 0 116
      Assets/Resource/Sprite/SpriteUI/Skill/红-灌木.png.meta
  45. 6 6
      Assets/Resource/Sprite/SpriteUI/Wheel.png.meta
  46. 6 6
      Assets/Resource/Sprite/SpriteUI/全部收回按钮.png.meta
  47. 7 7
      Assets/Resource/Sprite/SpriteUI/商店大背景.png.meta
  48. 6 6
      Assets/Resource/Sprite/SpriteUI/商店按钮.png.meta
  49. 9 9
      Assets/Resource/Sprite/SpriteUI/大底板.png.meta
  50. 二進制
      Assets/Resource/Sprite/SpriteUI/左箭头.png
  51. 0 100
      Assets/Resource/Sprite/SpriteUI/左箭头.png.meta
  52. 6 6
      Assets/Resource/Sprite/SpriteUI/快来打理花园对话框.png.meta
  53. 6 6
      Assets/Resource/Sprite/SpriteUI/技能地白底板.png.meta
  54. 6 6
      Assets/Resource/Sprite/SpriteUI/技能花费.png.meta
  55. 6 6
      Assets/Resource/Sprite/SpriteUI/按钮正常花.png.meta
  56. 6 6
      Assets/Resource/Sprite/SpriteUI/放花框子.png.meta
  57. 7 7
      Assets/Resource/Sprite/SpriteUI/游戏界面.png.meta
  58. 6 6
      Assets/Resource/Sprite/SpriteUI/游戏等级评分.png.meta
  59. 6 6
      Assets/Resource/Sprite/SpriteUI/特殊花朵.png.meta
  60. 6 6
      Assets/Resource/Sprite/SpriteUI/签到框.png.meta
  61. 6 6
      Assets/Resource/Sprite/SpriteUI/精灵按钮.png.meta
  62. 6 6
      Assets/Resource/Sprite/SpriteUI/花园按钮.png.meta
  63. 6 6
      Assets/Resource/Sprite/SpriteUI/通用界面.png.meta
  64. 6 6
      Assets/Resource/Sprite/SpriteUI/领取按钮.png.meta
  65. 6 6
      Assets/Resource/Sprite/SpriteUI/领取物品发光转动.png.meta
  66. 5 5
      Assets/Resource/Sprite/SpriteUI/魔法按钮.png.meta
  67. 1 1
      Assets/Resource/XML/Config/award_config.xml
  68. 2 2
      Assets/Resource/XML/PlayerConfig.xml
  69. 6 0
      Assets/Resource/XML/lan/ChineseSimplified.xml
  70. 6 0
      Assets/Resource/XML/lan/ChineseTraditional.xml
  71. 6 0
      Assets/Resource/XML/lan/English.xml
  72. 二進制
      Assets/Resource/Xlsx/language_config.xlsx
  73. 3 0
      Assets/Script/Manage/ManaCenter.cs
  74. 6 5
      Assets/Script/Manage/ManaGarden.cs
  75. 4 23
      Assets/Script/Manage/ManaIAP.cs
  76. 9 2
      Assets/Script/Manage/ManaMiniGame.cs
  77. 6 3
      Assets/Script/Manage/ManaReso.cs
  78. 13 2
      Assets/Script/Manage/ManaServer.cs
  79. 8 14
      Assets/Script/Manage/ManaTutorial.cs
  80. 1 4
      Assets/Script/Manage/ManaVisit.cs
  81. 0 3
      Assets/Script/Object/Skill/Ability.cs
  82. 24 14
      Assets/Script/Object/Skill/BigSkill.cs
  83. 3 3
      Assets/Script/Object/Skill/Skill.cs
  84. 2 1
      Assets/Script/Object/Slot.cs
  85. 0 12
      Assets/Script/Tool/Auxiliary.cs
  86. 44 0
      Assets/Script/Tool/DashGame/Language.cs
  87. 3 2
      Assets/Script/Tool/DashGame/Logo.cs
  88. 3 3
      MyLovelyGarden.Editor.csproj
  89. 4 3
      MyLovelyGarden.csproj
  90. 23 26
      MyLovelyGarden.sln
  91. 二進制
      ProjectSettings/GraphicsSettings.asset
  92. 二進制
      ProjectSettings/UnityConnectSettings.asset
  93. 3 7
      ToList.txt

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


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

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

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

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

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

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: 8d2d384f78b29a44a9c70c3daf45d1cb
+guid: b948198483a8b93419206e81215060f3
 folderAsset: yes
-timeCreated: 1494301205
+timeCreated: 1496150477
 licenseType: Pro
 DefaultImporter:
   userData: 

+ 0 - 7
Assets/Plugins/ShareSDK/iOS.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: db9454787e4284fa9899244d3663dcd4
-folderAsset: yes
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 2 - 56
Assets/Plugins/UnityPurchasing/Bin/Facebook/live/Facebook.dll.meta

@@ -1,79 +1,25 @@
 fileFormatVersion: 2
 guid: 97e43e86f5dfe4cb4a0eeee600af6b43
-timeCreated: 1473188568
+timeCreated: 1496885064
 licenseType: Pro
 PluginImporter:
   serializedVersion: 1
   iconMap: {}
   executionOrder: {}
   isPreloaded: 0
+  isOverridable: 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: 

+ 52 - 11
Assets/Plugins/UnityPurchasing/Icons/UnityEngine.Purchasing.IAPButtonIcon.png.meta

@@ -1,15 +1,15 @@
 fileFormatVersion: 2
 guid: 55e457740fe60405dac77af143e1a867
-timeCreated: 1479509804
-licenseType: Free
+timeCreated: 1496894042
+licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
-  serializedVersion: 2
+  serializedVersion: 4
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
+    sRGBTexture: 1
     linearTexture: 0
-    correctGamma: 0
     fadeOut: 0
     borderMipMap: 0
     mipMapFadeDistanceStart: 1
@@ -21,10 +21,8 @@ TextureImporter:
     normalMapFilter: 0
   isReadable: 0
   grayScaleToAlpha: 0
-  generateCubemap: 0
+  generateCubemap: 6
   cubemapConvolution: 0
-  cubemapConvolutionSteps: 7
-  cubemapConvolutionExponent: 1.5
   seamlessCubemap: 0
   textureFormat: -1
   maxTextureSize: 2048
@@ -35,9 +33,7 @@ TextureImporter:
     wrapMode: -1
   nPOTScale: 1
   lightmap: 0
-  rGBM: 0
   compressionQuality: 50
-  allowsAlphaSplitting: 0
   spriteMode: 0
   spriteExtrude: 1
   spriteMeshType: 1
@@ -45,10 +41,55 @@ TextureImporter:
   spritePivot: {x: 0.5, y: 0.5}
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spritePixelsToUnits: 100
+  alphaUsage: 1
   alphaIsTransparency: 0
   spriteTessellationDetail: -1
-  textureType: -1
-  buildTargetSettings: []
+  textureType: 0
+  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
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: iPhone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: WebGL
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 7 - 7
Assets/Resource/Mobile/ICON2.png.meta

@@ -60,28 +60,28 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
-    textureFormat: 12
+    textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 1
+    overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
-    textureFormat: 33
+    textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 1
+    overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
-    textureFormat: 47
+    textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 1
+    overridden: 0
   - buildTarget: WebGL
     maxTextureSize: 2048
     textureFormat: -1
@@ -112,5 +112,5 @@ TextureImporter:
     outline: []
   spritePackingTag: 
   userData: 
-  assetBundleName: ui
+  assetBundleName: 
   assetBundleVariant: 

二進制
Assets/Resource/Prefab/Object/DebugMode.prefab


+ 1 - 1
Assets/Resource/Prefab/Object/Star.prefab.meta

@@ -4,5 +4,5 @@ timeCreated: 1496825084
 licenseType: Pro
 NativeFormatImporter:
   userData: 
-  assetBundleName: scene
+  assetBundleName: ui
   assetBundleVariant: 

二進制
Assets/Resource/Prefab/PrefabUI/GroupA.prefab


+ 6 - 6
Assets/Resource/Sprite/Garden/描边1.png.meta

@@ -67,21 +67,21 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
   - buildTarget: iPhone
-    maxTextureSize: 2048
-    textureFormat: -1
+    maxTextureSize: 256
+    textureFormat: 33
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: Android
-    maxTextureSize: 2048
-    textureFormat: -1
+    maxTextureSize: 256
+    textureFormat: 47
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: WebGL
     maxTextureSize: 2048
     textureFormat: -1

+ 6 - 6
Assets/Resource/Sprite/Garden/提示图标底板.png.meta

@@ -67,21 +67,21 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
   - buildTarget: iPhone
-    maxTextureSize: 2048
-    textureFormat: -1
+    maxTextureSize: 256
+    textureFormat: 33
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: Android
-    maxTextureSize: 2048
-    textureFormat: -1
+    maxTextureSize: 256
+    textureFormat: 47
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: WebGL
     maxTextureSize: 2048
     textureFormat: -1

+ 6 - 6
Assets/Resource/Sprite/Garden/未开垦图标.png.meta

@@ -67,21 +67,21 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
   - buildTarget: iPhone
-    maxTextureSize: 2048
-    textureFormat: -1
+    maxTextureSize: 256
+    textureFormat: 33
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: Android
-    maxTextureSize: 2048
-    textureFormat: -1
+    maxTextureSize: 256
+    textureFormat: 47
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: WebGL
     maxTextureSize: 2048
     textureFormat: -1

+ 6 - 6
Assets/Resource/Sprite/Garden/种花光效1.png.meta

@@ -67,21 +67,21 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
   - buildTarget: iPhone
-    maxTextureSize: 2048
-    textureFormat: -1
+    maxTextureSize: 256
+    textureFormat: 33
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: Android
-    maxTextureSize: 2048
-    textureFormat: -1
+    maxTextureSize: 256
+    textureFormat: 47
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: WebGL
     maxTextureSize: 2048
     textureFormat: -1

+ 1 - 1
Assets/Resource/Sprite/Logo/LOGO0001.png.meta

@@ -93,7 +93,7 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
-  spritePackingTag: 
+  spritePackingTag: Logo
   userData: 
   assetBundleName: 
   assetBundleVariant: 

+ 1 - 1
Assets/Resource/Sprite/Logo/LOGO0003.png.meta

@@ -93,7 +93,7 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
-  spritePackingTag: 
+  spritePackingTag: Logo
   userData: 
   assetBundleName: 
   assetBundleVariant: 

+ 1 - 1
Assets/Resource/Sprite/Logo/LOGO0004.png.meta

@@ -93,7 +93,7 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
-  spritePackingTag: 
+  spritePackingTag: Logo
   userData: 
   assetBundleName: 
   assetBundleVariant: 

+ 1 - 1
Assets/Resource/Sprite/Logo/LOGO0005.png.meta

@@ -93,7 +93,7 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
-  spritePackingTag: 
+  spritePackingTag: Logo
   userData: 
   assetBundleName: 
   assetBundleVariant: 

+ 1 - 1
Assets/Resource/Sprite/Logo/LOGO0006.png.meta

@@ -93,7 +93,7 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
-  spritePackingTag: 
+  spritePackingTag: Logo
   userData: 
   assetBundleName: 
   assetBundleVariant: 

+ 1 - 1
Assets/Resource/Sprite/Logo/LOGO0007.png.meta

@@ -93,7 +93,7 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
-  spritePackingTag: 
+  spritePackingTag: Logo
   userData: 
   assetBundleName: 
   assetBundleVariant: 

+ 1 - 1
Assets/Resource/Sprite/Logo/LOGO0008.png.meta

@@ -93,7 +93,7 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
-  spritePackingTag: 
+  spritePackingTag: Logo
   userData: 
   assetBundleName: 
   assetBundleVariant: 

+ 1 - 1
Assets/Resource/Sprite/Logo/LOGO0009.png.meta

@@ -93,7 +93,7 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
-  spritePackingTag: 
+  spritePackingTag: Logo
   userData: 
   assetBundleName: 
   assetBundleVariant: 

+ 1 - 1
Assets/Resource/Sprite/Logo/LOGO0010.png.meta

@@ -93,7 +93,7 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
-  spritePackingTag: 
+  spritePackingTag: Logo
   userData: 
   assetBundleName: 
   assetBundleVariant: 

+ 1 - 1
Assets/Resource/Sprite/Logo/LOGO0011.png.meta

@@ -93,7 +93,7 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
-  spritePackingTag: 
+  spritePackingTag: Logo
   userData: 
   assetBundleName: 
   assetBundleVariant: 

+ 1 - 1
Assets/Resource/Sprite/Logo/LOGO0012.png.meta

@@ -93,7 +93,7 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
-  spritePackingTag: 
+  spritePackingTag: Logo
   userData: 
   assetBundleName: 
   assetBundleVariant: 

+ 1 - 1
Assets/Resource/Sprite/Logo/LOGO0013.png.meta

@@ -93,7 +93,7 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
-  spritePackingTag: 
+  spritePackingTag: Logo
   userData: 
   assetBundleName: 
   assetBundleVariant: 

+ 1 - 1
Assets/Resource/Sprite/Logo/LOGO0028.png.meta

@@ -93,7 +93,7 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
-  spritePackingTag: 
+  spritePackingTag: Logo
   userData: 
   assetBundleName: 
   assetBundleVariant: 

+ 1 - 1
Assets/Resource/Sprite/Logo/LOGO0029.png.meta

@@ -93,7 +93,7 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
-  spritePackingTag: 
+  spritePackingTag: Logo
   userData: 
   assetBundleName: 
   assetBundleVariant: 

+ 1 - 1
Assets/Resource/Sprite/Logo/LOGO0030.png.meta

@@ -93,7 +93,7 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
-  spritePackingTag: 
+  spritePackingTag: Logo
   userData: 
   assetBundleName: 
   assetBundleVariant: 

+ 1 - 1
Assets/Resource/Sprite/Logo/LOGO0031.png.meta

@@ -93,7 +93,7 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
-  spritePackingTag: 
+  spritePackingTag: Logo
   userData: 
   assetBundleName: 
   assetBundleVariant: 

+ 1 - 1
Assets/Resource/Sprite/Logo/LOGO0032.png.meta

@@ -93,7 +93,7 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
-  spritePackingTag: 
+  spritePackingTag: Logo
   userData: 
   assetBundleName: 
   assetBundleVariant: 

+ 1 - 1
Assets/Resource/Sprite/Logo/LOGO0033.png.meta

@@ -93,7 +93,7 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
-  spritePackingTag: 
+  spritePackingTag: Logo
   userData: 
   assetBundleName: 
   assetBundleVariant: 

+ 1 - 1
Assets/Resource/Sprite/Logo/LOGO0034.png.meta

@@ -93,7 +93,7 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
-  spritePackingTag: 
+  spritePackingTag: Logo
   userData: 
   assetBundleName: 
   assetBundleVariant: 

+ 1 - 1
Assets/Resource/Sprite/Logo/LOGO0035.png.meta

@@ -93,7 +93,7 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
-  spritePackingTag: 
+  spritePackingTag: Logo
   userData: 
   assetBundleName: 
   assetBundleVariant: 

+ 1 - 1
Assets/Resource/Sprite/Logo/LOGO0036.png.meta

@@ -93,7 +93,7 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
-  spritePackingTag: 
+  spritePackingTag: Logo
   userData: 
   assetBundleName: 
   assetBundleVariant: 

+ 1 - 1
Assets/Resource/Sprite/Logo/LOGO0037.png.meta

@@ -93,7 +93,7 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
-  spritePackingTag: 
+  spritePackingTag: Logo
   userData: 
   assetBundleName: 
   assetBundleVariant: 

+ 1 - 1
Assets/Resource/Sprite/Logo/LOGO0038.png.meta

@@ -93,7 +93,7 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
-  spritePackingTag: 
+  spritePackingTag: Logo
   userData: 
   assetBundleName: 
   assetBundleVariant: 

+ 1 - 1
Assets/Resource/Sprite/Logo/LOGO0039.png.meta

@@ -93,7 +93,7 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
-  spritePackingTag: 
+  spritePackingTag: Logo
   userData: 
   assetBundleName: 
   assetBundleVariant: 

+ 1 - 1
Assets/Resource/Sprite/Logo/LOGO0041.png.meta

@@ -93,7 +93,7 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
-  spritePackingTag: 
+  spritePackingTag: Logo
   userData: 
   assetBundleName: 
   assetBundleVariant: 

+ 33 - 1
Assets/Resource/Sprite/Reference/参考.jpg.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: cce32f605187dbf4e95e492691ad6ffd
-timeCreated: 1490877386
+timeCreated: 1496908371
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
@@ -58,6 +58,38 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: iPhone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: WebGL
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 3 - 3
Assets/Resource/Sprite/SpriteUI/Fertilize.png.meta

@@ -60,7 +60,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
-    textureFormat: 12
+    textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
@@ -68,7 +68,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
-    textureFormat: 33
+    textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
@@ -76,7 +76,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
-    textureFormat: 47
+    textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0

二進制
Assets/Resource/Sprite/SpriteUI/Skill/红-灌木.png


+ 0 - 116
Assets/Resource/Sprite/SpriteUI/Skill/红-灌木.png.meta

@@ -1,116 +0,0 @@
-fileFormatVersion: 2
-guid: bd056e996392c7d4597dba179372fccb
-timeCreated: 1489049667
-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
-  - buildTarget: Standalone
-    maxTextureSize: 2048
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-  - buildTarget: iPhone
-    maxTextureSize: 2048
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-  - buildTarget: Android
-    maxTextureSize: 2048
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-  - buildTarget: WebGL
-    maxTextureSize: 2048
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-  - buildTarget: tvOS
-    maxTextureSize: 2048
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-  - buildTarget: Windows Store Apps
-    maxTextureSize: 2048
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-  spritePackingTag: 
-  userData: 
-  assetBundleName: ui
-  assetBundleVariant: 

+ 6 - 6
Assets/Resource/Sprite/SpriteUI/Wheel.png.meta

@@ -67,21 +67,21 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
   - buildTarget: iPhone
-    maxTextureSize: 2048
-    textureFormat: -1
+    maxTextureSize: 128
+    textureFormat: 33
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: Android
-    maxTextureSize: 2048
-    textureFormat: -1
+    maxTextureSize: 128
+    textureFormat: 47
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: WebGL
     maxTextureSize: 2048
     textureFormat: -1

+ 6 - 6
Assets/Resource/Sprite/SpriteUI/全部收回按钮.png.meta

@@ -67,21 +67,21 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
   - buildTarget: iPhone
-    maxTextureSize: 2048
-    textureFormat: -1
+    maxTextureSize: 256
+    textureFormat: 33
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: Android
-    maxTextureSize: 2048
-    textureFormat: -1
+    maxTextureSize: 256
+    textureFormat: 47
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: WebGL
     maxTextureSize: 2048
     textureFormat: -1

+ 7 - 7
Assets/Resource/Sprite/SpriteUI/商店大背景.png.meta

@@ -51,7 +51,7 @@ TextureImporter:
   textureFormatSet: 0
   platformSettings:
   - buildTarget: DefaultTexturePlatform
-    maxTextureSize: 1024
+    maxTextureSize: 2048
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -59,7 +59,7 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
   - buildTarget: Standalone
-    maxTextureSize: 1024
+    maxTextureSize: 2048
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -68,22 +68,22 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 1024
-    textureFormat: -1
+    textureFormat: 33
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: Android
     maxTextureSize: 1024
-    textureFormat: -1
+    textureFormat: 47
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: WebGL
-    maxTextureSize: 1024
+    maxTextureSize: 2048
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50

+ 6 - 6
Assets/Resource/Sprite/SpriteUI/商店按钮.png.meta

@@ -67,21 +67,21 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
   - buildTarget: iPhone
-    maxTextureSize: 2048
-    textureFormat: -1
+    maxTextureSize: 128
+    textureFormat: 33
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: Android
-    maxTextureSize: 2048
-    textureFormat: -1
+    maxTextureSize: 128
+    textureFormat: 47
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: WebGL
     maxTextureSize: 2048
     textureFormat: -1

+ 9 - 9
Assets/Resource/Sprite/SpriteUI/大底板.png.meta

@@ -51,7 +51,7 @@ TextureImporter:
   textureFormatSet: 0
   platformSettings:
   - buildTarget: DefaultTexturePlatform
-    maxTextureSize: 1024
+    maxTextureSize: 2048
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -59,7 +59,7 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
   - buildTarget: Standalone
-    maxTextureSize: 1024
+    maxTextureSize: 2048
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -67,23 +67,23 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
   - buildTarget: iPhone
-    maxTextureSize: 1024
-    textureFormat: -1
+    maxTextureSize: 512
+    textureFormat: 32
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: Android
-    maxTextureSize: 1024
-    textureFormat: -1
+    maxTextureSize: 512
+    textureFormat: 34
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: WebGL
-    maxTextureSize: 1024
+    maxTextureSize: 2048
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50

二進制
Assets/Resource/Sprite/SpriteUI/左箭头.png


+ 0 - 100
Assets/Resource/Sprite/SpriteUI/左箭头.png.meta

@@ -1,100 +0,0 @@
-fileFormatVersion: 2
-guid: c6dd68cad864e1e459938aa04229378a
-timeCreated: 1489753687
-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
-  - buildTarget: Standalone
-    maxTextureSize: 2048
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-  - buildTarget: iPhone
-    maxTextureSize: 2048
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-  - buildTarget: Android
-    maxTextureSize: 2048
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-  - buildTarget: WebGL
-    maxTextureSize: 2048
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-  spritePackingTag: 
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 6 - 6
Assets/Resource/Sprite/SpriteUI/快来打理花园对话框.png.meta

@@ -67,21 +67,21 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
   - buildTarget: iPhone
-    maxTextureSize: 2048
-    textureFormat: -1
+    maxTextureSize: 256
+    textureFormat: 33
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: Android
-    maxTextureSize: 2048
-    textureFormat: -1
+    maxTextureSize: 256
+    textureFormat: 47
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: WebGL
     maxTextureSize: 2048
     textureFormat: -1

+ 6 - 6
Assets/Resource/Sprite/SpriteUI/技能地白底板.png.meta

@@ -67,21 +67,21 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
   - buildTarget: iPhone
-    maxTextureSize: 2048
-    textureFormat: -1
+    maxTextureSize: 512
+    textureFormat: 33
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: Android
-    maxTextureSize: 2048
-    textureFormat: -1
+    maxTextureSize: 512
+    textureFormat: 47
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: WebGL
     maxTextureSize: 2048
     textureFormat: -1

+ 6 - 6
Assets/Resource/Sprite/SpriteUI/技能花费.png.meta

@@ -67,21 +67,21 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
   - buildTarget: iPhone
-    maxTextureSize: 2048
-    textureFormat: -1
+    maxTextureSize: 256
+    textureFormat: 33
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: Android
-    maxTextureSize: 2048
-    textureFormat: -1
+    maxTextureSize: 256
+    textureFormat: 47
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: WebGL
     maxTextureSize: 2048
     textureFormat: -1

+ 6 - 6
Assets/Resource/Sprite/SpriteUI/按钮正常花.png.meta

@@ -67,21 +67,21 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
   - buildTarget: iPhone
-    maxTextureSize: 2048
-    textureFormat: -1
+    maxTextureSize: 128
+    textureFormat: 33
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: Android
-    maxTextureSize: 2048
-    textureFormat: -1
+    maxTextureSize: 128
+    textureFormat: 47
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: WebGL
     maxTextureSize: 2048
     textureFormat: -1

+ 6 - 6
Assets/Resource/Sprite/SpriteUI/放花框子.png.meta

@@ -67,13 +67,13 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
   - buildTarget: iPhone
-    maxTextureSize: 2048
-    textureFormat: -1
+    maxTextureSize: 128
+    textureFormat: 33
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: tvOS
     maxTextureSize: 2048
     textureFormat: -1
@@ -83,13 +83,13 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
   - buildTarget: Android
-    maxTextureSize: 2048
-    textureFormat: -1
+    maxTextureSize: 128
+    textureFormat: 47
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: Windows Store Apps
     maxTextureSize: 2048
     textureFormat: -1

+ 7 - 7
Assets/Resource/Sprite/SpriteUI/游戏界面.png.meta

@@ -51,7 +51,7 @@ TextureImporter:
   textureFormatSet: 0
   platformSettings:
   - buildTarget: DefaultTexturePlatform
-    maxTextureSize: 1024
+    maxTextureSize: 2048
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -59,7 +59,7 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
   - buildTarget: Standalone
-    maxTextureSize: 1024
+    maxTextureSize: 2048
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -68,22 +68,22 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 1024
-    textureFormat: -1
+    textureFormat: 33
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: Android
     maxTextureSize: 1024
-    textureFormat: -1
+    textureFormat: 47
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: WebGL
-    maxTextureSize: 1024
+    maxTextureSize: 2048
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50

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

@@ -67,21 +67,21 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
   - buildTarget: iPhone
-    maxTextureSize: 2048
-    textureFormat: -1
+    maxTextureSize: 128
+    textureFormat: 33
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: Android
-    maxTextureSize: 2048
-    textureFormat: -1
+    maxTextureSize: 128
+    textureFormat: 47
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: WebGL
     maxTextureSize: 2048
     textureFormat: -1

+ 6 - 6
Assets/Resource/Sprite/SpriteUI/特殊花朵.png.meta

@@ -67,21 +67,21 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
   - buildTarget: iPhone
-    maxTextureSize: 2048
-    textureFormat: -1
+    maxTextureSize: 128
+    textureFormat: 33
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: Android
-    maxTextureSize: 2048
-    textureFormat: -1
+    maxTextureSize: 128
+    textureFormat: 47
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: WebGL
     maxTextureSize: 2048
     textureFormat: -1

+ 6 - 6
Assets/Resource/Sprite/SpriteUI/签到框.png.meta

@@ -67,21 +67,21 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
   - buildTarget: iPhone
-    maxTextureSize: 2048
-    textureFormat: -1
+    maxTextureSize: 128
+    textureFormat: 33
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: Android
-    maxTextureSize: 2048
-    textureFormat: -1
+    maxTextureSize: 128
+    textureFormat: 47
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: WebGL
     maxTextureSize: 2048
     textureFormat: -1

+ 6 - 6
Assets/Resource/Sprite/SpriteUI/精灵按钮.png.meta

@@ -67,21 +67,21 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
   - buildTarget: iPhone
-    maxTextureSize: 2048
-    textureFormat: -1
+    maxTextureSize: 128
+    textureFormat: 33
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: Android
-    maxTextureSize: 2048
-    textureFormat: -1
+    maxTextureSize: 128
+    textureFormat: 47
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: WebGL
     maxTextureSize: 2048
     textureFormat: -1

+ 6 - 6
Assets/Resource/Sprite/SpriteUI/花园按钮.png.meta

@@ -67,21 +67,21 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
   - buildTarget: iPhone
-    maxTextureSize: 2048
-    textureFormat: -1
+    maxTextureSize: 128
+    textureFormat: 33
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: Android
-    maxTextureSize: 2048
-    textureFormat: -1
+    maxTextureSize: 128
+    textureFormat: 47
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: WebGL
     maxTextureSize: 2048
     textureFormat: -1

+ 6 - 6
Assets/Resource/Sprite/SpriteUI/通用界面.png.meta

@@ -67,21 +67,21 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
   - buildTarget: iPhone
-    maxTextureSize: 2048
-    textureFormat: -1
+    maxTextureSize: 1024
+    textureFormat: 33
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: Android
-    maxTextureSize: 2048
-    textureFormat: -1
+    maxTextureSize: 1024
+    textureFormat: 47
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: WebGL
     maxTextureSize: 2048
     textureFormat: -1

+ 6 - 6
Assets/Resource/Sprite/SpriteUI/领取按钮.png.meta

@@ -67,13 +67,13 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
   - buildTarget: iPhone
-    maxTextureSize: 2048
-    textureFormat: -1
+    maxTextureSize: 256
+    textureFormat: 33
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: tvOS
     maxTextureSize: 2048
     textureFormat: -1
@@ -83,13 +83,13 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
   - buildTarget: Android
-    maxTextureSize: 2048
-    textureFormat: -1
+    maxTextureSize: 256
+    textureFormat: 47
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: Windows Store Apps
     maxTextureSize: 2048
     textureFormat: -1

+ 6 - 6
Assets/Resource/Sprite/SpriteUI/领取物品发光转动.png.meta

@@ -67,21 +67,21 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
   - buildTarget: iPhone
-    maxTextureSize: 2048
-    textureFormat: -1
+    maxTextureSize: 256
+    textureFormat: 33
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: Android
-    maxTextureSize: 2048
-    textureFormat: -1
+    maxTextureSize: 256
+    textureFormat: 47
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: WebGL
     maxTextureSize: 2048
     textureFormat: -1

+ 5 - 5
Assets/Resource/Sprite/SpriteUI/魔法按钮.png.meta

@@ -68,20 +68,20 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
-    textureFormat: -1
+    textureFormat: 33
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: Android
-    maxTextureSize: 2048
-    textureFormat: -1
+    maxTextureSize: 128
+    textureFormat: 47
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
-    overridden: 0
+    overridden: 1
   - buildTarget: WebGL
     maxTextureSize: 2048
     textureFormat: -1

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

@@ -1,5 +1,5 @@
 <data>
-  <item id="1" coin="s*0.01*l" diamond="3,15" diamond_drop="0.5/l+l*0.0001" flower_drop="(1/f+l*0.001)*0.95" flower_rate_based="0.05,0.65,0.95" rate="0,400,650" coin_drop="r*l*0.65" flower_coin="l*0.65" star_cd="5" star_time="3" star_duration="10" />
+  <item id="1" coin="s*0.01*l" diamond="3,15" diamond_drop="0.5/l+l*0.0001" flower_drop="(1/f+l*0.001)*0.95" flower_rate_based="0.05,0.65,0.95" rate="0,400,650" coin_drop="r*l*0.65" flower_coin="l*0.65" star_cd="1" star_time="5,20" star_duration="5" />
   <comment>
     <id>
 

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

@@ -1,8 +1,8 @@
 <PlayerConfig>
-  <Version value="555" />
+  <Version value="570" />
 
   <ID value="Default" />
-////  <TutorialA value="0" />
+////  <TutorialA value="1" />
 ////  <TutorialB value="1" />
 ////  <TutorialC value="1" />
   <TutorialIndexA value="1" />

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

@@ -372,4 +372,10 @@
     <Second desc=""><![CDATA[秒]]></Second>
     <Seconds desc=""><![CDATA[秒]]></Seconds>
   </Plural>
+  <IOS>
+    <ShareUrl desc=""><![CDATA[www.dashgame.com]]></ShareUrl>
+  </IOS>
+  <Android>
+    <ShareUrl desc=""><![CDATA[www.dashgame.com]]></ShareUrl>
+  </Android>
 </lan>

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

@@ -372,4 +372,10 @@
     <Second desc=""><![CDATA[秒]]></Second>
     <Seconds desc=""><![CDATA[秒]]></Seconds>
   </Plural>
+  <IOS>
+    <ShareUrl desc=""><![CDATA[]]></ShareUrl>
+  </IOS>
+  <Android>
+    <ShareUrl desc=""><![CDATA[]]></ShareUrl>
+  </Android>
 </lan>

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

@@ -372,4 +372,10 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack6>
     <Second desc=""><![CDATA[ Second]]></Second>
     <Seconds desc=""><![CDATA[ Seconds]]></Seconds>
   </Plural>
+  <IOS>
+    <ShareUrl desc=""><![CDATA[]]></ShareUrl>
+  </IOS>
+  <Android>
+    <ShareUrl desc=""><![CDATA[]]></ShareUrl>
+  </Android>
 </lan>

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


+ 3 - 0
Assets/Script/Manage/ManaCenter.cs

@@ -9,6 +9,7 @@ using System;
 using System.Xml;
 using System.Collections;
 using System.Collections.Generic;
+using UnityEngine.Analytics;
 
 public class ManaCenter : Regist 
 {
@@ -950,6 +951,8 @@ public class ManaCenter : Regist
         }
 
 
+        Analytics.SetUserId(ManaServer.ID);
+
         Complete = true;
         
         Level = Level;

+ 6 - 5
Assets/Script/Manage/ManaGarden.cs

@@ -93,7 +93,8 @@ public class ManaGarden : Regist
     public static int TotalFlower;
     public static bool AwardLock = true;
 
-    public static float StarTime;
+    public static float MinStarTime;
+    public static float MaxStarTime;
 
     public static float ElfTimer;
     public static float StarTimer;
@@ -146,11 +147,11 @@ public class ManaGarden : Regist
     {
         if (!ManaCenter.MiniLock && !ManaVisit.InVisit)
         {
-            StarTimer += Time.fixedDeltaTime;
+            StarTimer -= Time.fixedDeltaTime;
 
-            if (StarTimer >= StarTime)
+            if (StarTimer < 0)
             {
-                StarTimer = 0;
+                StarTimer = Mathf.Lerp(MinStarTime, MaxStarTime, Random.Range(0f, 1f));
 
                 StarList.Add(ManaReso.GetStar());
             }
@@ -414,7 +415,7 @@ public class ManaGarden : Regist
         else
         {
             Slot slot = null;
-
+            
             for (int i = 0; i < SlotList.Count; i++)
             {
                 if (SlotList[i].Available)

+ 4 - 23
Assets/Script/Manage/ManaIAP.cs

@@ -26,24 +26,6 @@ public class ManaIAP : MonoBehaviour, IStoreListener
 
     #region Share配置
 
-    public static string ImagePath
-    {
-        get
-        {
-            string iconPath = Application.persistentDataPath + "/ICON2.png";
-
-            if (!File.Exists(iconPath))
-            {
-                Texture2D texture2D = ManaReso.Load<Texture2D>("ICON2", Folder.UI);
-
-                File.WriteAllBytes(iconPath, texture2D.EncodeToPNG());
-            }
-
-            return Application.persistentDataPath + "/ICON2.png";
-        }
-    }
-
-    public static string ShareUrl = "http://www.dashgame.com";
     public static string ImageUrl = "http://or5zgoeui.bkt.clouddn.com/game_icon.png";
 
     public static ShareSDK ShareSdk;
@@ -71,15 +53,15 @@ public class ManaIAP : MonoBehaviour, IStoreListener
     {
         if (Application.platform == RuntimePlatform.IPhonePlayer)
         {
-            Advertisement.Initialize("1408492", true);
+            Advertisement.Initialize("1408492", false);
         }
         else if (Application.isMobilePlatform)
         {
-            Advertisement.Initialize("1408493", true);
+            Advertisement.Initialize("1408493", false);
         }
         else if (Application.isEditor)
         {
-            Advertisement.Initialize("1408493", true);
+            Advertisement.Initialize("1408493", false);
         }
     }
 
@@ -216,9 +198,8 @@ public class ManaIAP : MonoBehaviour, IStoreListener
         shareContent.SetText(Language.GetStr("Common", "ShareContent"));
         shareContent.SetTitle(Language.GetStr("Common", "ShareTit"));
 
-        shareContent.SetUrl(ShareUrl);
+        shareContent.SetUrl(Language.GetShareUrl());
         shareContent.SetImageUrl(ImageUrl);
-        //shareContent.SetImagePath(ImagePath);
 
         shareContent.SetShareType(ContentType.App);
 

+ 9 - 2
Assets/Script/Manage/ManaMiniGame.cs

@@ -479,13 +479,20 @@ public class Award
 
         Star.CD = float.Parse(attribute[9].Value);
         Star.Time = float.Parse(attribute[11].Value);
-        ManaGarden.StarTime = float.Parse(attribute[10].Value);
+
+        string[] strings = attribute[10].Value.Split(',');
+
+        ManaGarden.MinStarTime = float.Parse(strings[0]);
+        ManaGarden.MaxStarTime = float.Parse(strings[1]);
+
+        ManaGarden.StarTimer = Mathf.Lerp(ManaGarden.MinStarTime, ManaGarden.MaxStarTime, Random.Range(0f, 1f));
+
 
         CoinFml = attribute[1].Value;
         FlowerFml = attribute[4].Value;
         DiamondFml = attribute[3].Value;
         
-        string[] strings = attribute[2].Value.Split(',');
+        strings = attribute[2].Value.Split(',');
 
         DiamondMin = int.Parse(strings[0]);
         DiamondMax = int.Parse(strings[1]);

+ 6 - 3
Assets/Script/Manage/ManaReso.cs

@@ -547,7 +547,7 @@ public class ManaReso : Regist
 
         pos.z = -0.35f + Random.Range(-0.01f, 0.01f);
 
-        Transform tra = Get("Star", Folder.Scene, false, null, pos, ObjType.Star);
+        Transform tra = Get("Star", Folder.UI, false, null, pos, ObjType.Star);
 
         Star star = tra.GetComponent<Star>();
 
@@ -1009,9 +1009,12 @@ public class ManaReso : Regist
                     (
                         () =>
                         {
-                            action.SafeInvoke();
+                            if (!Logo.Complete)
+                            {
+                                action.SafeInvoke();
 
-                            AsyncInstantiateLock = false;
+                                AsyncInstantiateLock = false;
+                            }
                         },
                         1
                     );

+ 13 - 2
Assets/Script/Manage/ManaServer.cs

@@ -56,6 +56,7 @@ public class ManaServer : Regist
 
     public static bool Connect_;
 
+    public static int Counter;
     public static float Timer;
     public static bool Complete;
 
@@ -73,11 +74,21 @@ public class ManaServer : Regist
         {
             Timer += UnityEngine.Time.fixedDeltaTime;
 
-            if (Timer >= 2.5f)
+            if (Timer >= 2f)
             {
                 Timer = 0;
+                Counter++;
 
-                Login(ManaCenter.LoginCallbackInitial);
+                if (Counter > 4)
+                {
+                    Complete = true;
+
+                    ManaCenter.LoginCallbackInitial(new JsonData());                    
+                }
+                else
+                {
+                    Login(ManaCenter.LoginCallbackInitial);
+                }
             }
         }
     }

+ 8 - 14
Assets/Script/Manage/ManaTutorial.cs

@@ -590,8 +590,6 @@ public class ManaTutorial : Regist
     {
         TutorialC = false;
 
-        Tutorial.HightDisable();
-
         ManaReso.Get("N_Tutorial").TweenBacCG();
 
         PayExemptAmt = 0;
@@ -648,18 +646,14 @@ public class ManaTutorial : Regist
 
                                 Tutorial.HightScreen(ManaReso.Get("C_VisitArrow0"), ManaReso.Get("C_Visit"));
 
-                                //ManaReso.AddButtonEventOnetime
-                                //(
-                                //    "C_Visit",
-                                //    () =>
-                                //    {
-                                //        EndC();
-
-                                //        //EndC1();
-
-                                //        //EnterC2();
-                                //    }
-                                //);
+                                ManaReso.AddButtonEventOnetime
+                                (
+                                    "C_Visit",
+                                    () =>
+                                    {
+                                        EndC1();
+                                    }
+                                );
                             }
                         );
                     }

+ 1 - 4
Assets/Script/Manage/ManaVisit.cs

@@ -291,10 +291,7 @@ public class ManaVisit
         }
 
 
-        if (!ManaTutorial.TutorialC)
-        {
-            ManaReso.SetActive("C_Return", true);
-        }
+        ManaReso.SetActive("C_Return", true);
 
         ManaGarden.AwardLock = false;
 

+ 0 - 3
Assets/Script/Object/Skill/Ability.cs

@@ -509,9 +509,6 @@ public class Ability : SkillRoot
                 }
             }
         );
-
-        Debug.Log(NewPerson);
-        Debug.Log(NewCoinPerson);
     }
 
     protected void UnlockAhead()

+ 24 - 14
Assets/Script/Object/Skill/BigSkill.cs

@@ -85,7 +85,7 @@ public class BigSkill : Skill
 
     public override void AnnulA()
     {
-        CoolTimer = CD * CdBuff;
+        CoolTimer = CD * CdBuff - 1;
 
         BarStatus = SkillStatus.Cool;
 
@@ -126,7 +126,7 @@ public class BigSkill : Skill
     public override bool DoCool()
     {
         CoolTimer -= Time.deltaTime;
-
+        
         TimeSpan timeSpan = new TimeSpan(0, 0, 0, Mathf.CeilToInt(CoolTimer));
 
         BarLab.text = string.Format("{0} : {1}", timeSpan.Minutes.ToString("00"), timeSpan.Seconds.ToString("00"));
@@ -202,16 +202,19 @@ public class BigSkill : Skill
                 NewUpgradeAmt = Auxiliary.FmlParse(UpgradeFml, "a", NewUpgradeAmt.ToString());
             }
 
-            UpgradeValue(ref NewPlus, Plus, UpgradePlus, Level - 1);
-            UpgradeValue(ref NewPersonBuff, PersonBuff, UpgradePerson, Level - 1);
-            UpgradeValue(ref NewCoinOnceBuff, UpgradeCoinOnce, Level - 1);
-            UpgradeSkillCdBuff(ref NewSkillCdBuff, UpgradeCD, Level - 1);
-
-            UpgradeValue(ref NewPerson, Person, UpgradePerson, Level - 1);
-            UpgradeValue(ref NewSkillCD, SkillCD, UpgradeCD, Level - 1);
-            UpgradeValue(ref NewDuration, Duration, UpgradeDuration, Level - 1);
-            UpgradeValue(ref NewCoinOnce, CoinOnce, UpgradeCoinOnce, Level - 1);
-            UpgradeValue(ref NewCoinPerson, CoinPerson, UpgradePlus, Level - 1);
+            if (BarStatus_ == SkillStatus.Upgrade)
+            {
+                UpgradeValue(ref NewPlus, Plus, UpgradePlus, Level - 1);
+                UpgradeValue(ref NewPersonBuff, PersonBuff, UpgradePerson, Level - 1);
+                UpgradeValue(ref NewCoinOnceBuff, UpgradeCoinOnce, Level - 1);
+                UpgradeSkillCdBuff(ref NewSkillCdBuff, UpgradeCD, Level - 1);
+
+                UpgradeValue(ref NewPerson, Person, UpgradePerson, Level - 1);
+                UpgradeValue(ref NewSkillCD, SkillCD, UpgradeCD, Level - 1);
+                UpgradeValue(ref NewDuration, Duration, UpgradeDuration, Level - 1);
+                UpgradeValue(ref NewCoinOnce, CoinOnce, UpgradeCoinOnce, Level - 1);
+                UpgradeValue(ref NewCoinPerson, CoinPerson, UpgradePlus, Level - 1);
+            }
         }
 
         if (BarStatus_ == SkillStatus.Use)
@@ -432,7 +435,7 @@ public class BigSkill : Skill
 
                 ManaCenter.SkillAmt++;
 
-                UseTimer = NewDuration;
+                UseTimer = NewDuration - 1;
 
                 BarStatus = SkillStatus.Use;
 
@@ -448,7 +451,14 @@ public class BigSkill : Skill
     {
         BarBtn.interactable = false;
 
-        ManaCenter.UseList.Add(this);
+        if (NewDuration.Equal(0))
+        {
+            AnnulA();
+        }
+        else
+        {
+            ManaCenter.UseList.Add(this);
+        }
 
         ManaCenter.SkillPlus += NewPlus;
         ManaCenter.SkillPerson += NewPerson;

+ 3 - 3
Assets/Script/Object/Skill/Skill.cs

@@ -155,7 +155,7 @@ public class Skill : SkillRoot
         ValueBuffParse(out SkillCD, out SkillCdBuff, attribute[10].Value);
         ValueBuffParse(out CoinOnce, out CoinOnceBuff, attribute[8].Value);
         ValueBuffParse(out CoinPerson, out Plus, attribute[6].Value);
-        
+
         #endregion
 
         SkillType = SkillType.Skill;
@@ -229,7 +229,7 @@ public class Skill : SkillRoot
 
     public override void AnnulA()
     {
-        CoolTimer = CD * CdBuff;
+        CoolTimer = CD * CdBuff - 1;
 
         ItemStatus = SkillStatus.Cool;
 
@@ -326,7 +326,7 @@ public class Skill : SkillRoot
                     ManaCenter.SkillAmt++;
                 }
 
-                UseTimer = NewDuration;
+                UseTimer = NewDuration - 1;
 
                 if (Duration.Equal(0))
                 {

+ 2 - 1
Assets/Script/Object/Slot.cs

@@ -105,12 +105,13 @@ public class Slot : Regist
     {
         Collider.enabled = true;
 
-        Available = true;
+        Available_ = true;
 
         FlowerInfo.Plant = false;
 
         ManaGarden.PlantList.Remove(this);
 
+
         Flower.Retrieve();
     }
 }

+ 0 - 12
Assets/Script/Tool/Auxiliary.cs

@@ -335,18 +335,6 @@ public class Auxiliary : Regist
     }
 
 
-    //public static string GetUnit(Unit unit, int value)
-    //{
-    //    if (value == 1)
-    //    {
-            
-    //    }
-    //    else
-    //    {
-            
-    //    }
-    //}
-
     public static string GetStreamPath()
     {
         if (Application.isEditor)

+ 44 - 0
Assets/Script/Tool/DashGame/Language.cs

@@ -194,6 +194,50 @@ public class Language
 		return error;
 	}
 
+    public static string GetShareUrl()
+    {
+        XmlDocument tempXML = new XmlDocument();
+
+        tempXML.LoadXml(LanguageDic[Lan.ChineseSimplified].text);
+
+
+        string page;
+
+        if (Application.isEditor)
+        {
+            page = "Android";
+        }
+        else if (Application.platform == RuntimePlatform.IPhonePlayer)
+        {
+            page = "IOS";
+        }
+        else if (Application.isMobilePlatform)
+        {
+            page = "Android";
+        }
+        else
+        {
+            throw new Exception();
+        }
+
+
+        try
+        {
+            XmlNode pageNode = tempXML.SelectSingleNode("lan/" + page);
+            XmlNode node = pageNode.SelectSingleNode("ShareUrl");
+            if (node != null)
+                return node.InnerText.Replace("\\n", "\n");
+        }
+        catch (Exception e)
+        {
+            Debug.LogException(e);
+        }
+
+        string error = "Topic missing page[" + page + "] id[" + "ShareUrl" + "]";
+        Debug.LogError(error);
+        return error;
+    }
+
 	private static Font defaultFont;
 	public static Font font; //todo Public改为private
 

+ 3 - 2
Assets/Script/Tool/DashGame/Logo.cs

@@ -26,14 +26,15 @@ public class Logo : MonoBehaviour
 
     public void Finish()
     {
+        ManaReso.Instance.StopAsync();
+
+
         Complete = true;
 
         Camera.SetActive(false);
 
         ManaUI.InitialInstantiate();
 
-        ManaReso.Instance.StopAsync();
-
         SceneManager.LoadScene(1);
     }
 }

+ 3 - 3
MyLovelyGarden.Editor.csproj

@@ -15,7 +15,7 @@
     <TargetFrameworkProfile>Unity Full v3.5</TargetFrameworkProfile>
     <CompilerResponseFile></CompilerResponseFile>
     <UnityProjectType>Editor:5</UnityProjectType>
-    <UnityBuildTarget>Android:13</UnityBuildTarget>
+    <UnityBuildTarget>StandaloneWindows64:19</UnityBuildTarget>
     <UnityVersion>5.5.0f3</UnityVersion>
     <RootNamespace></RootNamespace>
     <LangVersion Condition=" '$(VisualStudioVersion)' != '10.0' ">4</LangVersion>
@@ -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;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>
+    <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_64;UNITY_PURCHASING;UNITY_ANALYTICS;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;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;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_SCRIPTING_NEW_CSHARP_COMPILER;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_VIDEO;ENABLE_VR;ENABLE_WEBSOCKET_HOST;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;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>
+    <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_64;UNITY_PURCHASING;UNITY_ANALYTICS;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;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;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_SCRIPTING_NEW_CSHARP_COMPILER;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_VIDEO;ENABLE_VR;ENABLE_WEBSOCKET_HOST;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>

+ 4 - 3
MyLovelyGarden.csproj

@@ -15,7 +15,7 @@
     <TargetFrameworkProfile>Unity Full v3.5</TargetFrameworkProfile>
     <CompilerResponseFile></CompilerResponseFile>
     <UnityProjectType>Game:1</UnityProjectType>
-    <UnityBuildTarget>Android:13</UnityBuildTarget>
+    <UnityBuildTarget>StandaloneWindows64:19</UnityBuildTarget>
     <UnityVersion>5.5.0f3</UnityVersion>
     <RootNamespace></RootNamespace>
     <LangVersion Condition=" '$(VisualStudioVersion)' != '10.0' ">4</LangVersion>
@@ -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;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>
+    <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_64;UNITY_PURCHASING;UNITY_ANALYTICS;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;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;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_SCRIPTING_NEW_CSHARP_COMPILER;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_VIDEO;ENABLE_VR;ENABLE_WEBSOCKET_HOST;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;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>
+    <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_64;UNITY_PURCHASING;UNITY_ANALYTICS;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;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;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_SCRIPTING_NEW_CSHARP_COMPILER;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_VIDEO;ENABLE_VR;ENABLE_WEBSOCKET_HOST;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>
@@ -229,6 +229,7 @@
     <Compile Include="Assets\Script\Object\Skill\Skill.cs" />
     <Compile Include="Assets\Script\Object\Skill\SkillRoot.cs" />
     <Compile Include="Assets\Script\Object\Slot.cs" />
+    <Compile Include="Assets\Script\Object\Star.cs" />
     <Compile Include="Assets\Script\Object\Tutorial.cs" />
     <Compile Include="Assets\Script\Tool\Anim\Move2D.cs" />
     <Compile Include="Assets\Script\Tool\Anim\Move3D.cs" />

+ 23 - 26
MyLovelyGarden.sln

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

二進制
ProjectSettings/GraphicsSettings.asset


二進制
ProjectSettings/UnityConnectSettings.asset


+ 3 - 7
ToList.txt

@@ -1,10 +1,6 @@
-单复数映射
+日志修改
 
-测试到大亨光临
+单复数修改
 
 
-更改分享的网页连接
-
-发布前把服务器中的存档清理一次
-
-Unity Ads 代码和ServiceWindow 测试模式
+测试完大亨光临