Browse Source

增加微信支付

LiuQilin 7 years ago
parent
commit
5c4047b5b9
100 changed files with 2125 additions and 559 deletions
  1. 0 25
      Assets/Plugins/Alipay/IOS/AlipaySDK.framework.meta
  2. 1 1
      Assets/Plugins/UnityPurchasing/Bin/Facebook/live/FacebookStore.dll.meta
  3. 0 0
      Assets/Resource/Animations/人物动画/stand_ske.json
  4. 2 1
      Assets/Resource/Animations/人物动画/stand_ske.json.meta
  5. 0 0
      Assets/Resource/Animations/人物动画/stand_tex_0.json
  6. 2 1
      Assets/Resource/Animations/人物动画/stand_tex_0.json.meta
  7. 0 0
      Assets/Resource/Animations/人物动画/stand_tex_1.json
  8. 2 1
      Assets/Resource/Animations/人物动画/stand_tex_1.json.meta
  9. BIN
      Assets/Resource/Animations/人物动画/stand_texture_0.png
  10. 224 105
      Assets/Resource/Animations/人物动画/stand_texture_0.png.meta
  11. BIN
      Assets/Resource/Animations/人物动画/stand_texture_1.png
  12. 321 185
      Assets/Resource/Animations/人物动画/stand_texture_1.png.meta
  13. 1 0
      Assets/Resource/DragonBones/Unity/src/DragonBones/unity/UnityFactory.cs
  14. 1 1
      Assets/Resource/Logo.unity
  15. 4 17
      Assets/Resource/Prefab/Object/DebugMode.prefab
  16. 504 42
      Assets/Resource/Prefab/PrefabUI/Canvas.prefab
  17. 17 38
      Assets/Resource/Shader/GrayMat.mat
  18. 0 0
      Assets/Resource/Sprite/Editor/HotUpdate/NewDress/Dress_ske.json
  19. 2 1
      Assets/Resource/Sprite/Editor/HotUpdate/NewDress/Dress_ske.json.meta
  20. BIN
      Assets/Resource/Sprite/Editor/HotUpdate/NewDress/上衣14.png
  21. 14 2
      Assets/Resource/Sprite/Editor/HotUpdate/NewDress/上衣14.png.meta
  22. 1 1
      Assets/Resource/Sprite/Editor/HotUpdate/NewDress/上衣14_tex.json
  23. 2 1
      Assets/Resource/Sprite/Editor/HotUpdate/NewDress/上衣14_tex.json.meta
  24. BIN
      Assets/Resource/Sprite/Editor/HotUpdate/NewDress/下衣14.png
  25. 14 2
      Assets/Resource/Sprite/Editor/HotUpdate/NewDress/下衣14.png.meta
  26. 1 1
      Assets/Resource/Sprite/Editor/HotUpdate/NewDress/下衣14_tex.json
  27. 2 1
      Assets/Resource/Sprite/Editor/HotUpdate/NewDress/下衣14_tex.json.meta
  28. BIN
      Assets/Resource/Sprite/Editor/HotUpdate/NewDress/头发14(粉色).png
  29. 14 2
      Assets/Resource/Sprite/Editor/HotUpdate/NewDress/头发14(粉色).png.meta
  30. 1 1
      Assets/Resource/Sprite/Editor/HotUpdate/NewDress/头发14(粉色)_tex.json
  31. 2 1
      Assets/Resource/Sprite/Editor/HotUpdate/NewDress/头发14(粉色)_tex.json.meta
  32. 14 2
      Assets/Resource/Sprite/Editor/HotUpdate/NewDress/装饰14.png.meta
  33. 1 1
      Assets/Resource/Sprite/Editor/HotUpdate/NewDress/装饰14_tex.json
  34. 2 1
      Assets/Resource/Sprite/Editor/HotUpdate/NewDress/装饰14_tex.json.meta
  35. BIN
      Assets/Resource/Sprite/Editor/SpriteUI/alipay.png
  36. 76 0
      Assets/Resource/Sprite/Editor/SpriteUI/alipay.png.meta
  37. BIN
      Assets/Resource/Sprite/Editor/SpriteUI/wechat.png
  38. 76 0
      Assets/Resource/Sprite/Editor/SpriteUI/wechat.png.meta
  39. 14 2
      Assets/Resource/Sprite/Mobile/Garden/Flower0.png.meta
  40. 13 2
      Assets/Resource/Sprite/Mobile/Garden/Flower1.png.meta
  41. 13 2
      Assets/Resource/Sprite/Mobile/Garden/Flower10.png.meta
  42. 13 2
      Assets/Resource/Sprite/Mobile/Garden/Flower11.png.meta
  43. 13 2
      Assets/Resource/Sprite/Mobile/Garden/Flower12.png.meta
  44. 13 2
      Assets/Resource/Sprite/Mobile/Garden/Flower13.png.meta
  45. 13 2
      Assets/Resource/Sprite/Mobile/Garden/Flower14.png.meta
  46. 13 2
      Assets/Resource/Sprite/Mobile/Garden/Flower15.png.meta
  47. 13 2
      Assets/Resource/Sprite/Mobile/Garden/Flower16.png.meta
  48. 13 2
      Assets/Resource/Sprite/Mobile/Garden/Flower17.png.meta
  49. 13 2
      Assets/Resource/Sprite/Mobile/Garden/Flower18.png.meta
  50. 13 2
      Assets/Resource/Sprite/Mobile/Garden/Flower19.png.meta
  51. 13 2
      Assets/Resource/Sprite/Mobile/Garden/Flower2.png.meta
  52. 13 2
      Assets/Resource/Sprite/Mobile/Garden/Flower20.png.meta
  53. 13 2
      Assets/Resource/Sprite/Mobile/Garden/Flower21.png.meta
  54. 13 2
      Assets/Resource/Sprite/Mobile/Garden/Flower22.png.meta
  55. 13 2
      Assets/Resource/Sprite/Mobile/Garden/Flower23.png.meta
  56. 13 2
      Assets/Resource/Sprite/Mobile/Garden/Flower24.png.meta
  57. 13 2
      Assets/Resource/Sprite/Mobile/Garden/Flower25.png.meta
  58. 13 2
      Assets/Resource/Sprite/Mobile/Garden/Flower26.png.meta
  59. 13 2
      Assets/Resource/Sprite/Mobile/Garden/Flower27.png.meta
  60. 13 2
      Assets/Resource/Sprite/Mobile/Garden/Flower28.png.meta
  61. 13 2
      Assets/Resource/Sprite/Mobile/Garden/Flower29.png.meta
  62. 13 2
      Assets/Resource/Sprite/Mobile/Garden/Flower3.png.meta
  63. 13 2
      Assets/Resource/Sprite/Mobile/Garden/Flower30.png.meta
  64. 13 2
      Assets/Resource/Sprite/Mobile/Garden/Flower31.png.meta
  65. 13 2
      Assets/Resource/Sprite/Mobile/Garden/Flower32.png.meta
  66. 13 2
      Assets/Resource/Sprite/Mobile/Garden/Flower33.png.meta
  67. 13 2
      Assets/Resource/Sprite/Mobile/Garden/Flower34.png.meta
  68. 13 2
      Assets/Resource/Sprite/Mobile/Garden/Flower35.png.meta
  69. 14 2
      Assets/Resource/Sprite/Mobile/Garden/Flower37.png.meta
  70. 14 2
      Assets/Resource/Sprite/Mobile/Garden/Flower38.png.meta
  71. 14 2
      Assets/Resource/Sprite/Mobile/Garden/Flower39.png.meta
  72. 13 2
      Assets/Resource/Sprite/Mobile/Garden/Flower4.png.meta
  73. 14 2
      Assets/Resource/Sprite/Mobile/Garden/Flower40.png.meta
  74. 14 2
      Assets/Resource/Sprite/Mobile/Garden/Flower41.png.meta
  75. 14 2
      Assets/Resource/Sprite/Mobile/Garden/Flower42.png.meta
  76. 14 2
      Assets/Resource/Sprite/Mobile/Garden/Flower43.png.meta
  77. 14 2
      Assets/Resource/Sprite/Mobile/Garden/Flower44.png.meta
  78. 14 2
      Assets/Resource/Sprite/Mobile/Garden/Flower45.png.meta
  79. 14 2
      Assets/Resource/Sprite/Mobile/Garden/Flower46.png.meta
  80. 14 2
      Assets/Resource/Sprite/Mobile/Garden/Flower47.png.meta
  81. 14 2
      Assets/Resource/Sprite/Mobile/Garden/Flower48.png.meta
  82. 14 2
      Assets/Resource/Sprite/Mobile/Garden/Flower49.png.meta
  83. 13 2
      Assets/Resource/Sprite/Mobile/Garden/Flower5.png.meta
  84. 14 2
      Assets/Resource/Sprite/Mobile/Garden/Flower50.png.meta
  85. 13 2
      Assets/Resource/Sprite/Mobile/Garden/Flower6.png.meta
  86. 13 2
      Assets/Resource/Sprite/Mobile/Garden/Flower7.png.meta
  87. 13 2
      Assets/Resource/Sprite/Mobile/Garden/Flower8.png.meta
  88. 13 2
      Assets/Resource/Sprite/Mobile/Garden/Flower9.png.meta
  89. 3 0
      Assets/Resource/XML/lan/ChineseSimplified.xml
  90. 2 0
      Assets/Resource/XML/lan/ChineseTraditional.xml
  91. 2 0
      Assets/Resource/XML/lan/English.xml
  92. BIN
      Assets/Resource/Xlsx/language_config.xlsx
  93. 1 1
      Assets/Script/Editor/EditorAuxiliary.cs
  94. 3 1
      Assets/Script/Editor/PostProcessor.cs
  95. 7 0
      Assets/Script/Label/CanvasLabel.cs
  96. 2 0
      Assets/Script/Label/LanguageLabel.cs
  97. 20 3
      Assets/Script/Manage/HttpManager.cs
  98. 53 20
      Assets/Script/Manage/IAPManager.cs
  99. 53 0
      Assets/Script/Manage/PayCard.cs
  100. 13 0
      Assets/Script/Manage/PayCard.cs.meta

