Forráskód Böngészése

增加-试衣间新的服装

LiuQilin 8 éve
szülő
commit
82471c2b1e
32 módosított fájl, 615 hozzáadás és 345 törlés
  1. 2 2
      Assets/Extension.meta
  2. 0 0
      Assets/Resource/Animations/人物动画/Closet_ske.json
  3. 0 0
      Assets/Resource/Animations/人物动画/Closet_tex.json
  4. BIN
      Assets/Resource/Animations/人物动画/Closet_texture.png
  5. 399 162
      Assets/Resource/Animations/人物动画/Closet_texture.png.meta
  6. 0 0
      Assets/Resource/Animations/人物动画/stand_ske.json
  7. BIN
      Assets/Resource/Animations/人物动画/stand_texture.png
  8. 9 1
      Assets/Resource/Animations/人物动画/stand_texture.png.meta
  9. 0 9
      Assets/Resource/Animations/人物动画/备份.meta
  10. 0 0
      Assets/Resource/Animations/人物动画/备份/Closet_ske.json
  11. 0 8
      Assets/Resource/Animations/人物动画/备份/Closet_ske.json.meta
  12. 0 0
      Assets/Resource/Animations/人物动画/备份/Closet_tex.json
  13. 0 8
      Assets/Resource/Animations/人物动画/备份/Closet_tex.json.meta
  14. BIN
      Assets/Resource/Animations/人物动画/备份/Closet_texture.png
  15. 0 68
      Assets/Resource/Animations/人物动画/备份/Closet_texture.png.meta
  16. BIN
      Assets/Resource/Logo.unity
  17. BIN
      Assets/Resource/Prefab/PrefabUI/GroupA.prefab
  18. BIN
      Assets/Resource/Prefab/PrefabUI/GroupE.prefab
  19. 26 10
      Assets/Resource/XML/Config/dressRoom_config.xml
  20. 2 2
      Assets/Resource/XML/PlayerConfig.xml
  21. 17 0
      Assets/Resource/XML/lan/ChineseSimplified.xml
  22. 17 0
      Assets/Resource/XML/lan/ChineseTraditional.xml
  23. 17 0
      Assets/Resource/XML/lan/English.xml
  24. BIN
      Assets/Resource/Xlsx/dressRoom_config.xlsx
  25. BIN
      Assets/Resource/Xlsx/language_config.xlsx
  26. 65 11
      Assets/Script/Manage/ManaData.cs
  27. 4 39
      Assets/Script/Manage/ManaPlayer.cs
  28. 3 0
      Assets/Script/Manage/ManaTutorial.cs
  29. 5 16
      Assets/Script/Manage/ManaVisit.cs
  30. 46 8
      Assets/Script/Object/Player.cs
  31. BIN
      ProjectSettings/GraphicsSettings.asset
  32. 3 1
      ToList.txt

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

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

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
Assets/Resource/Animations/人物动画/Closet_ske.json


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
Assets/Resource/Animations/人物动画/Closet_tex.json


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


+ 399 - 162
Assets/Resource/Animations/人物动画/Closet_texture.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 8d523bac11c2f3742ab88a2cbd71bf39
-timeCreated: 1500285524
+timeCreated: 1500363240
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName:
@@ -89,6 +89,27 @@ TextureImporter:
     21300164: "\u5934\u997010"
     21300166: "\u5934\u997011"
     21300168: "\u5934\u997012"
+    21300170: "\u53C2\u8003\xB7\u5927\u5C0F\u90FD\u8DDF\u63D0\u4F9B\u7684\u4E00\u6837\xB7\u524D\u671F\u670D\u88C5\u53EF\u4EE5\u6309\u6211\u8BBE\u5B9A\u7684\u6765"
+    21300172: "\u53C2\u80033"
+    21300174: "\u5934\u9970\u54C111"
+    21300176: "\u53C2\u80032"
+    21300178: "\u53C2\u8003\u4F4D\u7F6E"
+    21300180: "\u4E0A\u88634"
+    21300182: "\u4E0A\u88635"
+    21300184: "\u4E0A\u88636"
+    21300186: "\u4E0A\u88637"
+    21300188: "\u4E0A\u88638"
+    21300190: "\u4E0A\u88639"
+    21300192: "\u4E0A\u886310"
+    21300194: "\u4E0A\u886311"
+    21300196: "\u4E0A\u886312"
+    21300198: "\u4E0A\u886313"
+    21300200: "\u4E0A\u886310\uFF08\u9EC4\uFF09"
+    21300202: "\u4E0A\u886311(\u7C89)"
+    21300204: "\u4E0A\u886313(\u7D2B)"
+    21300206: "\u4E0A\u88637\uFF08\u7C89\uFF09"
+    21300208: "\u7FC5\u81801"
+    21300210: "\u7FC5\u81802"
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -159,6 +180,14 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+  - buildTarget: iPhone
+    maxTextureSize: 4096
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
   spriteSheet:
     serializedVersion: 2
     sprites:
@@ -166,8 +195,8 @@ TextureImporter:
       name: "\u4E0A\u88632"
       rect:
         serializedVersion: 2
-        x: 1078
-        y: 16
+        x: 2865
+        y: 858
         width: 165
         height: 111
       alignment: 0
@@ -179,8 +208,8 @@ TextureImporter:
       name: "\u4E0A\u88633"
       rect:
         serializedVersion: 2
-        x: 1351
-        y: 18
+        x: 2865
+        y: 971
         width: 165
         height: 111
       alignment: 0
@@ -192,8 +221,8 @@ TextureImporter:
       name: "\u773C\u775B2"
       rect:
         serializedVersion: 2
-        x: 2740
-        y: 2017
+        x: 1930
+        y: 1230
         width: 231
         height: 77
       alignment: 0
@@ -205,8 +234,8 @@ TextureImporter:
       name: "\u773C\u775B3"
       rect:
         serializedVersion: 2
-        x: 774
-        y: 37
+        x: 3126
+        y: 2057
         width: 220
         height: 78
       alignment: 0
@@ -218,8 +247,8 @@ TextureImporter:
       name: "\u8111\u58F32"
       rect:
         serializedVersion: 2
-        x: 3048
-        y: 2478
+        x: 2313
+        y: 1599
         width: 548
         height: 424
       alignment: 0
@@ -231,8 +260,8 @@ TextureImporter:
       name: "\u88D9\u5B503"
       rect:
         serializedVersion: 2
-        x: 2090
-        y: 4
+        x: 1025
+        y: 579
         width: 203
         height: 135
       alignment: 0
@@ -244,8 +273,8 @@ TextureImporter:
       name: "\u5634\u5DF42"
       rect:
         serializedVersion: 2
-        x: 343
-        y: 213
+        x: 1400
+        y: 789
         width: 56
         height: 35
       alignment: 0
@@ -257,8 +286,8 @@ TextureImporter:
       name: "\u5634\u5DF43"
       rect:
         serializedVersion: 2
-        x: 2973
-        y: 2004
+        x: 3049
+        y: 1299
         width: 54
         height: 20
       alignment: 0
@@ -270,8 +299,8 @@ TextureImporter:
       name: "\u978B\u5B502"
       rect:
         serializedVersion: 2
-        x: 996
-        y: 17
+        x: 3348
+        y: 2087
         width: 39
         height: 48
       alignment: 0
@@ -283,8 +312,8 @@ TextureImporter:
       name: "\u978B\u5B503"
       rect:
         serializedVersion: 2
-        x: 3012
-        y: 2168
+        x: 1958
+        y: 1198
         width: 26
         height: 30
       alignment: 0
@@ -296,8 +325,8 @@ TextureImporter:
       name: "\u5934\u9970\u54C12"
       rect:
         serializedVersion: 2
-        x: 1281
-        y: 1126
+        x: 836
+        y: 1787
         width: 194
         height: 160
       alignment: 0
@@ -309,8 +338,8 @@ TextureImporter:
       name: "\u5934\u9970\u54C13"
       rect:
         serializedVersion: 2
-        x: 708
-        y: 316
+        x: 2058
+        y: 858
         width: 383
         height: 159
       alignment: 0
@@ -322,8 +351,8 @@ TextureImporter:
       name: "\u88D9\u5B502"
       rect:
         serializedVersion: 2
