Kaynağa Gözat

增加缺失服装

liuqilin 7 yıl önce
ebeveyn
işleme
62229d93db
35 değiştirilmiş dosya ile 1450 ekleme ve 665 silme
  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. 184 268
      Assets/Resource/Animations/人物动画/stand_texture_0.png.meta
  6. BIN
      Assets/Resource/Animations/人物动画/stand_texture_1.png
  7. 352 131
      Assets/Resource/Animations/人物动画/stand_texture_1.png.meta
  8. 387 4
      Assets/Resource/Logo.unity
  9. 1 0
      Assets/Resource/Prefab/Object/DebugMode.prefab
  10. BIN
      Assets/Resource/Sprite/Mobile/Garden/Flower0.png
  11. 100 0
      Assets/Resource/Sprite/Mobile/Garden/Flower0.png.meta
  12. 1 1
      Assets/Resource/XML/Config/cost_config.xml
  13. 48 42
      Assets/Resource/XML/Config/dressRoom_config.xml
  14. 54 50
      Assets/Resource/XML/Config/flower_config.xml
  15. 1 1
      Assets/Resource/XML/PlayerConfig.xml
  16. 40 31
      Assets/Resource/XML/lan/ChineseSimplified.xml
  17. 43 34
      Assets/Resource/XML/lan/ChineseTraditional.xml
  18. 43 34
      Assets/Resource/XML/lan/English.xml
  19. BIN
      Assets/Resource/Xlsx/dressRoom_config.xlsx
  20. BIN
      Assets/Resource/Xlsx/flower_config.xlsx
  21. BIN
      Assets/Resource/Xlsx/language_config.xlsx
  22. 74 12
      Assets/Script/Manage/ConfigManager.cs
  23. 24 7
      Assets/Script/Manage/GardenManager.cs
  24. 13 6
      Assets/Script/Manage/HttpManager.cs
  25. 19 19
      Assets/Script/Manage/MiniGameManager.cs
  26. 26 3
      Assets/Script/Manage/PlayerManager.cs
  27. 6 2
      Assets/Script/Manage/RechargeGiftManager.cs
  28. 5 5
      Assets/Script/Manage/SignManager.cs
  29. 1 1
      Assets/Script/Manage/TutorialManager.cs
  30. 9 2
      Assets/Script/Manage/UIManager.cs
  31. 7 0
      Assets/Script/Object/Flower.cs
  32. 6 6
      Assets/Script/Object/Player.cs
  33. 1 1
      Assets/Script/Object/PlazaRoomChest.cs
  34. 2 2
      Assets/Script/Object/Skill/Pack.cs
  35. 3 3
      ProjectSettings/GraphicsSettings.asset

Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
Assets/Resource/Animations/人物动画/stand_ske.json


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
Assets/Resource/Animations/人物动画/stand_tex_0.json


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
Assets/Resource/Animations/人物动画/stand_tex_1.json


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


Dosya farkı çok büyük olduğundan ihmal edildi
+ 184 - 268
Assets/Resource/Animations/人物动画/stand_texture_0.png.meta


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


+ 352 - 131
Assets/Resource/Animations/人物动画/stand_texture_1.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: c0256ea9e745dc544ae7035b55f87b84
-timeCreated: 1523417551
+timeCreated: 1523514568
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName:
@@ -89,6 +89,19 @@ TextureImporter:
     21300164: "\u65B0\u978B\u5B5016"
     21300166: "\u5934\u99706"
     21300168: "\u978B\u5B5014c"
+    21300170: 4
+    21300172: "\u4E0A\u886313(\u7D2B)"
+    21300174: "\u5934\u53D111(\u84DD)\u540E"
+    21300176: "\u4E0A\u886314b"
+    21300178: "\u5E3D\u5B5016"
+    21300180: "\u7FC5\u8180-\u7F3A\u5931"
+    21300182: "\u4E0A\u8863-\u7F3A\u5931"
+    21300184: "\u5934\u9970-\u7F3A\u5931"
+    21300186: 3
+    21300188: "\u671F\u5F85"
+    21300190: "\u978B\u5B5015-2"
+    21300192: "\u978B\u5B5014b"
+    21300194: "\u88D9\u5B5016"
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -179,13 +192,13 @@ TextureImporter:
     serializedVersion: 2
     sprites:
     - serializedVersion: 2
-      name: "\u773C\u775B1"
+      name: "\u978B\u5B5015-2_1"
       rect:
         serializedVersion: 2
-        x: 3192
-        y: 3638
-        width: 264
-        height: 95
+        x: 1549
+        y: 3433
+        width: 66
+        height: 134
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
@@ -195,8 +208,8 @@ TextureImporter:
       name: "\u4E0A\u88631"
       rect:
         serializedVersion: 2
-        x: 2475
-        y: 3496
+        x: 3915
+        y: 3983
         width: 165
         height: 111
       alignment: 0
@@ -205,11 +218,24 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
+      name: 2
+      rect:
+        serializedVersion: 2
+        x: 4015
+        y: 3847
+        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: "\u4E0A\u88632"
       rect:
         serializedVersion: 2
-        x: 2308
-        y: 3521
+        x: 3602
+        y: 3603
         width: 165
         height: 111
       alignment: 0
@@ -221,8 +247,8 @@ TextureImporter:
       name: "\u4E0A\u88633"
       rect:
         serializedVersion: 2
-        x: 2308
-        y: 3408
+        x: 3420
+        y: 3583
         width: 165
         height: 111
       alignment: 0
@@ -234,8 +260,8 @@ TextureImporter:
       name: "\u773C\u775B2"
       rect:
         serializedVersion: 2
-        x: 2926
-        y: 3661
+        x: 2993
+        y: 3860
         width: 264
         height: 95
       alignment: 0
@@ -247,8 +273,8 @@ TextureImporter:
       name: "\u978B\u5B502"
       rect:
         serializedVersion: 2
-        x: 3997
-        y: 3491
+        x: 2280
+        y: 3768
         width: 66
         height: 134
       alignment: 0
@@ -260,8 +286,8 @@ TextureImporter:
       name: "\u978B\u5B503"
       rect:
         serializedVersion: 2
-        x: 2844
-        y: 3478
+        x: 3973
+        y: 3560
         width: 66
         height: 134
       alignment: 0
@@ -273,8 +299,8 @@ TextureImporter:
       name: "\u88D9\u5B5010(\u9EC4)"
       rect:
         serializedVersion: 2
-        x: 3453
-        y: 3910
+        x: 2
+        y: 3031
         width: 271
         height: 184
       alignment: 0
@@ -286,8 +312,8 @@ TextureImporter:
       name: "\u88D9\u5B5010"
       rect:
         serializedVersion: 2
-        x: 3726
-        y: 3910
+        x: 864
+        y: 2919
         width: 271
         height: 184
       alignment: 0
@@ -299,7 +325,7 @@ TextureImporter:
       name: "\u8863\u670D11(\u7C89)"
       rect:
         serializedVersion: 2
-        x: 1803
+        x: 1208
         y: 3793
         width: 386
         height: 301
@@ -312,8 +338,8 @@ TextureImporter:
       name: "\u88D9\u5B5011(\u7C89)"
       rect:
         serializedVersion: 2
-        x: 3149
-        y: 3897
+        x: 560
+        y: 3170
         width: 302
         height: 197
       alignment: 0
@@ -322,11 +348,24 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
+      name: "\u8863\u670D11"
+      rect:
+        serializedVersion: 2
+        x: 820
+        y: 3793
+        width: 386
+        height: 301
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
       name: "\u88D9\u5B5011"
       rect:
         serializedVersion: 2
-        x: 2845
-        y: 3897
+        x: 864
+        y: 3105
         width: 302
         height: 197
       alignment: 0
@@ -335,11 +374,37 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
+      name: "\u88D9\u5B504"
+      rect:
+        serializedVersion: 2
+        x: 3710
+        y: 3952
+        width: 203
+        height: 142
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u88D9\u5B505"
+      rect:
+        serializedVersion: 2
+        x: 3286
+        y: 3821
+        width: 203
+        height: 142
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
       name: "\u88D9\u5B507\uFF08\u7C89\uFF09"
       rect:
         serializedVersion: 2
-        x: 2556
-        y: 3861
+        x: 1643
+        y: 3552
         width: 287
         height: 233
       alignment: 0
@@ -351,8 +416,8 @@ TextureImporter:
       name: "\u88D9\u5B507"
       rect:
         serializedVersion: 2
-        x: 2191
-        y: 3634
+        x: 1260
+        y: 3334
         width: 287
         height: 233
       alignment: 0
@@ -361,13 +426,26 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u88D9\u5B5012"
+      name: "\u88D9\u5B508"
       rect:
         serializedVersion: 2
-        x: 3453
-        y: 3735
-        width: 271
-        height: 173
+        x: 1949
+        y: 3655
+        width: 329
+        height: 247
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u88D9\u5B509"
+      rect:
+        serializedVersion: 2
+        x: 275
+        y: 3030
+        width: 259
+        height: 185
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
@@ -377,7 +455,7 @@ TextureImporter:
       name: "\u88D9\u5B5013"
       rect:
         serializedVersion: 2
-        x: 833
+        x: 344
         y: 3435
         width: 340
         height: 276
@@ -387,24 +465,24 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: 5
+      name: "\u88D9\u5B5013(\u7D2B)"
       rect:
         serializedVersion: 2
-        x: 3382
-        y: 3761
-        width: 66
-        height: 134
+        x: 2
+        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: 6
+      name: 3
       rect:
         serializedVersion: 2
-        x: 3999
-        y: 3960
+        x: 3769
+        y: 3580
         width: 66
         height: 134
       alignment: 0
@@ -413,11 +491,11 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: 7
+      name: 4
       rect:
         serializedVersion: 2
-        x: 3380
-        y: 3502
+        x: 3587
+        y: 3467
         width: 66
         height: 134
       alignment: 0
@@ -426,11 +504,11 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: 8
+      name: 5
       rect:
         serializedVersion: 2
-        x: 3640
-        y: 3599
+        x: 3655
+        y: 3467
         width: 66
         height: 134
       alignment: 0
@@ -439,11 +517,11 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: 9
+      name: 6
       rect:
         serializedVersion: 2
-        x: 3997
-        y: 3627
+        x: 3837
+        y: 3560
         width: 66
         height: 134
       alignment: 0
@@ -452,11 +530,11 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: 11
+      name: 7
       rect:
         serializedVersion: 2
-        x: 2642
-        y: 3365
+        x: 3905
+        y: 3560
         width: 66
         height: 134
       alignment: 0
@@ -465,78 +543,78 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u5934\u99704"
+      name: 8
       rect:
         serializedVersion: 2
-        x: 355
-        y: 3309
-        width: 440
-        height: 190
+        x: 3859
+        y: 3424
+        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: "\u5934\u99705"
+      name: 9
       rect:
         serializedVersion: 2
-        x: 2191
-        y: 3869
-        width: 363
-        height: 225
+        x: 3927
+        y: 3424
+        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: "\u5934\u99706"
+      name: 10
       rect:
         serializedVersion: 2
-        x: 1229
-        y: 3826
-        width: 572
-        height: 268
+        x: 3995
+        y: 3424
+        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: "\u5934\u99709"
+      name: "\u5934\u99704"
       rect:
         serializedVersion: 2
-        x: 2
-        y: 3404
-        width: 351
-        height: 307
+        x: 1949
+        y: 3904
+        width: 440
+        height: 190
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u5934\u997010"
+      name: "\u5934\u99705"
       rect:
         serializedVersion: 2
-        x: 1229
-        y: 3517
-        width: 351
-        height: 307
+        x: 2391
+        y: 3869
+        width: 363
+        height: 225
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u4E0A\u88635"
+      name: "\u5934\u997010"
       rect:
         serializedVersion: 2
-        x: 2140
-        y: 3518
-        width: 166
-        height: 114
+        x: 1596
+        y: 3787
+        width: 351
+        height: 307
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
@@ -546,8 +624,8 @@ TextureImporter:
       name: "\u4E0A\u88636"
       rect:
         serializedVersion: 2
-        x: 2662
-        y: 3501
+        x: 3679
+        y: 3716
         width: 180
         height: 111
       alignment: 0
@@ -559,8 +637,8 @@ TextureImporter:
       name: "\u4E0A\u88637"
       rect:
         serializedVersion: 2
-        x: 2480
-        y: 3609
+        x: 3181
+        y: 3612
         width: 180
         height: 111
       alignment: 0
@@ -572,8 +650,8 @@ TextureImporter:
       name: "\u4E0A\u886311"
       rect:
         serializedVersion: 2
-        x: 3192
-        y: 3515
+        x: 2993
+        y: 3737
         width: 186
         height: 121
       alignment: 0
@@ -585,8 +663,8 @@ TextureImporter:
       name: "\u4E0A\u886312"
       rect:
         serializedVersion: 2
-        x: 3458
-        y: 3622
+        x: 3861
+        y: 3696
         width: 180
         height: 111
       alignment: 0
