Browse Source

增加花朵

liuqilin 7 years ago
parent
commit
991fd43bd3
49 changed files with 1937 additions and 567 deletions
  1. 0 0
      Assets/Resource/Animations/人物动画/stand_ske.json
  2. 0 0
      Assets/Resource/Animations/人物动画/stand_tex_0.json
  3. 0 0
      Assets/Resource/Animations/人物动画/stand_tex_1.json
  4. BIN
      Assets/Resource/Animations/人物动画/stand_texture_0.png
  5. 165 215
      Assets/Resource/Animations/人物动画/stand_texture_0.png.meta
  6. BIN
      Assets/Resource/Animations/人物动画/stand_texture_1.png
  7. 182 141
      Assets/Resource/Animations/人物动画/stand_texture_1.png.meta
  8. 0 148
      Assets/Resource/Logo.unity
  9. 14 0
      Assets/Resource/Prefab/Object/DebugMode.prefab
  10. 2 2
      Assets/Resource/Sprite/Editor/Garden/Flower2.png.meta
  11. BIN
      Assets/Resource/Sprite/Mobile/Garden/Flower37.png
  12. 100 0
      Assets/Resource/Sprite/Mobile/Garden/Flower37.png.meta
  13. BIN
      Assets/Resource/Sprite/Mobile/Garden/Flower38.png
  14. 100 0
      Assets/Resource/Sprite/Mobile/Garden/Flower38.png.meta
  15. BIN
      Assets/Resource/Sprite/Mobile/Garden/Flower39.png
  16. 100 0
      Assets/Resource/Sprite/Mobile/Garden/Flower39.png.meta
  17. BIN
      Assets/Resource/Sprite/Mobile/Garden/Flower40.png
  18. 100 0
      Assets/Resource/Sprite/Mobile/Garden/Flower40.png.meta
  19. BIN
      Assets/Resource/Sprite/Mobile/Garden/Flower41.png
  20. 100 0
      Assets/Resource/Sprite/Mobile/Garden/Flower41.png.meta
  21. BIN
      Assets/Resource/Sprite/Mobile/Garden/Flower42.png
  22. 100 0
      Assets/Resource/Sprite/Mobile/Garden/Flower42.png.meta
  23. BIN
      Assets/Resource/Sprite/Mobile/Garden/Flower43.png
  24. 100 0
      Assets/Resource/Sprite/Mobile/Garden/Flower43.png.meta
  25. BIN
      Assets/Resource/Sprite/Mobile/Garden/Flower44.png
  26. 100 0
      Assets/Resource/Sprite/Mobile/Garden/Flower44.png.meta
  27. BIN
      Assets/Resource/Sprite/Mobile/Garden/Flower45.png
  28. 100 0
      Assets/Resource/Sprite/Mobile/Garden/Flower45.png.meta
  29. BIN
      Assets/Resource/Sprite/Mobile/Garden/Flower46.png
  30. 100 0
      Assets/Resource/Sprite/Mobile/Garden/Flower46.png.meta
  31. BIN
      Assets/Resource/Sprite/Mobile/Garden/Flower47.png
  32. 100 0
      Assets/Resource/Sprite/Mobile/Garden/Flower47.png.meta
  33. BIN
      Assets/Resource/Sprite/Mobile/Garden/Flower48.png
  34. 100 0
      Assets/Resource/Sprite/Mobile/Garden/Flower48.png.meta
  35. BIN
      Assets/Resource/Sprite/Mobile/Garden/Flower49.png
  36. 100 0
      Assets/Resource/Sprite/Mobile/Garden/Flower49.png.meta
  37. BIN
      Assets/Resource/Sprite/Mobile/Garden/Flower50.png
  38. 100 0
      Assets/Resource/Sprite/Mobile/Garden/Flower50.png.meta
  39. 4 3
      Assets/Resource/XML/Config/dressRoom_config.xml
  40. 59 36
      Assets/Resource/XML/Config/flower_config.xml
  41. 29 0
      Assets/Resource/XML/lan/ChineseSimplified.xml
  42. 29 0
      Assets/Resource/XML/lan/ChineseTraditional.xml
  43. 29 0
      Assets/Resource/XML/lan/English.xml
  44. BIN
      Assets/Resource/Xlsx/dressRoom_config.xlsx
  45. BIN
      Assets/Resource/Xlsx/flower_config.xlsx
  46. BIN
      Assets/Resource/Xlsx/language_config.xlsx
  47. 1 1
      Assets/Script/Manage/GardenManager.cs
  48. 16 20
      Assets/Script/Manage/MiniGameManager.cs
  49. 7 1
      Assets/Script/Object/Flower.cs

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


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


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


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


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


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


+ 182 - 141
Assets/Resource/Animations/人物动画/stand_texture_1.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: c0256ea9e745dc544ae7035b55f87b84
-timeCreated: 1523347495
+timeCreated: 1523417551
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName:
@@ -87,6 +87,8 @@ TextureImporter:
     21300160: "\u978B\u5B5014a"
     21300162: "\u7FC5\u81805"
     21300164: "\u65B0\u978B\u5B5016"
+    21300166: "\u5934\u99706"
+    21300168: "\u978B\u5B5014c"
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -177,13 +179,13 @@ TextureImporter:
     serializedVersion: 2
     sprites:
     - serializedVersion: 2
-      name: "\u978B\u5B5015-2_1"
+      name: "\u773C\u775B1"
       rect:
         serializedVersion: 2
-        x: 548
-        y: 3087
-        width: 66
-        height: 134
+        x: 3192
+        y: 3638
+        width: 264
+        height: 95
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
@@ -193,8 +195,8 @@ TextureImporter:
       name: "\u4E0A\u88631"
       rect:
         serializedVersion: 2
-        x: 3757
-        y: 3983
+        x: 2475
+        y: 3496
         width: 165
         height: 111
       alignment: 0
@@ -203,24 +205,24 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u978B\u5B501"
+      name: "\u4E0A\u88632"
       rect:
         serializedVersion: 2
-        x: 3893
-        y: 3824
-        width: 66
-        height: 134
+        x: 2308
+        y: 3521
+        width: 165
+        height: 111
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u4E0A\u88632"
+      name: "\u4E0A\u88633"
       rect:
         serializedVersion: 2
-        x: 715
-        y: 2954
+        x: 2308
+        y: 3408
         width: 165
         height: 111
       alignment: 0
@@ -229,13 +231,13 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u4E0A\u88633"
+      name: "\u773C\u775B2"
       rect:
         serializedVersion: 2
-        x: 548
-        y: 2954
-        width: 165
-        height: 111
+        x: 2926
+        y: 3661
+        width: 264
+        height: 95
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
@@ -245,8 +247,8 @@ TextureImporter:
       name: "\u978B\u5B502"
       rect:
         serializedVersion: 2
-        x: 3825
-        y: 3847
+        x: 3997
+        y: 3491
         width: 66
         height: 134
       alignment: 0
@@ -258,8 +260,8 @@ TextureImporter:
       name: "\u978B\u5B503"
       rect:
         serializedVersion: 2
-        x: 616
-        y: 3087
+        x: 2844
+        y: 3478
         width: 66
         height: 134
       alignment: 0
@@ -271,8 +273,8 @@ TextureImporter:
       name: "\u88D9\u5B5010(\u9EC4)"
       rect:
         serializedVersion: 2
-        x: 275
-        y: 3037
+        x: 3453
+        y: 3910
         width: 271
         height: 184
       alignment: 0
@@ -284,8 +286,8 @@ TextureImporter:
       name: "\u88D9\u5B5010"
       rect:
         serializedVersion: 2
-        x: 2
-        y: 3037
+        x: 3726
+        y: 3910
         width: 271
         height: 184
       alignment: 0
@@ -297,7 +299,7 @@ TextureImporter:
       name: "\u8863\u670D11(\u7C89)"
       rect:
         serializedVersion: 2
-        x: 820
+        x: 1803
         y: 3793
         width: 386
         height: 301
@@ -310,8 +312,8 @@ TextureImporter:
       name: "\u88D9\u5B5011(\u7C89)"
       rect:
         serializedVersion: 2
-        x: 480
-        y: 3514
+        x: 3149
+        y: 3897
         width: 302
         height: 197
       alignment: 0
@@ -323,8 +325,8 @@ TextureImporter:
       name: "\u88D9\u5B5011"
       rect:
         serializedVersion: 2
-        x: 686
-        y: 3067
+        x: 2845
+        y: 3897
         width: 302
         height: 197
       alignment: 0
@@ -336,8 +338,8 @@ TextureImporter:
       name: "\u88D9\u5B507\uFF08\u7C89\uFF09"
       rect:
         serializedVersion: 2
-        x: 1173
-        y: 3552
+        x: 2556
+        y: 3861
         width: 287
         height: 233
       alignment: 0
@@ -349,8 +351,8 @@ TextureImporter:
       name: "\u88D9\u5B507"
       rect:
         serializedVersion: 2
-        x: 1173
-        y: 3317
+        x: 2191
+        y: 3634
         width: 287
         height: 233
       alignment: 0
@@ -359,63 +361,63 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u88D9\u5B509"
+      name: "\u88D9\u5B5012"
       rect:
         serializedVersion: 2
-        x: 2368
-        y: 3909
-        width: 259
-        height: 185
+        x: 3453
+        y: 3735
+        width: 271
+        height: 173
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u88D9\u5B5012"
+      name: "\u88D9\u5B5013"
       rect:
         serializedVersion: 2