-        x: 1885
-        y: 1
+        x: 1400
+        y: 641
         width: 203
         height: 138
       alignment: 0
@@ -335,8 +364,8 @@ TextureImporter:
       name: "\u5934\u53D14\uFF08\u7C89\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 2528
-        y: 3438
+        x: 1
+        y: 2381
         width: 572
         height: 657
       alignment: 0
@@ -348,7 +377,7 @@ TextureImporter:
       name: "\u5934\u53D14\uFF08\u84DD\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 1954
+        x: 2146
         y: 3438
         width: 572
         height: 657
@@ -361,8 +390,8 @@ TextureImporter:
       name: "\u5934\u53D14\uFF08\u7EFF\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 3102
-        y: 3438
+        x: 652
+        y: 2850
         width: 572
         height: 657
       alignment: 0
@@ -374,7 +403,7 @@ TextureImporter:
       name: "\u5934\u53D15\uFF08\u68D5\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 712
+        x: 1226
         y: 2499
         width: 610
         height: 506
@@ -387,8 +416,8 @@ TextureImporter:
       name: "\u5934\u53D15\uFF08\u7EA2\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 1
-        y: 1997
+        x: 575
+        y: 2342
         width: 610
         height: 506
       alignment: 0
@@ -400,8 +429,8 @@ TextureImporter:
       name: "\u5934\u53D15\uFF08\u9EC4\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 2134
-        y: 2930
+        x: 3431
+        y: 3589
         width: 610
         height: 506
       alignment: 0
@@ -413,8 +442,8 @@ TextureImporter:
       name: "\u5934\u53D16+\u4E0B\uFF08\u68D5\uFF09"
       rect:
         serializedVersion: 2
-        x: 3676
-        y: 3325
+        x: 3431
+        y: 1273
         width: 382
         height: 770
       alignment: 0
@@ -426,8 +455,8 @@ TextureImporter:
       name: "\u5934\u53D16+\u4E0A\uFF08\u68D5\uFF09"
       rect:
         serializedVersion: 2
-        x: 1641
-        y: 1714
+        x: 1033
+        y: 1515
         width: 449
         height: 448
       alignment: 0
@@ -439,8 +468,8 @@ TextureImporter:
       name: "\u5934\u53D16+\u4E0B\uFF08\u7EFF\uFF09"
       rect:
         serializedVersion: 2
-        x: 3676
-        y: 2553
+        x: 1
+        y: 1609
         width: 382
         height: 770
       alignment: 0
@@ -452,8 +481,8 @@ TextureImporter:
       name: "\u5934\u53D16+\u4E0A\uFF08\u7EFF\uFF09"
       rect:
         serializedVersion: 2
-        x: 3224
-        y: 2988
+        x: 836
+        y: 1065
         width: 449
         height: 448
       alignment: 0
@@ -465,8 +494,8 @@ TextureImporter:
       name: "\u5934\u53D16+\u4E0B\uFF08\u9EC4\uFF09"
       rect:
         serializedVersion: 2
-        x: 1708
-        y: 2164
+        x: 3431
+        y: 2045
         width: 382
         height: 770
       alignment: 0
@@ -478,8 +507,8 @@ TextureImporter:
       name: "\u5934\u53D16+\u4E0A\uFF08\u9EC4\uFF09"
       rect:
         serializedVersion: 2
-        x: 1029
-        y: 1288
+        x: 1
+        y: 1049
         width: 449
         height: 448
       alignment: 0
@@ -491,8 +520,8 @@ TextureImporter:
       name: "\u5934\u53D16+\u4E0B\uFF08\u7C89\uFF09"
       rect:
         serializedVersion: 2
-        x: 1324
-        y: 2164
+        x: 3431
+        y: 2817
         width: 382
         height: 770
       alignment: 0
@@ -504,8 +533,8 @@ TextureImporter:
       name: "\u5934\u53D16+\u4E0A\uFF08\u7C89\uFF09"
       rect:
         serializedVersion: 2
-        x: 479
-        y: 1089
+        x: 385
+        y: 1499
         width: 449
         height: 448
       alignment: 0
@@ -518,7 +547,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 1
-        y: 3509
+        y: 3040
         width: 649
         height: 586
       alignment: 0
@@ -530,7 +559,7 @@ TextureImporter:
       name: "\u5934\u53D17(\u7C73\u767D)"
       rect:
         serializedVersion: 2
-        x: 652
+        x: 1495
         y: 3509
         width: 649
         height: 586
@@ -543,7 +572,7 @@ TextureImporter:
       name: "\u5934\u53D17(\u84DD\u8272)"
       rect:
         serializedVersion: 2
-        x: 1303
+        x: 844
         y: 3509
         width: 649
         height: 586
@@ -556,8 +585,8 @@ TextureImporter:
       name: "\u5934\u53D18(\u7C89)"
       rect:
         serializedVersion: 2
-        x: 1
-        y: 2505
+        x: 1937
+        y: 2936
         width: 709
         height: 500
       alignment: 0
@@ -569,8 +598,8 @@ TextureImporter:
       name: "\u5934\u53D18(\u7D2B)"
       rect:
         serializedVersion: 2
-        x: 712
-        y: 3007
+        x: 2720
+        y: 3093
         width: 709
         height: 500
       alignment: 0
@@ -582,8 +611,8 @@ TextureImporter:
       name: "\u5934\u53D18(\u7EFF)"
       rect:
         serializedVersion: 2
-        x: 1
-        y: 3007
+        x: 2720
+        y: 3595
         width: 709
         height: 500
       alignment: 0
@@ -595,8 +624,8 @@ TextureImporter:
       name: "\u5934\u53D18(\u9ED1)"
       rect:
         serializedVersion: 2
-        x: 1423
-        y: 2936
+        x: 1226
+        y: 3007
         width: 709
         height: 500
       alignment: 0
@@ -608,8 +637,8 @@ TextureImporter:
       name: "\u8111\u58F31(\u68D5\u8272)"
       rect:
         serializedVersion: 2
-        x: 2092
-        y: 1977
+        x: 1665
+        y: 2009
         width: 646
         height: 391
       alignment: 0
@@ -621,8 +650,8 @@ TextureImporter:
       name: "\u8111\u58F31(\u7C89\u8272)"
       rect:
         serializedVersion: 2
-        x: 3048
-        y: 2003
+        x: 385
+        y: 1949
         width: 646
         height: 391
       alignment: 0
@@ -634,8 +663,8 @@ TextureImporter:
       name: "\u8111\u58F32(\u7C89\u8272)"
       rect:
         serializedVersion: 2
-        x: 1091
-        y: 1738
+        x: 1665
+        y: 1583
         width: 548
         height: 424
       alignment: 0
@@ -647,8 +676,8 @@ TextureImporter:
       name: "\u8111\u58F32(\u9EC4\u8272)"
       rect:
         serializedVersion: 2
-        x: 479
-        y: 1539
+        x: 2863
+        y: 1599
         width: 548
         height: 424
       alignment: 0
@@ -660,8 +689,8 @@ TextureImporter:
       name: "\u8111\u58F32+\u4E0B\uFF08\u68D5\u8272\uFF09\u53E6\u4E00\u79CD\u53D1\u578B"
       rect:
         serializedVersion: 2
-        x: 2092
-        y: 2396
+        x: 2648
+        y: 2025
         width: 476
         height: 532
       alignment: 0
@@ -673,8 +702,8 @@ TextureImporter:
       name: "\u8111\u58F32+\u4E0B\uFF08\u7C89\u8272\uFF09\u53E6\u4E00\u79CD\u53D1\u578B"
       rect:
         serializedVersion: 2
-        x: 2746
-        y: 2904
+        x: 1187
+        y: 1965
         width: 476
         height: 532
       alignment: 0
@@ -686,8 +715,8 @@ TextureImporter:
       name: "\u8111\u58F33+\u4E0B\uFF08\u9EC4\u8272\uFF09\u8111\u58F32\u2014\u2014\u4E0B"
       rect:
         serializedVersion: 2
-        x: 613
-        y: 1965
+        x: 3431
+        y: 739
         width: 476
         height: 532
       alignment: 0