@@ -595,39 +673,52 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u4E0A\u886310\uFF08\u9EC4\uFF09"
+      name: "\u4E0A\u886311(\u7C89)"
       rect:
         serializedVersion: 2
-        x: 2745
-        y: 3614
-        width: 179
-        height: 144
+        x: 3491
+        y: 3809
+        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: "\u7FC5\u81801"
+      name: "\u4E0A\u886313(\u7D2B)"
       rect:
         serializedVersion: 2
-        x: 355
-        y: 3501
-        width: 476
-        height: 210
+        x: 3528
+        y: 3932
+        width: 180
+        height: 162
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u7CFB\u7EDF\u5B9D\u7BB1"
+      name: "\u4E0A\u88637\uFF08\u7C89\uFF09"
+      rect:
+        serializedVersion: 2
+        x: 3420
+        y: 3696
+        width: 180
+        height: 111
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u7FC5\u81801"
       rect:
         serializedVersion: 2
         x: 820
-        y: 3713
-        width: 407
-        height: 381
+        y: 3581
+        width: 476
+        height: 210
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
@@ -660,11 +751,24 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
+      name: "\u60CA\u8BB6"
+      rect:
+        serializedVersion: 2
+        x: 2756
+        y: 3836
+        width: 235
+        height: 119
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
       name: "\u5F00\u5FC3"
       rect:
         serializedVersion: 2
-        x: 2845
-        y: 3760
+        x: 539
+        y: 2886
         width: 270
         height: 135
       alignment: 0
@@ -673,11 +777,37 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
+      name: "\u671F\u5F85"
+      rect:
+        serializedVersion: 2
+        x: 3710
+        y: 3829
+        width: 235
+        height: 121
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u8272\u54AA\u54AA"
+      rect:
+        serializedVersion: 2
+        x: 3286
+        y: 3965
+        width: 240
+        height: 129
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
       name: "\u90C1\u95F7"
       rect:
         serializedVersion: 2
-        x: 2926
-        y: 3565
+        x: 3181
+        y: 3725
         width: 237
         height: 94
       alignment: 0
@@ -686,11 +816,37 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
+      name: "\u978B\u5B5015-1"
+      rect:
+        serializedVersion: 2
+        x: 1168
+        y: 3168
+        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: "\u978B\u5B5015-2"
+      rect:
+        serializedVersion: 2
+        x: 3791
+        y: 3424
+        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: "\u5934\u997015"
       rect:
         serializedVersion: 2
-        x: 3726
-        y: 3613
+        x: 268
+        y: 2873
         width: 269
         height: 148
       alignment: 0
@@ -702,8 +858,8 @@ TextureImporter:
       name: "\u4E0B\u886314b\u8774\u8776\u7ED3"
       rect:
         serializedVersion: 2
-        x: 3117
-        y: 3758
+        x: 2756
+        y: 3957
         width: 263
         height: 137
       alignment: 0
@@ -715,8 +871,8 @@ TextureImporter:
       name: "\u4E0B\u886314b"
       rect:
         serializedVersion: 2
-        x: 1582
-        y: 3575
+        x: 2
+        y: 3217
         width: 277
         height: 216
       alignment: 0
@@ -728,8 +884,8 @@ TextureImporter:
       name: "\u4E0B\u886314c\u8774\u8776\u7ED3"
       rect:
         serializedVersion: 2
-        x: 2480
-        y: 3722
+        x: 3021
+        y: 3957
         width: 263
         height: 137
       alignment: 0
@@ -741,8 +897,8 @@ TextureImporter:
       name: "\u4E0B\u886314c"
       rect:
         serializedVersion: 2
-        x: 1861
-        y: 3575
+        x: 281
+        y: 3217
         width: 277
         height: 216
       alignment: 0
@@ -754,8 +910,21 @@ TextureImporter:
       name: "\u978B\u5B5014a"
       rect:
         serializedVersion: 2
-        x: 3516
-        y: 3486
+        x: 1168
+        y: 3032
+        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: "\u978B\u5B5014b"
+      rect:
+        serializedVersion: 2
+        x: 3723
+        y: 3444
         width: 66
         height: 134
       alignment: 0
@@ -767,8 +936,8 @@ TextureImporter:
       name: "\u978B\u5B5014c"
       rect:
         serializedVersion: 2
-        x: 3448
-        y: 3486
+        x: 3947
+        y: 3847
         width: 66
         height: 134
       alignment: 0
@@ -780,8 +949,8 @@ TextureImporter:
       name: "\u4E0B\u886314a"
       rect:
         serializedVersion: 2
-        x: 2
-        y: 3186
+        x: 1298
+        y: 3569
         width: 343
         height: 216
       alignment: 0
@@ -790,11 +959,24 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
+      name: "\u5934\u53D111(\u68D5)\u540E"
+      rect:
+        serializedVersion: 2
+        x: 1012
+        y: 3304
+        width: 246
+        height: 275
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
       name: "\u7FC5\u81805"
       rect:
         serializedVersion: 2
-        x: 3726
-        y: 3763
+        x: 536
+        y: 3023
         width: 317
         height: 145
       alignment: 0
@@ -802,6 +984,45 @@ TextureImporter:
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u5E3D\u5B5016"
+      rect:
+        serializedVersion: 2
+        x: 1260
+        y: 3076
+        width: 247
+        height: 256
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u88D9\u5B5016"
+      rect:
+        serializedVersion: 2
+        x: 2
+        y: 2865
+        width: 264
+        height: 164
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u7FC5\u8180-\u7F3A\u5931"
+      rect:
+        serializedVersion: 2
+        x: 686
+        y: 3369
+        width: 324
+        height: 210
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
     outline: []
   spritePackingTag: 
   userData: 

+ 387 - 4
Assets/Resource/Logo.unity

@@ -91,6 +91,134 @@ NavMeshSettings:
     cellSize: 0.16666666
     accuratePlacement: 0
   m_NavMeshData: {fileID: 0}
+--- !u!1 &171779423
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 171779425}
+  - component: {fileID: 171779424}
+  m_Layer: 0
+  m_Name: Flower46
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!212 &171779424
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 171779423}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 0
+  m_ReflectionProbeUsage: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 21300000, guid: 63d0836f9f5007741971f9ae8adcdc9c, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+--- !u!4 &171779425
+Transform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 171779423}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -3.09, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 9
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &404551325
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 404551327}
+  - component: {fileID: 404551326}
+  m_Layer: 0
+  m_Name: Flower41
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!212 &404551326
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 404551325}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 0
+  m_ReflectionProbeUsage: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 21300000, guid: f57348d99d8cf9542af4de26b2763875, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+--- !u!4 &404551327
+Transform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 404551325}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 3.44, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 6
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &465425181
 GameObject:
   m_ObjectHideFlags: 0
@@ -155,6 +283,70 @@ SpriteRenderer:
   m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_FlipX: 0
   m_FlipY: 0
+--- !u!1 &625207371
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 625207373}
+  - component: {fileID: 625207372}
+  m_Layer: 0
+  m_Name: Flower48
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!212 &625207372
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 625207371}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 0
+  m_ReflectionProbeUsage: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 21300000, guid: a4b22903a4f12cc43bb6054b1d22962c, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+--- !u!4 &625207373
+Transform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 625207371}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 9.06, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 8
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &722194761
 GameObject:
   m_ObjectHideFlags: 0
@@ -322,6 +514,70 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 0}
+--- !u!1 &1104380298
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 1104380300}
+  - component: {fileID: 1104380299}
+  m_Layer: 0
+  m_Name: Flower37
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!212 &1104380299
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1104380298}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 0
+  m_ReflectionProbeUsage: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 21300000, guid: f96c9c8ba93438c49ad916f747d4c37d, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+--- !u!4 &1104380300
+Transform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1104380298}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1218118077
 GameObject:
   m_ObjectHideFlags: 0
@@ -613,10 +869,9 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   AuditEdition: 0
-  DebugMode: 1
-  CatchException: 0
-  DebugModeGo: {fileID: 1264531325540048, guid: b22fd2d9abc702d43ac62a412537d4e9,
-    type: 2}
+  DebugMode: 0
+  CatchException: 1
+  DebugModeGo: {fileID: 0}
 --- !u!4 &1833966245
 Transform:
   m_ObjectHideFlags: 0
@@ -630,3 +885,131 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1952218298
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 1952218300}
+  - component: {fileID: 1952218299}
+  m_Layer: 0
+  m_Name: Flower43
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!212 &1952218299
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1952218298}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 0
+  m_ReflectionProbeUsage: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 21300000, guid: f6d7d0280ec2e27479c2dc4a10583624, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+--- !u!4 &1952218300
+Transform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1952218298}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 6.09, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 7
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &2070429468
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 2070429470}
+  - component: {fileID: 2070429469}
+  m_Layer: 0
+  m_Name: Flower36
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!212 &2070429469
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 2070429468}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 0
+  m_ReflectionProbeUsage: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 21300000, guid: 39300fd0e860ea143850d7c4ec94625d, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+--- !u!4 &2070429470
+Transform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 2070429468}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -6.51, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

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

@@ -248,6 +248,7 @@ MonoBehaviour:
   - {fileID: 21300000, guid: a4b22903a4f12cc43bb6054b1d22962c, type: 3}
   - {fileID: 21300000, guid: 55dd76b953518ac4da7a6cc27e187113, type: 3}
   - {fileID: 21300000, guid: 5999e2d9ba3d4754b9e61d65f9fc9f77, type: 3}
+  - {fileID: 21300000, guid: 74f167d3f24d0304ba4695cf5c3ff9e2, type: 3}
   EffectList:
   - {fileID: 1630066744600056, guid: 7393b86a2791bd24580de399f79a96cd, type: 2}
   - {fileID: 1313425893881752, guid: 57a8b1695aa497442ae16329072ca484, type: 2}

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


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

@@ -0,0 +1,100 @@
+fileFormatVersion: 2
+guid: 74f167d3f24d0304ba4695cf5c3ff9e2
+timeCreated: 1523496107
+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.5829875, y: 0.625}
+  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: 

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

@@ -1,5 +1,5 @@
 <data>
-  <item id="1" desc="c*100" />
+  <item id="1" desc="c*1000" />
   <comment>
     <id>
 

+ 48 - 42
Assets/Resource/XML/Config/dressRoom_config.xml

@@ -29,17 +29,18 @@
   <item id="28" jump_frequency="" type="1" index="26" bodypart="1" level="50" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="115" iconOffset="" icon1offset="" icon2offset="" spriteName="头发8(紫)" spriteAlpha="" armatureName="头发8(紫)" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
   <item id="29" jump_frequency="" type="1" index="27" bodypart="1" level="50" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="115" iconOffset="" icon1offset="" icon2offset="" spriteName="头发8(绿)" spriteAlpha="" armatureName="头发8(绿)" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
   <item id="30" jump_frequency="" type="1" index="28" bodypart="1" level="50" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="115" iconOffset="" icon1offset="" icon2offset="" spriteName="头发8(黑)" spriteAlpha="" armatureName="头发8(黑)" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