+ 0 - 25
Assets/Plugins/Alipay/IOS/AlipaySDK.framework.meta

@@ -1,25 +0,0 @@
-fileFormatVersion: 2
-guid: 786969225a8dc4e0eb4e00a91e7e1501
-folderAsset: yes
-timeCreated: 1502698138
-licenseType: Pro
-PluginImporter:
-  serializedVersion: 1
-  iconMap: {}
-  executionOrder: {}
-  isPreloaded: 0
-  isOverridable: 0
-  platformData:
-    Any:
-      enabled: 0
-      settings: {}
-    Editor:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-    iOS:
-      enabled: 1
-      settings: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 1 - 1
Assets/Plugins/UnityPurchasing/Bin/Facebook/live/FacebookStore.dll.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 97e43e86f5dfe4cb4a0eeee600af6b43
-timeCreated: 1523932893
+timeCreated: 1524018940
 licenseType: Pro
 PluginImporter:
   externalObjects: {}

File diff suppressed because it is too large
+ 0 - 0
Assets/Resource/Animations/人物动画/stand_ske.json


+ 2 - 1
Assets/Resource/Animations/人物动画/stand_ske.json.meta

@@ -3,6 +3,7 @@ guid: d9cae0096b575ad439815b89ff28bbf0
 timeCreated: 1522823268
 licenseType: Pro
 TextScriptImporter:
+  externalObjects: {}
   userData: 
-  assetBundleName: config
+  assetBundleName: new_dress_ske
   assetBundleVariant: 

File diff suppressed because it is too large
+ 0 - 0
Assets/Resource/Animations/人物动画/stand_tex_0.json


+ 2 - 1
Assets/Resource/Animations/人物动画/stand_tex_0.json.meta

@@ -3,6 +3,7 @@ guid: 5dc33eba5b1a31e41b1a4e73bc26f716
 timeCreated: 1522823268
 licenseType: Pro
 TextScriptImporter:
+  externalObjects: {}
   userData: 
-  assetBundleName: config
+  assetBundleName: new_dress_tex
   assetBundleVariant: 

File diff suppressed because it is too large
+ 0 - 0
Assets/Resource/Animations/人物动画/stand_tex_1.json


+ 2 - 1
Assets/Resource/Animations/人物动画/stand_tex_1.json.meta

@@ -3,6 +3,7 @@ guid: cdbea75251ed3a7429b4644cf8092c72
 timeCreated: 1522823268
 licenseType: Pro
 TextScriptImporter:
+  externalObjects: {}
   userData: 
-  assetBundleName: config
+  assetBundleName: new_dress_tex
   assetBundleVariant: 

BIN
Assets/Resource/Animations/人物动画/stand_texture_0.png


File diff suppressed because it is too large
+ 224 - 105
Assets/Resource/Animations/人物动画/stand_texture_0.png.meta


BIN
Assets/Resource/Animations/人物动画/stand_texture_1.png


+ 321 - 185
Assets/Resource/Animations/人物动画/stand_texture_1.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: c0256ea9e745dc544ae7035b55f87b84
-timeCreated: 1523514568
+timeCreated: 1524022564
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName:
@@ -102,6 +102,11 @@ TextureImporter:
     21300190: "\u978B\u5B5015-2"
     21300192: "\u978B\u5B5014b"
     21300194: "\u88D9\u5B5016"
+    21300196: "\u5934\u53D111(\u68D5)"
+    21300198: "\u5934\u53D111(\u84DD)"
+    21300200: "\u978B\u5B50-\u7F3A\u5931"
+    21300202: "\u4E0B\u886314"
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -110,6 +115,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -125,10 +132,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: 0
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -150,6 +160,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 4096
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -158,6 +169,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 4096
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -166,6 +178,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 4096
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -174,6 +187,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 4096
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -182,6 +196,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: WebGL
     maxTextureSize: 4096
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -192,504 +207,542 @@ TextureImporter:
     serializedVersion: 2
     sprites:
     - serializedVersion: 2
-      name: "\u978B\u5B5015-2_1"
+      name: "\u773C\u775B1"
       rect:
         serializedVersion: 2
-        x: 1549
-        y: 3433
-        width: 66
-        height: 134
+        x: 1095
+        y: 3389
+        width: 264
+        height: 95
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
       name: "\u4E0A\u88631"
       rect:
         serializedVersion: 2
-        x: 3915
-        y: 3983
+        x: 1120
+        y: 3137
         width: 165
         height: 111
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
       name: 2
       rect:
         serializedVersion: 2
-        x: 4015
-        y: 3847
+        x: 138
+        y: 2853
         width: 66
         height: 134
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
       name: "\u4E0A\u88632"
       rect:
         serializedVersion: 2
-        x: 3602
-        y: 3603
+        x: 1287
+        y: 3137
         width: 165
         height: 111
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
       name: "\u4E0A\u88633"
       rect:
         serializedVersion: 2
-        x: 3420
-        y: 3583
+        x: 1465
+        y: 3145
         width: 165
         height: 111
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
       name: "\u773C\u775B2"
       rect:
         serializedVersion: 2
-        x: 2993
-        y: 3860
+        x: 3524
+        y: 3454
         width: 264
         height: 95
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u978B\u5B502"
+      name: "\u773C\u775B3"
       rect:
         serializedVersion: 2
-        x: 2280
-        y: 3768
-        width: 66
-        height: 134
+        x: 3790
+        y: 3418
+        width: 264
+        height: 95
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u978B\u5B503"
+      name: "\u978B\u5B502"
       rect:
         serializedVersion: 2
-        x: 3973
-        y: 3560
+        x: 138
+        y: 2989
         width: 66
         height: 134
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u88D9\u5B5010(\u9EC4)"
+      name: "\u978B\u5B503"
       rect:
         serializedVersion: 2
-        x: 2
-        y: 3031
-        width: 271
-        height: 184
+        x: 328
+        y: 3201
+        width: 66
+        height: 134
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u88D9\u5B5010"
+      name: "\u88D9\u5B5010(\u9EC4)"
       rect:
         serializedVersion: 2
-        x: 864
-        y: 2919
+        x: 1998
+        y: 3632
         width: 271
         height: 184
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u8863\u670D11(\u7C89)"
+      name: "\u88D9\u5B5010"
       rect:
         serializedVersion: 2
-        x: 1208
-        y: 3793
-        width: 386
-        height: 301
+        x: 2271
+        y: 3632
+        width: 271
+        height: 184
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
       name: "\u88D9\u5B5011(\u7C89)"
       rect:
         serializedVersion: 2
-        x: 560
-        y: 3170
+        x: 3551
+        y: 3897
         width: 302
         height: 197
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
-      tessellationDetail: -1
-    - serializedVersion: 2
-      name: "\u8863\u670D11"
-      rect:
-        serializedVersion: 2
-        x: 820
-        y: 3793
-        width: 386
-        height: 301
-      alignment: 0
-      pivot: {x: 0, y: 0}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
       name: "\u88D9\u5B5011"
       rect:
         serializedVersion: 2
-        x: 864
-        y: 3105
+        x: 3551
+        y: 3698
         width: 302
         height: 197
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
       name: "\u88D9\u5B504"
       rect:
         serializedVersion: 2
-        x: 3710
-        y: 3952
+        x: 3855
+        y: 3788
         width: 203
         height: 142
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
       name: "\u88D9\u5B505"
       rect:
         serializedVersion: 2
-        x: 3286
-        y: 3821
+        x: 3862
+        y: 3644
         width: 203
         height: 142
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
       name: "\u88D9\u5B507\uFF08\u7C89\uFF09"
       rect:
         serializedVersion: 2
-        x: 1643
-        y: 3552
+        x: 3013
+        y: 3861
         width: 287
         height: 233
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
       name: "\u88D9\u5B507"
       rect:
         serializedVersion: 2
-        x: 1260
-        y: 3334
+        x: 2724
+        y: 3861
         width: 287
         height: 233
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
       name: "\u88D9\u5B508"
       rect:
         serializedVersion: 2
-        x: 1949
-        y: 3655
+        x: 764
+        y: 3272
         width: 329
         height: 247
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
       name: "\u88D9\u5B509"
       rect:
         serializedVersion: 2
-        x: 275
-        y: 3030
+        x: 3282
+        y: 3651
         width: 259
         height: 185
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
       name: "\u88D9\u5B5013"
       rect:
         serializedVersion: 2
-        x: 344
-        y: 3435
+        x: 1656
+        y: 3606
         width: 340
         height: 276
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
       name: "\u88D9\u5B5013(\u7D2B)"
       rect:
         serializedVersion: 2