-        x: 2629
-        y: 3921
-        width: 271
-        height: 173
+        x: 833
+        y: 3435
+        width: 340
+        height: 276
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u88D9\u5B5013"
+      name: 5
       rect:
         serializedVersion: 2
-        x: 2
-        y: 3223
-        width: 340
-        height: 276
+        x: 3382
+        y: 3761
+        width: 66
+        height: 134
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u88D9\u5B5013(\u7D2B)"
+      name: 6
       rect:
         serializedVersion: 2
-        x: 344
-        y: 3223
-        width: 340
-        height: 276
+        x: 3999
+        y: 3960
+        width: 66
+        height: 134
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: 5
+      name: 7
       rect:
         serializedVersion: 2
-        x: 3992
-        y: 3960
+        x: 3380
+        y: 3502
         width: 66
         height: 134
       alignment: 0
@@ -424,11 +426,11 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: 6
+      name: 8
       rect:
         serializedVersion: 2
-        x: 3757
-        y: 3847
+        x: 3640
+        y: 3599
         width: 66
         height: 134
       alignment: 0
@@ -437,11 +439,24 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: 7
+      name: 9
       rect:
         serializedVersion: 2
-        x: 3961
-        y: 3824
+        x: 3997
+        y: 3627
+        width: 66
+        height: 134
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: 11
+      rect:
+        serializedVersion: 2
+        x: 2642
+        y: 3365
         width: 66
         height: 134
       alignment: 0
@@ -453,8 +468,8 @@ TextureImporter:
       name: "\u5934\u99704"
       rect:
         serializedVersion: 2
-        x: 1561
-        y: 3904
+        x: 355
+        y: 3309
         width: 440
         height: 190
       alignment: 0
@@ -466,7 +481,7 @@ TextureImporter:
       name: "\u5934\u99705"
       rect:
         serializedVersion: 2
-        x: 2003
+        x: 2191
         y: 3869
         width: 363
         height: 225
@@ -476,11 +491,24 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
+      name: "\u5934\u99706"
+      rect:
+        serializedVersion: 2
+        x: 1229
+        y: 3826
+        width: 572
+        height: 268
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
       name: "\u5934\u99709"
       rect:
         serializedVersion: 2
-        x: 1208
-        y: 3787
+        x: 2
+        y: 3404
         width: 351
         height: 307
       alignment: 0
@@ -492,8 +520,8 @@ TextureImporter:
       name: "\u5934\u997010"
       rect:
         serializedVersion: 2
-        x: 820
-        y: 3484
+        x: 1229
+        y: 3517
         width: 351
         height: 307
       alignment: 0
@@ -505,8 +533,8 @@ TextureImporter:
       name: "\u4E0A\u88635"
       rect:
         serializedVersion: 2
-        x: 990
-        y: 3029
+        x: 2140
+        y: 3518
         width: 166
         height: 114
       alignment: 0
@@ -518,8 +546,8 @@ TextureImporter:
       name: "\u4E0A\u88636"
       rect:
         serializedVersion: 2
-        x: 990
-        y: 3145
+        x: 2662
+        y: 3501
         width: 180
         height: 111
       alignment: 0
@@ -531,8 +559,8 @@ TextureImporter:
       name: "\u4E0A\u88637"
       rect:
         serializedVersion: 2
-        x: 965
-        y: 3371
+        x: 2480
+        y: 3609
         width: 180
         height: 111
       alignment: 0
@@ -541,11 +569,24 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
+      name: "\u4E0A\u886311"
+      rect:
+        serializedVersion: 2
+        x: 3192
+        y: 3515
+        width: 186
+        height: 121
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
       name: "\u4E0A\u886312"
       rect:
         serializedVersion: 2
-        x: 990
-        y: 3258
+        x: 3458
+        y: 3622
         width: 180
         height: 111
       alignment: 0
@@ -554,36 +595,36 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u7FC5\u81801"
+      name: "\u4E0A\u886310\uFF08\u9EC4\uFF09"
       rect:
         serializedVersion: 2
-        x: 2
-        y: 3501
-        width: 476
-        height: 210
+        x: 2745
+        y: 3614
+        width: 179
+        height: 144
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u82B1\u6735\u5B9D\u7BB1"
+      name: "\u7FC5\u81801"
       rect:
         serializedVersion: 2
-        x: 2
-        y: 3713
-        width: 407
-        height: 381
+        x: 355
+        y: 3501
+        width: 476
+        height: 210
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u94BB\u77F3\u5B9D\u7BB1"
+      name: "\u7CFB\u7EDF\u5B9D\u7BB1"
       rect:
         serializedVersion: 2
-        x: 411
+        x: 820
         y: 3713
         width: 407
         height: 381
@@ -593,52 +634,52 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u5F00\u5FC3"
+      name: "\u82B1\u6735\u5B9D\u7BB1"
       rect:
         serializedVersion: 2
-        x: 2902
-        y: 3812
-        width: 270
-        height: 135
+        x: 411
+        y: 3713
+        width: 407
+        height: 381
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u90C1\u95F7"
+      name: "\u94BB\u77F3\u5B9D\u7BB1"
       rect:
         serializedVersion: 2
-        x: 2368
-        y: 3813
-        width: 237
-        height: 94
+        x: 2
+        y: 3713
+        width: 407
+        height: 381
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u978B\u5B5014-1"
+      name: "\u5F00\u5FC3"
       rect:
         serializedVersion: 2
-        x: 1462
-        y: 3651
-        width: 66
-        height: 134
+        x: 2845
+        y: 3760
+        width: 270
+        height: 135
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u978B\u5B5015-1"
+      name: "\u90C1\u95F7"
       rect:
         serializedVersion: 2
-        x: 3924
-        y: 3960
-        width: 66
-        height: 134
+        x: 2926
+        y: 3565
+        width: 237
+        height: 94
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
@@ -648,8 +689,8 @@ TextureImporter:
       name: "\u5934\u997015"
       rect:
         serializedVersion: 2
-        x: 3221
-        y: 3946
+        x: 3726
+        y: 3613
         width: 269
         height: 148
       alignment: 0
@@ -661,8 +702,8 @@ TextureImporter:
       name: "\u4E0B\u886314b\u8774\u8776\u7ED3"
       rect:
         serializedVersion: 2
-        x: 3492
-        y: 3957
+        x: 3117
+        y: 3758
         width: 263
         height: 137
       alignment: 0
@@ -674,8 +715,8 @@ TextureImporter:
       name: "\u4E0B\u886314b"
       rect:
         serializedVersion: 2
-        x: 686
-        y: 3266
+        x: 1582
+        y: 3575
         width: 277
         height: 216
       alignment: 0
@@ -687,8 +728,8 @@ TextureImporter:
       name: "\u4E0B\u886314c\u8774\u8776\u7ED3"
       rect:
         serializedVersion: 2
-        x: 2629
-        y: 3782
+        x: 2480
+        y: 3722
         width: 263
         height: 137
       alignment: 0
@@ -700,8 +741,8 @@ TextureImporter:
       name: "\u4E0B\u886314c"
       rect:
         serializedVersion: 2
-        x: 1173
-        y: 3099
+        x: 1861
+        y: 3575
         width: 277
         height: 216
       alignment: 0
@@ -713,8 +754,8 @@ TextureImporter:
       name: "\u978B\u5B5014a"
       rect:
         serializedVersion: 2
-        x: 1906
-        y: 3768
+        x: 3516
+        y: 3486
         width: 66
         height: 134
       alignment: 0
@@ -723,39 +764,39 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u4E0B\u886314a"
+      name: "\u978B\u5B5014c"
       rect:
         serializedVersion: 2
-        x: 1561
-        y: 3686
-        width: 343
-        height: 216
+        x: 3448
+        y: 3486
+        width: 66
+        height: 134
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u7FC5\u81805"
+      name: "\u4E0B\u886314a"
       rect:
         serializedVersion: 2
-        x: 2902
-        y: 3949
-        width: 317
-        height: 145
+        x: 2
+        y: 3186
+        width: 343
+        height: 216
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u65B0\u978B\u5B5016"
+      name: "\u7FC5\u81805"
       rect:
         serializedVersion: 2
-        x: 882
-        y: 2931
-        width: 66
-        height: 134
+        x: 3726
+        y: 3763
+        width: 317
+        height: 145
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}

+ 0 - 148
Assets/Resource/Logo.unity