-  <item id="31" jump_frequency="" type="1" index="29" bodypart="1" level="50" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="90" iconOffset="" icon1offset="" icon2offset="" spriteName="头发14(粉色)" spriteAlpha="" armatureName="头发14(粉色)" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="DesignByKnife" />
-  <item id="32" jump_frequency="" type="1" index="30" bodypart="1" level="50" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="90" iconOffset="" icon1offset="" icon2offset="" spriteName="头发9-蓝" spriteAlpha="" armatureName="头发9-蓝" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="DesignByKnife" />
-  <item id="33" jump_frequency="" type="1" index="31" bodypart="1" level="50" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="90" iconOffset="" icon1offset="" icon2offset="" spriteName="头发9(白)" spriteAlpha="" armatureName="头发9(白)" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="DesignByKnife" />
-  <item id="34" jump_frequency="" type="1" index="32" bodypart="1" level="50" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="90" iconOffset="" icon1offset="" icon2offset="" spriteName="头发9-粉" spriteAlpha="" armatureName="头发9-粉" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="DesignByKnife" />
-  <item id="35" jump_frequency="" type="1" index="33" bodypart="1" level="50" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="90" iconOffset="" icon1offset="" icon2offset="" spriteName="头发9-黄" spriteAlpha="" armatureName="头发9-黄" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="DesignByKnife" />
-  <item id="36" jump_frequency="" type="1" index="34" bodypart="1" level="50" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="105" iconOffset="15" icon1offset="-6.67,-77.62" icon2offset="" spriteName="头发15(咖啡),头发15(咖啡)+下" spriteAlpha="" armatureName="头发15(咖啡)" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="DesignByKnife" />
-  <item id="37" jump_frequency="" type="1" index="35" 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="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="31" jump_frequency="" type="1" index="29" bodypart="1" level="30" buy_currency="2" buy_amt="50" buy_advance_currency="" buy_advance_amt="" pixelSize="90" iconOffset="" icon1offset="" icon2offset="" spriteName="头发14(粉色)" spriteAlpha="" armatureName="头发14(粉色)" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="DesignByKnife" />
+  <item id="32" jump_frequency="" type="1" index="30" bodypart="1" level="23" buy_currency="2" buy_amt="38" buy_advance_currency="" buy_advance_amt="" pixelSize="90" iconOffset="" icon1offset="" icon2offset="" spriteName="头发9-蓝" spriteAlpha="" armatureName="头发9-蓝" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="DesignByKnife" />
+  <item id="33" jump_frequency="" type="1" index="31" bodypart="1" level="23" buy_currency="2" buy_amt="38" buy_advance_currency="" buy_advance_amt="" pixelSize="90" iconOffset="" icon1offset="" icon2offset="" spriteName="头发9(白)" spriteAlpha="" armatureName="头发9(白)" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="DesignByKnife" />
+  <item id="34" jump_frequency="" type="1" index="32" bodypart="1" level="23" buy_currency="2" buy_amt="38" buy_advance_currency="" buy_advance_amt="" pixelSize="90" iconOffset="" icon1offset="" icon2offset="" spriteName="头发9-粉" spriteAlpha="" armatureName="头发9-粉" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="DesignByKnife" />
+  <item id="35" jump_frequency="" type="1" index="33" bodypart="1" level="23" buy_currency="2" buy_amt="38" buy_advance_currency="" buy_advance_amt="" pixelSize="90" iconOffset="" icon1offset="" icon2offset="" spriteName="头发9-黄" spriteAlpha="" armatureName="头发9-黄" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="DesignByKnife" />
+  <item id="36" jump_frequency="" type="1" index="34" bodypart="1" level="30" buy_currency="2" buy_amt="80" buy_advance_currency="" buy_advance_amt="" pixelSize="105" iconOffset="15" icon1offset="-6.67,-77.62" icon2offset="" spriteName="头发15(咖啡),头发15(咖啡)+下" spriteAlpha="" armatureName="头发15(咖啡)" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="DesignByKnife" />
+  <item id="37" jump_frequency="" type="1" index="35" bodypart="1" level="70" buy_currency="2" buy_amt="150" buy_advance_currency="" buy_advance_amt="" pixelSize="95" iconOffset="" icon1offset="" icon2offset="" spriteName="头发10(紫)" spriteAlpha="" armatureName="头发10(紫)" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
+  <item id="38" jump_frequency="" type="1" index="36" bodypart="1" level="70" buy_currency="2" buy_amt="150" 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="70" buy_currency="2" buy_amt="200" 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="70" buy_currency="2" buy_amt="200" 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="60" buy_currency="2" buy_amt="300" 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="42" jump_frequency="" type="1" index="40" bodypart="1" level="1" buy_currency="1" buy_amt="0" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="脑壳-缺失" spriteAlpha="" armatureName="脑壳-缺失" extraBodypart="" extraArmatureName="" ignore="1" 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="" />
@@ -55,12 +56,13 @@
   <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="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="0" icon1offset="" icon2offset="" spriteName="新鞋子16" spriteAlpha="" armatureName="新鞋子16" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
+  <item id="416" jump_frequency="" type="6" index="15" bodypart="3" level="30" buy_currency="2" buy_amt="50" 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="30" buy_currency="2" buy_amt="80" 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="50" buy_currency="2" buy_amt="350" 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="60" buy_currency="2" buy_amt="400" 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="60" buy_currency="2" buy_amt="400" 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="50" buy_currency="2" buy_amt="350" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="0" icon1offset="" icon2offset="" spriteName="新鞋子16" spriteAlpha="" armatureName="新鞋子16" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
+  <item id="422" jump_frequency="" type="6" index="21" bodypart="3" level="1" buy_currency="1" buy_amt="1" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" icon2offset="" spriteName="鞋子-缺失" spriteAlpha="" armatureName="鞋子-缺失" extraBodypart="" extraArmatureName="" ignore="1" 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="" />
@@ -78,12 +80,13 @@
   <item id="215" jump_frequency="" type="3" index="14" bodypart="2" level="50" buy_currency="2" buy_amt="1500" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="裙子12" spriteAlpha="" armatureName="裙子12" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
   <item id="216" jump_frequency="" type="3" index="15" bodypart="2" level="50" buy_currency="2" buy_amt="2000" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="裙子13" spriteAlpha="" armatureName="裙子13" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
   <item id="217" jump_frequency="" type="3" index="16" bodypart="2" level="50" buy_currency="2" buy_amt="2000" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="裙子13(紫)" spriteAlpha="" armatureName="裙子13(紫)" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
-  <item id="218" jump_frequency="" type="3" index="17" bodypart="2" level="50" buy_currency="2" buy_amt="2000" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="下衣14" spriteAlpha="" armatureName="下衣14" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="DesignByKnife" />
-  <item id="219" jump_frequency="" type="3" index="18" bodypart="2" level="50" buy_currency="2" buy_amt="2000" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="下衣15" spriteAlpha="" armatureName="裙子15" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="DesignByKnife" />
-  <item id="220" jump_frequency="" type="3" index="19" bodypart="2" level="50" buy_currency="2" buy_amt="2000" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="下衣14a" spriteAlpha="" armatureName="下衣14a" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
-  <item id="221" jump_frequency="" type="3" index="20" bodypart="2" level="50" buy_currency="2" buy_amt="2000" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="1.08,77.07" icon2offset="" spriteName="下衣14b,下衣14b蝴蝶结" spriteAlpha="" armatureName="下衣14b" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
-  <item id="222" jump_frequency="" type="3" index="21" bodypart="2" level="50" buy_currency="2" buy_amt="2000" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="1.08,77.08" icon2offset="" spriteName="下衣14c,下衣14c蝴蝶结" spriteAlpha="" armatureName="下衣14c" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
-  <item id="223" jump_frequency="" type="3" index="22" bodypart="2" level="50" buy_currency="2" buy_amt="2000" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="裙子16" spriteAlpha="" armatureName="裙子16" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
+  <item id="218" jump_frequency="" type="3" index="17" bodypart="2" level="30" buy_currency="2" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="下衣14" spriteAlpha="" armatureName="下衣14" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="DesignByKnife" />
+  <item id="219" jump_frequency="" type="3" index="18" bodypart="2" level="30" buy_currency="2" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="下衣15" spriteAlpha="" armatureName="裙子15" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="DesignByKnife" />
+  <item id="220" jump_frequency="" type="3" index="19" bodypart="2" level="60" buy_currency="2" buy_amt="2200" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="下衣14a" spriteAlpha="" armatureName="下衣14a" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
+  <item id="221" jump_frequency="" type="3" index="20" bodypart="2" level="70" buy_currency="2" buy_amt="2500" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="1.08,77.07" icon2offset="" spriteName="下衣14b,下衣14b蝴蝶结" spriteAlpha="" armatureName="下衣14b" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
+  <item id="222" jump_frequency="" type="3" index="21" bodypart="2" level="70" buy_currency="2" buy_amt="2500" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="1.08,77.08" icon2offset="" spriteName="下衣14c,下衣14c蝴蝶结" spriteAlpha="" armatureName="下衣14c" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
+  <item id="223" jump_frequency="" type="3" index="22" bodypart="2" level="60" buy_currency="2" buy_amt="2200" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="裙子16" spriteAlpha="" armatureName="裙子16" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
+  <item id="224" jump_frequency="" type="3" index="23" bodypart="2" level="1" buy_currency="1" buy_amt="0" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="裙子-缺失" spriteAlpha="" armatureName="裙子-缺失" extraBodypart="" extraArmatureName="" ignore="1" icon0offset="" desc="" />
   <item id="601" jump_frequency="" type="4" index="0" bodypart="4" 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="602" jump_frequency="" type="4" index="1" bodypart="4" 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="603" jump_frequency="" type="4" index="2" bodypart="4" 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="" />
@@ -96,11 +99,12 @@
   <item id="610" jump_frequency="" type="4" index="9" bodypart="4" level="40" buy_currency="2" buy_amt="300" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="头饰10" spriteAlpha="" armatureName="头饰10" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
   <item id="611" jump_frequency="" type="4" index="10" bodypart="4" level="50" buy_currency="2" buy_amt="350" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="头饰11" spriteAlpha="" armatureName="头饰11" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
   <item id="612" jump_frequency="" type="4" index="11" bodypart="4" level="50" buy_currency="2" buy_amt="400" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="头饰12" spriteAlpha="" armatureName="头饰12" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
-  <item id="613" jump_frequency="" type="4" index="12" bodypart="4" level="50" buy_currency="2" buy_amt="450" buy_advance_currency="" buy_advance_amt="" pixelSize="80" iconOffset="" icon1offset="" icon2offset="" spriteName="装饰14" spriteAlpha="" armatureName="装饰14" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="DesignByKnife" />
-  <item id="614" jump_frequency="" type="4" index="13" bodypart="4" level="50" buy_currency="2" buy_amt="400" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="头饰15" spriteAlpha="" armatureName="头饰15" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="DesignByKnife" />
-  <item id="615" jump_frequency="" type="4" index="14" bodypart="4" level="50" buy_currency="2" buy_amt="400" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="头饰13-1" spriteAlpha="" armatureName="头饰13-1" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
-  <item id="616" jump_frequency="" type="4" index="15" bodypart="4" level="50" buy_currency="2" buy_amt="400" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="头饰13-2" spriteAlpha="" armatureName="头饰13-2" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
-  <item id="617" jump_frequency="" type="4" index="15" bodypart="4" level="50" buy_currency="2" buy_amt="400" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="帽子16" spriteAlpha="" armatureName="帽子16" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
+  <item id="613" jump_frequency="" type="4" index="12" bodypart="4" level="30" buy_currency="2" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="80" iconOffset="" icon1offset="" icon2offset="" spriteName="装饰14" spriteAlpha="" armatureName="装饰14" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="DesignByKnife" />
+  <item id="614" jump_frequency="" type="4" index="13" bodypart="4" level="30" buy_currency="2" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="头饰15" spriteAlpha="" armatureName="头饰15" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="DesignByKnife" />
+  <item id="615" jump_frequency="" type="4" index="14" bodypart="4" level="80" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="头饰13-1" spriteAlpha="" armatureName="头饰13-1" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
+  <item id="616" jump_frequency="" type="4" index="15" bodypart="4" level="80" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="头饰13-2" spriteAlpha="" armatureName="头饰13-2" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
+  <item id="618" jump_frequency="" type="4" index="16" bodypart="4" level="1" buy_currency="1" buy_amt="1" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="头饰-缺失" spriteAlpha="" armatureName="头饰-缺失" extraBodypart="" extraArmatureName="" ignore="1" icon0offset="" desc="" />
+  <item id="617" jump_frequency="" type="4" index="15" bodypart="4" level="60" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="帽子16" spriteAlpha="" armatureName="帽子16" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
   <item id="801" jump_frequency="" type="2" index="0" bodypart="5" level="" buy_currency="1" buy_amt="50000" buy_advance_currency="" buy_advance_amt="" pixelSize="80" iconOffset="" icon1offset="-55.32,19.11" icon2offset="53.41,16.68" spriteName="上衣1,上衣1袖子右,上衣1袖子左" spriteAlpha="" armatureName="上衣1" extraBodypart="10,9" extraArmatureName="短袖1右,短袖1左" ignore="" icon0offset="15,0" desc="" />
   <item id="802" jump_frequency="" type="2" index="1" bodypart="5" level="" buy_currency="1" buy_amt="50000" buy_advance_currency="" buy_advance_amt="" pixelSize="80" iconOffset="" icon1offset="-55.26,18.83" icon2offset="52.58,17.45" spriteName="上衣2,上衣2袖子右,上衣2袖子左" spriteAlpha="" armatureName="上衣2" extraBodypart="10,9" extraArmatureName="短袖2右,短袖2左" ignore="" icon0offset="" desc="" />
   <item id="803" jump_frequency="" type="2" index="2" bodypart="5" level="" buy_currency="1" buy_amt="50000" buy_advance_currency="" buy_advance_amt="" pixelSize="80" iconOffset="" icon1offset="-55.26,18.83" icon2offset="52.58,17.45" spriteName="上衣3,上衣2袖子右,上衣2袖子左" spriteAlpha="" armatureName="上衣3" extraBodypart="10,9" extraArmatureName="短袖2右,短袖2左" ignore="" icon0offset="" desc="" />