@@ -699,8 +728,8 @@ TextureImporter:
       name: "\u8111\u58F33+\u4E0B\uFF08\u7C89\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 2570
-        y: 2370
+        x: 1838
+        y: 2402
         width: 476
         height: 532
       alignment: 0
@@ -712,8 +741,8 @@ TextureImporter:
       name: "\u8111\u58F33+\u4E0A\uFF08\u7C89\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 2092
-        y: 1589
+        x: 2215
+        y: 1211
         width: 444
         height: 386
       alignment: 0
@@ -725,8 +754,8 @@ TextureImporter:
       name: "\u8111\u58F33+\u4E0B\uFF08\u7D2B\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 1
-        y: 1463
+        x: 2648
+        y: 2559
         width: 476
         height: 532
       alignment: 0
@@ -738,8 +767,8 @@ TextureImporter:
       name: "\u8111\u58F33+\u4E0A\uFF08\u7D2B\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 2740
-        y: 1615
+        x: 1484
+        y: 1195
         width: 444
         height: 386
       alignment: 0
@@ -752,7 +781,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 1
-        y: 1075
+        y: 661
         width: 444
         height: 386
       alignment: 0
@@ -764,8 +793,8 @@ TextureImporter:
       name: "\u8863\u670D10\uFF08\u9EC4\uFF09"
       rect:
         serializedVersion: 2
-        x: 1480
-        y: 1108
+        x: 452
+        y: 827
         width: 349
         height: 334
       alignment: 0
@@ -777,8 +806,8 @@ TextureImporter:
       name: "\u88D9\u5B5010(\u9EC4)"
       rect:
         serializedVersion: 2
-        x: 1351
-        y: 131
+        x: 3126
+        y: 2324
         width: 271
         height: 183
       alignment: 0
@@ -790,8 +819,8 @@ TextureImporter:
       name: "\u8863\u670D10"
       rect:
         serializedVersion: 2
-        x: 930
-        y: 952
+        x: 452
+        y: 1163
         width: 349
         height: 334
       alignment: 0
@@ -803,8 +832,8 @@ TextureImporter:
       name: "\u88D9\u5B5010"
       rect:
         serializedVersion: 2
-        x: 1078
-        y: 130
+        x: 3126
+        y: 2509
         width: 271
         height: 184
       alignment: 0
@@ -816,8 +845,8 @@ TextureImporter:
       name: "\u8863\u670D11(\u7C89)"
       rect:
         serializedVersion: 2
-        x: 930
-        y: 649
+        x: 803
+        y: 746
         width: 386
         height: 301
       alignment: 0
@@ -829,8 +858,8 @@ TextureImporter:
       name: "\u88D9\u5B5011(\u7C89)"
       rect:
         serializedVersion: 2
-        x: 774
-        y: 117
+        x: 3126
+        y: 2894
         width: 302
         height: 197
       alignment: 0
@@ -842,8 +871,8 @@ TextureImporter:
       name: "\u8863\u670D11"
       rect:
         serializedVersion: 2
-        x: 447
-        y: 786
+        x: 2661
+        y: 1296
         width: 386
         height: 301
       alignment: 0
@@ -855,8 +884,8 @@ TextureImporter:
       name: "\u88D9\u5B5011"
       rect:
         serializedVersion: 2
-        x: 3186
-        y: 1804
+        x: 3126
+        y: 2695
         width: 302
         height: 197
       alignment: 0
@@ -868,8 +897,8 @@ TextureImporter:
       name: "\u88D9\u5B504"
       rect:
         serializedVersion: 2
-        x: 3490
-        y: 1859
+        x: 1669
+        y: 746
         width: 203
         height: 142
       alignment: 0
@@ -881,8 +910,8 @@ TextureImporter:
       name: "\u88D9\u5B505"
       rect:
         serializedVersion: 2
-        x: 1091
-        y: 2181
+        x: 1464
+        y: 781
         width: 203
         height: 142
       alignment: 0
@@ -894,8 +923,8 @@ TextureImporter:
       name: "\u88D9\u5B506"
       rect:
         serializedVersion: 2
-        x: 1091
-        y: 2325
+        x: 1191
+        y: 716
         width: 207
         height: 172
       alignment: 0
@@ -907,8 +936,8 @@ TextureImporter:
       name: "\u88D9\u5B507\uFF08\u7C89\uFF09"
       rect:
         serializedVersion: 2
-        x: 3696
-        y: 1809
+        x: 3139
+        y: 1086
         width: 287
         height: 233
       alignment: 0
@@ -920,8 +949,8 @@ TextureImporter:
       name: "\u88D9\u5B507"
       rect:
         serializedVersion: 2
-        x: 3696
-        y: 2044
+        x: 2316
+        y: 2427
         width: 287
         height: 233
       alignment: 0
@@ -933,8 +962,8 @@ TextureImporter:
       name: "\u88D9\u5B508"
       rect:
         serializedVersion: 2
-        x: 443
-        y: 1
+        x: 2313
+        y: 2153
         width: 329
         height: 247
       alignment: 0
@@ -946,8 +975,8 @@ TextureImporter:
       name: "\u88D9\u5B509"
       rect:
         serializedVersion: 2
-        x: 1624
-        y: 129
+        x: 3126
+        y: 2137
         width: 259
         height: 185
       alignment: 0
@@ -959,8 +988,8 @@ TextureImporter:
       name: "\u88D9\u5B5012"
       rect:
         serializedVersion: 2
-        x: 1885
-        y: 141
+        x: 1191
+        y: 890
         width: 271
         height: 173
       alignment: 0
@@ -972,8 +1001,8 @@ TextureImporter:
       name: "\u88D9\u5B5013"
       rect:
         serializedVersion: 2
-        x: 1
-        y: 210
+        x: 3049
+        y: 1321
         width: 340
         height: 276
       alignment: 0
@@ -985,8 +1014,8 @@ TextureImporter:
       name: "\u88D9\u5B5013(\u7D2B)"
       rect:
         serializedVersion: 2
-        x: 1
-        y: 488
+        x: 3049
+        y: 806
         width: 340
         height: 276
       alignment: 0
@@ -998,8 +1027,8 @@ TextureImporter:
       name: 2
       rect:
         serializedVersion: 2
-        x: 3012
-        y: 2284
+        x: 3387
+        y: 2238
         width: 30
         height: 40
       alignment: 0
@@ -1011,8 +1040,8 @@ TextureImporter:
       name: 3
       rect:
         serializedVersion: 2
-        x: 3012
-        y: 2242
+        x: 3387
+        y: 2196
         width: 30
         height: 40
       alignment: 0
@@ -1024,8 +1053,8 @@ TextureImporter:
       name: 4
       rect:
         serializedVersion: 2
-        x: 3012
-        y: 2200
+        x: 3387
+        y: 2154
         width: 30
         height: 40
       alignment: 0
@@ -1037,8 +1066,8 @@ TextureImporter:
       name: 5
       rect:
         serializedVersion: 2
-        x: 1324
-        y: 2937
+        x: 2163
+        y: 1239
         width: 39
         height: 68
       alignment: 0
@@ -1050,8 +1079,8 @@ TextureImporter:
       name: 6
       rect:
         serializedVersion: 2
-        x: 3012
-        y: 2326
+        x: 3387
+        y: 2280
         width: 34
         height: 42
       alignment: 0
@@ -1063,8 +1092,8 @@ TextureImporter:
       name: 7
       rect:
         serializedVersion: 2
-        x: 2973
-        y: 2026
+        x: 1838
+        y: 2937
         width: 39
         height: 68
       alignment: 0
@@ -1076,7 +1105,7 @@ TextureImporter:
       name: 8
       rect:
         serializedVersion: 2
-        x: 1365
+        x: 1879
         y: 2948
         width: 35
         height: 57
@@ -1089,8 +1118,8 @@ TextureImporter:
       name: 9
       rect:
         serializedVersion: 2
-        x: 708
-        y: 252
+        x: 1400
+        y: 826
         width: 55
         height: 62
       alignment: 0
@@ -1102,8 +1131,8 @@ TextureImporter:
       name: 10
       rect:
         serializedVersion: 2
-        x: 1037
-        y: 22
+        x: 3348
+        y: 2042
         width: 34
         height: 43
       alignment: 0