@@ -630,151 +630,3 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1001 &2044154207
-Prefab:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_RootOrder
-      value: 4
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_Pivot.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_Pivot.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1948781497737682, guid: 8647d80b558fa724a84d05f9e6aee9bc, type: 2}
-      propertyPath: m_Name
-      value: Canvas (1)
-      objectReference: {fileID: 0}
-    - target: {fileID: 1948781497737682, guid: 8647d80b558fa724a84d05f9e6aee9bc, type: 2}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224125343674225522, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 224125343674225522, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 224125343674225522, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_AnchoredPosition.x
-      value: 50
-      objectReference: {fileID: 0}
-    - target: {fileID: 224125343674225522, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_AnchoredPosition.y
-      value: -15
-      objectReference: {fileID: 0}
-    - target: {fileID: 224289193626966432, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 224289193626966432, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 224289193626966432, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_AnchoredPosition.x
-      value: 50
-      objectReference: {fileID: 0}
-    - target: {fileID: 224289193626966432, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_AnchoredPosition.y
-      value: -54.5
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_ParentPrefab: {fileID: 100100000, guid: 8647d80b558fa724a84d05f9e6aee9bc, type: 2}
-  m_IsPrefabParent: 0

+ 14 - 0
Assets/Resource/Prefab/Object/DebugMode.prefab

@@ -234,6 +234,20 @@ MonoBehaviour:
   - {fileID: 21300000, guid: bb70c889ccbe321409013e054676a60c, type: 3}
   - {fileID: 21300000, guid: ef311f45a2bae694283ff8b6fe9188a9, type: 3}
   - {fileID: 21300000, guid: 7d6f22b630025984482ed1d75fef0fc4, type: 3}
+  - {fileID: 21300000, guid: f96c9c8ba93438c49ad916f747d4c37d, type: 3}
+  - {fileID: 21300000, guid: 6ed1ff12d1b59ce4090900b7bedfd5ac, type: 3}
+  - {fileID: 21300000, guid: 03a8ad8af80a53e468e4eccf1c8f3a86, type: 3}
+  - {fileID: 21300000, guid: 9b1dd2a838afc14408ddc02de44fb1e2, type: 3}
+  - {fileID: 21300000, guid: f57348d99d8cf9542af4de26b2763875, type: 3}
+  - {fileID: 21300000, guid: 19a309674bcac314b81bf723f6037114, type: 3}
+  - {fileID: 21300000, guid: f6d7d0280ec2e27479c2dc4a10583624, type: 3}
+  - {fileID: 21300000, guid: 1214c732d1dd17d4893ae1d8a1f73a8a, type: 3}
+  - {fileID: 21300000, guid: d43675b4779ce6f4195f86f0d6e872cb, type: 3}
+  - {fileID: 21300000, guid: 63d0836f9f5007741971f9ae8adcdc9c, type: 3}
+  - {fileID: 21300000, guid: fc44c1280a049664399a8ea278cf7cbb, type: 3}
+  - {fileID: 21300000, guid: a4b22903a4f12cc43bb6054b1d22962c, type: 3}
+  - {fileID: 21300000, guid: 55dd76b953518ac4da7a6cc27e187113, type: 3}
+  - {fileID: 21300000, guid: 5999e2d9ba3d4754b9e61d65f9fc9f77, type: 3}
   EffectList:
   - {fileID: 1630066744600056, guid: 7393b86a2791bd24580de399f79a96cd, type: 2}
   - {fileID: 1313425893881752, guid: 57a8b1695aa497442ae16329072ca484, type: 2}

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

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

BIN
Assets/Resource/Sprite/Mobile/Garden/Flower37.png


+ 100 - 0
Assets/Resource/Sprite/Mobile/Garden/Flower37.png.meta

@@ -0,0 +1,100 @@
+fileFormatVersion: 2
+guid: f96c9c8ba93438c49ad916f747d4c37d
+timeCreated: 1523411440
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 9
+  spritePivot: {x: 0.5, y: 0.4826}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: iPhone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: WebGL
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: atlas2
+  assetBundleVariant: 

BIN
Assets/Resource/Sprite/Mobile/Garden/Flower38.png


+ 100 - 0
Assets/Resource/Sprite/Mobile/Garden/Flower38.png.meta

@@ -0,0 +1,100 @@
+fileFormatVersion: 2
+guid: 6ed1ff12d1b59ce4090900b7bedfd5ac
+timeCreated: 1523411440
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 9
+  spritePivot: {x: 0.5, y: 0.4826}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: iPhone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: WebGL
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: atlas2
+  assetBundleVariant: 

BIN
Assets/Resource/Sprite/Mobile/Garden/Flower39.png


+ 100 - 0
Assets/Resource/Sprite/Mobile/Garden/Flower39.png.meta

@@ -0,0 +1,100 @@
+fileFormatVersion: 2
+guid: 03a8ad8af80a53e468e4eccf1c8f3a86
+timeCreated: 1523411440
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 9
+  spritePivot: {x: 0.5, y: 0.4826}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: iPhone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: WebGL
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: atlas2
+  assetBundleVariant: 

BIN
Assets/Resource/Sprite/Mobile/Garden/Flower40.png


+ 100 - 0
Assets/Resource/Sprite/Mobile/Garden/Flower40.png.meta

@@ -0,0 +1,100 @@
+fileFormatVersion: 2
+guid: 9b1dd2a838afc14408ddc02de44fb1e2
+timeCreated: 1523411440
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 9
+  spritePivot: {x: 0.5, y: 0.4826}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: iPhone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: WebGL
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: atlas2
+  assetBundleVariant: 

BIN
Assets/Resource/Sprite/Mobile/Garden/Flower41.png


+ 100 - 0
Assets/Resource/Sprite/Mobile/Garden/Flower41.png.meta

@@ -0,0 +1,100 @@
+fileFormatVersion: 2
+guid: f57348d99d8cf9542af4de26b2763875
+timeCreated: 1523411440
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 9
+  spritePivot: {x: 0.5, y: 0.6}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: iPhone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: WebGL
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: atlas2
+  assetBundleVariant: 

BIN
Assets/Resource/Sprite/Mobile/Garden/Flower42.png


+ 100 - 0
Assets/Resource/Sprite/Mobile/Garden/Flower42.png.meta

@@ -0,0 +1,100 @@
+fileFormatVersion: 2
+guid: 19a309674bcac314b81bf723f6037114
+timeCreated: 1523411440
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 9
+  spritePivot: {x: 0.5, y: 0.6}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: iPhone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: WebGL
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: atlas2
+  assetBundleVariant: 

BIN
Assets/Resource/Sprite/Mobile/Garden/Flower43.png


+ 100 - 0
Assets/Resource/Sprite/Mobile/Garden/Flower43.png.meta

@@ -0,0 +1,100 @@
+fileFormatVersion: 2
+guid: f6d7d0280ec2e27479c2dc4a10583624
+timeCreated: 1523411440
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 9
+  spritePivot: {x: 0.5, y: 0.8}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: iPhone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: WebGL
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: atlas2
+  assetBundleVariant: 

BIN
Assets/Resource/Sprite/Mobile/Garden/Flower44.png


+ 100 - 0
Assets/Resource/Sprite/Mobile/Garden/Flower44.png.meta

@@ -0,0 +1,100 @@
+fileFormatVersion: 2
+guid: 1214c732d1dd17d4893ae1d8a1f73a8a
+timeCreated: 1523411440
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 9
+  spritePivot: {x: 0.5, y: 0.8}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: iPhone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: WebGL
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: atlas2
+  assetBundleVariant: 

BIN
Assets/Resource/Sprite/Mobile/Garden/Flower45.png


+ 100 - 0
Assets/Resource/Sprite/Mobile/Garden/Flower45.png.meta

@@ -0,0 +1,100 @@
+fileFormatVersion: 2
+guid: d43675b4779ce6f4195f86f0d6e872cb
+timeCreated: 1523411440
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 9
+  spritePivot: {x: 0.5, y: 0.45}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: iPhone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: WebGL
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: atlas2
+  assetBundleVariant: 

BIN
Assets/Resource/Sprite/Mobile/Garden/Flower46.png


+ 100 - 0
Assets/Resource/Sprite/Mobile/Garden/Flower46.png.meta

@@ -0,0 +1,100 @@
+fileFormatVersion: 2
+guid: 63d0836f9f5007741971f9ae8adcdc9c
+timeCreated: 1523411440
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 9
+  spritePivot: {x: 0.5, y: 0.45}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: iPhone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: WebGL
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: atlas2
+  assetBundleVariant: 

BIN
Assets/Resource/Sprite/Mobile/Garden/Flower47.png


+ 100 - 0
Assets/Resource/Sprite/Mobile/Garden/Flower47.png.meta

@@ -0,0 +1,100 @@
+fileFormatVersion: 2
+guid: fc44c1280a049664399a8ea278cf7cbb
+timeCreated: 1523411440
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 9
+  spritePivot: {x: 0.5, y: 0.45}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: iPhone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: WebGL
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: atlas2
+  assetBundleVariant: 

BIN
Assets/Resource/Sprite/Mobile/Garden/Flower48.png


+ 100 - 0
Assets/Resource/Sprite/Mobile/Garden/Flower48.png.meta

@@ -0,0 +1,100 @@
+fileFormatVersion: 2
+guid: a4b22903a4f12cc43bb6054b1d22962c
+timeCreated: 1523422991
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 9
+  spritePivot: {x: 0.5, y: 0.8}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: iPhone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: WebGL
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: atlas2
+  assetBundleVariant: 

BIN
Assets/Resource/Sprite/Mobile/Garden/Flower49.png


+ 100 - 0
Assets/Resource/Sprite/Mobile/Garden/Flower49.png.meta

@@ -0,0 +1,100 @@
+fileFormatVersion: 2
+guid: 55dd76b953518ac4da7a6cc27e187113
+timeCreated: 1523422991
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 9
+  spritePivot: {x: 0.5, y: 0.8}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: iPhone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: WebGL
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: atlas2
+  assetBundleVariant: 

BIN
Assets/Resource/Sprite/Mobile/Garden/Flower50.png


+ 100 - 0
Assets/Resource/Sprite/Mobile/Garden/Flower50.png.meta

@@ -0,0 +1,100 @@
+fileFormatVersion: 2
+guid: 5999e2d9ba3d4754b9e61d65f9fc9f77
+timeCreated: 1523422991
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 9
+  spritePivot: {x: 0.5, y: 0.8}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: iPhone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: WebGL
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: atlas2
+  assetBundleVariant: 

+ 4 - 3
Assets/Resource/XML/Config/dressRoom_config.xml

@@ -39,6 +39,7 @@
   <item id="38" jump_frequency="" type="1" index="36" bodypart="1" level="50" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="95" iconOffset="" icon1offset="" icon2offset="" spriteName="头发10(棕)" spriteAlpha="" armatureName="头发10(棕)" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
   <item id="39" jump_frequency="" type="1" index="37" bodypart="1" level="50" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="90" iconOffset="" icon1offset="95.34,-151.30" icon2offset="" spriteName="头发11(蓝),头发11(蓝)后" spriteAlpha="" armatureName="头发11(蓝)" extraBodypart="" extraArmatureName="" ignore="" icon0offset="-70,100" desc="" />
   <item id="40" jump_frequency="" type="1" index="38" bodypart="1" level="50" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="90" iconOffset="" icon1offset="95.34,-151.30" icon2offset="" spriteName="头发11(棕),头发11(棕)后" spriteAlpha="" armatureName="头发11(棕)" extraBodypart="" extraArmatureName="" ignore="" icon0offset="-70,100" desc="" />
+  <item id="41" jump_frequency="" type="1" index="39" bodypart="1" level="50" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="-40.1,-56.94" icon2offset="" spriteName="头发16,头发16后" spriteAlpha="" armatureName="头发16" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
   <item id="401" jump_frequency="" type="6" index="0" bodypart="3" level="" buy_currency="1" buy_amt="50000" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="15" icon1offset="" icon2offset="" spriteName="鞋子1" spriteAlpha="" armatureName="鞋子1" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
   <item id="402" jump_frequency="" type="6" index="1" bodypart="3" level="" buy_currency="1" buy_amt="10000000" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="15" icon1offset="" icon2offset="" spriteName="2" spriteAlpha="" armatureName="鞋子4" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
   <item id="403" jump_frequency="" type="6" index="2" bodypart="3" level="" buy_currency="2" buy_amt="50" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="15" icon1offset="" icon2offset="" spriteName="3" spriteAlpha="" armatureName="鞋子5" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
@@ -54,12 +55,12 @@
   <item id="413" jump_frequency="" type="6" index="12" bodypart="3" level="40" buy_currency="2" buy_amt="200" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="15" icon1offset="" icon2offset="" spriteName="8" spriteAlpha="" armatureName="鞋子10" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
   <item id="414" jump_frequency="" type="6" index="13" bodypart="3" level="50" buy_currency="2" buy_amt="250" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="15" icon1offset="" icon2offset="" spriteName="9" spriteAlpha="" armatureName="鞋子11" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
   <item id="415" jump_frequency="" type="6" index="14" bodypart="3" level="50" buy_currency="2" buy_amt="300" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="15" icon1offset="" icon2offset="" spriteName="10" spriteAlpha="" armatureName="鞋子12" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
-  <item id="416" jump_frequency="" type="6" index="15" bodypart="3" level="15" buy_currency="2" buy_amt="300" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="15" icon1offset="-35,0" icon2offset="" spriteName="鞋子14-1,鞋子14-2" spriteAlpha="" armatureName="鞋子16" extraBodypart="" extraArmatureName="" ignore="" icon0offset="35,0" desc="DesignByKnife" />
+  <item id="416" jump_frequency="" type="6" index="15" bodypart="3" level="15" buy_currency="2" buy_amt="300" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="0" icon1offset="-35,0" icon2offset="" spriteName="鞋子14-1,鞋子14-2" spriteAlpha="" armatureName="鞋子16" extraBodypart="" extraArmatureName="" ignore="" icon0offset="35,0" desc="DesignByKnife" />
   <item id="417" jump_frequency="" type="6" index="16" bodypart="3" level="15" buy_currency="2" buy_amt="300" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="15" icon1offset="-35,0" icon2offset="" spriteName="鞋子15-1,鞋子15-2" spriteAlpha="" armatureName="鞋子17" extraBodypart="" extraArmatureName="" ignore="" icon0offset="35,0" desc="DesignByKnife" />
   <item id="418" jump_frequency="" type="6" index="17" bodypart="3" level="15" buy_currency="2" buy_amt="300" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="15" icon1offset="" icon2offset="" spriteName="鞋子14a" spriteAlpha="" armatureName="鞋子14a" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
   <item id="419" jump_frequency="" type="6" index="18" bodypart="3" level="15" buy_currency="2" buy_amt="300" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="15" icon1offset="" icon2offset="" spriteName="鞋子14b" spriteAlpha="" armatureName="鞋子14b" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
   <item id="420" jump_frequency="" type="6" index="19" bodypart="3" level="15" buy_currency="2" buy_amt="300" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="15" icon1offset="" icon2offset="" spriteName="鞋子14c" spriteAlpha="" armatureName="鞋子14c" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
-  <item id="421" jump_frequency="" type="6" index="20" bodypart="3" level="15" buy_currency="2" buy_amt="300" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="15" icon1offset="" icon2offset="" spriteName="新鞋子16" spriteAlpha="" armatureName="新鞋子16" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
+  <item id="421" jump_frequency="" type="6" index="20" bodypart="3" level="15" buy_currency="2" buy_amt="300" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="0" icon1offset="" icon2offset="" spriteName="新鞋子16" spriteAlpha="" armatureName="新鞋子16" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
   <item id="201" jump_frequency="" type="3" index="0" bodypart="2" level="" buy_currency="1" buy_amt="50000" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="裙子1" spriteAlpha="" armatureName="裙子1" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
   <item id="202" jump_frequency="" type="3" index="1" bodypart="2" level="" buy_currency="1" buy_amt="50000" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="裙子2" spriteAlpha="" armatureName="裙子2" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
   <item id="203" jump_frequency="" type="3" index="2" bodypart="2" level="" buy_currency="1" buy_amt="50000" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="裙子3" spriteAlpha="" armatureName="裙子3" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
@@ -122,7 +123,7 @@
   <item id="820" jump_frequency="" type="2" index="19" bodypart="5" level="50" buy_currency="2" buy_amt="700" buy_advance_currency="" buy_advance_amt="" pixelSize="90" iconOffset="" icon1offset="" icon2offset="" spriteName="上衣14a" spriteAlpha="" armatureName="上衣14a" extraBodypart="10,9" extraArmatureName="上衣14a-袖子2,上衣14a-袖子1" ignore="" icon0offset="" desc="" />
   <item id="821" jump_frequency="" type="2" index="20" bodypart="5" level="50" buy_currency="2" buy_amt="700" buy_advance_currency="" buy_advance_amt="" pixelSize="70" iconOffset="" icon1offset="-59.56,16.23" icon2offset="56.97,13.65" spriteName="上衣14b,上衣14b-袖子2,上衣14b-袖子1" spriteAlpha="" armatureName="上衣14b" extraBodypart="10,9" extraArmatureName="上衣14b-袖子2,上衣14b-袖子1" ignore="" icon0offset="" desc="" />
   <item id="822" jump_frequency="" type="2" index="21" bodypart="5" level="50" buy_currency="2" buy_amt="700" buy_advance_currency="" buy_advance_amt="" pixelSize="70" iconOffset="" icon1offset="-59.56,16.23" icon2offset="56.97,13.65" spriteName="上衣14c,上衣14c-袖子2,上衣14c-袖子1" spriteAlpha="" armatureName="上衣14c" extraBodypart="10,9" extraArmatureName="上衣14c-袖子2,上衣14c-袖子1" ignore="" icon0offset="" desc="" />
-  <item id="823" jump_frequency="" type="2" index="22" bodypart="5" level="50" buy_currency="2" buy_amt="700" buy_advance_currency="" buy_advance_amt="" pixelSize="70" iconOffset="" icon1offset="" icon2offset="" spriteName="上衣16,上衣16袖子2,上衣16袖子1" spriteAlpha="" armatureName="上衣16" extraBodypart="10,9" extraArmatureName="上衣16袖子2,上衣16袖子1" ignore="" icon0offset="" desc="" />
+  <item id="823" jump_frequency="" type="2" index="22" bodypart="5" level="50" buy_currency="2" buy_amt="700" buy_advance_currency="" buy_advance_amt="" pixelSize="70" iconOffset="" icon1offset="-65,25" icon2offset="50,25" spriteName="上衣16,上衣16袖子2,上衣16袖子1" spriteAlpha="" armatureName="上衣16" extraBodypart="10,9" extraArmatureName="上衣16袖子2,上衣16袖子1" ignore="" icon0offset="" desc="" />
   <item id="1001" jump_frequency="" type="5" index="0" bodypart="6" level="" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="禁止标志" spriteAlpha="0.75" armatureName="Empty" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
   <item id="1002" jump_frequency="" type="5" index="1" bodypart="6" level="50" buy_currency="2" buy_amt="1500" buy_advance_currency="" buy_advance_amt="" pixelSize="110" iconOffset="" icon1offset="" icon2offset="" spriteName="翅膀1" spriteAlpha="" armatureName="翅膀1" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
   <item id="1003" jump_frequency="" type="5" index="2" bodypart="6" level="80" buy_currency="2" buy_amt="2000" buy_advance_currency="" buy_advance_amt="" pixelSize="110" iconOffset="" icon1offset="" icon2offset="" spriteName="翅膀2" spriteAlpha="" armatureName="翅膀2" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />

+ 59 - 36
Assets/Resource/XML/Config/flower_config.xml

@@ -1,40 +1,54 @@
 <data>
-  <item id="1" name="粉色小花" desc="粉色小花的描述" unlock_ahead_cur="1" unlock_ahead="50000" icon="Flower1" anim="" flower_coin_buff="0.5" />
-  <item id="2" name="紫色小花" desc="紫色小花的描述" unlock_ahead_cur="1" unlock_ahead="50000" icon="Flower2" anim="" flower_coin_buff="0.51" />
-  <item id="3" name="波斯菊(粉)" desc="波斯菊(粉)的描述" unlock_ahead_cur="1" unlock_ahead="100000" icon="Flower3" anim="" flower_coin_buff="0.52" />
-  <item id="4" name="康乃馨(红)" desc="康乃馨(红)的描述" unlock_ahead_cur="1" unlock_ahead="500000" icon="Flower4" anim="" flower_coin_buff="0.53" />
-  <item id="5" name="铃兰(白)" desc="铃兰(白)的描述" unlock_ahead_cur="1" unlock_ahead="1000000" icon="Flower5" anim="" flower_coin_buff="0.54" />
-  <item id="6" name="马蹄莲(白)" desc="马蹄莲(白)的描述" unlock_ahead_cur="1" unlock_ahead="5000000" icon="Flower6" anim="" flower_coin_buff="0.55" />
-  <item id="7" name="蒲公英" desc="蒲公英的描述" unlock_ahead_cur="2" unlock_ahead="100" icon="Flower7" anim="" flower_coin_buff="0.56" />
-  <item id="8" name="牵牛花(蓝)" desc="牵牛花(蓝)的描述" unlock_ahead_cur="2" unlock_ahead="100" icon="Flower8" anim="" flower_coin_buff="0.57" />
-  <item id="9" name="三色堇(紫)" desc="三色堇(紫)的描述" unlock_ahead_cur="2" unlock_ahead="150" icon="Flower9" anim="" flower_coin_buff="0.58" />
-  <item id="10" name="三叶草(粉)" desc="三叶草(粉)的描述" unlock_ahead_cur="2" unlock_ahead="150" icon="Flower10" anim="" flower_coin_buff="0.59" />
-  <item id="11" name="向日葵" desc="向日葵的描述" unlock_ahead_cur="2" unlock_ahead="200" icon="Flower11" anim="" flower_coin_buff="0.6" />
-  <item id="12" name="郁金香(粉)" desc="郁金香(粉)的描述" unlock_ahead_cur="2" unlock_ahead="200" icon="Flower12" anim="" flower_coin_buff="0.61" />
-  <item id="13" name="百合花(白)" desc="" unlock_ahead_cur="2" unlock_ahead="200" icon="Flower13" anim="" flower_coin_buff="0.62" />
-  <item id="14" name="非洲菊(粉)" desc="" unlock_ahead_cur="2" unlock_ahead="200" icon="Flower14" anim="" flower_coin_buff="0.63" />
-  <item id="15" name="红掌" desc="" unlock_ahead_cur="2" unlock_ahead="300" icon="Flower15" anim="" flower_coin_buff="0.64" />
-  <item id="16" name="桔梗花" desc="" unlock_ahead_cur="2" unlock_ahead="300" icon="Flower16" anim="" flower_coin_buff="0.65" />
-  <item id="17" name="康乃馨(白)" desc="" unlock_ahead_cur="2" unlock_ahead="300" icon="Flower17" anim="" flower_coin_buff="0.66" />
-  <item id="18" name="铃兰(粉)" desc="" unlock_ahead_cur="2" unlock_ahead="400" icon="Flower18" anim="" flower_coin_buff="0.67" />
-  <item id="19" name="曼陀罗(橘)" desc="" unlock_ahead_cur="2" unlock_ahead="400" icon="Flower19" anim="" flower_coin_buff="0.68" />
-  <item id="20" name="曼陀罗(粉)" desc="" unlock_ahead_cur="2" unlock_ahead="400" icon="Flower20" anim="" flower_coin_buff="0.69" />
-  <item id="21" name="玫瑰花(红)" desc="" unlock_ahead_cur="2" unlock_ahead="400" icon="Flower21" anim="" flower_coin_buff="0.7" />
-  <item id="22" name="玫瑰花(黄)" desc="" unlock_ahead_cur="2" unlock_ahead="500" icon="Flower22" anim="" flower_coin_buff="0.71" />
-  <item id="23" name="茑萝" desc="" unlock_ahead_cur="2" unlock_ahead="500" icon="Flower23" anim="" flower_coin_buff="0.72" />
-  <item id="24" name="牵牛花(紫)" desc="" unlock_ahead_cur="2" unlock_ahead="500" icon="Flower24" anim="" flower_coin_buff="0.73" />
-  <item id="25" name="虞美人(红)" desc="" unlock_ahead_cur="2" unlock_ahead="500" icon="Flower25" anim="" flower_coin_buff="0.74" />
-  <item id="26" name="郁金香(黄)" desc="" unlock_ahead_cur="2" unlock_ahead="500" icon="Flower26" anim="" flower_coin_buff="0.75" />
-  <item id="27" name="鸢尾(紫)" desc="" unlock_ahead_cur="2" unlock_ahead="600" icon="Flower27" anim="" flower_coin_buff="0.76" />
-  <item id="28" name="朱槿(粉)" desc="" unlock_ahead_cur="2" unlock_ahead="600" icon="Flower28" anim="" flower_coin_buff="0.77" />
-  <item id="29" name="朱槿(黄)" desc="" unlock_ahead_cur="2" unlock_ahead="600" icon="Flower29" anim="" flower_coin_buff="0.78" />
-  <item id="30" name="满天星(白)" desc="" unlock_ahead_cur="2" unlock_ahead="700" icon="Flower30" anim="" flower_coin_buff="0.79" />
-  <item id="31" name="满天星(粉)" desc="" unlock_ahead_cur="2" unlock_ahead="700" icon="Flower31" anim="" flower_coin_buff="0.8" />
-  <item id="32" name="紫罗兰(白)" desc="" unlock_ahead_cur="2" unlock_ahead="700" icon="Flower32" anim="" flower_coin_buff="0.81" />
-  <item id="33" name="紫罗兰(紫)" desc="" unlock_ahead_cur="2" unlock_ahead="700" icon="Flower33" anim="" flower_coin_buff="0.82" />
-  <item id="34" name="紫罗兰(蓝)" desc="" unlock_ahead_cur="2" unlock_ahead="700" icon="Flower34" anim="" flower_coin_buff="0.83" />
-  <item id="35" name="鸡冠花(红)" desc="" unlock_ahead_cur="2" unlock_ahead="1000" icon="Flower35" anim="" flower_coin_buff="0.84" />
-  <item id="36" name="鸡冠花(黄)" desc="" unlock_ahead_cur="2" unlock_ahead="1000" icon="Flower36" anim="" flower_coin_buff="0.85" />
+  <item id="1" name="粉色小花" desc="粉色小花的描述" unlock_ahead_cur="1" unlock_ahead="50000" icon="Flower1" anim="" flower_coin_buff="0.5" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" />
+  <item id="2" name="紫色小花" desc="紫色小花的描述" unlock_ahead_cur="1" unlock_ahead="50000" icon="Flower2" anim="" flower_coin_buff="0.51" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" />
+  <item id="3" name="波斯菊(粉)" desc="波斯菊(粉)的描述" unlock_ahead_cur="1" unlock_ahead="100000" icon="Flower3" anim="" flower_coin_buff="0.52" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" />
+  <item id="4" name="康乃馨(红)" desc="康乃馨(红)的描述" unlock_ahead_cur="1" unlock_ahead="500000" icon="Flower4" anim="" flower_coin_buff="0.53" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" />
+  <item id="5" name="铃兰(白)" desc="铃兰(白)的描述" unlock_ahead_cur="1" unlock_ahead="1000000" icon="Flower5" anim="" flower_coin_buff="0.54" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" />
+  <item id="6" name="马蹄莲(白)" desc="马蹄莲(白)的描述" unlock_ahead_cur="1" unlock_ahead="5000000" icon="Flower6" anim="" flower_coin_buff="0.55" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" />
+  <item id="7" name="蒲公英" desc="蒲公英的描述" unlock_ahead_cur="2" unlock_ahead="100" icon="Flower7" anim="" flower_coin_buff="0.56" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" />
+  <item id="8" name="牵牛花(蓝)" desc="牵牛花(蓝)的描述" unlock_ahead_cur="2" unlock_ahead="100" icon="Flower8" anim="" flower_coin_buff="0.57" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" />
+  <item id="9" name="三色堇(紫)" desc="三色堇(紫)的描述" unlock_ahead_cur="2" unlock_ahead="150" icon="Flower9" anim="" flower_coin_buff="0.58" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" />
+  <item id="10" name="三叶草(粉)" desc="三叶草(粉)的描述" unlock_ahead_cur="2" unlock_ahead="150" icon="Flower10" anim="" flower_coin_buff="0.59" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" />
+  <item id="11" name="向日葵" desc="向日葵的描述" unlock_ahead_cur="2" unlock_ahead="200" icon="Flower11" anim="" flower_coin_buff="0.6" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" />
+  <item id="12" name="郁金香(粉)" desc="郁金香(粉)的描述" unlock_ahead_cur="2" unlock_ahead="200" icon="Flower12" anim="" flower_coin_buff="0.61" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" />
+  <item id="13" name="百合花(白)" desc="" unlock_ahead_cur="2" unlock_ahead="200" icon="Flower13" anim="" flower_coin_buff="0.62" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" />
+  <item id="14" name="非洲菊(粉)" desc="" unlock_ahead_cur="2" unlock_ahead="200" icon="Flower14" anim="" flower_coin_buff="0.63" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" />
+  <item id="15" name="红掌" desc="" unlock_ahead_cur="2" unlock_ahead="300" icon="Flower15" anim="" flower_coin_buff="0.64" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" />
+  <item id="16" name="桔梗花" desc="" unlock_ahead_cur="2" unlock_ahead="300" icon="Flower16" anim="" flower_coin_buff="0.65" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" />
+  <item id="17" name="康乃馨(白)" desc="" unlock_ahead_cur="2" unlock_ahead="300" icon="Flower17" anim="" flower_coin_buff="0.66" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" />
+  <item id="18" name="铃兰(粉)" desc="" unlock_ahead_cur="2" unlock_ahead="400" icon="Flower18" anim="" flower_coin_buff="0.67" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" />
+  <item id="19" name="曼陀罗(橘)" desc="" unlock_ahead_cur="2" unlock_ahead="400" icon="Flower19" anim="" flower_coin_buff="0.68" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" />
+  <item id="20" name="曼陀罗(粉)" desc="" unlock_ahead_cur="2" unlock_ahead="400" icon="Flower20" anim="" flower_coin_buff="0.69" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" />
+  <item id="21" name="玫瑰花(红)" desc="" unlock_ahead_cur="2" unlock_ahead="400" icon="Flower21" anim="" flower_coin_buff="0.7" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" />
+  <item id="22" name="玫瑰花(黄)" desc="" unlock_ahead_cur="2" unlock_ahead="500" icon="Flower22" anim="" flower_coin_buff="0.71" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" />
+  <item id="23" name="茑萝" desc="" unlock_ahead_cur="2" unlock_ahead="500" icon="Flower23" anim="" flower_coin_buff="0.72" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" />
+  <item id="24" name="牵牛花(紫)" desc="" unlock_ahead_cur="2" unlock_ahead="500" icon="Flower24" anim="" flower_coin_buff="0.73" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" />
+  <item id="25" name="虞美人(红)" desc="" unlock_ahead_cur="2" unlock_ahead="500" icon="Flower25" anim="" flower_coin_buff="0.74" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" />
+  <item id="26" name="郁金香(黄)" desc="" unlock_ahead_cur="2" unlock_ahead="500" icon="Flower26" anim="" flower_coin_buff="0.75" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" />
+  <item id="27" name="鸢尾(紫)" desc="" unlock_ahead_cur="2" unlock_ahead="600" icon="Flower27" anim="" flower_coin_buff="0.76" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" />
+  <item id="28" name="朱槿(粉)" desc="" unlock_ahead_cur="2" unlock_ahead="600" icon="Flower28" anim="" flower_coin_buff="0.77" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" />
+  <item id="29" name="朱槿(黄)" desc="" unlock_ahead_cur="2" unlock_ahead="600" icon="Flower29" anim="" flower_coin_buff="0.78" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" />
+  <item id="30" name="满天星(白)" desc="" unlock_ahead_cur="2" unlock_ahead="700" icon="Flower30" anim="" flower_coin_buff="0.79" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" />
+  <item id="31" name="满天星(粉)" desc="" unlock_ahead_cur="2" unlock_ahead="700" icon="Flower31" anim="" flower_coin_buff="0.8" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" />
+  <item id="32" name="紫罗兰(白)" desc="" unlock_ahead_cur="2" unlock_ahead="700" icon="Flower32" anim="" flower_coin_buff="0.81" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" />
+  <item id="33" name="紫罗兰(紫)" desc="" unlock_ahead_cur="2" unlock_ahead="700" icon="Flower33" anim="" flower_coin_buff="0.82" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" />
+  <item id="34" name="紫罗兰(蓝)" desc="" unlock_ahead_cur="2" unlock_ahead="700" icon="Flower34" anim="" flower_coin_buff="0.83" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" />
+  <item id="35" name="鸡冠花(红)" desc="" unlock_ahead_cur="2" unlock_ahead="1000" icon="Flower35" anim="" flower_coin_buff="0.84" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" />
+  <item id="36" name="鸡冠花(黄)" desc="" unlock_ahead_cur="2" unlock_ahead="1000" icon="Flower36" anim="" flower_coin_buff="0.85" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" />
+  <item id="37" name="" desc="" unlock_ahead_cur="2" unlock_ahead="1000" icon="Flower37" anim="" flower_coin_buff="0.85" itemSize="0.2" flowerCardSize="0.5" minigameSize="0.9" />
+  <item id="38" name="" desc="" unlock_ahead_cur="2" unlock_ahead="1000" icon="Flower38" anim="" flower_coin_buff="0.85" itemSize="0.2" flowerCardSize="0.5" minigameSize="0.9" />
+  <item id="39" name="" desc="" unlock_ahead_cur="2" unlock_ahead="1000" icon="Flower39" anim="" flower_coin_buff="0.85" itemSize="0.2" flowerCardSize="0.5" minigameSize="0.9" />
+  <item id="40" name="" desc="" unlock_ahead_cur="2" unlock_ahead="1000" icon="Flower40" anim="" flower_coin_buff="0.85" itemSize="0.2" flowerCardSize="0.5" minigameSize="0.9" />
+  <item id="41" name="" desc="" unlock_ahead_cur="2" unlock_ahead="1000" icon="Flower41" anim="" flower_coin_buff="0.85" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" />
+  <item id="42" name="" desc="" unlock_ahead_cur="2" unlock_ahead="1000" icon="Flower42" anim="" flower_coin_buff="0.85" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" />
+  <item id="43" name="" desc="" unlock_ahead_cur="2" unlock_ahead="1000" icon="Flower43" anim="" flower_coin_buff="0.85" itemSize="0.3" flowerCardSize="0.8" minigameSize="1.2625" />
+  <item id="44" name="" desc="" unlock_ahead_cur="2" unlock_ahead="1000" icon="Flower44" anim="" flower_coin_buff="0.85" itemSize="0.3" flowerCardSize="0.8" minigameSize="1.2625" />
+  <item id="45" name="" desc="" unlock_ahead_cur="2" unlock_ahead="1000" icon="Flower45" anim="" flower_coin_buff="0.85" itemSize="0.2" flowerCardSize="0.5" minigameSize="0.9" />
+  <item id="46" name="" desc="" unlock_ahead_cur="2" unlock_ahead="1000" icon="Flower46" anim="" flower_coin_buff="0.85" itemSize="0.2" flowerCardSize="0.5" minigameSize="0.9" />
+  <item id="47" name="" desc="" unlock_ahead_cur="2" unlock_ahead="1000" icon="Flower47" anim="" flower_coin_buff="0.85" itemSize="0.2" flowerCardSize="0.5" minigameSize="0.9" />
+  <item id="48" name="" desc="" unlock_ahead_cur="2" unlock_ahead="1000" icon="Flower48" anim="" flower_coin_buff="0.85" itemSize="0.3" flowerCardSize="0.8" minigameSize="1.2625" />
+  <item id="49" name="" desc="" unlock_ahead_cur="2" unlock_ahead="1000" icon="Flower49" anim="" flower_coin_buff="0.85" itemSize="0.3" flowerCardSize="0.8" minigameSize="1.2625" />
+  <item id="50" name="" desc="" unlock_ahead_cur="2" unlock_ahead="1000" icon="Flower50" anim="" flower_coin_buff="0.85" itemSize="0.3" flowerCardSize="0.8" minigameSize="1.2625" />
   <comment>
     <id>
 id
@@ -61,5 +75,14 @@ id
     <flower_coin_buff>
 种花金币加成
 </flower_coin_buff>
+    <itemSize>
+
+</itemSize>
+    <flowerCardSize>
+
+</flowerCardSize>
+    <minigameSize>
+
+</minigameSize>
   </comment>
 </data>

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

@@ -366,6 +366,20 @@
     <Flower34 desc=""><![CDATA[紫罗兰(蓝)]]></Flower34>
     <Flower35 desc=""><![CDATA[鸡冠花(红)]]></Flower35>
     <Flower36 desc=""><![CDATA[鸡冠花(黄)]]></Flower36>
+    <Flower37 desc=""><![CDATA[名字]]></Flower37>
+    <Flower38 desc=""><![CDATA[名字]]></Flower38>
+    <Flower39 desc=""><![CDATA[名字]]></Flower39>
+    <Flower40 desc=""><![CDATA[名字]]></Flower40>
+    <Flower41 desc=""><![CDATA[名字]]></Flower41>
+    <Flower42 desc=""><![CDATA[名字]]></Flower42>
+    <Flower43 desc=""><![CDATA[名字]]></Flower43>
+    <Flower44 desc=""><![CDATA[名字]]></Flower44>
+    <Flower45 desc=""><![CDATA[名字]]></Flower45>
+    <Flower46 desc=""><![CDATA[名字]]></Flower46>
+    <Flower47 desc=""><![CDATA[名字]]></Flower47>
+    <Flower48 desc=""><![CDATA[名字]]></Flower48>
+    <Flower49 desc=""><![CDATA[名字]]></Flower49>
+    <Flower50 desc=""><![CDATA[名字]]></Flower50>
   </FlowerName>
   <FlowerColor>
     <Flower1 desc=""><![CDATA[粉]]></Flower1>
@@ -404,6 +418,20 @@
     <Flower34 desc=""><![CDATA[蓝]]></Flower34>
     <Flower35 desc=""><![CDATA[红]]></Flower35>
     <Flower36 desc=""><![CDATA[黄]]></Flower36>
+    <Flower37 desc=""><![CDATA[黄]]></Flower37>
+    <Flower38 desc=""><![CDATA[黄]]></Flower38>
+    <Flower39 desc=""><![CDATA[黄]]></Flower39>
+    <Flower40 desc=""><![CDATA[黄]]></Flower40>
+    <Flower41 desc=""><![CDATA[黄]]></Flower41>
+    <Flower42 desc=""><![CDATA[黄]]></Flower42>
+    <Flower43 desc=""><![CDATA[黄]]></Flower43>
+    <Flower44 desc=""><![CDATA[黄]]></Flower44>
+    <Flower45 desc=""><![CDATA[黄]]></Flower45>
+    <Flower46 desc=""><![CDATA[黄]]></Flower46>
+    <Flower47 desc=""><![CDATA[黄]]></Flower47>
+    <Flower48 desc=""><![CDATA[黄]]></Flower48>
+    <Flower49 desc=""><![CDATA[黄]]></Flower49>
+    <Flower50 desc=""><![CDATA[黄]]></Flower50>
   </FlowerColor>
   <SkillName>
     <Pack1 desc=""><![CDATA[金币大礼包]]></Pack1>
@@ -838,6 +866,7 @@
     <Armature38 desc=""><![CDATA[丸子(棕)]]></Armature38>
     <Armature39 desc=""><![CDATA[麻花辫(蓝)]]></Armature39>
     <Armature40 desc=""><![CDATA[麻花辫(棕)]]></Armature40>
+    <Armature41 desc=""><![CDATA[名字]]></Armature41>
     <Armature201 desc=""><![CDATA[蛋糕诱惑]]></Armature201>
     <Armature202 desc=""><![CDATA[小纯真]]></Armature202>
     <Armature203 desc=""><![CDATA[清凉之夏]]></Armature203>

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

@@ -366,6 +366,20 @@
     <Flower34 desc=""><![CDATA[紫羅蘭(藍)]]></Flower34>
     <Flower35 desc=""><![CDATA[雞冠花(紅)]]></Flower35>
     <Flower36 desc=""><![CDATA[雞冠花(黃)]]></Flower36>
+    <Flower37 desc=""><![CDATA[]]></Flower37>
+    <Flower38 desc=""><![CDATA[]]></Flower38>
+    <Flower39 desc=""><![CDATA[]]></Flower39>
+    <Flower40 desc=""><![CDATA[]]></Flower40>
+    <Flower41 desc=""><![CDATA[]]></Flower41>
+    <Flower42 desc=""><![CDATA[]]></Flower42>
+    <Flower43 desc=""><![CDATA[]]></Flower43>
+    <Flower44 desc=""><![CDATA[]]></Flower44>
+    <Flower45 desc=""><![CDATA[]]></Flower45>
+    <Flower46 desc=""><![CDATA[]]></Flower46>
+    <Flower47 desc=""><![CDATA[]]></Flower47>
+    <Flower48 desc=""><![CDATA[]]></Flower48>
+    <Flower49 desc=""><![CDATA[]]></Flower49>
+    <Flower50 desc=""><![CDATA[]]></Flower50>
   </FlowerName>
   <FlowerColor>
     <Flower1 desc=""><![CDATA[粉]]></Flower1>
@@ -404,6 +418,20 @@
     <Flower34 desc=""><![CDATA[藍]]></Flower34>
     <Flower35 desc=""><![CDATA[紅]]></Flower35>
     <Flower36 desc=""><![CDATA[黃]]></Flower36>
+    <Flower37 desc=""><![CDATA[]]></Flower37>
+    <Flower38 desc=""><![CDATA[]]></Flower38>
+    <Flower39 desc=""><![CDATA[]]></Flower39>
+    <Flower40 desc=""><![CDATA[]]></Flower40>
+    <Flower41 desc=""><![CDATA[]]></Flower41>
+    <Flower42 desc=""><![CDATA[]]></Flower42>
+    <Flower43 desc=""><![CDATA[]]></Flower43>
+    <Flower44 desc=""><![CDATA[]]></Flower44>
+    <Flower45 desc=""><![CDATA[]]></Flower45>
+    <Flower46 desc=""><![CDATA[]]></Flower46>
+    <Flower47 desc=""><![CDATA[]]></Flower47>
+    <Flower48 desc=""><![CDATA[]]></Flower48>
+    <Flower49 desc=""><![CDATA[]]></Flower49>
+    <Flower50 desc=""><![CDATA[]]></Flower50>
   </FlowerColor>
   <SkillName>
     <Pack1 desc=""><![CDATA[金幣大禮包]]></Pack1>
@@ -838,6 +866,7 @@
     <Armature38 desc=""><![CDATA[丸子(棕)]]></Armature38>
     <Armature39 desc=""><![CDATA[麻花辮(藍)]]></Armature39>
     <Armature40 desc=""><![CDATA[麻花辮(棕)]]></Armature40>
+    <Armature41 desc=""><![CDATA[]]></Armature41>
     <Armature201 desc=""><![CDATA[蛋糕誘惑]]></Armature201>
     <Armature202 desc=""><![CDATA[小純真]]></Armature202>
     <Armature203 desc=""><![CDATA[清涼之夏]]></Armature203>

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

@@ -364,6 +364,20 @@ Program 水怪
     <Flower34 desc=""><![CDATA[Violet(Blue)]]></Flower34>
     <Flower35 desc=""><![CDATA[Cockscomb(Red)]]></Flower35>
     <Flower36 desc=""><![CDATA[Cockscomb(Yellow)]]></Flower36>
+    <Flower37 desc=""><![CDATA[]]></Flower37>
+    <Flower38 desc=""><![CDATA[]]></Flower38>
+    <Flower39 desc=""><![CDATA[]]></Flower39>
+    <Flower40 desc=""><![CDATA[]]></Flower40>
+    <Flower41 desc=""><![CDATA[]]></Flower41>
+    <Flower42 desc=""><![CDATA[]]></Flower42>
+    <Flower43 desc=""><![CDATA[]]></Flower43>
+    <Flower44 desc=""><![CDATA[]]></Flower44>
+    <Flower45 desc=""><![CDATA[]]></Flower45>
+    <Flower46 desc=""><![CDATA[]]></Flower46>
+    <Flower47 desc=""><![CDATA[]]></Flower47>
+    <Flower48 desc=""><![CDATA[]]></Flower48>
+    <Flower49 desc=""><![CDATA[]]></Flower49>
+    <Flower50 desc=""><![CDATA[]]></Flower50>
   </FlowerName>
   <FlowerColor>
     <Flower1 desc=""><![CDATA[Pink]]></Flower1>
@@ -402,6 +416,20 @@ Program 水怪
     <Flower34 desc=""><![CDATA[Blue]]></Flower34>
     <Flower35 desc=""><![CDATA[Red]]></Flower35>
     <Flower36 desc=""><![CDATA[Yellow]]></Flower36>
+    <Flower37 desc=""><![CDATA[]]></Flower37>
+    <Flower38 desc=""><![CDATA[]]></Flower38>
+    <Flower39 desc=""><![CDATA[]]></Flower39>
+    <Flower40 desc=""><![CDATA[]]></Flower40>
+    <Flower41 desc=""><![CDATA[]]></Flower41>
+    <Flower42 desc=""><![CDATA[]]></Flower42>
+    <Flower43 desc=""><![CDATA[]]></Flower43>
+    <Flower44 desc=""><![CDATA[]]></Flower44>
+    <Flower45 desc=""><![CDATA[]]></Flower45>
+    <Flower46 desc=""><![CDATA[]]></Flower46>
+    <Flower47 desc=""><![CDATA[]]></Flower47>
+    <Flower48 desc=""><![CDATA[]]></Flower48>
+    <Flower49 desc=""><![CDATA[]]></Flower49>
+    <Flower50 desc=""><![CDATA[]]></Flower50>
   </FlowerColor>
   <SkillName>
     <Pack1 desc=""><![CDATA[Gift of Coins]]></Pack1>
@@ -837,6 +865,7 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack12>
     <Armature38 desc=""><![CDATA[Bun(Brown)]]></Armature38>
     <Armature39 desc=""><![CDATA[Twist(Blue)]]></Armature39>
     <Armature40 desc=""><![CDATA[Twist(Brown)]]></Armature40>
+    <Armature41 desc=""><![CDATA[]]></Armature41>
     <Armature201 desc=""><![CDATA[Cake]]></Armature201>
     <Armature202 desc=""><![CDATA[Innocence]]></Armature202>
     <Armature203 desc=""><![CDATA[Cool Summer]]></Armature203>

BIN
Assets/Resource/Xlsx/dressRoom_config.xlsx


BIN
Assets/Resource/Xlsx/flower_config.xlsx


BIN
Assets/Resource/Xlsx/language_config.xlsx


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

@@ -722,7 +722,7 @@ public class GardenManager : Regist
         Image image = ResourceManager.Get<Image>(CanvasLabel.H_Icon2);
         image.material = material;
         image.sprite = flowerInfo.Icon;
-        image.Resize(true, DeltaSize.FlowerCardSpriteX, DeltaSize.FlowerCardSpriteY);
+        image.Resize(true, flowerInfo.flowerCardSize, flowerInfo.flowerCardSize);
     }
 
 

+ 16 - 20
Assets/Script/Manage/MiniGameManager.cs

@@ -162,7 +162,7 @@ public class MinigameAward
             ResourceManager.SetActive(CanvasLabel.Da_FlowerIcon, true);
 
             ResourceManager.Get<Image>(CanvasLabel.Da_FlowerIcon).sprite = flowerInfo.Icon;
-            ResourceManager.Get<Image>(CanvasLabel.Da_FlowerIcon).Resize(true, 0.25f, 0.25f);
+            ResourceManager.Get<Image>(CanvasLabel.Da_FlowerIcon).Resize(true, flowerInfo.itemSize, flowerInfo.itemSize);
 
             ResourceManager.SetText(CanvasLabel.Da_FlowerLab, flowerInfo.Name);
 
@@ -190,7 +190,7 @@ public class MinigameAward
                     ResourceManager.SetActive(CanvasLabel.Da_Flower, true);
 
                     ResourceManager.Get<Image>(CanvasLabel.Da_FlowerIcon).sprite = flowerInfo.Icon;
-                    ResourceManager.Get<Image>(CanvasLabel.Da_FlowerIcon).Resize(true, 0.25f, 0.25f);
+                    ResourceManager.Get<Image>(CanvasLabel.Da_FlowerIcon).Resize(true, flowerInfo.itemSize, flowerInfo.itemSize);
 
                     ResourceManager.SetText(CanvasLabel.Da_FlowerLab, flowerInfo.Name);
 
@@ -1349,14 +1349,12 @@ public class MiniGameManager : Regist
             ResourceManager.SetActive(CanvasLabel.D_FlowerBtn5, true);
             ResourceManager.SetActive(CanvasLabel.D_FlowerBtn6, true);
 
-            float deltaSIzeX = 1.0625f;
-            float deltaSIzeY = 1.0625f;
-            ResourceManager.SetSprite(CanvasLabel.D_FlowerIcon1, MinigameFlowerDictionary[0].FlowerInfo.Icon).Resize(true, deltaSIzeX, deltaSIzeY);
-            ResourceManager.SetSprite(CanvasLabel.D_FlowerIcon2, MinigameFlowerDictionary[1].FlowerInfo.Icon).Resize(true, deltaSIzeX, deltaSIzeY);
-            ResourceManager.SetSprite(CanvasLabel.D_FlowerIcon3, MinigameFlowerDictionary[3].FlowerInfo.Icon).Resize(true, deltaSIzeX, deltaSIzeY);
-            ResourceManager.SetSprite(CanvasLabel.D_FlowerIcon4, MinigameFlowerDictionary[4].FlowerInfo.Icon).Resize(true, deltaSIzeX, deltaSIzeY);
-            ResourceManager.SetSprite(CanvasLabel.D_FlowerIcon5, MinigameFlowerDictionary[6].FlowerInfo.Icon).Resize(true, deltaSIzeX, deltaSIzeY);
-            ResourceManager.SetSprite(CanvasLabel.D_FlowerIcon6, MinigameFlowerDictionary[7].FlowerInfo.Icon).Resize(true, deltaSIzeX, deltaSIzeY);
+            ResourceManager.SetSprite(CanvasLabel.D_FlowerIcon1, MinigameFlowerDictionary[0].FlowerInfo.Icon).Resize(true, MinigameFlowerDictionary[0].FlowerInfo.minigameSize, MinigameFlowerDictionary[0].FlowerInfo.minigameSize);
+            ResourceManager.SetSprite(CanvasLabel.D_FlowerIcon2, MinigameFlowerDictionary[1].FlowerInfo.Icon).Resize(true, MinigameFlowerDictionary[1].FlowerInfo.minigameSize, MinigameFlowerDictionary[1].FlowerInfo.minigameSize);
+            ResourceManager.SetSprite(CanvasLabel.D_FlowerIcon3, MinigameFlowerDictionary[3].FlowerInfo.Icon).Resize(true, MinigameFlowerDictionary[3].FlowerInfo.minigameSize, MinigameFlowerDictionary[3].FlowerInfo.minigameSize);
+            ResourceManager.SetSprite(CanvasLabel.D_FlowerIcon4, MinigameFlowerDictionary[4].FlowerInfo.Icon).Resize(true, MinigameFlowerDictionary[4].FlowerInfo.minigameSize, MinigameFlowerDictionary[4].FlowerInfo.minigameSize);
+            ResourceManager.SetSprite(CanvasLabel.D_FlowerIcon5, MinigameFlowerDictionary[6].FlowerInfo.Icon).Resize(true, MinigameFlowerDictionary[6].FlowerInfo.minigameSize, MinigameFlowerDictionary[6].FlowerInfo.minigameSize);
+            ResourceManager.SetSprite(CanvasLabel.D_FlowerIcon6, MinigameFlowerDictionary[7].FlowerInfo.Icon).Resize(true, MinigameFlowerDictionary[7].FlowerInfo.minigameSize, MinigameFlowerDictionary[7].FlowerInfo.minigameSize);
         }
 
         PrepareText.StreamForScale();
@@ -2053,11 +2051,9 @@ public class MiniGameManager : Regist
             throw new Exception();
         }
 