@@ -118,24 +122,26 @@
   <item id="815" jump_frequency="" type="2" index="14" bodypart="5" level="50" buy_currency="2" buy_amt="600" buy_advance_currency="" buy_advance_amt="" pixelSize="85" iconOffset="" icon1offset="-59.77,16.52" icon2offset="56.81,13.58" spriteName="上衣12,上衣12袖子右,上衣12袖子左" spriteAlpha="" armatureName="上衣12" extraBodypart="10,9" extraArmatureName="短袖12右,短袖12左" ignore="" icon0offset="" desc="" />
   <item id="816" jump_frequency="" type="2" index="15" bodypart="5" level="50" buy_currency="2" buy_amt="650" buy_advance_currency="" buy_advance_amt="" pixelSize="60" iconOffset="" icon1offset="-50,36.31" icon2offset="57.8,33.83" spriteName="上衣13,上衣13袖子右,上衣13袖子左" spriteAlpha="" armatureName="上衣13" extraBodypart="10,9" extraArmatureName="短袖13右,短袖13左" ignore="" icon0offset="" desc="" />
   <item id="817" jump_frequency="" type="2" index="16" bodypart="5" level="50" buy_currency="2" buy_amt="700" buy_advance_currency="" buy_advance_amt="" pixelSize="80" iconOffset="" icon1offset="-59.77,36.31" icon2offset="57.8,33.83" spriteName="上衣13(紫),上衣13蓝袖子右,上衣13蓝袖子左" spriteAlpha="" armatureName="上衣13(紫)" extraBodypart="10,9" extraArmatureName="短袖13蓝右,短袖13蓝左" ignore="" icon0offset="" desc="" />
-  <item id="818" jump_frequency="" type="2" index="17" bodypart="5" level="50" buy_currency="2" buy_amt="750" buy_advance_currency="" buy_advance_amt="" pixelSize="90" iconOffset="" icon1offset="" icon2offset="" spriteName="上衣14" spriteAlpha="" armatureName="上衣14" extraBodypart="10,9" extraArmatureName="" ignore="" icon0offset="" desc="DesignByKnife" />
-  <item id="819" jump_frequency="" type="2" index="18" bodypart="5" level="50" buy_currency="2" buy_amt="700" buy_advance_currency="" buy_advance_amt="" pixelSize="73" iconOffset="" icon1offset="71.85,2.89" icon2offset="-66.24,-0.4" spriteName="上衣15,上衣15(袖子)-1,上衣15(袖子)-2" spriteAlpha="" armatureName="上衣15" extraBodypart="10,9" extraArmatureName="上衣15(袖子)左,上衣15(袖子)右" ignore="" icon0offset="" desc="DesignByKnife" />
+  <item id="818" jump_frequency="" type="2" index="17" bodypart="5" level="30" buy_currency="2" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="90" iconOffset="" icon1offset="" icon2offset="" spriteName="上衣14" spriteAlpha="" armatureName="上衣14" extraBodypart="10,9" extraArmatureName="" ignore="" icon0offset="" desc="DesignByKnife" />
+  <item id="819" jump_frequency="" type="2" index="18" bodypart="5" level="30" buy_currency="2" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="73" iconOffset="" icon1offset="71.85,2.89" icon2offset="-66.24,-0.4" spriteName="上衣15,上衣15(袖子)-1,上衣15(袖子)-2" spriteAlpha="" armatureName="上衣15" extraBodypart="10,9" extraArmatureName="上衣15(袖子)左,上衣15(袖子)右" ignore="" icon0offset="" desc="DesignByKnife" />
   <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="-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="821" jump_frequency="" type="2" index="20" bodypart="5" level="70" buy_currency="2" buy_amt="800" 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="70" buy_currency="2" buy_amt="800" 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="60" buy_currency="2" buy_amt="700" buy_advance_currency="" buy_advance_amt="" pixelSize="70" iconOffset="" icon1offset="-65,25" icon2offset="50,22" spriteName="上衣16,上衣16袖子2,上衣16袖子1_1" spriteAlpha="" armatureName="上衣16" extraBodypart="10,9" extraArmatureName="上衣16袖子2,上衣16袖子1" ignore="" icon0offset="" desc="" />
+  <item id="824" jump_frequency="" type="2" index="23" bodypart="5" level="1" buy_currency="1" buy_amt="1" buy_advance_currency="" buy_advance_amt="" pixelSize="70" iconOffset="" icon1offset="" icon2offset="" spriteName="上衣-缺失" spriteAlpha="" armatureName="上衣-缺失" extraBodypart="10,9" extraArmatureName="Empty,Empty" ignore="1" 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="" />
-  <item id="1004" jump_frequency="" type="5" index="3" bodypart="6" level="50" buy_currency="2" buy_amt="2000" buy_advance_currency="" buy_advance_amt="" pixelSize="110" iconOffset="" icon1offset="" icon2offset="" spriteName="翅膀3" spriteAlpha="" armatureName="翅膀3" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
-  <item id="1005" jump_frequency="" type="5" index="4" bodypart="6" level="50" buy_currency="2" buy_amt="2000" buy_advance_currency="" buy_advance_amt="" pixelSize="110" iconOffset="" icon1offset="" icon2offset="" spriteName="翅膀4" spriteAlpha="" armatureName="翅膀4" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
-  <item id="1006" jump_frequency="" type="5" index="5" bodypart="6" level="50" buy_currency="2" buy_amt="2000" buy_advance_currency="" buy_advance_amt="" pixelSize="110" iconOffset="" icon1offset="" icon2offset="" spriteName="翅膀5" spriteAlpha="" armatureName="翅膀5" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
-  <item id="1200" jump_frequency="" type="" index="" bodypart="11" level="" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="" iconOffset="" icon1offset="" icon2offset="" spriteName="" spriteAlpha="" armatureName="眼睛1" extraBodypart="" extraArmatureName="" ignore="1" icon0offset="" desc="" />
-  <item id="1201" jump_frequency="" type="" index="" bodypart="11" level="" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="" iconOffset="" icon1offset="" icon2offset="" spriteName="" spriteAlpha="" armatureName="眼睛2" extraBodypart="" extraArmatureName="" ignore="1" icon0offset="" desc="" />
-  <item id="1202" jump_frequency="" type="" index="" bodypart="11" level="" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="" iconOffset="" icon1offset="" icon2offset="" spriteName="" spriteAlpha="" armatureName="眼睛3" extraBodypart="" extraArmatureName="" ignore="1" icon0offset="" desc="" />
-  <item id="1203" jump_frequency="" type="" index="" bodypart="12" level="" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="" iconOffset="" icon1offset="" icon2offset="" spriteName="" spriteAlpha="" armatureName="嘴巴1" extraBodypart="" extraArmatureName="" ignore="1" icon0offset="" desc="" />
-  <item id="1204" jump_frequency="" type="" index="" bodypart="12" level="" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="" iconOffset="" icon1offset="" icon2offset="" spriteName="" spriteAlpha="" armatureName="嘴巴2" extraBodypart="" extraArmatureName="" ignore="1" icon0offset="" desc="" />
-  <item id="1205" jump_frequency="" type="" index="" bodypart="12" level="" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="" iconOffset="" icon1offset="" icon2offset="" spriteName="" spriteAlpha="" armatureName="嘴巴3" extraBodypart="" extraArmatureName="" ignore="1" icon0offset="" desc="" />
+  <item id="1004" jump_frequency="" type="5" index="3" bodypart="6" level="90" buy_currency="2" buy_amt="2000" buy_advance_currency="" buy_advance_amt="" pixelSize="110" iconOffset="" icon1offset="" icon2offset="" spriteName="翅膀3" spriteAlpha="" armatureName="翅膀3" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
+  <item id="1005" jump_frequency="" type="5" index="4" bodypart="6" level="100" buy_currency="2" buy_amt="2500" buy_advance_currency="" buy_advance_amt="" pixelSize="110" iconOffset="" icon1offset="" icon2offset="" spriteName="翅膀4" spriteAlpha="" armatureName="翅膀4" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
+  <item id="1006" jump_frequency="" type="5" index="5" bodypart="6" level="90" buy_currency="2" buy_amt="2000" buy_advance_currency="" buy_advance_amt="" pixelSize="110" iconOffset="" icon1offset="" icon2offset="" spriteName="翅膀5" spriteAlpha="" armatureName="翅膀5" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
+  <item id="1007" jump_frequency="" type="5" index="6" bodypart="6" level="1" buy_currency="1" buy_amt="0" buy_advance_currency="" buy_advance_amt="" pixelSize="110" iconOffset="" icon1offset="" icon2offset="" spriteName="翅膀-缺失" spriteAlpha="" armatureName="翅膀-缺失" extraBodypart="" extraArmatureName="" ignore="1" icon0offset="" desc="" />
+  <item id="1200" jump_frequency="" type="" index="" bodypart="11" level="" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="" iconOffset="" icon1offset="" icon2offset="" spriteName="眼睛1" spriteAlpha="" armatureName="眼睛1" extraBodypart="" extraArmatureName="" ignore="1" icon0offset="" desc="" />
+  <item id="1201" jump_frequency="" type="" index="" bodypart="11" level="" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="" iconOffset="" icon1offset="" icon2offset="" spriteName="眼睛2" spriteAlpha="" armatureName="眼睛2" extraBodypart="" extraArmatureName="" ignore="1" icon0offset="" desc="" />
+  <item id="1202" jump_frequency="" type="" index="" bodypart="11" level="" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="" iconOffset="" icon1offset="" icon2offset="" spriteName="眼睛3" spriteAlpha="" armatureName="眼睛3" extraBodypart="" extraArmatureName="" ignore="1" icon0offset="" desc="" />
+  <item id="1203" jump_frequency="" type="" index="" bodypart="12" level="" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="" iconOffset="" icon1offset="" icon2offset="" spriteName="嘴巴1" spriteAlpha="" armatureName="嘴巴1" extraBodypart="" extraArmatureName="" ignore="1" icon0offset="" desc="" />
+  <item id="1204" jump_frequency="" type="" index="" bodypart="12" level="" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="" iconOffset="" icon1offset="" icon2offset="" spriteName="嘴巴2" spriteAlpha="" armatureName="嘴巴2" extraBodypart="" extraArmatureName="" ignore="1" icon0offset="" desc="" />
+  <item id="1205" jump_frequency="" type="" index="" bodypart="12" level="" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="" iconOffset="" icon1offset="" icon2offset="" spriteName="嘴巴3" spriteAlpha="" armatureName="嘴巴3" extraBodypart="" extraArmatureName="" ignore="1" icon0offset="" desc="" />
   <comment>
     <id>
 id

+ 54 - 50
Assets/Resource/XML/Config/flower_config.xml

@@ -1,54 +1,55 @@
 <data>
-  <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" />
+  <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" show="" />
+  <item id="0" name="缺失小花" desc="" unlock_ahead_cur="1" unlock_ahead="0" icon="Flower0" anim="" flower_coin_buff="0" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" show="0" />
+  <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" show="" />
+  <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" show="" />
+  <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" show="" />
+  <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" show="" />
+  <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" show="" />
+  <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" show="" />
+  <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" show="" />
+  <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" show="" />
+  <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" show="" />
+  <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" show="" />
+  <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" show="" />
+  <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" show="" />
+  <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" show="" />
+  <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" show="" />
+  <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" show="" />
+  <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" show="" />
+  <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" show="" />
+  <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" show="" />
+  <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" show="" />
+  <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" show="" />
+  <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" show="" />
+  <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" show="" />
+  <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" show="" />
+  <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" show="" />
+  <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" show="" />
+  <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" show="" />
+  <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" show="" />
+  <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" show="" />
+  <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" show="" />
+  <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" show="" />
+  <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" show="" />
+  <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" show="" />
+  <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" show="" />
+  <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" show="" />
+  <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" show="" />
+  <item id="37" name="风信子(白色) " desc="" unlock_ahead_cur="1" unlock_ahead="5000000" icon="Flower37" anim="" flower_coin_buff="0.85" itemSize="0.2" flowerCardSize="0.5" minigameSize="0.9" show="" />
+  <item id="38" name="风信子(粉色)" desc="" unlock_ahead_cur="1" unlock_ahead="10000000" icon="Flower38" anim="" flower_coin_buff="0.85" itemSize="0.2" flowerCardSize="0.5" minigameSize="0.9" show="" />
+  <item id="39" name="风信子(黄色)" desc="" unlock_ahead_cur="2" unlock_ahead="100" icon="Flower39" anim="" flower_coin_buff="0.85" itemSize="0.2" flowerCardSize="0.5" minigameSize="0.9" show="" />
+  <item id="40" name="风信子(紫色)" desc="" unlock_ahead_cur="2" unlock_ahead="150" icon="Flower40" anim="" flower_coin_buff="0.85" itemSize="0.2" flowerCardSize="0.5" minigameSize="0.9" show="" />
+  <item id="41" name="虎刺梅(红色)" desc="" unlock_ahead_cur="2" unlock_ahead="300" icon="Flower41" anim="" flower_coin_buff="0.85" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" show="" />
+  <item id="42" name="虎刺梅(黄色)" desc="" unlock_ahead_cur="2" unlock_ahead="300" icon="Flower42" anim="" flower_coin_buff="0.85" itemSize="0.25" flowerCardSize="0.6125" minigameSize="1.0625" show="" />
+  <item id="43" name="茉莉花(黄色)" desc="" unlock_ahead_cur="2" unlock_ahead="500" icon="Flower43" anim="" flower_coin_buff="0.85" itemSize="0.3" flowerCardSize="0.8" minigameSize="1.2625" show="" />
+  <item id="44" name="茉莉花(紫色)" desc="" unlock_ahead_cur="2" unlock_ahead="600" icon="Flower44" anim="" flower_coin_buff="0.85" itemSize="0.3" flowerCardSize="0.8" minigameSize="1.2625" show="" />
+  <item id="45" name="勿忘我(黄色)" desc="" unlock_ahead_cur="2" unlock_ahead="600" icon="Flower45" anim="" flower_coin_buff="0.85" itemSize="0.2" flowerCardSize="0.5" minigameSize="0.9" show="" />
+  <item id="46" name="勿忘我(蓝色)" desc="" unlock_ahead_cur="2" unlock_ahead="700" icon="Flower46" anim="" flower_coin_buff="0.85" itemSize="0.2" flowerCardSize="0.5" minigameSize="0.9" show="" />
+  <item id="47" name="勿忘我(紫色)" desc="" unlock_ahead_cur="2" unlock_ahead="700" icon="Flower47" anim="" flower_coin_buff="0.85" itemSize="0.2" flowerCardSize="0.5" minigameSize="0.9" show="" />
+  <item id="48" name="花烟草(白色)" desc="" unlock_ahead_cur="2" unlock_ahead="800" icon="Flower48" anim="" flower_coin_buff="0.85" itemSize="0.3" flowerCardSize="0.8" minigameSize="1.2625" show="" />
+  <item id="49" name="花烟草(粉色)" desc="" unlock_ahead_cur="2" unlock_ahead="800" icon="Flower49" anim="" flower_coin_buff="0.85" itemSize="0.3" flowerCardSize="0.8" minigameSize="1.2625" show="" />
+  <item id="50" name="花烟草(红色)" desc="" unlock_ahead_cur="2" unlock_ahead="800" icon="Flower50" anim="" flower_coin_buff="0.85" itemSize="0.3" flowerCardSize="0.8" minigameSize="1.2625" show="" />
   <comment>
     <id>
 id