@@ -1115,8 +1144,8 @@ TextureImporter:
       name: 11
       rect:
         serializedVersion: 2
-        x: 401
-        y: 218
+        x: 1930
+        y: 1198
         width: 26
         height: 30
       alignment: 0
@@ -1128,8 +1157,8 @@ TextureImporter:
       name: 12
       rect:
         serializedVersion: 2
-        x: 1037
-        y: 67
+        x: 3389
+        y: 2087
         width: 39
         height: 48
       alignment: 0
@@ -1141,8 +1170,8 @@ TextureImporter:
       name: 13
       rect:
         serializedVersion: 2
-        x: 996
-        y: 67
+        x: 3389
+        y: 2037
         width: 39
         height: 48
       alignment: 0
@@ -1154,8 +1183,8 @@ TextureImporter:
       name: "\u5934\u99704"
       rect:
         serializedVersion: 2
-        x: 1
-        y: 18
+        x: 2058
+        y: 1019
         width: 440
         height: 190
       alignment: 0
@@ -1167,8 +1196,8 @@ TextureImporter:
       name: "\u5934\u99705"
       rect:
         serializedVersion: 2
-        x: 343
-        y: 250
+        x: 2500
+        y: 857
         width: 363
         height: 225
       alignment: 0
@@ -1180,8 +1209,8 @@ TextureImporter:
       name: "\u5934\u99706"
       rect:
         serializedVersion: 2
-        x: 1480
-        y: 1444
+        x: 1484
+        y: 925
         width: 572
         height: 268
       alignment: 0
@@ -1193,8 +1222,8 @@ TextureImporter:
       name: "\u5934\u99707"
       rect:
         serializedVersion: 2
-        x: 2740
-        y: 2096
+        x: 1930
+        y: 1309
         width: 270
         height: 272
       alignment: 0
@@ -1206,8 +1235,8 @@ TextureImporter:
       name: "\u5934\u99708"
       rect:
         serializedVersion: 2
-        x: 3696
-        y: 2279
+        x: 2316
+        y: 2662
         width: 270
         height: 272
       alignment: 0
@@ -1220,7 +1249,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 447
-        y: 477
+        y: 518
         width: 351
         height: 307
       alignment: 0
@@ -1233,7 +1262,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 1
-        y: 766
+        y: 352
         width: 351
         height: 307
       alignment: 0
@@ -1245,8 +1274,8 @@ TextureImporter:
       name: "\u5934\u997011"
       rect:
         serializedVersion: 2
-        x: 2538
-        y: 1799
+        x: 836
+        y: 1609
         width: 171
         height: 176
       alignment: 0
@@ -1258,8 +1287,8 @@ TextureImporter:
       name: "\u5934\u997012"
       rect:
         serializedVersion: 2
-        x: 1281
-        y: 984
+        x: 1033
+        y: 2200
         width: 143
         height: 140
       alignment: 0
@@ -1267,6 +1296,214 @@ TextureImporter:
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u4E0A\u88634"
+      rect:
+        serializedVersion: 2
+        x: 1484
+        y: 1804
+        width: 172
+        height: 159
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u4E0A\u88635"
+      rect:
+        serializedVersion: 2
+        x: 1230
+        y: 600
+        width: 166
+        height: 114
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u4E0A\u88636"
+      rect:
+        serializedVersion: 2
+        x: 1874
+        y: 812
+        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: "\u4E0A\u88637"
+      rect:
+        serializedVersion: 2
+        x: 542
+        y: 405
+        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: "\u4E0A\u88638"
+      rect:
+        serializedVersion: 2
+        x: 652
+        y: 3513
+        width: 179
+        height: 113
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u4E0A\u88639"
+      rect:
+        serializedVersion: 2
+        x: 800
+        y: 597
+        width: 223
+        height: 147
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u4E0A\u886310"
+      rect:
+        serializedVersion: 2
+        x: 800
+        y: 451
+        width: 179
+        height: 144
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u4E0A\u886311"
+      rect:
+        serializedVersion: 2
+        x: 354
+        y: 395
+        width: 186
+        height: 121
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u4E0A\u886312"
+      rect:
+        serializedVersion: 2
+        x: 1874
+        y: 699
+        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: "\u4E0A\u886313"
+      rect:
+        serializedVersion: 2
+        x: 1287
+        y: 1187
+        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: "\u4E0A\u886310\uFF08\u9EC4\uFF09"
+      rect:
+        serializedVersion: 2
+        x: 1484
+        y: 1658
+        width: 179
+        height: 144
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u4E0A\u886311(\u7C89)"
+      rect:
+        serializedVersion: 2
+        x: 2313
+        y: 2030
+        width: 186
+        height: 121
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u4E0A\u886313(\u7D2B)"
+      rect:
+        serializedVersion: 2
+        x: 1287
+        y: 1351
+        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: "\u4E0A\u88637\uFF08\u7C89\uFF09"
+      rect:
+        serializedVersion: 2
+        x: 1287
+        y: 1074
+        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: 2661
+        y: 1084
+        width: 476
+        height: 210
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u7FC5\u81802"
+      rect:
+        serializedVersion: 2
+        x: 1
+        y: 3628
+        width: 841
+        height: 467
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
     outline: []
   spritePackingTag: 
   userData: 

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
Assets/Resource/Animations/人物动画/stand_ske.json


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


+ 9 - 1
Assets/Resource/Animations/人物动画/stand_texture.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 650acd38d498d664185f2a3b2cf387e9
-timeCreated: 1500274907
+timeCreated: 1500364739
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName:
@@ -86,6 +86,14 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+  - buildTarget: iPhone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
   spriteSheet:
     serializedVersion: 2
     sprites:

+ 0 - 9
Assets/Resource/Animations/人物动画/备份.meta

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

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
Assets/Resource/Animations/人物动画/备份/Closet_ske.json


+ 0 - 8
Assets/Resource/Animations/人物动画/备份/Closet_ske.json.meta

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

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
Assets/Resource/Animations/人物动画/备份/Closet_tex.json


+ 0 - 8
Assets/Resource/Animations/人物动画/备份/Closet_tex.json.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 49cd2fb2651558b48bdda33e1651ac75
-timeCreated: 1500011345
-licenseType: Pro
-TextScriptImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BIN
Assets/Resource/Animations/人物动画/备份/Closet_texture.png


+ 0 - 68
Assets/Resource/Animations/人物动画/备份/Closet_texture.png.meta

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

BIN
Assets/Resource/Logo.unity


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


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


+ 26 - 10
Assets/Resource/XML/Config/dressRoom_config.xml

@@ -4,12 +4,12 @@
   <item id="3" jump_frequency="" type="1" index="1" bodypart="1" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="120" iconOffset="" icon1offset="" spriteName="脑壳1(棕色)" armatureName="脑壳1(棕色)" />
   <item id="4" jump_frequency="" type="1" index="2" bodypart="1" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="120" iconOffset="" icon1offset="" spriteName="脑壳1(粉色)" armatureName="脑壳1(粉色)" />
   <item id="5" jump_frequency="" type="1" index="3" bodypart="1" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="105" iconOffset="" icon1offset="" spriteName="脑壳2(黄色)" armatureName="脑壳2(黄色)" />
-  <item id="6" jump_frequency="" type="1" index="4" bodypart="1" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="105" iconOffset="" icon1offset="" spriteName="脑壳2" armatureName="脑壳2(棕色)" />
+  <item id="6" jump_frequency="" type="1" index="4" bodypart="1" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="105" iconOffset="" icon1offset="" spriteName="脑壳2" armatureName="脑壳2" />
   <item id="7" jump_frequency="" type="1" index="5" bodypart="1" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="105" iconOffset="" icon1offset="" spriteName="脑壳2(粉色)" armatureName="脑壳2(粉色)" />
   <item id="8" jump_frequency="" type="1" index="6" bodypart="1" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="15" icon1offset="1.82,-132.79" spriteName="脑壳2(黄色),脑壳3+下(黄色)脑壳2——下" armatureName="脑壳2B(黄色)" />
   <item id="9" jump_frequency="" type="1" index="7" bodypart="1" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="15" icon1offset="1.82,-132.79" spriteName="脑壳2,脑壳2+下(棕色)另一种发型" armatureName="脑壳2B(棕色)" />
   <item id="10" jump_frequency="" type="1" index="8" bodypart="1" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="15" icon1offset="1.82,-132.79" spriteName="脑壳2(粉色),脑壳2+下(粉色)另一种发型" armatureName="脑壳2B(粉色)" />