-        x: 2
-        y: 3435
+        x: 2134
+        y: 3818
         width: 340
         height: 276
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: 3
+      name: 8
       rect:
         serializedVersion: 2
-        x: 3769
-        y: 3580
+        x: 1454
+        y: 3009
         width: 66
         height: 134
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: 4
+      name: 9
       rect:
         serializedVersion: 2
-        x: 3587
-        y: 3467
+        x: 1522
+        y: 3009
         width: 66
         height: 134
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: 5
+      name: 10
       rect:
         serializedVersion: 2
-        x: 3655
-        y: 3467
+        x: 70
+        y: 2989
         width: 66
         height: 134
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: 6
+      name: 11
       rect:
         serializedVersion: 2
-        x: 3837
-        y: 3560
+        x: 206
+        y: 2989
         width: 66
         height: 134
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: 7
+      name: 12
       rect:
         serializedVersion: 2
-        x: 3905
-        y: 3560
+        x: 396
+        y: 3057
         width: 66
         height: 134
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: 8
+      name: 13
       rect:
         serializedVersion: 2
-        x: 3859
-        y: 3424
+        x: 2
+        y: 2853
         width: 66
         height: 134
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: 9
+      name: "\u5934\u99704"
       rect:
         serializedVersion: 2
-        x: 3927
-        y: 3424
-        width: 66
-        height: 134
+        x: 764
+        y: 3521
+        width: 440
+        height: 190
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: 10
+      name: "\u5934\u99705"
       rect:
         serializedVersion: 2
-        x: 3995
-        y: 3424
-        width: 66
-        height: 134
+        x: 1206
+        y: 3486
+        width: 363
+        height: 225
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u5934\u99704"
+      name: "\u5934\u99709"
       rect:
         serializedVersion: 2
-        x: 1949
-        y: 3904
-        width: 440
-        height: 190
+        x: 1303
+        y: 3787
+        width: 351
+        height: 307
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u5934\u99705"
+      name: "\u5934\u997010"
       rect:
         serializedVersion: 2
-        x: 2391
-        y: 3869
-        width: 363
-        height: 225
+        x: 411
+        y: 3411
+        width: 351
+        height: 307
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u5934\u997010"
+      name: "\u4E0A\u88635"
       rect:
         serializedVersion: 2
-        x: 1596
-        y: 3787
-        width: 351
-        height: 307
+        x: 2544
+        y: 3703
+        width: 166
+        height: 114
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
       name: "\u4E0A\u88636"
       rect:
         serializedVersion: 2
-        x: 3679
-        y: 3716
+        x: 938
+        y: 3153
         width: 180
         height: 111
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
       name: "\u4E0A\u88637"
       rect:
         serializedVersion: 2
-        x: 3181
-        y: 3612
+        x: 1283
+        y: 3250
         width: 180
         height: 111
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
       name: "\u4E0A\u886311"
       rect:
         serializedVersion: 2
-        x: 2993
-        y: 3737
+        x: 1361
+        y: 3363
         width: 186
         height: 121
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
       name: "\u4E0A\u886312"
       rect:
         serializedVersion: 2
-        x: 3861
-        y: 3696
+        x: 1549
+        y: 3258
         width: 180
         height: 111
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u4E0A\u886310\uFF08\u9EC4\uFF09"
+      rect:
+        serializedVersion: 2
+        x: 2073
+        y: 3336
+        width: 179
+        height: 144
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
       name: "\u4E0A\u886311(\u7C89)"
       rect:
         serializedVersion: 2
-        x: 3491
-        y: 3809
+        x: 1095
+        y: 3266
         width: 186
         height: 121
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
       name: "\u4E0A\u886313(\u7D2B)"
       rect:
         serializedVersion: 2
-        x: 3528
+        x: 3855
         y: 3932
         width: 180
         height: 162
@@ -697,51 +750,55 @@ TextureImporter:
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
       name: "\u4E0A\u88637\uFF08\u7C89\uFF09"
       rect:
         serializedVersion: 2
-        x: 3420
-        y: 3696
+        x: 756
+        y: 3159
         width: 180
         height: 111
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
       name: "\u7FC5\u81801"
       rect:
         serializedVersion: 2
-        x: 820
-        y: 3581
+        x: 1656
+        y: 3884
         width: 476
         height: 210
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u82B1\u6735\u5B9D\u7BB1"
+      name: "\u7CFB\u7EDF\u5B9D\u7BB1"
       rect:
         serializedVersion: 2
-        x: 411
-        y: 3713
+        x: 2
+        y: 3337
         width: 407
         height: 381
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
       name: "\u94BB\u77F3\u5B9D\u7BB1"
       rect:
         serializedVersion: 2
-        x: 2
+        x: 894
         y: 3713
         width: 407
         height: 381
@@ -749,282 +806,361 @@ TextureImporter:
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
       name: "\u60CA\u8BB6"
       rect:
         serializedVersion: 2
-        x: 2756
-        y: 3836
+        x: 1836
+        y: 3238
         width: 235
         height: 119
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
       name: "\u5F00\u5FC3"
       rect:
         serializedVersion: 2
-        x: 539
-        y: 2886
+        x: 2269
+        y: 3495
         width: 270
         height: 135
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
       name: "\u671F\u5F85"
       rect:
         serializedVersion: 2
-        x: 3710
-        y: 3829
+        x: 1836
+        y: 3359
         width: 235
         height: 121
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
       name: "\u8272\u54AA\u54AA"
       rect:
         serializedVersion: 2
-        x: 3286
-        y: 3965
+        x: 3282
+        y: 3520
         width: 240
         height: 129
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
       name: "\u90C1\u95F7"
       rect:
         serializedVersion: 2
-        x: 3181
-        y: 3725
+        x: 1549
+        y: 3371
         width: 237
         height: 94
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
       name: "\u978B\u5B5015-1"
       rect:
         serializedVersion: 2
-        x: 1168
-        y: 3168
+        x: 328
+        y: 3065
         width: 66
         height: 134
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
       name: "\u978B\u5B5015-2"
       rect:
         serializedVersion: 2
-        x: 3791
-        y: 3424
+        x: 274
+        y: 2929
         width: 66
         height: 134
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
       name: "\u5934\u997015"
       rect:
         serializedVersion: 2
-        x: 268
-        y: 2873
+        x: 1998
+        y: 3482
         width: 269
         height: 148
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
       name: "\u4E0B\u886314b\u8774\u8776\u7ED3"
       rect:
         serializedVersion: 2
-        x: 2756
-        y: 3957
+        x: 2269
+        y: 3356
         width: 263
         height: 137
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
       name: "\u4E0B\u886314b"
       rect:
         serializedVersion: 2
-        x: 2
-        y: 3217
+        x: 2724
+        y: 3643
         width: 277
         height: 216
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
       name: "\u4E0B\u886314c\u8774\u8776\u7ED3"
       rect:
         serializedVersion: 2
-        x: 3021
-        y: 3957
+        x: 1571
+        y: 3467
         width: 263
         height: 137
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
       name: "\u4E0B\u886314c"
       rect:
         serializedVersion: 2
-        x: 281
-        y: 3217
+        x: 3003
+        y: 3643
         width: 277
         height: 216
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
       name: "\u978B\u5B5014a"
       rect:
         serializedVersion: 2
-        x: 1168
-        y: 3032
+        x: 2
+        y: 2989
         width: 66
         height: 134
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
       name: "\u978B\u5B5014b"
       rect:
         serializedVersion: 2
-        x: 3723
-        y: 3444
+        x: 70
+        y: 2853
         width: 66
         height: 134
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u978B\u5B5014c"
+      name: "\u4E0B\u886314a"
       rect:
         serializedVersion: 2
-        x: 3947
-        y: 3847
-        width: 66
-        height: 134
+        x: 411
+        y: 3193
+        width: 343
+        height: 216
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u4E0B\u886314a"
+      name: "\u5934\u53D111(\u68D5)\u540E"
       rect:
         serializedVersion: 2
-        x: 1298
-        y: 3569
-        width: 343
-        height: 216
+        x: 2476
+        y: 3819
+        width: 246
+        height: 275
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u5934\u53D111(\u68D5)\u540E"
+      name: "\u5934\u53D111(\u68D5)"
       rect:
         serializedVersion: 2
-        x: 1012
-        y: 3304
-        width: 246
-        height: 275
+        x: 2
+        y: 3720
+        width: 444
+        height: 374
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u5934\u53D111(\u84DD)"
+      rect:
+        serializedVersion: 2
+        x: 448
+        y: 3720
+        width: 444
+        height: 374
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
       name: "\u7FC5\u81805"
       rect:
         serializedVersion: 2
-        x: 536
-        y: 3023
+        x: 3543
+        y: 3551
         width: 317
         height: 145
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
       name: "\u5E3D\u5B5016"
       rect:
         serializedVersion: 2
-        x: 1260
-        y: 3076
+        x: 3302
+        y: 3838
         width: 247
         height: 256
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
       name: "\u88D9\u5B5016"
       rect:
         serializedVersion: 2
-        x: 2
-        y: 2865
+        x: 2544
+        y: 3477
         width: 264
         height: 164
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
       tessellationDetail: -1
     - serializedVersion: 2
       name: "\u7FC5\u8180-\u7F3A\u5931"
       rect:
         serializedVersion: 2