@@ -84,5 +85,8 @@ id
     <minigameSize>
 
 </minigameSize>
+    <show>
+显示在花朵管理界面
+</show>
   </comment>
 </data>

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

@@ -1,5 +1,5 @@
 <PlayerConfig>
-  <Version value="26" />
+  <Version value="29" />
   <ReplayVersion value="1" />
   
   <ID value="Default" />

+ 40 - 31
Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -330,6 +330,7 @@
     <SendMessageSucceed desc=""><![CDATA[发送消息成功]]></SendMessageSucceed>
   </PlazaroomMemberItem>
   <FlowerName>
+    <Flower0 desc=""><![CDATA[缺失小花]]></Flower0>
     <Flower1 desc=""><![CDATA[粉色小花]]></Flower1>
     <Flower2 desc=""><![CDATA[紫色小花]]></Flower2>
     <Flower3 desc=""><![CDATA[波斯菊(粉)]]></Flower3>
@@ -366,22 +367,23 @@
     <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>
+    <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>
+    <Flower0 desc=""><![CDATA[粉]]></Flower0>
     <Flower1 desc=""><![CDATA[粉]]></Flower1>
     <Flower2 desc=""><![CDATA[紫]]></Flower2>
     <Flower3 desc=""><![CDATA[粉]]></Flower3>
@@ -418,20 +420,20 @@
     <Flower34 desc=""><![CDATA[蓝]]></Flower34>
     <Flower35 desc=""><![CDATA[红]]></Flower35>
     <Flower36 desc=""><![CDATA[黄]]></Flower36>
-    <Flower37 desc=""><![CDATA[]]></Flower37>
-    <Flower38 desc=""><![CDATA[]]></Flower38>
+    <Flower37 desc=""><![CDATA[]]></Flower37>
+    <Flower38 desc=""><![CDATA[]]></Flower38>
     <Flower39 desc=""><![CDATA[黄]]></Flower39>
-    <Flower40 desc=""><![CDATA[]]></Flower40>
-    <Flower41 desc=""><![CDATA[]]></Flower41>
+    <Flower40 desc=""><![CDATA[]]></Flower40>
+    <Flower41 desc=""><![CDATA[]]></Flower41>
     <Flower42 desc=""><![CDATA[黄]]></Flower42>
-    <Flower43 desc=""><![CDATA[]]></Flower43>
-    <Flower44 desc=""><![CDATA[]]></Flower44>
+    <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>
+    <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>
@@ -866,7 +868,8 @@
     <Armature38 desc=""><![CDATA[丸子(棕)]]></Armature38>
     <Armature39 desc=""><![CDATA[麻花辫(蓝)]]></Armature39>
     <Armature40 desc=""><![CDATA[麻花辫(棕)]]></Armature40>
-    <Armature41 desc=""><![CDATA[名字]]></Armature41>
+    <Armature41 desc=""><![CDATA[炽天使]]></Armature41>
+    <Armature42 desc=""><![CDATA[缺失]]></Armature42>
     <Armature201 desc=""><![CDATA[蛋糕诱惑]]></Armature201>
     <Armature202 desc=""><![CDATA[小纯真]]></Armature202>
     <Armature203 desc=""><![CDATA[清凉之夏]]></Armature203>
@@ -889,7 +892,8 @@
     <Armature220 desc=""><![CDATA[蝶梦]]></Armature220>
     <Armature221 desc=""><![CDATA[橙意]]></Armature221>
     <Armature222 desc=""><![CDATA[青意]]></Armature222>
-    <Armature223 desc=""><![CDATA[名字]]></Armature223>
+    <Armature223 desc=""><![CDATA[炽天使]]></Armature223>
+    <Armature224 desc=""><![CDATA[缺失]]></Armature224>
     <Armature401 desc=""><![CDATA[小皮鞋]]></Armature401>
     <Armature402 desc=""><![CDATA[小靴子(黑)]]></Armature402>
     <Armature403 desc=""><![CDATA[小靴子(蓝)]]></Armature403>
@@ -910,7 +914,8 @@
     <Armature418 desc=""><![CDATA[蝶梦]]></Armature418>
     <Armature419 desc=""><![CDATA[橙意]]></Armature419>
     <Armature420 desc=""><![CDATA[青意]]></Armature420>
-    <Armature421 desc=""><![CDATA[名字]]></Armature421>
+    <Armature421 desc=""><![CDATA[炽天使]]></Armature421>
+    <Armature422 desc=""><![CDATA[缺失]]></Armature422>
     <Armature601 desc=""><![CDATA[赤炎蝴蝶结]]></Armature601>
     <Armature602 desc=""><![CDATA[粉色小花]]></Armature602>
     <Armature603 desc=""><![CDATA[兔耳萌萌]]></Armature603>
@@ -927,7 +932,8 @@
     <Armature614 desc=""><![CDATA[春华]]></Armature614>
     <Armature615 desc=""><![CDATA[熊熊]]></Armature615>
     <Armature616 desc=""><![CDATA[蝶梦]]></Armature616>
-    <Armature617 desc=""><![CDATA[名字]]></Armature617>
+    <Armature617 desc=""><![CDATA[纱帽]]></Armature617>
+    <Armature618 desc=""><![CDATA[缺失]]></Armature618>
     <Armature801 desc=""><![CDATA[小鱼]]></Armature801>
     <Armature802 desc=""><![CDATA[可爱宝贝]]></Armature802>
     <Armature803 desc=""><![CDATA[浮生小白]]></Armature803>
@@ -950,13 +956,15 @@
     <Armature820 desc=""><![CDATA[蝶梦]]></Armature820>
     <Armature821 desc=""><![CDATA[橙意]]></Armature821>
     <Armature822 desc=""><![CDATA[青意]]></Armature822>
-    <Armature823 desc=""><![CDATA[名字]]></Armature823>
+    <Armature823 desc=""><![CDATA[炽天使]]></Armature823>
+    <Armature824 desc=""><![CDATA[缺失]]></Armature824>
     <Armature1001 desc=""><![CDATA[无翅膀]]></Armature1001>
     <Armature1002 desc=""><![CDATA[薄翼]]></Armature1002>
     <Armature1003 desc=""><![CDATA[精灵之翼]]></Armature1003>
     <Armature1004 desc=""><![CDATA[蝴蝶妖精]]></Armature1004>
     <Armature1005 desc=""><![CDATA[蝶梦]]></Armature1005>
-    <Armature1006 desc=""><![CDATA[名字]]></Armature1006>
+    <Armature1006 desc=""><![CDATA[炽天使之翼]]></Armature1006>
+    <Armature1007 desc=""><![CDATA[缺失]]></Armature1007>
     <DesignByKnife desc=""><![CDATA[热心玩家<{<color=blue>小刀</color>}>设计ID[1801104863982007122]]]></DesignByKnife>
   </DressRoom>
   <Tip>
@@ -969,6 +977,7 @@
     <Tip7 desc=""><![CDATA[目前有3个考验大脑的小游戏,你都能玩出好成绩吗?]]></Tip7>
     <Tip8 desc=""><![CDATA[如果你觉得游戏还不错,请分享给你的朋友吧!还能获得奖励哦!]]></Tip8>
     <Tip9 desc=""><![CDATA[如果发现小游戏里有一朵花被星星笼罩,那么你有机会得到它哦~]]></Tip9>
+    <Tip10 desc=""><![CDATA[如果你发现某位小公主穿着带问号的灰色裙子,不要怀疑你的眼睛,这说明你该更新一下游戏了!]]></Tip10>
   </Tip>
   <MinigameName>
     <Punch desc=""><![CDATA[打理花园]]></Punch>

+ 43 - 34
Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -330,6 +330,7 @@
     <SendMessageSucceed desc=""><![CDATA[發送消息成功]]></SendMessageSucceed>
   </PlazaroomMemberItem>
   <FlowerName>
+    <Flower0 desc=""><![CDATA[]]></Flower0>
     <Flower1 desc=""><![CDATA[粉色小花]]></Flower1>
     <Flower2 desc=""><![CDATA[紫色小花]]></Flower2>
     <Flower3 desc=""><![CDATA[波斯菊(粉)]]></Flower3>
@@ -366,22 +367,23 @@
     <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>
+    <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>
+    <Flower0 desc=""><![CDATA[粉]]></Flower0>
     <Flower1 desc=""><![CDATA[粉]]></Flower1>
     <Flower2 desc=""><![CDATA[紫]]></Flower2>
     <Flower3 desc=""><![CDATA[粉]]></Flower3>
@@ -418,20 +420,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>
+    <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>
@@ -866,7 +868,8 @@
     <Armature38 desc=""><![CDATA[丸子(棕)]]></Armature38>
     <Armature39 desc=""><![CDATA[麻花辮(藍)]]></Armature39>
     <Armature40 desc=""><![CDATA[麻花辮(棕)]]></Armature40>
-    <Armature41 desc=""><![CDATA[]]></Armature41>
+    <Armature41 desc=""><![CDATA[熾天使]]></Armature41>
+    <Armature42 desc=""><![CDATA[]]></Armature42>
     <Armature201 desc=""><![CDATA[蛋糕誘惑]]></Armature201>
     <Armature202 desc=""><![CDATA[小純真]]></Armature202>
     <Armature203 desc=""><![CDATA[清涼之夏]]></Armature203>
@@ -889,7 +892,8 @@
     <Armature220 desc=""><![CDATA[蝶夢]]></Armature220>
     <Armature221 desc=""><![CDATA[橙意]]></Armature221>
     <Armature222 desc=""><![CDATA[青意]]></Armature222>
-    <Armature223 desc=""><![CDATA[]]></Armature223>
+    <Armature223 desc=""><![CDATA[熾天使]]></Armature223>
+    <Armature224 desc=""><![CDATA[]]></Armature224>
     <Armature401 desc=""><![CDATA[小皮鞋]]></Armature401>
     <Armature402 desc=""><![CDATA[小靴子(黑)]]></Armature402>
     <Armature403 desc=""><![CDATA[小靴子(藍)]]></Armature403>
@@ -910,7 +914,8 @@
     <Armature418 desc=""><![CDATA[蝶夢]]></Armature418>
     <Armature419 desc=""><![CDATA[橙意]]></Armature419>
     <Armature420 desc=""><![CDATA[青意]]></Armature420>
-    <Armature421 desc=""><![CDATA[]]></Armature421>
+    <Armature421 desc=""><![CDATA[熾天使]]></Armature421>
+    <Armature422 desc=""><![CDATA[]]></Armature422>
     <Armature601 desc=""><![CDATA[赤炎蝴蝶結]]></Armature601>
     <Armature602 desc=""><![CDATA[粉色小花]]></Armature602>
     <Armature603 desc=""><![CDATA[兔耳萌萌]]></Armature603>
@@ -927,7 +932,8 @@
     <Armature614 desc=""><![CDATA[春華]]></Armature614>
     <Armature615 desc=""><![CDATA[熊熊]]></Armature615>
     <Armature616 desc=""><![CDATA[蝶夢]]></Armature616>
-    <Armature617 desc=""><![CDATA[]]></Armature617>
+    <Armature617 desc=""><![CDATA[紗帽]]></Armature617>
+    <Armature618 desc=""><![CDATA[]]></Armature618>
     <Armature801 desc=""><![CDATA[小魚]]></Armature801>
     <Armature802 desc=""><![CDATA[可愛寶貝]]></Armature802>
     <Armature803 desc=""><![CDATA[浮生小白]]></Armature803>