-  <item id="11" jump_frequency="" type="1" index="9" bodypart="1" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="90" iconOffset="17.5" icon1offset="25.38,-112.81" spriteName="脑壳3+上(粉色),脑壳3+下(粉色)" armatureName="脑壳3(粉色)" />
+  <item id="11" jump_frequency="" type="1" index="9" bodypart="1" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="90" iconOffset="17.5" icon1offset="25.38,-112.81" spriteName="脑壳3+上(粉色),脑壳3+下(粉色)" armatureName="脑壳3" />
   <item id="12" jump_frequency="" type="1" index="10" bodypart="1" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="90" iconOffset="17.5" icon1offset="25.38,-112.81" spriteName="脑壳3+上(紫色),脑壳3+下(紫色)" armatureName="脑壳3(紫色)" />
   <item id="13" jump_frequency="" type="1" index="11" bodypart="1" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="90" iconOffset="17.5" icon1offset="25.38,-112.81" spriteName="脑壳3+上(黄色),脑壳3+下(黄色)脑壳2——下" armatureName="脑壳3(黄色)" />
   <item id="14" jump_frequency="" type="1" index="12" bodypart="1" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" spriteName="头发4(粉色)" armatureName="头发4(粉色)" />
@@ -68,14 +68,30 @@
   <item id="67" jump_frequency="" type="3" index="19" bodypart="3" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" spriteName="12" armatureName="鞋子14" />
   <item id="68" jump_frequency="" type="3" index="20" bodypart="3" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="" icon1offset="" spriteName="13" armatureName="鞋子15" />
   <item id="69" jump_frequency="" type="4" index="3" bodypart="4" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" spriteName="头饰4" armatureName="头饰4" />
-  <item id="70" jump_frequency="" type="4" index="3" bodypart="4" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" spriteName="头饰5" armatureName="头饰5" />
-  <item id="71" jump_frequency="" type="4" index="3" bodypart="4" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" spriteName="头饰6" armatureName="头饰6" />
-  <item id="72" jump_frequency="" type="4" index="3" bodypart="4" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" spriteName="头饰7" armatureName="头饰7" />
-  <item id="73" jump_frequency="" type="4" index="3" bodypart="4" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" spriteName="头饰8" armatureName="头饰8" />
-  <item id="74" jump_frequency="" type="4" index="3" bodypart="4" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" spriteName="头饰9" armatureName="头饰9" />
-  <item id="75" jump_frequency="" type="4" index="3" bodypart="4" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" spriteName="头饰10" armatureName="头饰10" />
-  <item id="76" jump_frequency="" type="4" index="3" bodypart="4" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" spriteName="头饰11" armatureName="头饰11" />
-  <item id="77" jump_frequency="" type="4" index="3" bodypart="4" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" spriteName="头饰12" armatureName="头饰12" />
+  <item id="70" jump_frequency="" type="4" index="4" bodypart="4" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" spriteName="头饰5" armatureName="头饰5" />
+  <item id="71" jump_frequency="" type="4" index="5" bodypart="4" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" spriteName="头饰6" armatureName="头饰6" />
+  <item id="72" jump_frequency="" type="4" index="6" bodypart="4" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" spriteName="头饰7" armatureName="头饰7" />
+  <item id="73" jump_frequency="" type="4" index="7" bodypart="4" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" spriteName="头饰8" armatureName="头饰8" />
+  <item id="74" jump_frequency="" type="4" index="8" bodypart="4" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" spriteName="头饰9" armatureName="头饰9" />
+  <item id="75" jump_frequency="" type="4" index="9" bodypart="4" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" spriteName="头饰10" armatureName="头饰10" />
+  <item id="76" jump_frequency="" type="4" index="10" bodypart="4" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" spriteName="头饰11" armatureName="头饰11" />
+  <item id="77" jump_frequency="" type="4" index="11" bodypart="4" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" spriteName="头饰12" armatureName="头饰12" />
+  <item id="78" jump_frequency="" type="2" index="3" bodypart="5" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="-16" icon1offset="" spriteName="上衣4" armatureName="上衣4" />
+  <item id="79" jump_frequency="" type="2" index="4" bodypart="5" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" spriteName="上衣5" armatureName="上衣5" />
+  <item id="80" jump_frequency="" type="2" index="5" bodypart="5" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" spriteName="上衣6" armatureName="上衣6" />
+  <item id="81" jump_frequency="" type="2" index="6" bodypart="5" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" spriteName="上衣7" armatureName="上衣7" />
+  <item id="82" jump_frequency="" type="2" index="7" bodypart="5" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" spriteName="上衣7(粉)" armatureName="上衣7(粉)" />
+  <item id="83" jump_frequency="" type="2" index="8" bodypart="5" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" spriteName="上衣8" armatureName="上衣8" />
+  <item id="84" jump_frequency="" type="2" index="9" bodypart="5" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" spriteName="上衣9" armatureName="上衣9" />
+  <item id="85" jump_frequency="" type="2" index="10" bodypart="5" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" spriteName="上衣10" armatureName="上衣10" />
+  <item id="86" jump_frequency="" type="2" index="11" bodypart="5" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" spriteName="上衣10(黄)" armatureName="上衣10(黄)" />
+  <item id="87" jump_frequency="" type="2" index="12" bodypart="5" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" spriteName="上衣11" armatureName="上衣11" />
+  <item id="88" jump_frequency="" type="2" index="13" bodypart="5" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" spriteName="上衣11(粉)" armatureName="上衣11(粉)" />
+  <item id="89" jump_frequency="" type="2" index="14" bodypart="5" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" spriteName="上衣12" armatureName="上衣12" />
+  <item id="90" jump_frequency="" type="2" index="15" bodypart="5" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" spriteName="上衣13" armatureName="上衣13" />
+  <item id="91" jump_frequency="" type="2" index="16" bodypart="5" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" spriteName="上衣13(紫)" armatureName="上衣13(紫)" />
+  <item id="92" jump_frequency="" type="5" index="0" bodypart="6" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="110" iconOffset="" icon1offset="" spriteName="翅膀1" armatureName="翅膀1" />
+  <item id="93" jump_frequency="" type="5" index="1" bodypart="6" level="" buy_currency="1" buy_amt="100" buy_advance_currency="" buy_advance_amt="" pixelSize="110" iconOffset="" icon1offset="" spriteName="翅膀2" armatureName="翅膀2" />
   <comment>
     <id>
 id

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

@@ -1,5 +1,5 @@
 <PlayerConfig>
-  <Version value="671" />
+  <Version value="676" />
 
   <ID value="Default" />
   <TutorialA value="1" />
@@ -29,7 +29,7 @@
   <DressList value ="2 6 11 31 32 33 34 35 36 37 38 39 40 41 42"/>
   <FlowerList value="1" />
   <AchieveList value="" />
-  <DressData Head="" Dress="" Shoe="" HeadWear="" Top="" Eye="" Mouse=""/>
+  <DressData Head="" Dress="" Shoe="" HeadWear="" Top="" Eye="" Mouse="" Wing="Empty"/>
   <AchieveData AD="0" Skill="0" Sign="0" Share="0" ElfLevel="0" MiniGame="0" FlowerCoin="0" TotalPerson="0"/>
 
   <SkillList>

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

@@ -469,5 +469,22 @@
     <Armature75 desc=""><![CDATA[服装的说明]]></Armature75>
     <Armature76 desc=""><![CDATA[服装的说明]]></Armature76>
     <Armature77 desc=""><![CDATA[服装的说明]]></Armature77>