-        x: 686
-        y: 3369
+        x: 2
+        y: 3125
         width: 324
         height: 210
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
+      physicsShape: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u4E0A\u8863-\u7F3A\u5931"
+      rect:
+        serializedVersion: 2
+        x: 1632
+        y: 3137
+        width: 165
+        height: 111
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u978B\u5B50-\u7F3A\u5931"
+      rect:
+        serializedVersion: 2
+        x: 1571
+        y: 3651
+        width: 66
+        height: 134
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u4E0B\u886314"
+      rect:
+        serializedVersion: 2
+        x: 3862
+        y: 3515
+        width: 207
+        height: 127
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
       tessellationDetail: -1
     outline: []
+    physicsShape: []
   spritePackingTag: 
   userData: 
-  assetBundleName: scene
+  assetBundleName: new_dress_tex
   assetBundleVariant: 

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

@@ -244,6 +244,7 @@ namespace DragonBones
                 material.mainTexture = textureAtlas;
 
                 //Initializer.DebugText.text = "error : ufr5";
+                //Debug.Log(textureAtlas.name);
                 AtlasDictionary.Add(textureAtlas.name, textureAtlas);
 
                 //Initializer.DebugText.text = "error : ufr6";

+ 1 - 1
Assets/Resource/Logo.unity

@@ -341,7 +341,7 @@ RectTransform:
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 841147520}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 488.5, y: 275, z: 0}
+  m_LocalPosition: {x: 432.5, y: 243.5, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 722194762}

+ 4 - 17
Assets/Resource/Prefab/Object/DebugMode.prefab

@@ -51,23 +51,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 93a1da3798d4c6b44a5a139df98a95f3, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  NewDressSkeList:
-  - {fileID: 4900000, guid: 578290abd89616344820081776adb70a, type: 3}
-  NewDressTexList:
-  - {fileID: 2800000, guid: 5fa5bf8d920e02e478f5f48fd4a17c4d, type: 3}
-  - {fileID: 2800000, guid: 9134c52440e84c94691416af2d76f4e6, type: 3}
-  - {fileID: 2800000, guid: 595ba4eea8a77cd488494ec8664afc81, type: 3}
-  - {fileID: 2800000, guid: 605aad146433a1d459ac657b1d0d7710, type: 3}
-  NewDressTexConfigList:
-  - {fileID: 4900000, guid: 0c710b3abfc5cf7429d8ebd1a555598f, type: 3}
-  - {fileID: 4900000, guid: 11194f1ec403c4b478fd9c3fb3ef8e6c, type: 3}
-  - {fileID: 4900000, guid: 4ed6a8f18430d8743addbcb7bb976b48, type: 3}
-  - {fileID: 4900000, guid: 474b844c27d8bf94e807b68f790c39d3, type: 3}
-  NewDressSpriteList:
-  - {fileID: 21300000, guid: 605aad146433a1d459ac657b1d0d7710, type: 3}
-  - {fileID: 21300000, guid: 595ba4eea8a77cd488494ec8664afc81, type: 3}
-  - {fileID: 21300000, guid: 9134c52440e84c94691416af2d76f4e6, type: 3}
-  - {fileID: 21300000, guid: 5fa5bf8d920e02e478f5f48fd4a17c4d, type: 3}
+  NewDressSkeList: []
+  NewDressTexList: []
+  NewDressTexConfigList: []
+  NewDressSpriteList: []
   NewFlowerSpriteList:
   - {fileID: 21300000, guid: 39300fd0e860ea143850d7c4ec94625d, type: 3}
   AtlasTexture: {fileID: 2800000, guid: b31bbacb2e0ff3d459f4878983a39b50, type: 3}

File diff suppressed because it is too large
+ 504 - 42
Assets/Resource/Prefab/PrefabUI/Canvas.prefab


+ 17 - 38
Assets/Resource/Shader/GrayMat.mat

@@ -8,51 +8,30 @@ Material:
   m_PrefabInternal: {fileID: 0}
   m_Name: GrayMat
   m_Shader: {fileID: 4800000, guid: ac390d8200b91bd419e2d7b9e580d07d, type: 3}
-  m_ShaderKeywords: _EMISSION
+  m_ShaderKeywords: UNITY_UI_CLIP_RECT _EMISSION
   m_LightmapFlags: 1
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
+  disabledShaderPasses: []
   m_SavedProperties:
-    serializedVersion: 2
+    serializedVersion: 3
     m_TexEnvs:
-    - first:
-        name: _MainTex
-      second:
+    - _MainTex:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     m_Floats:
-    - first:
-        name: _ColorMask
-      second: 15
-    - first:
-        name: _GrayLerp
-      second: 1
-    - first:
-        name: _GrayScaleX
-      second: 0.299
-    - first:
-        name: _GrayScaleY
-      second: 0.587
-    - first:
-        name: _GrayScaleZ
-      second: 0.114
-    - first:
-        name: _Stencil
-      second: 0
-    - first:
-        name: _StencilComp
-      second: 8
-    - first:
-        name: _StencilOp
-      second: 0
-    - first:
-        name: _StencilReadMask
-      second: 255
-    - first:
-        name: _StencilWriteMask
-      second: 255
-    - first:
-        name: _UseUIAlphaClip
-      second: 0
+    - _ColorMask: 15
+    - _GrayLerp: 1
+    - _GrayScaleX: 0.299
+    - _GrayScaleY: 0.587
+    - _GrayScaleZ: 0.114
+    - _Stencil: 0
+    - _StencilComp: 8
+    - _StencilOp: 0
+    - _StencilReadMask: 255
+    - _StencilWriteMask: 255
+    - _UseUIAlphaClip: 0
     m_Colors: []

File diff suppressed because it is too large
+ 0 - 0
Assets/Resource/Sprite/Editor/HotUpdate/NewDress/Dress_ske.json


+ 2 - 1
Assets/Resource/Sprite/Editor/HotUpdate/NewDress/Dress_ske.json.meta

@@ -3,6 +3,7 @@ guid: 578290abd89616344820081776adb70a
 timeCreated: 1516589539
 licenseType: Pro
 TextScriptImporter:
+  externalObjects: {}
   userData: 
-  assetBundleName: new_dress_ske
+  assetBundleName: 
   assetBundleVariant: 

BIN
Assets/Resource/Sprite/Editor/HotUpdate/NewDress/上衣14.png


+ 14 - 2
Assets/Resource/Sprite/Editor/HotUpdate/NewDress/上衣14.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1516589527
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -60,6 +67,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -68,6 +76,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -76,6 +85,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -84,6 +94,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: WebGL
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -94,7 +105,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: 
   userData: 
-  assetBundleName: new_dress_tex
+  assetBundleName: 
   assetBundleVariant: 

+ 1 - 1
Assets/Resource/Sprite/Editor/HotUpdate/NewDress/上衣14_tex.json

@@ -1 +1 @@
-{ "imagePath":"上衣14.png","SubTexture":[{"width":185,"y":0,"height":111,"name":"上衣14","x":0}],"name":"Dress_ske"}
+{ "imagePath":"上衣14.png","SubTexture":[{"width":185,"y":0,"height":111,"name":"上衣14","x":0}],"name":"上衣14"}

+ 2 - 1
Assets/Resource/Sprite/Editor/HotUpdate/NewDress/上衣14_tex.json.meta

@@ -3,6 +3,7 @@ guid: 474b844c27d8bf94e807b68f790c39d3
 timeCreated: 1516598870
 licenseType: Pro
 TextScriptImporter:
+  externalObjects: {}
   userData: 
-  assetBundleName: new_dress_tex
+  assetBundleName: 
   assetBundleVariant: 

BIN
Assets/Resource/Sprite/Editor/HotUpdate/NewDress/下衣14.png


+ 14 - 2
Assets/Resource/Sprite/Editor/HotUpdate/NewDress/下衣14.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1516589527
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -60,6 +67,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -68,6 +76,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -76,6 +85,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -84,6 +94,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: WebGL
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -94,7 +105,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: 
   userData: 
-  assetBundleName: new_dress_tex
+  assetBundleName: 
   assetBundleVariant: 

+ 1 - 1
Assets/Resource/Sprite/Editor/HotUpdate/NewDress/下衣14_tex.json

@@ -1 +1 @@
-{ "imagePath":"下衣14.png","SubTexture":[{"width":207,"y":0,"height":127,"name":"下衣14","x":0}],"name":"Dress_ske"}
+{ "imagePath":"下衣14.png","SubTexture":[{"width":207,"y":0,"height":127,"name":"下衣14","x":0}],"name":"上衣14"}

+ 2 - 1
Assets/Resource/Sprite/Editor/HotUpdate/NewDress/下衣14_tex.json.meta

@@ -3,6 +3,7 @@ guid: 4ed6a8f18430d8743addbcb7bb976b48
 timeCreated: 1516598870
 licenseType: Pro
 TextScriptImporter:
+  externalObjects: {}
   userData: 
-  assetBundleName: new_dress_tex
+  assetBundleName: 
   assetBundleVariant: 

BIN
Assets/Resource/Sprite/Editor/HotUpdate/NewDress/头发14(粉色).png


+ 14 - 2
Assets/Resource/Sprite/Editor/HotUpdate/NewDress/头发14(粉色).png.meta

@@ -4,6 +4,7 @@ timeCreated: 1516589527
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -60,6 +67,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -68,6 +76,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -76,6 +85,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -84,6 +94,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: WebGL
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -94,7 +105,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: 
   userData: 