-        float deltaSIzeX = 1.0625f;
-        float deltaSIzeY = 1.0625f;
-        ResourceManager.SetSprite(CanvasLabel.D_FlowerIcon7, GardenManager.FlowerInfoDictionary[idList[0]].Icon).Resize(true, deltaSIzeX, deltaSIzeY);
-        ResourceManager.SetSprite(CanvasLabel.D_FlowerIcon8, GardenManager.FlowerInfoDictionary[idList[1]].Icon).Resize(true, deltaSIzeX, deltaSIzeY);
-        ResourceManager.SetSprite(CanvasLabel.D_FlowerIcon9, GardenManager.FlowerInfoDictionary[idList[2]].Icon).Resize(true, deltaSIzeX, deltaSIzeY);
+        ResourceManager.SetSprite(CanvasLabel.D_FlowerIcon7, GardenManager.FlowerInfoDictionary[idList[0]].Icon).Resize(true, GardenManager.FlowerInfoDictionary[idList[0]].minigameSize, GardenManager.FlowerInfoDictionary[idList[0]].minigameSize);
+        ResourceManager.SetSprite(CanvasLabel.D_FlowerIcon8, GardenManager.FlowerInfoDictionary[idList[1]].Icon).Resize(true, GardenManager.FlowerInfoDictionary[idList[1]].minigameSize, GardenManager.FlowerInfoDictionary[idList[1]].minigameSize);
+        ResourceManager.SetSprite(CanvasLabel.D_FlowerIcon9, GardenManager.FlowerInfoDictionary[idList[2]].Icon).Resize(true, GardenManager.FlowerInfoDictionary[idList[2]].minigameSize, GardenManager.FlowerInfoDictionary[idList[2]].minigameSize);
 
         for (int i = 0; i < idList.Count; i++)
         {
@@ -2144,11 +2140,11 @@ public class MiniGameManager : Regist
         correctImage.sprite = buttonFlowers[0].FlowerInfo.Icon;
         icons[0].sprite = buttonFlowers[1].FlowerInfo.Icon;
         icons[1].sprite = buttonFlowers[2].FlowerInfo.Icon;
-        float deltaSIzeX = 1.0625f;
-        float deltaSIzeY = 1.0625f;
-        correctImage.Resize(true, deltaSIzeX, deltaSIzeY);
-        icons[0].Resize(true, deltaSIzeX, deltaSIzeY);
-        icons[1].Resize(true, deltaSIzeX, deltaSIzeY);
+        //float deltaSIzeX = 1.0625f;
+        //float deltaSIzeY = 1.0625f;
+        correctImage.Resize(true, buttonFlowers[0].FlowerInfo.minigameSize, buttonFlowers[0].FlowerInfo.minigameSize);
+        icons[0].Resize(true, buttonFlowers[1].FlowerInfo.minigameSize, buttonFlowers[1].FlowerInfo.minigameSize);
+        icons[1].Resize(true, buttonFlowers[2].FlowerInfo.minigameSize, buttonFlowers[2].FlowerInfo.minigameSize);
         correctButton.TweenForCG();
         buttons[0].TweenForCG();
         buttons[1].TweenForCG();

+ 7 - 1
Assets/Script/Object/Flower.cs

@@ -136,6 +136,9 @@ public class FlowerInfo
     public int UnlockCost;
     public float AwardCoinBuff;
     public Current UnlockCur;
+    public float itemSize;
+    public float flowerCardSize;
+    public float minigameSize;
 
     public Text StatusText;
     public Text AmountText;
@@ -168,10 +171,13 @@ public class FlowerInfo
         UnlockCur = Auxiliary.CurrentParse(attribute[3].Value);
         UnlockCost = Auxiliary.StringToInt(attribute[4].Value, 0);
         AwardCoinBuff = Auxiliary.StringToFloat(attribute[7].Value, 1);
+        itemSize = Auxiliary.StringToFloat(attribute[8].Value, 1);
+        flowerCardSize = Auxiliary.StringToFloat(attribute[9].Value, 1);
+        minigameSize = Auxiliary.StringToFloat(attribute[10].Value, 1);
 
         Image.sprite = Icon;
 
-        Image.Resize(true, 0.25f, 0.25f);
+        Image.Resize(true, itemSize, itemSize);
 
         Button.onClick.AddListener
         (

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