+    <Armature78 desc=""><![CDATA[服装的说明]]></Armature78>
+    <Armature79 desc=""><![CDATA[服装的说明]]></Armature79>
+    <Armature80 desc=""><![CDATA[服装的说明]]></Armature80>
+    <Armature81 desc=""><![CDATA[服装的说明]]></Armature81>
+    <Armature82 desc=""><![CDATA[服装的说明]]></Armature82>
+    <Armature83 desc=""><![CDATA[服装的说明]]></Armature83>
+    <Armature84 desc=""><![CDATA[服装的说明]]></Armature84>
+    <Armature85 desc=""><![CDATA[服装的说明]]></Armature85>
+    <Armature86 desc=""><![CDATA[服装的说明]]></Armature86>
+    <Armature87 desc=""><![CDATA[服装的说明]]></Armature87>
+    <Armature88 desc=""><![CDATA[服装的说明]]></Armature88>
+    <Armature89 desc=""><![CDATA[服装的说明]]></Armature89>
+    <Armature90 desc=""><![CDATA[服装的说明]]></Armature90>
+    <Armature91 desc=""><![CDATA[服装的说明]]></Armature91>
+    <Armature92 desc=""><![CDATA[服装的说明]]></Armature92>
+    <Armature93 desc=""><![CDATA[服装的说明]]></Armature93>
+    <Armature94 desc=""><![CDATA[服装的说明]]></Armature94>
   </DressRoom>
 </lan>

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

@@ -469,5 +469,22 @@
     <Armature75 desc=""><![CDATA[]]></Armature75>
     <Armature76 desc=""><![CDATA[]]></Armature76>
     <Armature77 desc=""><![CDATA[]]></Armature77>
+    <Armature78 desc=""><![CDATA[]]></Armature78>
+    <Armature79 desc=""><![CDATA[]]></Armature79>
+    <Armature80 desc=""><![CDATA[]]></Armature80>
+    <Armature81 desc=""><![CDATA[]]></Armature81>
+    <Armature82 desc=""><![CDATA[]]></Armature82>
+    <Armature83 desc=""><![CDATA[]]></Armature83>
+    <Armature84 desc=""><![CDATA[]]></Armature84>
+    <Armature85 desc=""><![CDATA[]]></Armature85>
+    <Armature86 desc=""><![CDATA[]]></Armature86>
+    <Armature87 desc=""><![CDATA[]]></Armature87>
+    <Armature88 desc=""><![CDATA[]]></Armature88>
+    <Armature89 desc=""><![CDATA[]]></Armature89>
+    <Armature90 desc=""><![CDATA[]]></Armature90>
+    <Armature91 desc=""><![CDATA[]]></Armature91>
+    <Armature92 desc=""><![CDATA[]]></Armature92>
+    <Armature93 desc=""><![CDATA[]]></Armature93>
+    <Armature94 desc=""><![CDATA[]]></Armature94>
   </DressRoom>
 </lan>

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

@@ -469,5 +469,22 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack6>
     <Armature75 desc=""><![CDATA[]]></Armature75>
     <Armature76 desc=""><![CDATA[]]></Armature76>
     <Armature77 desc=""><![CDATA[]]></Armature77>
+    <Armature78 desc=""><![CDATA[]]></Armature78>
+    <Armature79 desc=""><![CDATA[]]></Armature79>
+    <Armature80 desc=""><![CDATA[]]></Armature80>
+    <Armature81 desc=""><![CDATA[]]></Armature81>
+    <Armature82 desc=""><![CDATA[]]></Armature82>
+    <Armature83 desc=""><![CDATA[]]></Armature83>
+    <Armature84 desc=""><![CDATA[]]></Armature84>
+    <Armature85 desc=""><![CDATA[]]></Armature85>
+    <Armature86 desc=""><![CDATA[]]></Armature86>
+    <Armature87 desc=""><![CDATA[]]></Armature87>
+    <Armature88 desc=""><![CDATA[]]></Armature88>
+    <Armature89 desc=""><![CDATA[]]></Armature89>
+    <Armature90 desc=""><![CDATA[]]></Armature90>
+    <Armature91 desc=""><![CDATA[]]></Armature91>
+    <Armature92 desc=""><![CDATA[]]></Armature92>
+    <Armature93 desc=""><![CDATA[]]></Armature93>
+    <Armature94 desc=""><![CDATA[]]></Armature94>
   </DressRoom>
 </lan>

BIN
Assets/Resource/Xlsx/dressRoom_config.xlsx


BIN
Assets/Resource/Xlsx/language_config.xlsx


+ 65 - 11
Assets/Script/Manage/ManaData.cs

@@ -10,6 +10,8 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Security.Cryptography;
 
+using Random = UnityEngine.Random;
+
 public class ManaData : Regist
 {
     #region 变量
@@ -78,6 +80,8 @@ public class ManaData : Regist
                         if (nativeVersion < defaultVersion)
                         {
                             PlayerDoc_ = MergeXML(nativeVersion, nativeDoc, DefaultDoc);
+
+                            ManaServer.Save();
                         }
                         else if (nativeVersion > defaultVersion)
                         {
@@ -231,6 +235,8 @@ public class ManaData : Regist
             if (nativeVersion < defaultVersion)
             {
                 MergeXML(nativeVersion, PlayerDoc_, DefaultDoc);
+
+                ManaServer.Save();
             }
         }
         else
@@ -584,15 +590,58 @@ public class ManaData : Regist
             xmlNode = node.SelectSingleNode("DressData");
         }
 
+
         List<string> dataList = new List<string>();
 
-        dataList.Add(xmlNode.Attributes[0].Value);
-        dataList.Add(xmlNode.Attributes[1].Value);
-        dataList.Add(xmlNode.Attributes[2].Value);
-        dataList.Add(xmlNode.Attributes[3].Value);
-        dataList.Add(xmlNode.Attributes[4].Value);
-        dataList.Add(xmlNode.Attributes[5].Value);
-        dataList.Add(xmlNode.Attributes[6].Value);
+        if (xmlNode != null && xmlNode.Attributes.Count == 8)
+        {
+            dataList.Add(xmlNode.Attributes[0].Value);
+            dataList.Add(xmlNode.Attributes[1].Value);
+            dataList.Add(xmlNode.Attributes[2].Value);
+            dataList.Add(xmlNode.Attributes[3].Value);
+            dataList.Add(xmlNode.Attributes[4].Value);
+            dataList.Add(xmlNode.Attributes[5].Value);
+            dataList.Add(xmlNode.Attributes[6].Value);
+            dataList.Add(xmlNode.Attributes[7].Value);
+        }
+        else
+        {
+            float rate = Random.Range(0f, 1f);
+
+            if (rate < 0.33f)
+            {
+                dataList.Add("脑壳1");
+                dataList.Add("裙子1");
+                dataList.Add("鞋子1");
+                dataList.Add("头饰品1");
+                dataList.Add("上衣1");
+                dataList.Add("眼睛1");
+                dataList.Add("嘴巴1");
+                dataList.Add("Empty");
+            }
+            else if (rate < 0.66f)
+            {
+                dataList.Add("脑壳2");
+                dataList.Add("裙子2");
+                dataList.Add("鞋子2");
+                dataList.Add("头饰品2");
+                dataList.Add("上衣2");
+                dataList.Add("眼睛2");
+                dataList.Add("嘴巴2");
+                dataList.Add("Empty");
+            }
+            else
+            {
+                dataList.Add("脑壳3");
+                dataList.Add("裙子3");
+                dataList.Add("鞋子3");
+                dataList.Add("头饰品3");
+                dataList.Add("上衣3");
+                dataList.Add("眼睛3");
+                dataList.Add("嘴巴3");
+                dataList.Add("Empty");
+            }
+        }
 
         return dataList;
     }
@@ -850,15 +899,17 @@ public class ManaData : Regist
 
     public static XmlDocument MergeXML(int nativeVersion, XmlDocument nativeDoc, XmlDocument defaultDoc)
     {
-        if (nativeVersion < 671)
+        if (nativeVersion < 676)
         {
-            To671(nativeDoc, defaultDoc);
+            Debug.Log("UpdateArchive");
+
+            To676(nativeDoc, defaultDoc);
         }
 
         return nativeDoc;
     }
 
-    public static XmlDocument To671(XmlDocument nativeDoc, XmlDocument defaultDoc)
+    public static XmlDocument To676(XmlDocument nativeDoc, XmlDocument defaultDoc)
     {
         string playerType = "";
         XmlNode xmlNode1 = nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("DressList");
@@ -899,7 +950,7 @@ public class ManaData : Regist
         }
 
 