-  assetBundleName: new_dress_tex
+  assetBundleName: 
   assetBundleVariant: 

+ 1 - 1
Assets/Resource/Sprite/Editor/HotUpdate/NewDress/头发14(粉色)_tex.json

@@ -1 +1 @@
-{ "imagePath":"头发14(粉色).png","SubTexture":[{"width":450,"y":0,"height":445,"name":"头发14(粉色)","x":0}],"name":"Dress_ske"}
+{ "imagePath":"头发14(粉色).png","SubTexture":[{"width":450,"y":0,"height":445,"name":"头发14(粉色)","x":0}],"name":"上衣14"}

+ 2 - 1
Assets/Resource/Sprite/Editor/HotUpdate/NewDress/头发14(粉色)_tex.json.meta

@@ -3,6 +3,7 @@ guid: 11194f1ec403c4b478fd9c3fb3ef8e6c
 timeCreated: 1516598870
 licenseType: Pro
 TextScriptImporter:
+  externalObjects: {}
   userData: 
-  assetBundleName: new_dress_tex
+  assetBundleName: 
   assetBundleVariant: 

+ 14 - 2
Assets/Resource/Sprite/Editor/HotUpdate/NewDress/装饰14.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1516589527
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -60,6 +67,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -68,6 +76,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -76,6 +85,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -84,6 +94,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: WebGL
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -94,7 +105,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: 
   userData: 
-  assetBundleName: new_dress_tex
+  assetBundleName: 
   assetBundleVariant: 

+ 1 - 1
Assets/Resource/Sprite/Editor/HotUpdate/NewDress/装饰14_tex.json

@@ -1 +1 @@
-{ "imagePath":"装饰14.png","SubTexture":[{"width":183,"y":0,"height":264,"name":"装饰14","x":0}],"name":"Dress_ske"}
+{ "imagePath":"装饰14.png","SubTexture":[{"width":183,"y":0,"height":264,"name":"装饰14","x":0}],"name":"上衣14"}

+ 2 - 1
Assets/Resource/Sprite/Editor/HotUpdate/NewDress/装饰14_tex.json.meta

@@ -3,6 +3,7 @@ guid: 0c710b3abfc5cf7429d8ebd1a555598f
 timeCreated: 1516598870
 licenseType: Pro
 TextScriptImporter:
+  externalObjects: {}
   userData: 
-  assetBundleName: new_dress_tex
+  assetBundleName: 
   assetBundleVariant: 

BIN
Assets/Resource/Sprite/Editor/SpriteUI/alipay.png


+ 76 - 0
Assets/Resource/Sprite/Editor/SpriteUI/alipay.png.meta

@@ -0,0 +1,76 @@
+fileFormatVersion: 2
+guid: f1c557df829820747a567892f698571b
+timeCreated: 1524042668
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    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:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 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
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/Resource/Sprite/Editor/SpriteUI/wechat.png


+ 76 - 0
Assets/Resource/Sprite/Editor/SpriteUI/wechat.png.meta

@@ -0,0 +1,76 @@
+fileFormatVersion: 2
+guid: 287530e95c44bc648a66d3f9e9bc2a1d
+timeCreated: 1524042668
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    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:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 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
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 14 - 2
Assets/Resource/Sprite/Mobile/Garden/Flower0.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1523496107
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -60,6 +67,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -68,6 +76,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -76,6 +85,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -84,6 +94,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: WebGL
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -94,7 +105,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: 
   userData: 
-  assetBundleName: atlas2
+  assetBundleName: new_flower_tex
   assetBundleVariant: 

+ 13 - 2
Assets/Resource/Sprite/Mobile/Garden/Flower1.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1509112612
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -60,6 +67,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -68,6 +76,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -76,6 +85,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -86,7 +96,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: Flower
   userData: 
-  assetBundleName: atlas2
+  assetBundleName: new_flower_tex
   assetBundleVariant: 

+ 13 - 2
Assets/Resource/Sprite/Mobile/Garden/Flower10.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1509112619
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -60,6 +67,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -68,6 +76,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -76,6 +85,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -86,7 +96,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: Flower
   userData: 
-  assetBundleName: atlas2
+  assetBundleName: new_flower_tex
   assetBundleVariant: 

+ 13 - 2
Assets/Resource/Sprite/Mobile/Garden/Flower11.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1509112619
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -60,6 +67,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -68,6 +76,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -76,6 +85,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -86,7 +96,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: Flower
   userData: 
-  assetBundleName: atlas2
+  assetBundleName: new_flower_tex
   assetBundleVariant: 

+ 13 - 2
Assets/Resource/Sprite/Mobile/Garden/Flower12.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1509112620
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -60,6 +67,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -68,6 +76,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -76,6 +85,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -86,7 +96,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: Flower
   userData: 
-  assetBundleName: atlas2
+  assetBundleName: new_flower_tex
   assetBundleVariant: 

+ 13 - 2
Assets/Resource/Sprite/Mobile/Garden/Flower13.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1509112620
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -60,6 +67,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -68,6 +76,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -76,6 +85,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -86,7 +96,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: Flower
   userData: 
-  assetBundleName: atlas2
+  assetBundleName: new_flower_tex
   assetBundleVariant: 

+ 13 - 2
Assets/Resource/Sprite/Mobile/Garden/Flower14.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1509112621
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -60,6 +67,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -68,6 +76,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -76,6 +85,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -86,7 +96,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: Flower
   userData: 
-  assetBundleName: atlas2
+  assetBundleName: new_flower_tex
   assetBundleVariant: 

+ 13 - 2
Assets/Resource/Sprite/Mobile/Garden/Flower15.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1509112622
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -60,6 +67,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -68,6 +76,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -76,6 +85,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -86,7 +96,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: Flower
   userData: 
-  assetBundleName: atlas2
+  assetBundleName: new_flower_tex
   assetBundleVariant: 

+ 13 - 2
Assets/Resource/Sprite/Mobile/Garden/Flower16.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1509112623
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -60,6 +67,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -68,6 +76,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -76,6 +85,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -86,7 +96,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: Flower
   userData: 
-  assetBundleName: atlas2
+  assetBundleName: new_flower_tex
   assetBundleVariant: 

+ 13 - 2
Assets/Resource/Sprite/Mobile/Garden/Flower17.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1509112623
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -60,6 +67,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -68,6 +76,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -76,6 +85,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -86,7 +96,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: Flower
   userData: 
-  assetBundleName: atlas2
+  assetBundleName: new_flower_tex
   assetBundleVariant: 

+ 13 - 2
Assets/Resource/Sprite/Mobile/Garden/Flower18.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1509112624
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -60,6 +67,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -68,6 +76,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -76,6 +85,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -86,7 +96,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: Flower
   userData: 
-  assetBundleName: atlas2
+  assetBundleName: new_flower_tex
   assetBundleVariant: 

+ 13 - 2
Assets/Resource/Sprite/Mobile/Garden/Flower19.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1509112625
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -60,6 +67,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -68,6 +76,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -76,6 +85,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -86,7 +96,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: Flower
   userData: 
-  assetBundleName: atlas2
+  assetBundleName: new_flower_tex
   assetBundleVariant: 

+ 13 - 2
Assets/Resource/Sprite/Mobile/Garden/Flower2.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1509112612
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -60,6 +67,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -68,6 +76,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -76,6 +85,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -86,7 +96,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: Flower
   userData: 
-  assetBundleName: atlas2
+  assetBundleName: new_flower_tex
   assetBundleVariant: 

+ 13 - 2
Assets/Resource/Sprite/Mobile/Garden/Flower20.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1509112625
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -60,6 +67,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -68,6 +76,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -76,6 +85,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -86,7 +96,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: Flower
   userData: 
-  assetBundleName: atlas2
+  assetBundleName: new_flower_tex
   assetBundleVariant: 

+ 13 - 2
Assets/Resource/Sprite/Mobile/Garden/Flower21.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1509112626
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -60,6 +67,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -68,6 +76,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -76,6 +85,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -86,7 +96,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: Flower
   userData: 
-  assetBundleName: atlas2
+  assetBundleName: new_flower_tex
   assetBundleVariant: 

+ 13 - 2
Assets/Resource/Sprite/Mobile/Garden/Flower22.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1509112627
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -60,6 +67,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -68,6 +76,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -76,6 +85,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -86,7 +96,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: Flower
   userData: 
-  assetBundleName: atlas2
+  assetBundleName: new_flower_tex
   assetBundleVariant: 

+ 13 - 2
Assets/Resource/Sprite/Mobile/Garden/Flower23.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1509112627
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -60,6 +67,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -68,6 +76,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -76,6 +85,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -86,7 +96,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: Flower
   userData: 
-  assetBundleName: atlas2
+  assetBundleName: new_flower_tex
   assetBundleVariant: 

+ 13 - 2
Assets/Resource/Sprite/Mobile/Garden/Flower24.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1509112628
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -60,6 +67,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -68,6 +76,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -76,6 +85,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -86,7 +96,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: Flower
   userData: 
-  assetBundleName: atlas2
+  assetBundleName: new_flower_tex
   assetBundleVariant: 

+ 13 - 2
Assets/Resource/Sprite/Mobile/Garden/Flower25.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1509112629
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -60,6 +67,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -68,6 +76,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -76,6 +85,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -86,7 +96,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: Flower
   userData: 