@@ -950,13 +956,15 @@
     <Armature820 desc=""><![CDATA[蝶夢]]></Armature820>
     <Armature821 desc=""><![CDATA[橙意]]></Armature821>
     <Armature822 desc=""><![CDATA[青意]]></Armature822>
-    <Armature823 desc=""><![CDATA[]]></Armature823>
+    <Armature823 desc=""><![CDATA[熾天使]]></Armature823>
+    <Armature824 desc=""><![CDATA[]]></Armature824>
     <Armature1001 desc=""><![CDATA[無翅膀]]></Armature1001>
     <Armature1002 desc=""><![CDATA[薄翼]]></Armature1002>
     <Armature1003 desc=""><![CDATA[精靈之翼]]></Armature1003>
     <Armature1004 desc=""><![CDATA[蝴蝶妖精]]></Armature1004>
     <Armature1005 desc=""><![CDATA[蝶夢]]></Armature1005>
-    <Armature1006 desc=""><![CDATA[]]></Armature1006>
+    <Armature1006 desc=""><![CDATA[熾天使之翼]]></Armature1006>
+    <Armature1007 desc=""><![CDATA[]]></Armature1007>
     <DesignByKnife desc=""><![CDATA[熱心玩家<{<color=blue>小刀</color>}>設計ID[1801104863982007122]]]></DesignByKnife>
   </DressRoom>
   <Tip>
@@ -969,6 +977,7 @@
     <Tip7 desc=""><![CDATA[目前有3個考驗大腦的小遊戲,你都能玩出好成績嗎?]]></Tip7>
     <Tip8 desc=""><![CDATA[如果你覺得遊戲還不錯,請分享給你的朋友吧!還能獲得獎勵哦!]]></Tip8>
     <Tip9 desc=""><![CDATA[如果發現小遊戲裡有一朵花被星星籠罩,那麼你有機會得到它哦~]]></Tip9>
+    <Tip10 desc=""><![CDATA[如果你發現某位小公主穿著帶問號的灰色裙子,不要懷疑你的眼睛,這說明你該更新一下遊戲了!]]></Tip10>
   </Tip>
   <MinigameName>
     <Punch desc=""><![CDATA[打理花園]]></Punch>

+ 43 - 34
Assets/Resource/XML/lan/English.xml

@@ -328,6 +328,7 @@ Program 水怪
     <SendMessageSucceed desc=""><![CDATA[Success]]></SendMessageSucceed>
   </PlazaroomMemberItem>
   <FlowerName>
+    <Flower0 desc=""><![CDATA[]]></Flower0>
     <Flower1 desc=""><![CDATA[Pink Flower]]></Flower1>
     <Flower2 desc=""><![CDATA[Purple Flower]]></Flower2>
     <Flower3 desc=""><![CDATA[Calliopsis(Pink)]]></Flower3>
@@ -364,22 +365,23 @@ 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>
+    <Flower37 desc=""><![CDATA[Hyacinth(White)]]></Flower37>
+    <Flower38 desc=""><![CDATA[Hyacinth(Pink)]]></Flower38>
+    <Flower39 desc=""><![CDATA[Hyacinth(Yellow)]]></Flower39>
+    <Flower40 desc=""><![CDATA[Hyacinth(Purple)]]></Flower40>
+    <Flower41 desc=""><![CDATA[Crown of Thorns(Red)]]></Flower41>
+    <Flower42 desc=""><![CDATA[Crown of Thorns(Yellow)]]></Flower42>
+    <Flower43 desc=""><![CDATA[Jasmine(White)]]></Flower43>
+    <Flower44 desc=""><![CDATA[Jasmine(Purple)]]></Flower44>
+    <Flower45 desc=""><![CDATA[Forget me not(Yellow)]]></Flower45>
+    <Flower46 desc=""><![CDATA[Forget me not(Blue)]]></Flower46>
+    <Flower47 desc=""><![CDATA[Forget me not(Purple)]]></Flower47>
+    <Flower48 desc=""><![CDATA[Henbane(White)]]></Flower48>
+    <Flower49 desc=""><![CDATA[Henbane(Pink)]]></Flower49>
+    <Flower50 desc=""><![CDATA[Henbane(Red)]]></Flower50>
   </FlowerName>
   <FlowerColor>
+    <Flower0 desc=""><![CDATA[Pink]]></Flower0>
     <Flower1 desc=""><![CDATA[Pink]]></Flower1>
     <Flower2 desc=""><![CDATA[Purple]]></Flower2>
     <Flower3 desc=""><![CDATA[Pink]]></Flower3>
@@ -416,20 +418,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>
+    <Flower37 desc=""><![CDATA[White]]></Flower37>
+    <Flower38 desc=""><![CDATA[Pink]]></Flower38>
+    <Flower39 desc=""><![CDATA[Yellow]]></Flower39>
+    <Flower40 desc=""><![CDATA[Purple]]></Flower40>
+    <Flower41 desc=""><![CDATA[Red]]></Flower41>
+    <Flower42 desc=""><![CDATA[Yellow]]></Flower42>
+    <Flower43 desc=""><![CDATA[White]]></Flower43>
+    <Flower44 desc=""><![CDATA[Purple]]></Flower44>
+    <Flower45 desc=""><![CDATA[Yellow]]></Flower45>
+    <Flower46 desc=""><![CDATA[Blue]]></Flower46>
+    <Flower47 desc=""><![CDATA[Purple]]></Flower47>
+    <Flower48 desc=""><![CDATA[White]]></Flower48>
+    <Flower49 desc=""><![CDATA[Pink]]></Flower49>
+    <Flower50 desc=""><![CDATA[Red]]></Flower50>
   </FlowerColor>
   <SkillName>
     <Pack1 desc=""><![CDATA[Gift of Coins]]></Pack1>
@@ -865,7 +867,8 @@ 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>
+    <Armature41 desc=""><![CDATA[Blazing Angel]]></Armature41>
+    <Armature42 desc=""><![CDATA[]]></Armature42>
     <Armature201 desc=""><![CDATA[Cake]]></Armature201>
     <Armature202 desc=""><![CDATA[Innocence]]></Armature202>
     <Armature203 desc=""><![CDATA[Cool Summer]]></Armature203>
@@ -888,7 +891,8 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack12>
     <Armature220 desc=""><![CDATA[Dream of Butterfly]]></Armature220>
     <Armature221 desc=""><![CDATA[Orange Imagination]]></Armature221>
     <Armature222 desc=""><![CDATA[Blue Imagination]]></Armature222>
-    <Armature223 desc=""><![CDATA[]]></Armature223>
+    <Armature223 desc=""><![CDATA[Blazing Angel]]></Armature223>
+    <Armature224 desc=""><![CDATA[]]></Armature224>
     <Armature401 desc=""><![CDATA[Leather Shoes]]></Armature401>
     <Armature402 desc=""><![CDATA[Boots(Black)]]></Armature402>
     <Armature403 desc=""><![CDATA[Boots(Blue)]]></Armature403>
@@ -909,7 +913,8 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack12>
     <Armature418 desc=""><![CDATA[Dream of Butterfly]]></Armature418>
     <Armature419 desc=""><![CDATA[Orange Imagination]]></Armature419>
     <Armature420 desc=""><![CDATA[Blue Imagination]]></Armature420>
-    <Armature421 desc=""><![CDATA[]]></Armature421>
+    <Armature421 desc=""><![CDATA[Blazing Angel]]></Armature421>
+    <Armature422 desc=""><![CDATA[]]></Armature422>
     <Armature601 desc=""><![CDATA[Big Bowknot]]></Armature601>
     <Armature602 desc=""><![CDATA[Pink Flower]]></Armature602>
     <Armature603 desc=""><![CDATA[Rabbit]]></Armature603>
@@ -926,7 +931,8 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack12>
     <Armature614 desc=""><![CDATA[Spring]]></Armature614>
     <Armature615 desc=""><![CDATA[Teddy]]></Armature615>
     <Armature616 desc=""><![CDATA[Dream of Butterfly]]></Armature616>
-    <Armature617 desc=""><![CDATA[]]></Armature617>
+    <Armature617 desc=""><![CDATA[Yarn cap]]></Armature617>
+    <Armature618 desc=""><![CDATA[]]></Armature618>
     <Armature801 desc=""><![CDATA[Fish]]></Armature801>
     <Armature802 desc=""><![CDATA[Lovely Baby]]></Armature802>
     <Armature803 desc=""><![CDATA[The White]]></Armature803>
@@ -949,13 +955,15 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack12>
     <Armature820 desc=""><![CDATA[Dream of Butterfly]]></Armature820>
     <Armature821 desc=""><![CDATA[Orange Imagination]]></Armature821>
     <Armature822 desc=""><![CDATA[Blue Imagination]]></Armature822>
-    <Armature823 desc=""><![CDATA[]]></Armature823>
+    <Armature823 desc=""><![CDATA[Blazing Angel]]></Armature823>
+    <Armature824 desc=""><![CDATA[]]></Armature824>
     <Armature1001 desc=""><![CDATA[No Wings]]></Armature1001>
     <Armature1002 desc=""><![CDATA[Thin Wings]]></Armature1002>
     <Armature1003 desc=""><![CDATA[Elf Wings]]></Armature1003>
     <Armature1004 desc=""><![CDATA[Butterfly Elf]]></Armature1004>
     <Armature1005 desc=""><![CDATA[Dream of Butterfly]]></Armature1005>
-    <Armature1006 desc=""><![CDATA[]]></Armature1006>
+    <Armature1006 desc=""><![CDATA[Wing of Blazing Angel]]></Armature1006>
+    <Armature1007 desc=""><![CDATA[]]></Armature1007>
     <DesignByKnife desc=""><![CDATA[Designed by player <{<color=blue>小刀</color>}>ID[1801104863982007122]]]></DesignByKnife>
   </DressRoom>
   <Tip>
@@ -968,6 +976,7 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack12>
     <Tip7 desc=""><![CDATA[There are 3 mini games for your brain, can you do them well?]]></Tip7>
     <Tip8 desc=""><![CDATA[Share the game to your friends, and get the rewards!]]></Tip8>
     <Tip9 desc=""><![CDATA[If you find stars hanging over a flower in mini games, don't miss it!]]></Tip9>
+    <Tip10 desc=""><![CDATA[If see a girl dress in grey with a question mark, no doubt, you have to update your client now!]]></Tip10>
   </Tip>
   <MinigameName>
     <Punch desc=""><![CDATA[Take care]]></Punch>

BIN
Assets/Resource/Xlsx/dressRoom_config.xlsx


BIN
Assets/Resource/Xlsx/flower_config.xlsx


BIN
Assets/Resource/Xlsx/language_config.xlsx


+ 74 - 12
Assets/Script/Manage/ConfigManager.cs

@@ -591,7 +591,7 @@ public class ConfigManager : Regist
         attribute.Value = "";
         attribute1.Value = "";
 
-        foreach (var kv in GardenManager.FlowerInfoDictionary)
+        foreach (var kv in GardenManager.GetFlowerInfoDict())
         {
             if (kv.Value.Unlock)
             {
@@ -1244,18 +1244,32 @@ public class ConfigManager : Regist
     public static List<string> GetDefaultDressDatas()
     {
         List<string> defaultDressDatas = new List<string>();
-        defaultDressDatas.Add("脑壳1");
-        defaultDressDatas.Add("裙子1");
-        defaultDressDatas.Add("鞋子1");
-        defaultDressDatas.Add("头饰品1");
-        defaultDressDatas.Add("上衣1");
+        defaultDressDatas.Add("脑壳-缺失");
+        defaultDressDatas.Add("裙子-缺失");
+        defaultDressDatas.Add("鞋子-缺失");
+        defaultDressDatas.Add("头饰-缺失");
+        defaultDressDatas.Add("上衣-缺失");
         defaultDressDatas.Add("眼睛1");
         defaultDressDatas.Add("嘴巴1");
+        defaultDressDatas.Add("翅膀-缺失");
         defaultDressDatas.Add("Empty");
         defaultDressDatas.Add("Empty");
-        defaultDressDatas.Add("短袖2左");
         defaultDressDatas.Add("Empty");
-        defaultDressDatas.Add("短袖2右");
+        defaultDressDatas.Add("Empty");
+
+        //defaultDressDatas.Add("脑壳1");
+        //defaultDressDatas.Add("裙子1");
+        //defaultDressDatas.Add("鞋子1");
+        //defaultDressDatas.Add("头饰品1");
+        //defaultDressDatas.Add("上衣1");
+        //defaultDressDatas.Add("眼睛1");
+        //defaultDressDatas.Add("嘴巴1");
+        //defaultDressDatas.Add("Empty");
+        //defaultDressDatas.Add("Empty");
+        //defaultDressDatas.Add("短袖2左");
+        //defaultDressDatas.Add("Empty");
+        //defaultDressDatas.Add("短袖2右");
+
         return defaultDressDatas;
     }
 
@@ -1463,6 +1477,20 @@ public class ConfigManager : Regist
             ToVersion26(nativeDoc, defaultDoc);
         }
 
+        if (nativeVersion < 28)
+        {
+            Debug.LogWarning("UpdateArchive to 28");
+
+            ToVersion28(nativeDoc, defaultDoc);
+        }
+
+        if (nativeVersion < 29)
+        {
+            Debug.LogWarning("UpdateArchive to 29");
+
+            ToVersion29(nativeDoc, defaultDoc);
+        }
+
         return nativeDoc;
     }
 
@@ -1853,10 +1881,44 @@ public class ConfigManager : Regist
     {
         nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value = 26.ToString();
 
-        XmlNode xmlNode = defaultDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.FashionShowTutorial);
-        nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).AppendChild(nativeDoc.ImportNode(xmlNode, true));
-        xmlNode = defaultDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.FashionShowTutorialIndex);
-        nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).AppendChild(nativeDoc.ImportNode(xmlNode, true));
+        return nativeDoc;
+    }
+
+    public static XmlDocument ToVersion27(XmlDocument nativeDoc, XmlDocument defaultDoc)
+    {
+        nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value = 27.ToString();
+
+        string persistentFolderPath = $"{Application.persistentDataPath}{Path.DirectorySeparatorChar}HotUpdate";
+        if (Directory.Exists(persistentFolderPath))
+        {
+            Directory.Delete(persistentFolderPath, true);
+        }
+
+        return nativeDoc;
+    }
+
+    public static XmlDocument ToVersion28(XmlDocument nativeDoc, XmlDocument defaultDoc)
+    {
+        nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value = 28.ToString();
+
+        string persistentFolderPath = $"{Application.persistentDataPath}{Path.DirectorySeparatorChar}HotUpdate";
+        if (Directory.Exists(persistentFolderPath))
+        {
+            Directory.Delete(persistentFolderPath, true);
+        }
+
+        return nativeDoc;
+    }
+
+    public static XmlDocument ToVersion29(XmlDocument nativeDoc, XmlDocument defaultDoc)
+    {
+        nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value = 29.ToString();
+
+        string persistentFolderPath = $"{Application.persistentDataPath}{Path.DirectorySeparatorChar}HotUpdate";
+        if (Directory.Exists(persistentFolderPath))
+        {
+            Directory.Delete(persistentFolderPath, true);
+        }
 
         return nativeDoc;
     }