-        nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Version").Attributes[0].Value = 671.ToString();
+        nativeDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Version").Attributes[0].Value = 676.ToString();
 
         xmlNode1 = defaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("DressList");
         xmlNode2 = defaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("DressData");
@@ -916,6 +967,7 @@ public class ManaData : Regist
             xmlNode2.Attributes[4].Value = "上衣1";
             xmlNode2.Attributes[5].Value = "眼睛1";
             xmlNode2.Attributes[6].Value = "嘴巴1";
+            xmlNode2.Attributes[7].Value = "Empty";
         }
         else if (playerType == "PlayerBrown")
         {
@@ -926,6 +978,7 @@ public class ManaData : Regist
             xmlNode2.Attributes[4].Value = "上衣2";
             xmlNode2.Attributes[5].Value = "眼睛2";
             xmlNode2.Attributes[6].Value = "嘴巴2";
+            xmlNode2.Attributes[7].Value = "Empty";
         }
         else if (playerType == "PlayerPink")
         {
@@ -936,6 +989,7 @@ public class ManaData : Regist
             xmlNode2.Attributes[4].Value = "上衣3";
             xmlNode2.Attributes[5].Value = "眼睛3";
             xmlNode2.Attributes[6].Value = "嘴巴3";
+            xmlNode2.Attributes[7].Value = "Empty";
         }
 
         nativeDoc.SelectSingleNode("PlayerConfig").AppendChild(nativeDoc.ImportNode(xmlNode1, true));

+ 4 - 39
Assets/Script/Manage/ManaPlayer.cs

@@ -201,53 +201,17 @@ public class ManaPlayer : Regist
     }
 
 
-    public Player GetPlayer(string type = null, XmlNode xmlNode = null)
+    public Player GetPlayer(XmlNode xmlNode = null)
     {
         List<string> DressData = new List<string>();
 
-        if (type == null && xmlNode == null)
+        if (xmlNode == null)
         {
             DressData = ManaData.GetDressData();
         }
         else
         {
-            if (type == null)
-            {
-                DressData = ManaData.GetDressData(xmlNode);
-            }
-            else
-            {
-                if (type == "PlayerBlond")
-                {
-                    DressData.Add("脑壳1");
-                    DressData.Add("裙子1");
-                    DressData.Add("鞋子1");
-                    DressData.Add("头饰品1");
-                    DressData.Add("上衣1");
-                    DressData.Add("眼睛1");
-                    DressData.Add("嘴巴1");
-                }
-                else if (type == "PlayerBrown")
-                {
-                    DressData.Add("脑壳2");
-                    DressData.Add("裙子2");
-                    DressData.Add("鞋子2");
-                    DressData.Add("头饰品2");
-                    DressData.Add("上衣2");
-                    DressData.Add("眼睛2");
-                    DressData.Add("嘴巴2");
-                }
-                else if (type == "PlayerPink")
-                {
-                    DressData.Add("脑壳3");
-                    DressData.Add("裙子3");
-                    DressData.Add("鞋子3");
-                    DressData.Add("头饰品3");
-                    DressData.Add("上衣3");
-                    DressData.Add("眼睛3");
-                    DressData.Add("嘴巴3");
-                }
-            }
+            DressData = ManaData.GetDressData(xmlNode);
         }
 
 
@@ -284,5 +248,6 @@ public class ManaPlayer : Regist
         Player.ChangeClose(BodyPart.Top, dressData[4]);
         Player.ChangeClose(BodyPart.Eye, dressData[5]);
         Player.ChangeClose(BodyPart.Mouse, dressData[6]);
+        Player.ChangeClose(BodyPart.Wing, dressData[7]);
     }
 }

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

@@ -256,6 +256,7 @@ public class ManaTutorial : Regist
                     ManaPlayer.DressData.Add("上衣3");
                     ManaPlayer.DressData.Add("眼睛3");
                     ManaPlayer.DressData.Add("嘴巴3");
+                    ManaPlayer.DressData.Add("Empty");
                 }
                 else if (ManaPlayer.SeleTra == ManaPlayer.PlayerBlond)
                 {
@@ -266,6 +267,7 @@ public class ManaTutorial : Regist
                     ManaPlayer.DressData.Add("上衣1");
                     ManaPlayer.DressData.Add("眼睛1");
                     ManaPlayer.DressData.Add("嘴巴1");
+                    ManaPlayer.DressData.Add("Empty");
                 }
                 else if (ManaPlayer.SeleTra == ManaPlayer.PlayerBrown)
                 {
@@ -276,6 +278,7 @@ public class ManaTutorial : Regist
                     ManaPlayer.DressData.Add("上衣2");
                     ManaPlayer.DressData.Add("眼睛2");
                     ManaPlayer.DressData.Add("嘴巴2");
+                    ManaPlayer.DressData.Add("Empty");
                 }
 
                 ManaData.SaveDress();

+ 5 - 16
Assets/Script/Manage/ManaVisit.cs

@@ -47,7 +47,6 @@ public class ManaVisit
     public static int Slot;
     public static int Level;
     public static int PageAmt;
-    public static string Player;
     public static XmlNode Node;
     public static XmlDocument Document;
 
@@ -282,20 +281,6 @@ public class ManaVisit
         Document.LoadXml(XmlStr);
 
         Node = Document.SelectSingleNode("PlayerConfig");
-        XmlNode tempNode = Node.SelectSingleNode("Player");
-
-        if (tempNode == null)
-        {
-            Player = null;
-
-            tempNode = Node;
-        }
-        else
-        {
-            Player = Node.SelectSingleNode("Player").Attributes[0].Value;
-
-            tempNode = null;
-        }
 
         ManaReso.SetActive("C_Coin", false);
         ManaReso.SetActive("C_Group1", false);
@@ -460,6 +445,7 @@ public class ManaVisit
         {
             OriginPlantList = new List<Slot>(ManaGarden.PlantList);
 
+            ManaData.SaveDress();
             ManaData.SavePlantList();
         }
 
@@ -513,7 +499,7 @@ public class ManaVisit
 
         ManaReso.TraDic.Remove("Player");
 
-        ManaPlayer.Instance.GetPlayer(Player, tempNode).SetAllCollider(false);
+        ManaPlayer.Instance.GetPlayer(Node).SetAllCollider(false);
 
         Garden.PlayerPos = new List<Vector3>();
 
@@ -701,6 +687,7 @@ public class ManaVisit
             xmlNode.Attributes[4].Value = "上衣1";
             xmlNode.Attributes[5].Value = "眼睛1";
             xmlNode.Attributes[6].Value = "嘴巴1";
+            xmlNode.Attributes[7].Value = "Empty";
         }
         else if (rate < 0.66f)
         {
@@ -711,6 +698,7 @@ public class ManaVisit
             xmlNode.Attributes[4].Value = "上衣2";
             xmlNode.Attributes[5].Value = "眼睛2";
             xmlNode.Attributes[6].Value = "嘴巴2";
+            xmlNode.Attributes[7].Value = "Empty";
         }
         else
         {
@@ -721,6 +709,7 @@ public class ManaVisit
             xmlNode.Attributes[4].Value = "上衣3";
             xmlNode.Attributes[5].Value = "眼睛3";
             xmlNode.Attributes[6].Value = "嘴巴3";
+            xmlNode.Attributes[7].Value = "Empty";
         }
 
         return doc.OuterXml;

+ 46 - 8
Assets/Script/Object/Player.cs

@@ -20,6 +20,7 @@ public enum BodyPart
     Top,
     Shoe,
     Head,
+    Wing,
     Dress,
     Mouse,
     Headwear,
@@ -57,7 +58,7 @@ public class CloseUnit
     public Image Icon2;
     public Button BuyBtn;
     public Button DressBtn;
-    public Vector2 Icon1Offset;
+    public Vector2 IconOffset1;
     public BodyPart BodyPart;
     public Transform Transform;
     public CloseType Type;
@@ -84,7 +85,7 @@ public class CloseUnit
         BuyAdvanceAmt = Auxiliary.DoubleParse(attribute[9].Value, 0);
         PixelSize = Auxiliary.IntParse(attribute[10].Value, 100);
         IconOffset = Auxiliary.FloatParse(attribute[11].Value, 0);