-  assetBundleName: atlas2
+  assetBundleName: new_flower_tex
   assetBundleVariant: 

+ 13 - 2
Assets/Resource/Sprite/Mobile/Garden/Flower26.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1509112630
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -60,6 +67,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -68,6 +76,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -76,6 +85,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -86,7 +96,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: Flower
   userData: 
-  assetBundleName: atlas2
+  assetBundleName: new_flower_tex
   assetBundleVariant: 

+ 13 - 2
Assets/Resource/Sprite/Mobile/Garden/Flower27.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1509112631
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -60,6 +67,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -68,6 +76,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -76,6 +85,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -86,7 +96,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: Flower
   userData: 
-  assetBundleName: atlas2
+  assetBundleName: new_flower_tex
   assetBundleVariant: 

+ 13 - 2
Assets/Resource/Sprite/Mobile/Garden/Flower28.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1509112632
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -60,6 +67,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -68,6 +76,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -76,6 +85,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -86,7 +96,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: Flower
   userData: 
-  assetBundleName: atlas2
+  assetBundleName: new_flower_tex
   assetBundleVariant: 

+ 13 - 2
Assets/Resource/Sprite/Mobile/Garden/Flower29.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1509112632
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -60,6 +67,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -68,6 +76,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -76,6 +85,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -86,7 +96,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: Flower
   userData: 
-  assetBundleName: atlas2
+  assetBundleName: new_flower_tex
   assetBundleVariant: 

+ 13 - 2
Assets/Resource/Sprite/Mobile/Garden/Flower3.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1509112613
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -60,6 +67,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -68,6 +76,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -76,6 +85,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -86,7 +96,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: Flower
   userData: 
-  assetBundleName: atlas2
+  assetBundleName: new_flower_tex
   assetBundleVariant: 

+ 13 - 2
Assets/Resource/Sprite/Mobile/Garden/Flower30.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1509112633
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -60,6 +67,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -68,6 +76,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -76,6 +85,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -86,7 +96,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: Flower
   userData: 
-  assetBundleName: atlas2
+  assetBundleName: new_flower_tex
   assetBundleVariant: 

+ 13 - 2
Assets/Resource/Sprite/Mobile/Garden/Flower31.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1509112634
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -60,6 +67,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -68,6 +76,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -76,6 +85,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -86,7 +96,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: Flower
   userData: 
-  assetBundleName: atlas2
+  assetBundleName: new_flower_tex
   assetBundleVariant: 

+ 13 - 2
Assets/Resource/Sprite/Mobile/Garden/Flower32.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1509112634
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -60,6 +67,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -68,6 +76,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -76,6 +85,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -86,7 +96,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: Flower
   userData: 
-  assetBundleName: atlas2
+  assetBundleName: new_flower_tex
   assetBundleVariant: 

+ 13 - 2
Assets/Resource/Sprite/Mobile/Garden/Flower33.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1509112635
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -60,6 +67,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -68,6 +76,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -76,6 +85,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -86,7 +96,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: Flower
   userData: 
-  assetBundleName: atlas2
+  assetBundleName: new_flower_tex
   assetBundleVariant: 

+ 13 - 2
Assets/Resource/Sprite/Mobile/Garden/Flower34.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1509112636
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -60,6 +67,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -68,6 +76,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -76,6 +85,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -86,7 +96,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: Flower
   userData: 
-  assetBundleName: atlas2
+  assetBundleName: new_flower_tex
   assetBundleVariant: 

+ 13 - 2
Assets/Resource/Sprite/Mobile/Garden/Flower35.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1509112636
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -60,6 +67,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -68,6 +76,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -76,6 +85,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -86,7 +96,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: Flower
   userData: 
-  assetBundleName: atlas2
+  assetBundleName: new_flower_tex
   assetBundleVariant: 

+ 14 - 2
Assets/Resource/Sprite/Mobile/Garden/Flower37.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1523411440
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -60,6 +67,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -68,6 +76,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -76,6 +85,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -84,6 +94,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: WebGL
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -94,7 +105,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: 
   userData: 
-  assetBundleName: atlas2
+  assetBundleName: new_flower_tex
   assetBundleVariant: 

+ 14 - 2
Assets/Resource/Sprite/Mobile/Garden/Flower38.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1523411440
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -60,6 +67,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -68,6 +76,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -76,6 +85,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -84,6 +94,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: WebGL
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -94,7 +105,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: 
   userData: 
-  assetBundleName: atlas2
+  assetBundleName: new_flower_tex
   assetBundleVariant: 

+ 14 - 2
Assets/Resource/Sprite/Mobile/Garden/Flower39.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1523411440
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -60,6 +67,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -68,6 +76,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -76,6 +85,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -84,6 +94,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: WebGL
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -94,7 +105,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: 
   userData: 
-  assetBundleName: atlas2
+  assetBundleName: new_flower_tex
   assetBundleVariant: 

+ 13 - 2
Assets/Resource/Sprite/Mobile/Garden/Flower4.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1509112614
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -60,6 +67,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -68,6 +76,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -76,6 +85,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -86,7 +96,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: Flower
   userData: 
-  assetBundleName: atlas2
+  assetBundleName: new_flower_tex
   assetBundleVariant: 

+ 14 - 2
Assets/Resource/Sprite/Mobile/Garden/Flower40.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1523411440
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -60,6 +67,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -68,6 +76,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -76,6 +85,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -84,6 +94,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: WebGL
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -94,7 +105,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: 
   userData: 
-  assetBundleName: atlas2
+  assetBundleName: new_flower_tex
   assetBundleVariant: 

+ 14 - 2
Assets/Resource/Sprite/Mobile/Garden/Flower41.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1523411440
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -60,6 +67,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -68,6 +76,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -76,6 +85,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -84,6 +94,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: WebGL
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -94,7 +105,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: 
   userData: 
-  assetBundleName: atlas2
+  assetBundleName: new_flower_tex
   assetBundleVariant: 

+ 14 - 2
Assets/Resource/Sprite/Mobile/Garden/Flower42.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1523411440
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -60,6 +67,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -68,6 +76,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -76,6 +85,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -84,6 +94,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: WebGL
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -94,7 +105,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: 
   userData: 
-  assetBundleName: atlas2
+  assetBundleName: new_flower_tex
   assetBundleVariant: 

+ 14 - 2
Assets/Resource/Sprite/Mobile/Garden/Flower43.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1523411440
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -60,6 +67,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -68,6 +76,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -76,6 +85,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -84,6 +94,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: WebGL
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -94,7 +105,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: 
   userData: 
-  assetBundleName: atlas2
+  assetBundleName: new_flower_tex
   assetBundleVariant: 

+ 14 - 2
Assets/Resource/Sprite/Mobile/Garden/Flower44.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1523411440
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -60,6 +67,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -68,6 +76,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -76,6 +85,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -84,6 +94,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: WebGL
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -94,7 +105,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: 
   userData: 
-  assetBundleName: atlas2
+  assetBundleName: new_flower_tex
   assetBundleVariant: 

+ 14 - 2
Assets/Resource/Sprite/Mobile/Garden/Flower45.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1523411440
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -60,6 +67,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -68,6 +76,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -76,6 +85,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -84,6 +94,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: WebGL
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -94,7 +105,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: 
   userData: 
-  assetBundleName: atlas2
+  assetBundleName: new_flower_tex
   assetBundleVariant: 

+ 14 - 2
Assets/Resource/Sprite/Mobile/Garden/Flower46.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1523411440
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -60,6 +67,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -68,6 +76,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -76,6 +85,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -84,6 +94,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: WebGL
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -94,7 +105,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: 
   userData: 
-  assetBundleName: atlas2
+  assetBundleName: new_flower_tex
   assetBundleVariant: 

+ 14 - 2
Assets/Resource/Sprite/Mobile/Garden/Flower47.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1523411440
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -60,6 +67,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -68,6 +76,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -76,6 +85,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -84,6 +94,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: WebGL
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -94,7 +105,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: 
   userData: 
-  assetBundleName: atlas2
+  assetBundleName: new_flower_tex
   assetBundleVariant: 

+ 14 - 2
Assets/Resource/Sprite/Mobile/Garden/Flower48.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1523422991
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -60,6 +67,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -68,6 +76,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -76,6 +85,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -84,6 +94,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: WebGL
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -94,7 +105,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: 
   userData: 
-  assetBundleName: atlas2
+  assetBundleName: new_flower_tex
   assetBundleVariant: 

+ 14 - 2
Assets/Resource/Sprite/Mobile/Garden/Flower49.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1523422991
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -60,6 +67,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -68,6 +76,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -76,6 +85,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -84,6 +94,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: WebGL
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -94,7 +105,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: 
   userData: 
-  assetBundleName: atlas2
+  assetBundleName: new_flower_tex
   assetBundleVariant: 

+ 13 - 2
Assets/Resource/Sprite/Mobile/Garden/Flower5.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1509112615
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -60,6 +67,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -68,6 +76,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -76,6 +85,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -86,7 +96,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: Flower
   userData: 
-  assetBundleName: atlas2
+  assetBundleName: new_flower_tex
   assetBundleVariant: 

+ 14 - 2
Assets/Resource/Sprite/Mobile/Garden/Flower50.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1523422991
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -60,6 +67,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -68,6 +76,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -76,6 +85,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -84,6 +94,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: WebGL
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -94,7 +105,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: 
   userData: 