+ 24 - 7
Assets/Script/Manage/GardenManager.cs

@@ -182,7 +182,7 @@ public class GardenManager : Regist
     {
         get
         {
-            foreach (var kv in FlowerInfoDictionary)
+            foreach (var kv in GetFlowerInfoDict())
             {
                 if (!kv.Value.Unlock)
                 {
@@ -199,7 +199,7 @@ public class GardenManager : Regist
         {
             List<int> unlockedFlowerIDList = new List<int>();
 
-            foreach (var kv in FlowerInfoDictionary)
+            foreach (var kv in GetFlowerInfoDict())
             {
                 if (kv.Value.Unlock)
                 {
@@ -241,7 +241,7 @@ public class GardenManager : Regist
     public static List<ElfType> ElfList = new List<ElfType>();
     public static List<Transform> SlotPageList = new List<Transform>();
 
-    public static Dictionary<int, FlowerInfo> FlowerInfoDictionary = new Dictionary<int, FlowerInfo>();
+    private static Dictionary<int, FlowerInfo> FlowerInfoDictionary = new Dictionary<int, FlowerInfo>();
 
     public static int DefaultSlotPage = 2;
     public static int CriticalSlotIndex = 7;
@@ -253,6 +253,23 @@ public class GardenManager : Regist
 
     #endregion
 
+    public static FlowerInfo GetFlowerInfo(int id)
+    {
+        if (FlowerInfoDictionary.ContainsKey(id) == false)
+        {
+            id = 0;
+            Debug.LogError("no such flower");
+        }
+        return FlowerInfoDictionary[id];
+    }
+
+    public static Dictionary<int, FlowerInfo> GetFlowerInfoDict()
+    {
+        return FlowerInfoDictionary;
+    }
+
+
+
     public void Update()
     {
         if (TutorialManager.NewplayerTutorial || Player.InDressRoom || SFSManager.GardenSmartFox.PlazaRoomController.JoinedPlazaRoom)
@@ -356,7 +373,7 @@ public class GardenManager : Regist
             {
                 TotalNormalFlower++;
             }
-            FlowerInfoDictionary.Add(flowerInfo.ID, flowerInfo);
+            GetFlowerInfoDict().Add(flowerInfo.ID, flowerInfo);
         }
 
         #endregion
@@ -381,7 +398,7 @@ public class GardenManager : Regist
 
         for (int i = 0; i < flowerIDList.Count; i++)
         {
-            FlowerInfoDictionary[flowerIDList[i]].Unlock = true;
+            GetFlowerInfo(flowerIDList[i]).Unlock = true;
         }
 
 
@@ -389,7 +406,7 @@ public class GardenManager : Regist
 
         for (int i = 0; i < flowerAmountList.Count; i++)
         {
-            FlowerInfoDictionary[flowerIDList[i]].Amount = flowerAmountList[i];
+            GetFlowerInfo(flowerIDList[i]).Amount = flowerAmountList[i];
         }
 
 
@@ -482,7 +499,7 @@ public class GardenManager : Regist
     {
         Slot slot = SlotList[index];
 
-        FlowerInfo flowerInfo = FlowerInfoDictionary[id];
+        FlowerInfo flowerInfo = GetFlowerInfo(id);
 
         slot.Plant(flowerInfo, false);
     }

+ 13 - 6
Assets/Script/Manage/HttpManager.cs

@@ -953,8 +953,15 @@ public class HttpManager : Regist
 
             for (int i = 0; i < idList.Count; i++)
             {
-                if (GardenManager.FlowerInfoDictionary.TryGetValue(idList[i], out flowerInfo))
+                //if (GardenManager.FlowerInfoDictionary.TryGetValue(idList[i], out flowerInfo))
+                //{
+                    flowerInfo = GardenManager.GetFlowerInfo(idList[i]);
+
+                if (flowerInfo.ID == 0)
                 {
+                    continue;
+                }
+
                     flowerInfo.Add();
 
                     float newSpriteSize = 0.225f;
@@ -967,11 +974,11 @@ public class HttpManager : Regist
                     lab.text = flowerInfo.Name;
 
                     InfoBoxManager.GardenInfoBox.Display($"{Language.GetStr(LanguageLabel.Common__Get)} {TransferLabel.FlowerSprite}{flowerInfo.Name}", 10, Color.white, ResourceManager.LoadSprite(ResourceLabel.Atlas, Folder.Atlas));
-                }
-                else
-                {
-                    Debug.LogWarning($"Unknown id {idList[i]}");
-                }
+                //}
+                //else
+                //{
+                //    Debug.LogWarning($"Unknown id {idList[i]}");
+                //}
             }
         }
         else if (mailReward.Key == "coin")

+ 19 - 19
Assets/Script/Manage/MiniGameManager.cs

@@ -157,7 +157,7 @@ public class MinigameAward
         {
             UnlockFlowerFlag = true;
 
-            FlowerInfo flowerInfo = GardenManager.FlowerInfoDictionary[1];
+            FlowerInfo flowerInfo = GardenManager.GetFlowerInfo(1);
 
             ResourceManager.SetActive(CanvasLabel.Da_FlowerIcon, true);
 
@@ -182,7 +182,7 @@ public class MinigameAward
 
                 if (Random.Range(0f, 1f) <= unlockFlowerRate)
                 {
-                    FlowerInfo flowerInfo = GardenManager.FlowerInfoDictionary[UnlockFlowerID];
+                    FlowerInfo flowerInfo = GardenManager.GetFlowerInfo(UnlockFlowerID);
 
                     flowerInfo.Add();
 
@@ -242,7 +242,7 @@ public class MinigameAward
         List<float> weights = new List<float>();
         for (int j = 0; j < flowerIDs.Count; j++)
         {
-            FlowerInfo flowerInfo = GardenManager.FlowerInfoDictionary[flowerIDs[j]];
+            FlowerInfo flowerInfo = GardenManager.GetFlowerInfo(flowerIDs[j]);
             float flowerIDRate = (float) Auxiliary.FmlParse(FlowerIDRateFml, "i", flowerIDs[j].ToString());
             float flowerAmtRate = (float) Auxiliary.FmlParse(FlowerAmtRateFml, "a", flowerInfo.amount.ToString());
             float weight = flowerIDRate*flowerAmtRate;
@@ -1151,7 +1151,7 @@ public class MiniGameManager : Regist
 
         if (newFlowerFlag)
         {
-            List<int> flowerIDs = GardenManager.FlowerInfoDictionary.Keys.ToList();
+            List<int> flowerIDs = GardenManager.GetFlowerInfoDict().Keys.ToList();
 
             MinigameAward.UnlockFlowerID = MinigameAward.SelectUnlockFlowerID(flowerIDs);
             MinigameAward.HaveNewFlowerFlag = false;
@@ -1627,7 +1627,7 @@ public class MiniGameManager : Regist
             {
                 while (true)
                 {
-                    FlowerInfo flowerInfo = GardenManager.FlowerInfoDictionary.Random();
+                    FlowerInfo flowerInfo = GardenManager.GetFlowerInfoDict().Random();
 
                     if (flowerInfo.Unlock)
                     {
@@ -1646,7 +1646,7 @@ public class MiniGameManager : Regist
 
             int specialSlotID = idList.Random(1, true, true)[0];
 
-            Flower flower = ResourceManager.GetFlower(GardenManager.FlowerInfoDictionary[MinigameAward.UnlockFlowerID], MinigameSlots[specialSlotID]);
+            Flower flower = ResourceManager.GetFlower(GardenManager.GetFlowerInfo(MinigameAward.UnlockFlowerID), MinigameSlots[specialSlotID]);
 
             flower.PlayNewFlowerEffec();
 
@@ -1656,7 +1656,7 @@ public class MiniGameManager : Regist
             {
                 while (true)
                 {
-                    FlowerInfo flowerInfo = GardenManager.FlowerInfoDictionary.Random();
+                    FlowerInfo flowerInfo = GardenManager.GetFlowerInfoDict().Random();
 
                     if (flowerInfo.Unlock)
                     {
@@ -1709,7 +1709,7 @@ public class MiniGameManager : Regist
             {
                 while (true)
                 {
-                    FlowerInfo flowerInfo = GardenManager.FlowerInfoDictionary.Random();
+                    FlowerInfo flowerInfo = GardenManager.GetFlowerInfoDict().Random();
 
                     if (flowerInfo.Unlock)
                     {
@@ -1728,7 +1728,7 @@ public class MiniGameManager : Regist
         {
             int specialSlotID = idList.Random(1, true, true)[0];
 
-            flower = ResourceManager.GetFlower(GardenManager.FlowerInfoDictionary[MinigameAward.UnlockFlowerID], MinigameSlots[specialSlotID]);
+            flower = ResourceManager.GetFlower(GardenManager.GetFlowerInfo(MinigameAward.UnlockFlowerID), MinigameSlots[specialSlotID]);
 
             flower.PlayNewFlowerEffec();
 
@@ -1740,7 +1740,7 @@ public class MiniGameManager : Regist
             {
                 while (true)
                 {
-                    FlowerInfo flowerInfo = GardenManager.FlowerInfoDictionary.Random();
+                    FlowerInfo flowerInfo = GardenManager.GetFlowerInfoDict().Random();
 
                     if (flowerInfo.Unlock)
                     {
@@ -1984,11 +1984,11 @@ public class MiniGameManager : Regist
 
         if (firstRound && !MinigameAward.HaveNewFlowerFlag)
         {
-            flowerInfo = GardenManager.FlowerInfoDictionary[MinigameAward.UnlockFlowerID];
+            flowerInfo = GardenManager.GetFlowerInfo(MinigameAward.UnlockFlowerID);
         }
         else
         {
-            flowerInfo = GardenManager.FlowerInfoDictionary.Random(false, flowerIndo => { return flowerIndo.Unlock; });
+            flowerInfo = GardenManager.GetFlowerInfoDict().Random(false, flowerIndo => { return flowerIndo.Unlock; });
         }
 
         FindSoloGameFlowerIDs.Add(flowerInfo.ID);
@@ -1997,7 +1997,7 @@ public class MiniGameManager : Regist
 
         while (slotIDs.Count > 0)
         {
-            flowerInfo = GardenManager.FlowerInfoDictionary.Random(false, info => { return info.Unlock && info.ID != FindSoloGameFlowerIDs[0]; });
+            flowerInfo = GardenManager.GetFlowerInfoDict().Random(false, info => { return info.Unlock && info.ID != FindSoloGameFlowerIDs[0]; });
 
             if (slotIDs.Count == 1)
             {
@@ -2051,9 +2051,9 @@ public class MiniGameManager : Regist
             throw new Exception();
         }
 
-        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);
+        ResourceManager.SetSprite(CanvasLabel.D_FlowerIcon7, GardenManager.GetFlowerInfo(idList[0]).Icon).Resize(true, GardenManager.GetFlowerInfo(idList[0]).minigameSize, GardenManager.GetFlowerInfo(idList[0]).minigameSize);
+        ResourceManager.SetSprite(CanvasLabel.D_FlowerIcon8, GardenManager.GetFlowerInfo(idList[1]).Icon).Resize(true, GardenManager.GetFlowerInfo(idList[1]).minigameSize, GardenManager.GetFlowerInfo(idList[1]).minigameSize);
+        ResourceManager.SetSprite(CanvasLabel.D_FlowerIcon9, GardenManager.GetFlowerInfo(idList[2]).Icon).Resize(true, GardenManager.GetFlowerInfo(idList[2]).minigameSize, GardenManager.GetFlowerInfo(idList[2]).minigameSize);
 
         for (int i = 0; i < idList.Count; i++)
         {
@@ -2198,7 +2198,7 @@ public class MiniGameManager : Regist
         if (MinigameAward.HaveNewFlowerFlag)
         {
             FindMissingNewFlower = null;
-            List<FlowerInfo> flowerInfos = new List<FlowerInfo>(GardenManager.FlowerInfoDictionary.Values.ToList());
+            List<FlowerInfo> flowerInfos = new List<FlowerInfo>(GardenManager.GetFlowerInfoDict().Values.ToList());
             for (int i = 0; i < flowerInfos.Count; i++)
             {
                 if (!flowerInfos[i].Unlock)
@@ -2222,9 +2222,9 @@ public class MiniGameManager : Regist
         else
         {
             int specialSlotID = idList.Random(1, true, true)[0];
-            FindMissingNewFlower = ResourceManager.GetFlower(GardenManager.FlowerInfoDictionary[MinigameAward.UnlockFlowerID], MinigameSlots[specialSlotID]);
+            FindMissingNewFlower = ResourceManager.GetFlower(GardenManager.GetFlowerInfo(MinigameAward.UnlockFlowerID), MinigameSlots[specialSlotID]);
             MinigameIdleFlowerList.Add(FindMissingNewFlower);
-            List<FlowerInfo> flowerInfos = new List<FlowerInfo>(GardenManager.FlowerInfoDictionary.Values.ToList());
+            List<FlowerInfo> flowerInfos = new List<FlowerInfo>(GardenManager.GetFlowerInfoDict().Values.ToList());
             for (int i = 0; i < flowerInfos.Count; i++)
             {
                 if (!flowerInfos[i].Unlock || flowerInfos[i].ID == MinigameAward.UnlockFlowerID)

+ 26 - 3
Assets/Script/Manage/PlayerManager.cs

@@ -1,4 +1,4 @@
-using DragonBones;
+using DragonBones;
 
 #if UNITY_EDITOR
 using UnityEditor;
@@ -165,8 +165,31 @@ public class PlayerManager : Regist
             if (!CloseItemDictionary.Values.ToList().MyContains(item => item.ArmatureName == armatureName))
             {
                 Debug.Log(armatureName);
-                DressData = ConfigManager.GetDefaultDressDatas();
-                break;
+                if (i == 0)
+                {
+                    DressData[0] = "脑壳-缺失";
+                }
+                else if (i == 1)
+                {
+                    DressData[1] = "裙子-缺失";
+                }
+                else if (i == 2)
+                {
+                    DressData[2] = "鞋子-缺失";
+                }
+                else if (i == 3)
+                {
+                    DressData[3] = "头饰-缺失";
+                }
+                else if (i == 4)
+                {
+                    DressData[4] = "上衣-缺失";
+                }
+                else if (i == 7)
+                {
+                    DressData[7] = "翅膀-缺失";
+                }
+                //DressData = ConfigManager.GetDefaultDressDatas();
             }
         }
         BuildPlayer(DressData);

+ 6 - 2
Assets/Script/Manage/RechargeGiftManager.cs

@@ -125,7 +125,11 @@ public class RechargeGift
             }
             else if (type == GiftType.花朵)
             {
-                FlowerInfo flowerInfo = GardenManager.FlowerInfoDictionary[value];
+                FlowerInfo flowerInfo = GardenManager.GetFlowerInfo(value);
+                if (flowerInfo.ID == 0)
+                {
+                    flowerInfo = GardenManager.GetFlowerInfo(1);
+                }
                 flowerInfo.Add();
                 giftAwardInfo.Key = type;
                 giftAwardInfo.Value = value;
@@ -561,7 +565,7 @@ public class RechargeGiftManager
         }
         else if (type == RechargeGift.GiftType.花朵)
         {
-            FlowerInfo flowerInfo = GardenManager.FlowerInfoDictionary[id];
+            FlowerInfo flowerInfo = GardenManager.GetFlowerInfo(id);
             images[0].transform.SetActive(true);
             images[0].sprite = flowerInfo.Icon;
             images[0].SetNativeSize();

+ 5 - 5
Assets/Script/Manage/SignManager.cs

@@ -122,7 +122,7 @@ public class SignItem
         {
             for (int i = 0; i < AwardFlowerIDs.Count; i++)
             {
-                FlowerInfo flowerInfo = GardenManager.FlowerInfoDictionary[AwardFlowerIDs[i]];
+                FlowerInfo flowerInfo = GardenManager.GetFlowerInfo(AwardFlowerIDs[i]);
 
                 if (flowerInfo.Unlock == false)
                 {
@@ -181,7 +181,7 @@ public class SignItem
         {
             for (int i = 0; i < AwardFlowerIDs.Count; i++)
             {
-                FlowerInfo flowerInfo = GardenManager.FlowerInfoDictionary[AwardFlowerIDs[i]];
+                FlowerInfo flowerInfo = GardenManager.GetFlowerInfo(AwardFlowerIDs[i]);
 
                 if (flowerInfo.Unlock == false)
                 {
@@ -450,7 +450,7 @@ public class Lottery
             lottery.Icon2.SetActive(true);
             lottery.Icon3.SetActive(false);
 
-            lottery.Icon2.sprite = GardenManager.FlowerInfoDictionary[lottery.Value].Icon;
+            lottery.Icon2.sprite = GardenManager.GetFlowerInfo(lottery.Value).Icon;
 
             lottery.Icon2.Resize(true, 0.3125f, 0.3125f);
 
@@ -642,9 +642,9 @@ public class Lottery
         }
         else if (Type == LotteryType.Flower.GetHashCode())
         {
-            GardenManager.FlowerInfoDictionary[Value].Add();
+            GardenManager.GetFlowerInfo(Value).Add();
 
-            ResourceManager.SetText(CanvasLabel.Bc_Lab, Language.GetStr(LanguageLabel.UI__Bc_Lab1) + " " + GardenManager.FlowerInfoDictionary[Value].Name);
+            ResourceManager.SetText(CanvasLabel.Bc_Lab, Language.GetStr(LanguageLabel.UI__Bc_Lab1) + " " + GardenManager.GetFlowerInfo(Value).Name);
         }
         else if (Type == LotteryType.Close.GetHashCode())
         {

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

@@ -591,7 +591,7 @@ public class TutorialManager : Regist
             }
         );
 
-        FlowerInfo flowerInfo = GardenManager.FlowerInfoDictionary[1];
+        FlowerInfo flowerInfo = GardenManager.GetFlowerInfo(1);
 
         flowerInfo.Button.AddButtonEventOnetime
         (

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

@@ -744,7 +744,7 @@ public class UIManager : Regist
                 {
                     ResourceManager.Get(CanvasLabel.Da_FlowerGroup).GetTweenScale().InDestination = true;
 
-                    FlowerInfo flowerInfo = GardenManager.FlowerInfoDictionary[MinigameAward.UnlockFlowerID];
+                    FlowerInfo flowerInfo = GardenManager.GetFlowerInfo(MinigameAward.UnlockFlowerID);
 
                     ResourceManager.SetActive(CanvasLabel.Da_Flower, true);
 
@@ -1941,8 +1941,15 @@ public class UIManager : Regist
 
         tween.OnBackwardStart += () =>
         {
-            foreach (var kv in GardenManager.FlowerInfoDictionary)
+            foreach (var kv in GardenManager.GetFlowerInfoDict())
             {
+                //Debug.Log(kv.Value);
+                //Debug.Log(kv.Value.UIPartical);
+                //Debug.Log(kv.Value.UIPartical.Animator);
+                if (kv.Value.UIPartical.Animator == null)
+                {
+                    continue;
+                }
                 kv.Value.UIPartical.Animator.SetTrigger("Stop");
             }
         };

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

@@ -101,6 +101,7 @@ public class FlowerInfo
     }
     public bool unlock;
 
+    public bool show;
     public bool IsSpecial;
     public float SkillPlus = 0.1f;
     public static string IDPrefix = "Flower";
@@ -174,6 +175,12 @@ public class FlowerInfo
         itemSize = Auxiliary.StringToFloat(attribute[8].Value, 1);
         flowerCardSize = Auxiliary.StringToFloat(attribute[9].Value, 1);
         minigameSize = Auxiliary.StringToFloat(attribute[10].Value, 1);
+        show = Auxiliary.StringToBool(attribute[11].Value, true);
+
+        if (show == false)
+        {
+            FlowerItem.SetActive(false);
+        }
 
         Image.sprite = Icon;
 

+ 6 - 6
Assets/Script/Object/Player.cs

@@ -164,11 +164,6 @@ public class CloseItem
         //Debug.Log(ID);
         PlayerManager.CloseItemDictionary.Add(ID, this);
 
-        if (Unavailable)
-        {
-            return;
-        }
-
         Type = TypeParse(attribute[2].Value);
         Index = Auxiliary.StringToInt(attribute[3].Value, -1);
         BuyLevel = Auxiliary.StringToInt(attribute[5].Value, 0);
@@ -187,6 +182,11 @@ public class CloseItem
         IconOffset0 = Auxiliary.StringToVector(',', attribute[20].Value, new Vector3());
         desc = attribute[21].Value;
 
+        if (Unavailable)
+        {
+            return;
+        }
+
         CreateItem();
     }
 
@@ -414,7 +414,7 @@ public class CloseItem
         }
         else
         {
-            throw new Exception();
+            return CloseType.Shoe;
         }
     }
 

+ 1 - 1
Assets/Script/Object/PlazaRoomChest.cs

@@ -303,7 +303,7 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
 
         if (chestData.ChestType == ChestType.GuessColor)
         {
-            AnswerInfo = GardenManager.FlowerInfoDictionary.Random();
+            AnswerInfo = GardenManager.GetFlowerInfoDict().Random();
             AnswerColor = Language.GetStr(LanguageLabel.CombineLanguageLabel(LanguageLabel.FlowerColor, AnswerInfo.FullID)).ToLower();
         }
     }

+ 2 - 2
Assets/Script/Object/Skill/Pack.cs

@@ -350,7 +350,7 @@ public class Pack : SkillRoot
         {
             for (int i = 0; i < Flowers.Length; i++)
             {
-                FlowerInfo flowerInfo = GardenManager.FlowerInfoDictionary[int.Parse(Flowers[i])];
+                FlowerInfo flowerInfo = GardenManager.GetFlowerInfo(int.Parse(Flowers[i]));
 
                 flowerInfo.Add();
                 tempFlower += string.Format("{0}{1}{2}    ", Language.GetStr(LanguageLabel.UI__J_Info0), TransferLabel.FlowerSprite, flowerInfo.Name);
@@ -462,7 +462,7 @@ public class Pack : SkillRoot
                 {
                     for (int j = 0; j < Flowers.Length; j++)
                     {
-                        FlowerInfo flowerInfo = GardenManager.FlowerInfoDictionary[int.Parse(Flowers[j])];
+                        FlowerInfo flowerInfo = GardenManager.GetFlowerInfo(int.Parse(Flowers[j]));
                         stringBuilder.Append(Language.GetStr(LanguageLabel.CombineLanguageLabel(LanguageLabel.FlowerName, flowerInfo.FullID)));
 
                         if (j != Flowers.Length - 1)

+ 3 - 3
ProjectSettings/GraphicsSettings.asset

@@ -43,13 +43,13 @@ GraphicsSettings:
     type: 0}
   m_TierSettings_Tier1:
     renderingPath: 1
-    useCascadedShadowMaps: 1
+    useCascadedShadowMaps: 0
   m_TierSettings_Tier2:
     renderingPath: 1
-    useCascadedShadowMaps: 1
+    useCascadedShadowMaps: 0
   m_TierSettings_Tier3:
     renderingPath: 1
-    useCascadedShadowMaps: 1
+    useCascadedShadowMaps: 0
   m_DefaultRenderingPath: 1
   m_DefaultMobileRenderingPath: 1
   m_TierSettings: []

Bu fark içinde çok fazla dosya değişikliği olduğu için bazı dosyalar gösterilmiyor