-        Icon1Offset = Auxiliary.VectorParse(',', attribute[12].Value, new Vector3());
+        IconOffset1 = Auxiliary.VectorParse(',', attribute[12].Value, new Vector3());
         Sprites = SpriteParse(attribute[13].Value);
         ArmatureName = attribute[14].Value;
 
@@ -150,7 +151,7 @@ public class CloseUnit
 
             Icon1.Resize(true, new Vector2(newSize, newSize));
 
-            Icon1.transform.localPosition = Icon1Offset*newSize + new Vector2(0, IconOffset);
+            Icon1.transform.localPosition = IconOffset1*newSize + new Vector2(0, IconOffset);
         }
 
 
@@ -168,6 +169,8 @@ public class CloseUnit
                     image.sprite = Sprites[0];
                     image.Resize(true, new Vector2(newSize, newSize));
 
+                    image.transform.localPosition = new Vector3(0, 22) + new Vector3(0, IconOffset);
+
                     if (Sprites.Length > 1)
                     {
                         ManaReso.SetActive("Pa_Icon1", true);
@@ -176,7 +179,7 @@ public class CloseUnit
                         image1.sprite = Sprites[1];
                         image1.Resize(true, new Vector2(newSize, newSize));
 
-                        image1.transform.position = image.transform.position + (Vector3) Icon1Offset*newSize;
+                        image1.transform.localPosition = new Vector3(0, 22) + new Vector3(0, IconOffset) + (Vector3)IconOffset1 * newSize;
                     }
                     else
                     {
@@ -243,6 +246,10 @@ public class CloseUnit
         {
             return BodyPart.Top;
         }
+        else if (type == 6)
+        {
+            return BodyPart.Wing;
+        }
         else
         {
             throw new Exception();
@@ -337,6 +344,7 @@ public class Player : Regist , IPointerClickHandler
     private string Top;
     private string Shoe;
     private string Head;
+    private string Wing;
     private string Dress;
     private string Mouse;
     private string HeadWear;
@@ -346,6 +354,7 @@ public class Player : Regist , IPointerClickHandler
     public DragonBones.Slot TopSlot;
     public DragonBones.Slot HeadSlot;
     public DragonBones.Slot DressSlot;
+    public DragonBones.Slot WingSlot;
     public DragonBones.Slot MouseSlot;
     public DragonBones.Slot LeftShoeSlot;
     public DragonBones.Slot RightShoeSlot;
@@ -386,6 +395,14 @@ public class Player : Regist , IPointerClickHandler
     }
 
 
+    public void Update()
+    {
+        if (Input.GetKeyDown(KeyCode.Space))
+        {
+            UnityFactory.factory.BuildArmature("脑壳1");
+        }
+    }
+
     public void FixedUpdate()
     {
         if (InDressRoom)
@@ -483,6 +500,11 @@ public class Player : Regist , IPointerClickHandler
         closeUnitList.Add(ManaPlayer.CloseUnitDic[ManaPlayer.CloseIDDic[HeadWear]]);
         closeUnitList.Add(ManaPlayer.CloseUnitDic[ManaPlayer.CloseIDDic[Top]]);
 
+        if (Wing != "Empty")
+        {
+            closeUnitList.Add(ManaPlayer.CloseUnitDic[ManaPlayer.CloseIDDic[Wing]]);
+        }
+
         for (int i = 0; i < closeUnitList.Count; i++)
         {
             if (!closeUnitList[i].Bought)
@@ -498,7 +520,8 @@ public class Player : Regist , IPointerClickHandler
         ManaPlayer.DressData[2] = Shoe;
         ManaPlayer.DressData[3] = HeadWear;
         ManaPlayer.DressData[4] = Top;
-
+        ManaPlayer.DressData[7] = Wing;
+        
         ExitDressRoom();
     }
 
@@ -696,6 +719,7 @@ public class Player : Regist , IPointerClickHandler
         Top = "上衣1";
         Shoe = "鞋子1";
         Head = "脑壳1";
+        Wing = "Empty";
         Dress = "裙子1";
         Mouse = "嘴巴1";
         HeadWear = "头饰品1";
@@ -703,6 +727,7 @@ public class Player : Regist , IPointerClickHandler
         EyeSlot = UAC.armature.GetSlot("眼睛");
         TopSlot = UAC.armature.GetSlot("上衣");
         HeadSlot = UAC.armature.GetSlot("脑壳");
+        WingSlot = UAC.armature.GetSlot("翅膀");
         DressSlot = UAC.armature.GetSlot("裙子");
         MouseSlot = UAC.armature.GetSlot("嘴巴");
         LeftShoeSlot = UAC.armature.GetSlot("鞋子左");
@@ -713,6 +738,7 @@ public class Player : Regist , IPointerClickHandler
         ChangeClose(BodyPart.Top, "上衣1", false);
         ChangeClose(BodyPart.Shoe, "鞋子1", false);
         ChangeClose(BodyPart.Head, "脑壳1", false);
+        ChangeClose(BodyPart.Wing, "Empty", false);
         ChangeClose(BodyPart.Dress, "裙子1", false);
         ChangeClose(BodyPart.Mouse, "嘴巴1", false);
         ChangeClose(BodyPart.Headwear, "头饰品1", false);
@@ -727,7 +753,7 @@ public class Player : Regist , IPointerClickHandler
         ChangeClose(BodyPart.Eye, "眼睛3", false);
         ChangeClose(BodyPart.Top, "上衣3", false);
         ChangeClose(BodyPart.Shoe, "鞋子3", false);
-        ChangeClose(BodyPart.Head, "脑壳3(粉色)", false);
+        ChangeClose(BodyPart.Head, "脑壳3", false);
         ChangeClose(BodyPart.Dress, "裙子3", false);
         ChangeClose(BodyPart.Mouse, "嘴巴3", false);
         ChangeClose(BodyPart.Headwear, "头饰品3", false);
@@ -753,7 +779,7 @@ public class Player : Regist , IPointerClickHandler
         ChangeClose(BodyPart.Eye, "眼睛2", false);
         ChangeClose(BodyPart.Top, "上衣2", false);
         ChangeClose(BodyPart.Shoe, "鞋子2", false);
-        ChangeClose(BodyPart.Head, "脑壳2(棕色)", false);
+        ChangeClose(BodyPart.Head, "脑壳2", false);
         ChangeClose(BodyPart.Dress, "裙子2", false);
         ChangeClose(BodyPart.Mouse, "嘴巴2", false);
         ChangeClose(BodyPart.Headwear, "头饰品2", false);
@@ -768,17 +794,23 @@ public class Player : Regist , IPointerClickHandler
     {
         UAC.transform.SetLZ(2);
         
+        if (Wing != "Empty")
+        {
+            transform.FindChild("Armature/" + Wing).SetLZ(0.003f);
+        }
+
         transform.FindChild("Armature/" + Eye).SetLZ(-0.001f);
         transform.FindChild("Armature/" + Top).SetLZ(-0.003f);
         transform.FindChild("Armature/" + Mouse).SetLZ(-0.001f);
         transform.FindChild("Armature/" + HeadWear).SetLZ(-0.001f);
 
         Transform tempTra = transform.FindChild("Armature/" + Head);
-
+        
         tempTra.SetLZ(0);
         if (tempTra.childCount > 1)
         {
             tempTra.GetChild(0).SetLZ(0.002f);
+            tempTra.GetChild(1).SetLZ(0f);
         }
 
 
@@ -833,6 +865,12 @@ public class Player : Regist , IPointerClickHandler
 
             slotList.Add(HeadSlot);
         }
+        else if (bodyPart == BodyPart.Wing)
+        {
+            Wing = armatureName;
+
+            slotList.Add(WingSlot);
+        }
         else if (bodyPart == BodyPart.Dress)
         {
             Dress = armatureName;

BIN
ProjectSettings/GraphicsSettings.asset


+ 3 - 1
ToList.txt

@@ -1,4 +1,6 @@
-饰品位置有问题
+合并分支
+
+上传DragonBone
 
 
 还原PlayerConfig

Nem az összes módosított fájl került megjelenítésre, mert túl sok fájl változott