-  assetBundleName: atlas2
+  assetBundleName: new_flower_tex
   assetBundleVariant: 

+ 13 - 2
Assets/Resource/Sprite/Mobile/Garden/Flower6.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1509112616
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -60,6 +67,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -68,6 +76,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -76,6 +85,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -86,7 +96,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: Flower
   userData: 
-  assetBundleName: atlas2
+  assetBundleName: new_flower_tex
   assetBundleVariant: 

+ 13 - 2
Assets/Resource/Sprite/Mobile/Garden/Flower7.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1509112617
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -60,6 +67,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -68,6 +76,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -76,6 +85,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -86,7 +96,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: Flower
   userData: 
-  assetBundleName: atlas2
+  assetBundleName: new_flower_tex
   assetBundleVariant: 

+ 13 - 2
Assets/Resource/Sprite/Mobile/Garden/Flower8.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1509112617
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -60,6 +67,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -68,6 +76,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -76,6 +85,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -86,7 +96,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: Flower
   userData: 
-  assetBundleName: atlas2
+  assetBundleName: new_flower_tex
   assetBundleVariant: 

+ 13 - 2
Assets/Resource/Sprite/Mobile/Garden/Flower9.png.meta

@@ -4,6 +4,7 @@ timeCreated: 1509112618
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
+  externalObjects: {}
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -12,6 +13,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -1
-    wrapMode: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,6 +58,7 @@ TextureImporter:
   platformSettings:
   - buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -60,6 +67,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Standalone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -68,6 +76,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: iPhone
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -76,6 +85,7 @@ TextureImporter:
     overridden: 0
   - buildTarget: Android
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -86,7 +96,8 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
   spritePackingTag: Flower
   userData: 
-  assetBundleName: atlas2
+  assetBundleName: new_flower_tex
   assetBundleVariant: 

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

@@ -135,6 +135,8 @@
     <Pa_Tit desc=""><![CDATA[购买装扮]]></Pa_Tit>
     <Pa_BtnLab desc=""><![CDATA[购买]]></Pa_BtnLab>
     <Pa_VisitWarning desc=""><![CDATA[即将离开搭配秀访问TA的花园,确定继续?]]></Pa_VisitWarning>
+    <Pg_CrateTimeLimitWarning desc=""><![CDATA[5分钟内只能创建一个搭配秀
+剩余时间%NUM%]]></Pg_CrateTimeLimitWarning>
     <Pg_Cute desc=""><![CDATA[可爱]]></Pg_Cute>
     <Pg_Grace desc=""><![CDATA[优雅]]></Pg_Grace>
     <Pg_Vivid desc=""><![CDATA[活泼]]></Pg_Vivid>
@@ -297,6 +299,7 @@
     <AH_PrivateMessageEmpty desc=""><![CDATA[发送内容不能为空]]></AH_PrivateMessageEmpty>
     <AH_SendPrivateMessageFailed desc=""><![CDATA[发送失败]]></AH_SendPrivateMessageFailed>
     <AH_Current desc=""><![CDATA[刚刚]]></AH_Current>
+    <AK_Desc desc=""><![CDATA[请选择支付方式]]></AK_Desc>
   </UI>
   <FriendItem>
     <SendMessageButtonText desc=""><![CDATA[私信]]></SendMessageButtonText>

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

@@ -135,6 +135,7 @@
     <Pa_Tit desc=""><![CDATA[購買裝扮]]></Pa_Tit>
     <Pa_BtnLab desc=""><![CDATA[購買]]></Pa_BtnLab>
     <Pa_VisitWarning desc=""><![CDATA[即將離開搭配秀訪問TA的花園,確定繼續?]]></Pa_VisitWarning>
+    <Pg_CrateTimeLimitWarning desc=""><![CDATA[]]></Pg_CrateTimeLimitWarning>
     <Pg_Cute desc=""><![CDATA[可愛]]></Pg_Cute>
     <Pg_Grace desc=""><![CDATA[優雅]]></Pg_Grace>
     <Pg_Vivid desc=""><![CDATA[活潑]]></Pg_Vivid>
@@ -297,6 +298,7 @@
     <AH_PrivateMessageEmpty desc=""><![CDATA[發送內容不能為空]]></AH_PrivateMessageEmpty>
     <AH_SendPrivateMessageFailed desc=""><![CDATA[發送失敗]]></AH_SendPrivateMessageFailed>
     <AH_Current desc=""><![CDATA[剛剛]]></AH_Current>
+    <AK_Desc desc=""><![CDATA[請選擇支付方式]]></AK_Desc>
   </UI>
   <FriendItem>
     <SendMessageButtonText desc=""><![CDATA[私信]]></SendMessageButtonText>

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

@@ -135,6 +135,7 @@ Program 水怪
     <Pa_Tit desc=""><![CDATA[Buy clothing]]></Pa_Tit>
     <Pa_BtnLab desc=""><![CDATA[Buy]]></Pa_BtnLab>
     <Pa_VisitWarning desc=""><![CDATA[Will you leave fashion show to visit his/her garden?]]></Pa_VisitWarning>
+    <Pg_CrateTimeLimitWarning desc=""><![CDATA[]]></Pg_CrateTimeLimitWarning>
     <Pg_Cute desc=""><![CDATA[Cute]]></Pg_Cute>
     <Pg_Grace desc=""><![CDATA[Graceful]]></Pg_Grace>
     <Pg_Vivid desc=""><![CDATA[Lively]]></Pg_Vivid>
@@ -297,6 +298,7 @@ Program 水怪
     <AH_PrivateMessageEmpty desc=""><![CDATA[Content can not be null]]></AH_PrivateMessageEmpty>
     <AH_SendPrivateMessageFailed desc=""><![CDATA[Failed]]></AH_SendPrivateMessageFailed>
     <AH_Current desc=""><![CDATA[Just now]]></AH_Current>
+    <AK_Desc desc=""><![CDATA[Please choose a payment method]]></AK_Desc>
   </UI>
   <FriendItem>
     <SendMessageButtonText desc=""><![CDATA[Message]]></SendMessageButtonText>

BIN
Assets/Resource/Xlsx/language_config.xlsx


+ 1 - 1
Assets/Script/Editor/EditorAuxiliary.cs

@@ -40,7 +40,7 @@ public class EditorAuxiliary : Editor
             foreach (var sprite in Script.Sprites)
             {
                 string content = string.Format("{{ \"imagePath\":\"{0}.png\",\"SubTexture\":[{{\"width\":{1},\"y\":0,\"height\":{2},\"name\":\"{3}\",\"x\":0}}],\"name\":\"{4}\"}}", sprite.name, sprite.rect.width, sprite.rect.height, sprite.name, projectName);
-                File.WriteAllText(string.Format("{0}/Resource/Sprite/Editor/Dress/{1}_tex.json", Application.dataPath, sprite.name), content);
+                File.WriteAllText(string.Format("{0}/Resource/Sprite/Editor/HotUpdate/NewDress/{1}_tex.json", Application.dataPath, sprite.name), content);
             }
             AssetDatabase.Refresh();
         }

+ 3 - 1
Assets/Script/Editor/PostProcessor.cs

@@ -1,3 +1,4 @@
+#if !UNITY_EDITOR_WIN
 using UnityEditor;
 using UnityEngine;
 using UnityEditor.Callbacks;
@@ -134,4 +135,5 @@ public class NewBehaviourScript
         //保存PBXProject
         File.WriteAllText(projectPath, project.WriteToString());
     }
-}
+}
+#endif

+ 7 - 0
Assets/Script/Label/CanvasLabel.cs

@@ -268,6 +268,13 @@ public class CanvasLabel
     public static string Fg_BtnLab = "Fg_BtnLab";
     public static string Fg_Lab = "Fg_Lab";
     public static string Fg_Close = "Fg_Close";
+    public static string AK_PayCard = "AK_PayCard";
+    public static string AK_PayCard0 = "AK_PayCard0";
+    public static string AK_Desc = "AK_Desc";
+    public static string AK_Close = "AK_Close";
+    public static string AK_Buttons = "AK_Buttons";
+    public static string AK_Alipay = "AK_Alipay";
+    public static string AK_WXPay = "AK_WXPay";
     public static string D_MiniGame = "D_MiniGame";
     public static string D_HudParent = "D_HudParent";
     public static string D_Quit = "D_Quit";

+ 2 - 0
Assets/Script/Label/LanguageLabel.cs

@@ -150,6 +150,7 @@ public class LanguageLabel
     	public static string UI__Pa_Tit = "UI__Pa_Tit";
     	public static string UI__Pa_BtnLab = "UI__Pa_BtnLab";
     	public static string UI__Pa_VisitWarning = "UI__Pa_VisitWarning";
+    	public static string UI__Pg_CrateTimeLimitWarning = "UI__Pg_CrateTimeLimitWarning";
     	public static string UI__Pg_Cute = "UI__Pg_Cute";
     	public static string UI__Pg_Grace = "UI__Pg_Grace";
     	public static string UI__Pg_Vivid = "UI__Pg_Vivid";
@@ -312,6 +313,7 @@ public class LanguageLabel
     	public static string UI__AH_PrivateMessageEmpty = "UI__AH_PrivateMessageEmpty";
     	public static string UI__AH_SendPrivateMessageFailed = "UI__AH_SendPrivateMessageFailed";
     	public static string UI__AH_Current = "UI__AH_Current";
+    	public static string UI__AK_Desc = "UI__AK_Desc";
     	public static string FriendItem = "FriendItem";
     	public static string FriendItem__SendMessageButtonText = "FriendItem__SendMessageButtonText";
     	public static string FriendItem__DeleteButtonText = "FriendItem__DeleteButtonText";

+ 20 - 3
Assets/Script/Manage/HttpManager.cs

@@ -156,7 +156,6 @@ public class HttpManager : Regist
     public static string AddCommentURL = NewBaseURL + "/comment/comment";
     public static string GetCommentURL = NewBaseURL + "/comment/index";
     public static string IndexURL = NewBaseURL + "/index/index";
-    public static string GetProductIDURL = NewBaseURL + "/pay/pay";
     public static string LoginURL = NewBaseURL + "/user/login";
     public static string SaveURL = NewBaseURL + "/user/save";
     public static string OtherURL = NewBaseURL + "/user/other";
@@ -181,6 +180,10 @@ public class HttpManager : Regist
     public static string GetUserShowListURL = NewBaseURL + "/show/show_list_user";
     public static string GetShowCommentListURL = NewBaseURL + "/show/comment_list";
     public static string DeleteShowURL = NewBaseURL + "/show/delete";
+
+    public static string AlipayIdURL = NewBaseURL + "/pay/pay";
+    public static string WXPayIdURL = NewBaseURL + "/pay/wxpay";
+
     public static string ReportMailAddress = "bug@dashgame.com";
 
     #endregion
@@ -337,6 +340,11 @@ public class HttpManager : Regist
 
     public void Update()
     {
+        //if (Input.GetKeyDown(KeyCode.Space))
+        //{
+        //    GetWXPayProductID("com.dashgame.garden.diamond100", Debug.Log);
+        //}
+
         if (!Manager.Inited && !Inited)
         {
             ReconnectTimeTimer += Time.deltaTime;
@@ -1137,7 +1145,7 @@ public class HttpManager : Regist
     }
 
 
-    public static void GetProductID(string id, URLRequest.URLRequestCallBackDelegate callback)
+    public static void GetAlipayProductID(string id, URLRequest.URLRequestCallBackDelegate callback)
     {
         URLRequestData urlData = new URLRequestData();
 
@@ -1145,9 +1153,18 @@ public class HttpManager : Regist
         urlData.Add("i", id);
         urlData.Add("u", LoginCallbackData.Inst_Object["i"].ToJson().Trim('"'));
 
-        URLRequest.CreateStrURLRequest(true, GetProductIDURL, urlData, callback, URLRequest.Method.POST);
+        URLRequest.CreateStrURLRequest(true, AlipayIdURL, urlData, callback, URLRequest.Method.POST);
     }
 
+    public static void GetWXPayProductID(string id, URLRequest.URLRequestCallBackDelegate callback)
+    {
+        URLRequestData urlData = new URLRequestData();
+
+        urlData.Add("i", id);
+        urlData.Add("u", GetPlayerId());
+
+        URLRequest.CreateStrURLRequest(true, WXPayIdURL, urlData, callback, URLRequest.Method.POST);
+    }
 
     public static void Login(URLRequest.URLRequestJsonCallBackDelegate callback = null)
     {

+ 53 - 20
Assets/Script/Manage/IAPManager.cs

@@ -19,6 +19,7 @@ public enum PayChannel
 {
     AliPay,
     UnityIAP,
+    WXPay,
 }
 
 public class IAPManager : MonoBehaviour, IStoreListener
@@ -147,6 +148,14 @@ public class IAPManager : MonoBehaviour, IStoreListener
 
     public static void InitIAP()
     {
+        foreach (var attribute in ConfigManager.GetIAPConfig())
+        {
+            ProductList.Add(attribute[1].Value);
+
+            ProductIdDictionary.Add(attribute[5].Value, attribute[1].Value);
+            PackNameDictionary.Add(attribute[1].Value, attribute[5].Value);
+        }
+
         if (Application.isEditor)
         {
             return;
@@ -173,13 +182,13 @@ public class IAPManager : MonoBehaviour, IStoreListener
 
     public static void InitAlipay()
     {
-        foreach (var attribute in ConfigManager.GetIAPConfig())
-        {
-            ProductList.Add(attribute[1].Value);
+        //foreach (var attribute in ConfigManager.GetIAPConfig())
+        //{
+        //    ProductList.Add(attribute[1].Value);
 
-            ProductIdDictionary.Add(attribute[5].Value, attribute[1].Value);
-            PackNameDictionary.Add(attribute[1].Value, attribute[5].Value);
-        }
+        //    ProductIdDictionary.Add(attribute[5].Value, attribute[1].Value);
+        //    PackNameDictionary.Add(attribute[1].Value, attribute[5].Value);
+        //}
 
         AliplayManager.Instance.Init();
     }
@@ -252,25 +261,25 @@ public class IAPManager : MonoBehaviour, IStoreListener
 
     public static void TryPurchase(string str)
     {
-        if (!Inited)
-        {
-            Bubble.Show(null, Language.GetStr(LanguageLabel.IAP__PurchaseFail));
+        //if (!Inited)
+        //{
+        //    Bubble.Show(null, Language.GetStr(LanguageLabel.IAP__PurchaseFail));
 
-            InitIAP();
+        //    InitIAP();
 
-            return;
-        }
+        //    return;
+        //}
 
-        if (!ProductList.Contains(ProductIdDictionary[str]))
-        {
-            Bubble.Show(null, Language.GetStr(LanguageLabel.IAP__PurchaseUnvalid));
+        //if (!ProductList.Contains(ProductIdDictionary[str]))
+        //{
+        //    Bubble.Show(null, Language.GetStr(LanguageLabel.IAP__PurchaseUnvalid));
 
-            return;
-        }
+        //    return;
+        //}
 
         if (RechargeGiftManager.Inited)
         {
-            Purchase(str);
+            SelectPayChannel(str);
         }
         else
         {
@@ -279,18 +288,31 @@ public class IAPManager : MonoBehaviour, IStoreListener
                 jData =>
                 {
                     RechargeGiftManager.Init(jData);
-                    Purchase(str);
+                    SelectPayChannel(str);
                 },
                 () => { Bubble.Show(null, Language.GetStr(LanguageLabel.UI__GetThanksGiftInfoFailed)); }
             );
         }
     }
 
+    private static void SelectPayChannel(string str)
+    {
+        if (PayChannel != PayChannel.UnityIAP)
+        {
+            PayCard.Init();
+            PayCard.Show(() => Purchase(str));
+        }
+        else
+        {
+            Purchase(str);
+        }
+    }
+
     private static void Purchase(string str)
     {
         if (PayChannel == PayChannel.AliPay)
         {
-            HttpManager.GetProductID
+            HttpManager.GetAlipayProductID
             (
                 ProductIdDictionary[str],
                 data =>
@@ -299,6 +321,17 @@ public class IAPManager : MonoBehaviour, IStoreListener
                 }
             );
         }
+        else if (PayChannel == PayChannel.WXPay)
+        {
+            HttpManager.GetWXPayProductID
+            (
+                ProductIdDictionary[str],
+                data =>
+                {
+                    WXPayManager.Pay(data);
+                }
+            );
+        }
         else if (PayChannel == PayChannel.UnityIAP)
         {
             IStoreController.InitiatePurchase(ProductIdDictionary[str]);

+ 53 - 0
Assets/Script/Manage/PayCard.cs

@@ -0,0 +1,53 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class PayCard
+{
+    public static Action onPayChannelSelect;
+
+    private static bool inited;
+
+    public static void Init()
+    {
+        if (inited)
+        {
+            return;
+        }
+        inited = true;
+        ResourceManager.Get<CanvasGroup>(CanvasLabel.AK_PayCard).CreateTweenCG(1, 0.25f, false, true, Curve.EaseOutQuad);
+        ResourceManager.Get<Button>(CanvasLabel.AK_Alipay).onClick.AddListener(OnAlipayClick);
+        ResourceManager.Get<Button>(CanvasLabel.AK_WXPay).onClick.AddListener(OnWXPayClick);
+        ResourceManager.Get<Button>(CanvasLabel.AK_Close).onClick.AddListener(Hide);
+
+        LanguageManager.Add(ResourceManager.Get<Text>(CanvasLabel.AK_Desc), new MulLanStr(LanguageLabel.UI__AK_Desc));
+    }
+
+    public static void Show(Action callback)
+    {
+        ResourceManager.Get(CanvasLabel.AK_PayCard).TweenForCG();
+        onPayChannelSelect += callback;
+    }
+
+    public static void Hide()
+    {
+        AudioManager.PlayClip(ResourceLabel.BtnClip);
+        ResourceManager.Get(CanvasLabel.AK_PayCard).TweenBacCG();
+        onPayChannelSelect = null;
+    }
+
+    private static void OnAlipayClick()
+    {
+        IAPManager.PayChannel = PayChannel.AliPay;
+        onPayChannelSelect.Invoke();
+    }
+
+    private static void OnWXPayClick()
+    {
+        IAPManager.PayChannel = PayChannel.WXPay;
+        onPayChannelSelect.Invoke();
+    }
+}

+ 13 - 0
Assets/Script/Manage/PayCard.cs.meta

@@ -0,0 +1,13 @@
+fileFormatVersion: 2
+guid: b775e1c339598534fabea176f6def322
+timeCreated: 1524043236
+licenseType: Pro
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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