修改搭配秀 增加新的服装

Assets/Resource/Animations/人物动画/stand_ske.json.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: d9cae0096b575ad439815b89ff28bbf0
-timeCreated: 1502703588
+timeCreated: 1522823268
 licenseType: Pro
 TextScriptImporter:
   userData: 

Assets/Resource/Animations/人物动画/stand_tex.json.meta → Assets/Resource/Animations/人物动画/stand_tex_0.json.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: cf10bfe715240ea4e87102475ca55678
-timeCreated: 1502703588
+guid: 5dc33eba5b1a31e41b1a4e73bc26f716
+timeCreated: 1522823268
 licenseType: Pro
 TextScriptImporter:
   userData: 

Assets/Resource/Animations/人物动画/stand_tex_1.json.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: cdbea75251ed3a7429b4644cf8092c72
+timeCreated: 1522823268
+licenseType: Pro
+TextScriptImporter:
+  userData: 
+  assetBundleName: config
+  assetBundleVariant: 

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

@@ -0,0 +1,585 @@
+fileFormatVersion: 2
+guid: c0256ea9e745dc544ae7035b55f87b84
+timeCreated: 1522830458
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName:
+    21300000: "\u978B\u5B5015-2_1"
+    21300002: "\u773C\u775B1"
+    21300004: "\u4E0A\u88631"
+    21300006: "\u4E0A\u88632"
+    21300008: "\u4E0A\u88633"
+    21300010: "\u773C\u775B2"
+    21300012: "\u773C\u775B3"
+    21300014: "\u978B\u5B502"
+    21300016: "\u88D9\u5B5010(\u9EC4)"
+    21300018: "\u88D9\u5B5010"
+    21300020: "\u88D9\u5B5011(\u7C89)"
+    21300022: "\u8863\u670D11"
+    21300024: "\u88D9\u5B5011"
+    21300026: "\u88D9\u5B507\uFF08\u7C89\uFF09"
+    21300028: "\u88D9\u5B507"
+    21300030: "\u88D9\u5B509"
+    21300032: "\u88D9\u5B5012"
+    21300034: "\u88D9\u5B5013(\u7D2B)"
+    21300036: 10
+    21300038: 11
+    21300040: 12
+    21300042: 13
+    21300044: "\u5934\u99704"
+    21300046: "\u5934\u99705"
+    21300048: "\u5934\u99709"
+    21300050: "\u5934\u997010"
+    21300052: "\u4E0A\u88636"
+    21300054: "\u4E0A\u88637"
+    21300056: "\u4E0A\u886310"
+    21300058: "\u4E0A\u886311"
+    21300060: "\u4E0A\u886312"
+    21300062: "\u4E0A\u886310\uFF08\u9EC4\uFF09"
+    21300064: "\u4E0A\u88637\uFF08\u7C89\uFF09"
+    21300066: "\u60CA\u8BB6"
+    21300068: "\u90C1\u95F7"
+    21300070: "\u5934\u997015"
+    21300072: "\u4E0B\u886314b\u8774\u8776\u7ED3"
+    21300074: "\u4E0B\u886314b"
+    21300076: "\u4E0B\u886314c\u8774\u8776\u7ED3"
+    21300078: "\u4E0B\u886314c"
+    21300080: "\u4E0B\u886314a"
+    21300082: "\u5934\u997013-1"
+    21300084: "\u4E0A\u886314a"
+    21300086: 2
+    21300088: "\u88D9\u5B5013"
+    21300090: "\u4E0A\u88635"
+    21300092: "\u7FC5\u81801"
+    21300094: "\u7CFB\u7EDF\u5B9D\u7BB1"
+    21300096: "\u94BB\u77F3\u5B9D\u7BB1"
+    21300098: "\u5F00\u5FC3"
+    21300100: "\u978B\u5B5015-1"
+  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: 1
+  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: 2
+  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: 4096
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 4096
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: iPhone
+    maxTextureSize: 4096
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 4096
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites:
+    - serializedVersion: 2
+      name: "\u978B\u5B5015-2_1"
+      rect:
+        serializedVersion: 2
+        x: 548
+        y: 3087
+        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\u88631"
+      rect:
+        serializedVersion: 2
+        x: 2641
+        y: 3833
+        width: 165
+        height: 111
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: 2
+      rect:
+        serializedVersion: 2
+        x: 2808
+        y: 3810
+        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: 990
+        y: 3142
+        width: 165
+        height: 111
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u4E0A\u88633"
+      rect:
+        serializedVersion: 2
+        x: 990
+        y: 3029
+        width: 165
+        height: 111
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u88D9\u5B5010(\u9EC4)"
+      rect:
+        serializedVersion: 2
+        x: 275
+        y: 3037
+        width: 271
+        height: 184
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u88D9\u5B5010"
+      rect:
+        serializedVersion: 2
+        x: 2
+        y: 3037
+        width: 271
+        height: 184
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u88D9\u5B5011(\u7C89)"
+      rect:
+        serializedVersion: 2
+        x: 480
+        y: 3514
+        width: 302
+        height: 197
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u8863\u670D11"
+      rect:
+        serializedVersion: 2
+        x: 820
+        y: 3793
+        width: 386
+        height: 301
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u88D9\u5B5011"
+      rect:
+        serializedVersion: 2
+        x: 686
+        y: 3067
+        width: 302
+        height: 197
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u88D9\u5B507\uFF08\u7C89\uFF09"
+      rect:
+        serializedVersion: 2
+        x: 1173
+        y: 3317
+        width: 287
+        height: 233
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u88D9\u5B507"
+      rect:
+        serializedVersion: 2
+        x: 1173
+        y: 3552
+        width: 287
+        height: 233
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u88D9\u5B5012"
+      rect:
+        serializedVersion: 2
+        x: 2368
+        y: 3921
+        width: 271
+        height: 173
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u88D9\u5B5013"
+      rect:
+        serializedVersion: 2
+        x: 2
+        y: 3223
+        width: 340
+        height: 276
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u88D9\u5B5013(\u7D2B)"
+      rect:
+        serializedVersion: 2
+        x: 344
+        y: 3223
+        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: 12
+      rect:
+        serializedVersion: 2
+        x: 1462
+        y: 3651
+        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: 13
+      rect:
+        serializedVersion: 2
+        x: 1906
+        y: 3768
+        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\u99704"
+      rect:
+        serializedVersion: 2
+        x: 1561
+        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\u99705"
+      rect:
+        serializedVersion: 2
+        x: 2003
+        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: "\u5934\u99709"
+      rect:
+        serializedVersion: 2
+        x: 820
+        y: 3484
+        width: 351
+        height: 307
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u5934\u997010"
+      rect:
+        serializedVersion: 2
+        x: 1208
+        y: 3787
+        width: 351
+        height: 307
+      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: 990
+        y: 3255
+        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\u88637"
+      rect:
+        serializedVersion: 2
+        x: 965
+        y: 3371
+        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: 2
+        y: 3501
+        width: 476
+        height: 210
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u7CFB\u7EDF\u5B9D\u7BB1"
+      rect:
+        serializedVersion: 2
+        x: 411
+        y: 3713
+        width: 407
+        height: 381
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u94BB\u77F3\u5B9D\u7BB1"
+      rect:
+        serializedVersion: 2
+        x: 2
+        y: 3713
+        width: 407
+        height: 381
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u5F00\u5FC3"
+      rect:
+        serializedVersion: 2
+        x: 2912
+        y: 3959
+        width: 270
+        height: 135
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u978B\u5B5015-1"
+      rect:
+        serializedVersion: 2
+        x: 616
+        y: 3087
+        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: 2641
+        y: 3946
+        width: 269
+        height: 148
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u4E0B\u886314b\u8774\u8776\u7ED3"
+      rect:
+        serializedVersion: 2
+        x: 2912
+        y: 3820
+        width: 263
+        height: 137
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u4E0B\u886314b"
+      rect:
+        serializedVersion: 2
+        x: 1173
+        y: 3099
+        width: 277
+        height: 216
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u4E0B\u886314c\u8774\u8776\u7ED3"
+      rect:
+        serializedVersion: 2
+        x: 3184
+        y: 3957
+        width: 263
+        height: 137
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u4E0B\u886314c"
+      rect:
+        serializedVersion: 2
+        x: 686
+        y: 3266
+        width: 277
+        height: 216
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u4E0B\u886314a"
+      rect:
+        serializedVersion: 2
+        x: 1561
+        y: 3686
+        width: 343
+        height: 216
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: scene
+  assetBundleVariant: 

Assets/Resource/Logo.unity

@@ -612,11 +612,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: f1828554d8ffa12449b221fe29b2c32c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  AuditEdition: 0
-  DebugMode: 1
-  CatchException: 0
-  DebugModeGo: {fileID: 1264531325540048, guid: b22fd2d9abc702d43ac62a412537d4e9,
-    type: 2}
+  AuditEdition: 1
+  DebugMode: 0
+  CatchException: 1
+  DebugModeGo: {fileID: 0}
 --- !u!4 &1833966245
 Transform:
   m_ObjectHideFlags: 0

Assets/Resource/Prefab/Object/DebugMode.prefab

@@ -251,7 +251,7 @@ MonoBehaviour:
   - {fileID: 1649364772911118, guid: 08a1f522944c12245b657272217bf6b7, type: 2}
   - {fileID: 1419661773526862, guid: 034390a4ac0a8aa40863954a4a717afb, type: 2}
   - {fileID: 1766945874161584, guid: 8dca2c526a81c534ab9271aa85c7fe34, type: 2}
-  - {fileID: 2800000, guid: 8d523bac11c2f3742ab88a2cbd71bf39, type: 3}
+  - {fileID: 2800000, guid: c486bd2e1e577b24a86013546709abda, type: 3}
   - {fileID: 4800000, guid: 62507a9ea3ab77f4db3a493bdcbe5eff, type: 3}
   - {fileID: 2100000, guid: fb2dfea585d68dc47a46204dac2928d9, type: 2}
   - {fileID: 1388920081486088, guid: e7e5120af8916d144931c09850445367, type: 2}
@@ -287,19 +287,15 @@ MonoBehaviour:
   - {fileID: 21300018, guid: 980c962c52249774e9266e82d2496d13, type: 3}
   - {fileID: 21300000, guid: 1f1210050a455994aaf12f941c81ee57, type: 3}
   - {fileID: 1584217464481202, guid: 6bdee3b429ae9ea45bedbab463b1f914, type: 2}
-  - {fileID: 21300282, guid: 8d523bac11c2f3742ab88a2cbd71bf39, type: 3}
-  - {fileID: 21300280, guid: 8d523bac11c2f3742ab88a2cbd71bf39, type: 3}
-  - {fileID: 21300276, guid: 8d523bac11c2f3742ab88a2cbd71bf39, type: 3}
-  - {fileID: 21300284, guid: 8d523bac11c2f3742ab88a2cbd71bf39, type: 3}
-  - {fileID: 21300278, guid: 8d523bac11c2f3742ab88a2cbd71bf39, type: 3}
   - {fileID: 1422722603004606, guid: f66999d8c3be4ff46b7dbde0417af018, type: 2}
   - {fileID: 1405543926191242, guid: c4b5d8c946975864492b168f89e68abc, type: 2}
   - {fileID: 21300000, guid: 800334d458bc8994eb9936152a80ef43, type: 3}
+  - {fileID: 2800000, guid: c0256ea9e745dc544ae7035b55f87b84, type: 3}
   ConfigList:
   - {fileID: 4900000, guid: f039d2181a3e9ea418ff5f211730b175, type: 3}
   - {fileID: 4900000, guid: ff8c2496a2cfe6e4eaa5262e9d7b0b2a, type: 3}
   - {fileID: 4900000, guid: 592b5873809f003499db8a5484f2b765, type: 3}
-  - {fileID: 4900000, guid: cf10bfe715240ea4e87102475ca55678, type: 3}
+  - {fileID: 4900000, guid: 5dc33eba5b1a31e41b1a4e73bc26f716, type: 3}
   - {fileID: 4900000, guid: aed362854a581da4399847ab3c71acce, type: 3}
   - {fileID: 4900000, guid: 5f649838ec2ce1d43b1b0cc6326149b0, type: 3}
   - {fileID: 4900000, guid: 4e6ffe6a76751f64fbe4a8e9187d73d7, type: 3}
@@ -322,5 +318,6 @@ MonoBehaviour:
   - {fileID: 4900000, guid: 2a6d8a1acd28b9b40acaa68244594b9d, type: 3}
   - {fileID: 4900000, guid: d9f61a725b556c844a98ee0b486eabe7, type: 3}
   - {fileID: 4900000, guid: 6bf784d003b5c104e94531afb827212a, type: 3}
+  - {fileID: 4900000, guid: cdbea75251ed3a7429b4644cf8092c72, type: 3}
   DiscardList: []
   PlazaRoomList: []

Assets/Resource/Shader/DragonboneUGUIMat.mat

@@ -48,7 +48,7 @@ Material:
     - first:
         name: _MainTex
       second:
-        m_Texture: {fileID: 2800000, guid: 8d523bac11c2f3742ab88a2cbd71bf39, type: 3}
+        m_Texture: {fileID: 2800000, guid: c486bd2e1e577b24a86013546709abda, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - first:

Assets/Resource/XML/Config/dressRoom_config.xml

@@ -35,6 +35,10 @@
   <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="" />
   <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="" />
   <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="" />
+  <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="" />
+  <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="" />
+  <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" />
+  <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" />
   <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="" />
   <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="" />
   <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="" />
@@ -52,6 +56,9 @@
   <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="" />
   <item id="416" jump_frequency="" type="6" index="15" bodypart="3" level="15" buy_currency="2" buy_amt="300" buy_advance_currency="" buy_advance_amt="" pixelSize="40" iconOffset="15" icon1offset="-35,0" icon2offset="" spriteName="鞋子14-1,鞋子14-2" spriteAlpha="" armatureName="鞋子16" extraBodypart="" extraArmatureName="" ignore="" icon0offset="35,0" />
   <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" />
+  <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="" />
+  <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="" />
+  <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="" />
   <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="" />
   <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="" />
   <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="" />
@@ -71,6 +78,9 @@
   <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="" />
   <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="" />
   <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="" />
+  <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="" />
+  <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="" />
+  <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="" />
   <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="" />
   <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="" />
   <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="" />
@@ -85,6 +95,8 @@
   <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="" />
   <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="" />
   <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="" />
+  <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="" />
+  <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="" />
   <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="" />
   <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="" />
   <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="" />
@@ -104,9 +116,14 @@
   <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="70" 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="" />
   <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="110" iconOffset="" icon1offset="" icon2offset="" spriteName="上衣14" spriteAlpha="" armatureName="上衣14" extraBodypart="10,9" extraArmatureName="" ignore="" icon0offset="" />
   <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="90" 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="" />
+  <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="" />
+  <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="80" 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="" />
+  <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="80" 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="" />
   <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="" />
   <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="" />
   <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="" />
+  <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="" />
+  <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="" />
   <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="" />
   <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="" />
   <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="" />

Assets/Resource/XML/PlayerConfig.xml

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

Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -829,6 +829,10 @@
     <Armature34 desc=""><![CDATA[名字]]></Armature34>
     <Armature35 desc=""><![CDATA[名字]]></Armature35>
     <Armature36 desc=""><![CDATA[名字]]></Armature36>
+    <Armature37 desc=""><![CDATA[名字]]></Armature37>
+    <Armature38 desc=""><![CDATA[名字]]></Armature38>
+    <Armature39 desc=""><![CDATA[名字]]></Armature39>
+    <Armature40 desc=""><![CDATA[名字]]></Armature40>
     <Armature201 desc=""><![CDATA[蛋糕诱惑]]></Armature201>
     <Armature202 desc=""><![CDATA[小纯真]]></Armature202>
     <Armature203 desc=""><![CDATA[清凉之夏]]></Armature203>
@@ -848,6 +852,9 @@
     <Armature217 desc=""><![CDATA[青梦公主]]></Armature217>
     <Armature218 desc=""><![CDATA[名字]]></Armature218>
     <Armature219 desc=""><![CDATA[名字]]></Armature219>
+    <Armature220 desc=""><![CDATA[名字]]></Armature220>
+    <Armature221 desc=""><![CDATA[名字]]></Armature221>
+    <Armature222 desc=""><![CDATA[名字]]></Armature222>
     <Armature401 desc=""><![CDATA[小皮鞋]]></Armature401>
     <Armature402 desc=""><![CDATA[小靴子(黑)]]></Armature402>
     <Armature403 desc=""><![CDATA[小靴子(蓝)]]></Armature403>
@@ -865,6 +872,9 @@
     <Armature415 desc=""><![CDATA[海星]]></Armature415>
     <Armature416 desc=""><![CDATA[名字]]></Armature416>
     <Armature417 desc=""><![CDATA[名字]]></Armature417>
+    <Armature418 desc=""><![CDATA[名字]]></Armature418>
+    <Armature419 desc=""><![CDATA[名字]]></Armature419>
+    <Armature420 desc=""><![CDATA[名字]]></Armature420>
     <Armature601 desc=""><![CDATA[赤炎蝴蝶结]]></Armature601>
     <Armature602 desc=""><![CDATA[粉色小花]]></Armature602>
     <Armature603 desc=""><![CDATA[兔耳萌萌]]></Armature603>
@@ -879,6 +889,8 @@
     <Armature612 desc=""><![CDATA[小黄鸭]]></Armature612>
     <Armature613 desc=""><![CDATA[名字]]></Armature613>
     <Armature614 desc=""><![CDATA[名字]]></Armature614>
+    <Armature615 desc=""><![CDATA[名字]]></Armature615>
+    <Armature616 desc=""><![CDATA[名字]]></Armature616>
     <Armature801 desc=""><![CDATA[小鱼]]></Armature801>
     <Armature802 desc=""><![CDATA[可爱宝贝]]></Armature802>
     <Armature803 desc=""><![CDATA[浮生小白]]></Armature803>
@@ -898,9 +910,14 @@
     <Armature817 desc=""><![CDATA[小洋装(蓝)]]></Armature817>
     <Armature818 desc=""><![CDATA[名字]]></Armature818>
     <Armature819 desc=""><![CDATA[名字]]></Armature819>
+    <Armature820 desc=""><![CDATA[名字]]></Armature820>
+    <Armature821 desc=""><![CDATA[名字]]></Armature821>
+    <Armature822 desc=""><![CDATA[名字]]></Armature822>
     <Armature1001 desc=""><![CDATA[无翅膀]]></Armature1001>
     <Armature1002 desc=""><![CDATA[薄翼]]></Armature1002>
     <Armature1003 desc=""><![CDATA[精灵之翼]]></Armature1003>
+    <Armature1004 desc=""><![CDATA[名字]]></Armature1004>
+    <Armature1005 desc=""><![CDATA[名字]]></Armature1005>
   </DressRoom>
   <Tip>
     <Tip1 desc=""><![CDATA[玩累了就休息一下，即使离线，花园也有收益哟~]]></Tip1>

Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -829,6 +829,10 @@
     <Armature34 desc=""><![CDATA[]]></Armature34>
     <Armature35 desc=""><![CDATA[]]></Armature35>
     <Armature36 desc=""><![CDATA[]]></Armature36>
+    <Armature37 desc=""><![CDATA[]]></Armature37>
+    <Armature38 desc=""><![CDATA[]]></Armature38>
+    <Armature39 desc=""><![CDATA[]]></Armature39>
+    <Armature40 desc=""><![CDATA[]]></Armature40>
     <Armature201 desc=""><![CDATA[蛋糕誘惑]]></Armature201>
     <Armature202 desc=""><![CDATA[小純真]]></Armature202>
     <Armature203 desc=""><![CDATA[清涼之夏]]></Armature203>
@@ -848,6 +852,9 @@
     <Armature217 desc=""><![CDATA[青夢公主]]></Armature217>
     <Armature218 desc=""><![CDATA[]]></Armature218>
     <Armature219 desc=""><![CDATA[]]></Armature219>
+    <Armature220 desc=""><![CDATA[]]></Armature220>
+    <Armature221 desc=""><![CDATA[]]></Armature221>
+    <Armature222 desc=""><![CDATA[]]></Armature222>
     <Armature401 desc=""><![CDATA[小皮鞋]]></Armature401>
     <Armature402 desc=""><![CDATA[小靴子(黑)]]></Armature402>
     <Armature403 desc=""><![CDATA[小靴子(藍)]]></Armature403>
@@ -865,6 +872,9 @@
     <Armature415 desc=""><![CDATA[海星]]></Armature415>
     <Armature416 desc=""><![CDATA[]]></Armature416>
     <Armature417 desc=""><![CDATA[]]></Armature417>
+    <Armature418 desc=""><![CDATA[]]></Armature418>
+    <Armature419 desc=""><![CDATA[]]></Armature419>
+    <Armature420 desc=""><![CDATA[]]></Armature420>
     <Armature601 desc=""><![CDATA[赤炎蝴蝶結]]></Armature601>
     <Armature602 desc=""><![CDATA[粉色小花]]></Armature602>
     <Armature603 desc=""><![CDATA[兔耳萌萌]]></Armature603>
@@ -879,6 +889,8 @@
     <Armature612 desc=""><![CDATA[小黃鴨]]></Armature612>
     <Armature613 desc=""><![CDATA[]]></Armature613>
     <Armature614 desc=""><![CDATA[]]></Armature614>
+    <Armature615 desc=""><![CDATA[]]></Armature615>
+    <Armature616 desc=""><![CDATA[]]></Armature616>
     <Armature801 desc=""><![CDATA[小魚]]></Armature801>
     <Armature802 desc=""><![CDATA[可愛寶貝]]></Armature802>
     <Armature803 desc=""><![CDATA[浮生小白]]></Armature803>
@@ -898,9 +910,14 @@
     <Armature817 desc=""><![CDATA[小洋裝(藍)]]></Armature817>
     <Armature818 desc=""><![CDATA[]]></Armature818>
     <Armature819 desc=""><![CDATA[]]></Armature819>
+    <Armature820 desc=""><![CDATA[]]></Armature820>
+    <Armature821 desc=""><![CDATA[]]></Armature821>
+    <Armature822 desc=""><![CDATA[]]></Armature822>
     <Armature1001 desc=""><![CDATA[無翅膀]]></Armature1001>
     <Armature1002 desc=""><![CDATA[薄翼]]></Armature1002>
     <Armature1003 desc=""><![CDATA[精靈之翼]]></Armature1003>
+    <Armature1004 desc=""><![CDATA[]]></Armature1004>
+    <Armature1005 desc=""><![CDATA[]]></Armature1005>
   </DressRoom>
   <Tip>
     <Tip1 desc=""><![CDATA[玩累了就休息一下，即使離線，花園也有收益喲~]]></Tip1>

Assets/Resource/XML/lan/English.xml

@@ -828,6 +828,10 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack12>
     <Armature34 desc=""><![CDATA[]]></Armature34>
     <Armature35 desc=""><![CDATA[]]></Armature35>
     <Armature36 desc=""><![CDATA[]]></Armature36>
+    <Armature37 desc=""><![CDATA[]]></Armature37>
+    <Armature38 desc=""><![CDATA[]]></Armature38>
+    <Armature39 desc=""><![CDATA[]]></Armature39>
+    <Armature40 desc=""><![CDATA[]]></Armature40>
     <Armature201 desc=""><![CDATA[Cake]]></Armature201>
     <Armature202 desc=""><![CDATA[Innocence]]></Armature202>
     <Armature203 desc=""><![CDATA[Cool Summer]]></Armature203>
@@ -847,6 +851,9 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack12>
     <Armature217 desc=""><![CDATA[Sleeping Princess(Blue)]]></Armature217>
     <Armature218 desc=""><![CDATA[]]></Armature218>
     <Armature219 desc=""><![CDATA[]]></Armature219>
+    <Armature220 desc=""><![CDATA[]]></Armature220>
+    <Armature221 desc=""><![CDATA[]]></Armature221>
+    <Armature222 desc=""><![CDATA[]]></Armature222>
     <Armature401 desc=""><![CDATA[Leather Shoes]]></Armature401>
     <Armature402 desc=""><![CDATA[Boots(Black)]]></Armature402>
     <Armature403 desc=""><![CDATA[Boots(Blue)]]></Armature403>
@@ -864,6 +871,9 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack12>
     <Armature415 desc=""><![CDATA[Starfish]]></Armature415>
     <Armature416 desc=""><![CDATA[]]></Armature416>
     <Armature417 desc=""><![CDATA[]]></Armature417>
+    <Armature418 desc=""><![CDATA[]]></Armature418>
+    <Armature419 desc=""><![CDATA[]]></Armature419>
+    <Armature420 desc=""><![CDATA[]]></Armature420>
     <Armature601 desc=""><![CDATA[Big Bowknot]]></Armature601>
     <Armature602 desc=""><![CDATA[Pink Flower]]></Armature602>
     <Armature603 desc=""><![CDATA[Rabbit]]></Armature603>
@@ -878,6 +888,8 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack12>
     <Armature612 desc=""><![CDATA[Yellow Duck]]></Armature612>
     <Armature613 desc=""><![CDATA[]]></Armature613>
     <Armature614 desc=""><![CDATA[]]></Armature614>
+    <Armature615 desc=""><![CDATA[]]></Armature615>
+    <Armature616 desc=""><![CDATA[]]></Armature616>
     <Armature801 desc=""><![CDATA[Fish]]></Armature801>
     <Armature802 desc=""><![CDATA[Lovely Baby]]></Armature802>
     <Armature803 desc=""><![CDATA[The White]]></Armature803>
@@ -897,9 +909,14 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack12>
     <Armature817 desc=""><![CDATA[Cute Dress(Blue)]]></Armature817>
     <Armature818 desc=""><![CDATA[]]></Armature818>
     <Armature819 desc=""><![CDATA[]]></Armature819>
+    <Armature820 desc=""><![CDATA[]]></Armature820>
+    <Armature821 desc=""><![CDATA[]]></Armature821>
+    <Armature822 desc=""><![CDATA[]]></Armature822>
     <Armature1001 desc=""><![CDATA[No Wings]]></Armature1001>
     <Armature1002 desc=""><![CDATA[Thin Wings]]></Armature1002>
     <Armature1003 desc=""><![CDATA[Elf Wings]]></Armature1003>
+    <Armature1004 desc=""><![CDATA[]]></Armature1004>
+    <Armature1005 desc=""><![CDATA[]]></Armature1005>
   </DressRoom>
   <Tip>
     <Tip1 desc=""><![CDATA[The visitors will come to pay the tickest for your garden even if your are offline!]]></Tip1>

Assets/Script/Editor/EditorAuxiliary.cs

@@ -203,7 +203,7 @@ public class EditorAuxiliary : Editor
             SpriteMetaData spriteMetaData = new SpriteMetaData();
 
             int x = int.Parse(jsonData[i].Inst_Object["x"].ToJson().Trim('"'));
-            int y = int.Parse(jsonData[i].Inst_Object["y"].ToJson().Trim('"'));
+            int y = int.Parse(jsonData[i].Inst_Object["y"].ToJson().Trim('"'))/* - 2050*/;
             int width = int.Parse(jsonData[i].Inst_Object["width"].ToJson().Trim('"'));
             int height = int.Parse(jsonData[i].Inst_Object["height"].ToJson().Trim('"'));
             string spriteName = jsonData[i].Inst_Object["name"].ToJson().Trim('"');

Assets/Script/Label/ResourceLabel.cs

@@ -91,9 +91,11 @@ public class ResourceLabel
     public static string MinigameRateStar = "游戏等级评分";
 
     public static string RobotConfig = "robot_config";
-    public static string StandTex = "stand_tex";
+    public static string StandTex0 = "stand_tex_0";
+    public static string StandTex1 = "stand_tex_1";
     public static string StandSke = "stand_ske";
-    public static string StandTexture = "stand_texture";
+    public static string StandTexture0 = "stand_texture_0";
+    public static string StandTexture1 = "stand_texture_1";
     public static string PhonoGraphTex = "PhonoGraph_tex";
     public static string PhonoGraphSke = "PhonoGraph_ske";
     public static string PhonoGraphTexture = "PhonoGraph_texture";

Assets/Script/Manage/ConfigManager.cs

@@ -1417,6 +1417,13 @@ public class ConfigManager : Regist
             ToVersion20(nativeDoc, defaultDoc);
         }
 
+        if (nativeVersion < 21)
+        {
+            Debug.LogWarning("UpdateArchive to 21");
+
+            ToVersion21(nativeDoc, defaultDoc);
+        }
+
         return nativeDoc;
     }
 
@@ -1738,4 +1745,17 @@ public class ConfigManager : Regist
 
         return nativeDoc;
     }
+
+    public static XmlDocument ToVersion21(XmlDocument nativeDoc, XmlDocument defaultDoc)
+    {
+        nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value = 21.ToString();
+
+        string persistentFolderPath = $"{Application.persistentDataPath}{Path.DirectorySeparatorChar}HotUpdate";
+        if (Directory.Exists(persistentFolderPath))
+        {
+            Directory.Delete(persistentFolderPath, true);
+        }
+
+        return nativeDoc;
+    }
 }

Assets/Script/Manage/PlayerManager.cs

@@ -51,7 +51,10 @@ public class PlayerManager : Regist
             UnityFactory.factory.LoadDragonBonesData(ResourceManager.Load<TextAsset>(ResourceLabel.StandSke, Folder.Config));
 
             Initializer.DebugText.text = "error : mp0-2";
-            UnityFactory.factory.LoadTextureAtlasData(ResourceManager.Load<TextAsset>(ResourceLabel.StandTex, Folder.Config), ResourceLabel.StandTexture);
+            UnityFactory.factory.LoadTextureAtlasData(ResourceManager.Load<TextAsset>(ResourceLabel.StandTex0, Folder.Config), ResourceLabel.StandTexture0);
+
+            Initializer.DebugText.text = "error : mp0-3";
+            UnityFactory.factory.LoadTextureAtlasData(ResourceManager.Load<TextAsset>(ResourceLabel.StandTex1, Folder.Config), ResourceLabel.StandTexture1);
 
             Inited = true;
         }

Assets/Script/Object/DragonBoneGraphic.cs

@@ -9,7 +9,7 @@ using UnityEngine.UI;
 [ExecuteInEditMode, RequireComponent(typeof(CanvasRenderer), typeof(RectTransform))]
 public class DragonBoneGraphic : MaskableGraphic
 {
-    private Material OriginMaterial;
+    //private Material OriginMaterial;
 
     public Mesh SharedMesh
     {
@@ -62,7 +62,7 @@ public class DragonBoneGraphic : MaskableGraphic
         {
             sharedMesh = meshFilter.sharedMesh;
         }
-        OriginMaterial = material;
+        //OriginMaterial = material;
         material = Lib.DragonboneUGUIMat;
         if (meshRenderer.sharedMaterial != null)
         {
@@ -99,7 +99,8 @@ public class DragonBoneGraphic : MaskableGraphic
         }
         if (copyTrans.gameObject.activeInHierarchy == false)
         {
-            gameObject.SetActive(false);
+            DestroyImmediate(gameObject);
+            return;
         }
         int siblingIndex = transform.GetSiblingIndex();
         transform.SetParent(copyTrans.parent);

Assets/Script/Object/Player.cs

@@ -1385,6 +1385,39 @@ public class Player : Regist , IPointerClickHandler
     }
 
 
+    private List<TweenRenderer> fadeAnims = new List<TweenRenderer>();
+    public void PlayFadeOutAnim()
+    {
+        fadeAnims = new List<TweenRenderer>();
+        if (fadeAnims.Count == 0)
+        {
+            Renderer[] renderers = PlayerManager.Player.UAC.transform.GetComponentsInChildren<Renderer>(true);
+            foreach (var renderer in renderers)
+            {
+                TweenRenderer fadeAnim = AnimManager.CreateTweenRenderer(renderer, 0, 1, 0.25f, true, true, Curve.EaseOutQuad);
+                fadeAnim.UseSharedMaterial = true;
+                fadeAnims.Add(fadeAnim);
+            }
+        }
+        foreach (var fadeAnim in fadeAnims)
+        {
+            fadeAnim.StartBackward();
+        }
+    }
+
+    public void PlayFadeInAnim()
+    {
+        foreach (var fadeAnim in fadeAnims)
+        {
+            if (fadeAnim.Target == null)
+            {
+                continue;
+            }
+            fadeAnim.StartForward();
+        }
+    }
+
+
     private List<UnityUGUIDisplay> uguiDisplays;
     public void DisplayInUI(float scale)
     {
@@ -1462,7 +1495,12 @@ public class Player : Regist , IPointerClickHandler
         if (!PlayerManager.Inited)
         {
             UnityFactory.factory.LoadDragonBonesData(ResourceManager.Load<TextAsset>(ResourceLabel.StandSke, Folder.Config));
-            UnityFactory.factory.LoadTextureAtlasData(ResourceManager.Load<TextAsset>(ResourceLabel.StandTex, Folder.Config), ResourceLabel.StandTexture);
+
+            Initializer.DebugText.text = "error : mp0-2";
+            UnityFactory.factory.LoadTextureAtlasData(ResourceManager.Load<TextAsset>(ResourceLabel.StandTex0, Folder.Config), ResourceLabel.StandTexture0);
+
+            Initializer.DebugText.text = "error : mp0-3";
+            UnityFactory.factory.LoadTextureAtlasData(ResourceManager.Load<TextAsset>(ResourceLabel.StandTex1, Folder.Config), ResourceLabel.StandTexture1);
 
             PlayerManager.Inited = true;
         }
@@ -1622,6 +1660,10 @@ public class Player : Regist , IPointerClickHandler
             foreach (var display in uguiDisplays)
             {
                 //Debug.Log(display.dbGraphic.copyTrans.name);
+                if (display.dbGraphic == null)
+                {
+                    continue;
+                }
                 display.dbGraphic.transform.SetAsLastSibling();
             }
 
@@ -1707,9 +1749,9 @@ public class Player : Regist , IPointerClickHandler
             {
                 rightTexture = PlayerManager.GetCloseTexture(closeItem.Sprites[1].name);
             }
-            UnityFactory.factory.ReplaceSlotDisplay("stand_ske", "Armature", "鞋子左", "鞋子15-2_1", LeftShoeSlot, 
+            UnityFactory.factory.ReplaceSlotDisplay("stand", "Armature", "鞋子左", "鞋子15-2_1", LeftShoeSlot, 
                 leftTexture, new Material(Shader.Find("Sprites/Default")));
-            UnityFactory.factory.ReplaceSlotDisplay("stand_ske", "Armature", "鞋子右", "鞋子15-1_2", RightShoeSlot,
+            UnityFactory.factory.ReplaceSlotDisplay("stand", "Armature", "鞋子右", "鞋子15-1_2", RightShoeSlot,
                 rightTexture, new Material(Shader.Find("Sprites/Default")));
             leftShoeDisplayName = closeItem.Sprites[0].name;
             if (closeItem.Sprites.Length == 1)

Assets/Script/Social/FashionShowEditPage.cs

@@ -84,7 +84,7 @@ public class FashionShowEditPage : Regist
     public static Player DisplayPlayer;
     private static KV<int, double> TotalCoin;
     private static KV<int, double> TotalDiamond;
-    private static TweenRenderer PlayerTween;
+    //private static TweenRenderer PlayerTween;
     private static GetFashionShowData FashionShowData;
     private static List<int> CloseIDs = new List<int>();
     //private static List<string> CloseNames = new List<string>();
@@ -251,8 +251,8 @@ public class FashionShowEditPage : Regist
             CloseItem closeItem = PlayerManager.CloseItemDictionary[closeID];
             closeItem.ChangeDress(DisplayPlayer, false);
         }
-        DelayCall.Call(1, () => { DisplayPlayer.ResetDepth(); DisplayPlayer.DisplayInUI(37.5f); });
-
+        DelayCall.Call(1, () => { DisplayPlayer.DisplayInUI(37.5f); DisplayPlayer.ResetDepth(); });
+        
         float cuteRate = FashionShowData.GetCuteRate();
         float gloryRate = FashionShowData.GetGloryRate();
         float graceRate = FashionShowData.GetGraceRate();
@@ -303,10 +303,12 @@ public class FashionShowEditPage : Regist
 
     private static void TransitPanel()
     {
-        Renderer renderer = PlayerManager.Player.HeadSlot.UnityTransform.GetComponentInChildren<Renderer>(true);
-        PlayerTween = AnimManager.CreateTweenRenderer(renderer, 0, 1, 0.25f, false, true, Curve.EaseOutQuad);
-        PlayerTween.UseSharedMaterial = true;
-        PlayerTween.StartBackward();
+        //Renderer renderer = PlayerManager.Player.HeadSlot.UnityTransform.GetComponentInChildren<Renderer>(true);
+        //PlayerTween = AnimManager.CreateTweenRenderer(renderer, 0, 1, 0.25f, false, true, Curve.EaseOutQuad);
+        //PlayerTween.UseSharedMaterial = true;
+        //PlayerTween.StartBackward();
+
+        PlayerManager.Player.PlayFadeOutAnim();
 
         ChangeDressPanel.GetTweenCG().AddEventOnetime(EventType.BackwardFinish, () => { Panel.TweenForVec(); });
         ChangeDressPanel.TweenBacCG();
@@ -414,10 +416,12 @@ public class FashionShowEditPage : Regist
             //DisplayPlayer.DisplayInScene();
             //ResourceManager.Save(DisplayPlayer);
 
-            if (PlayerTween != null)
-            {
-                PlayerTween.StartForward();
-            }
+            //if (PlayerTween != null)
+            //{
+            //    PlayerTween.StartForward();
+            //}
+
+            PlayerManager.Player.PlayFadeInAnim();
 
             Panel.GetTweenVec().AddEventOnetime(EventType.BackwardFinish, () => { ChangeDressPanel.TweenForCG(); });
             Panel.TweenBacVec();

Assets/Script/Social/FashionShowHomePage.cs

@@ -188,6 +188,7 @@ public class FashionShowHomePage : Regist
 
     public static void HidePanel()
     {
+        GardenManager.RetrieveAllElf();
         TweenRoot tween = Panel.GetTweenVec();
         tween.AddEventOnetime
         (

Assets/Script/Tool/Auxiliary.cs

@@ -156,6 +156,7 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.Space))
         {
+            //GardenManager.CreateElfTimer = 0;
             DebugManager.ResetGardenLevel(50);
             //foreach (var skill in Manager.UsingSkillList)
             //{

Assets/Script/Tool/Bundle.cs

@@ -275,11 +275,15 @@ public class Bundle : MonoBehaviour
 
 #if UNITY_EDITOR
 
-            string assetPath = AssetDatabase.GetAssetPath(ResourceManager.Load<Texture2D>("stand_texture", Folder.Scene));
 
-            Object[] objects = AssetDatabase.LoadAllAssetsAtPath(assetPath);
+            List<Object> objects = new List<Object>();
+            string assetPath = AssetDatabase.GetAssetPath(ResourceManager.Load<Texture2D>("stand_texture_0", Folder.Scene));
+            objects.AddRange(AssetDatabase.LoadAllAssetsAtPath(assetPath));
 
-            for (int i = 0; i < objects.Length; i++)
+            assetPath = AssetDatabase.GetAssetPath(ResourceManager.Load<Texture2D>("stand_texture_1", Folder.Scene));
+            objects.AddRange(AssetDatabase.LoadAllAssetsAtPath(assetPath));
+
+            for (int i = 0; i < objects.Count; i++)
             {
                 Sprite sprite = objects[i] as Sprite;
 
@@ -317,9 +321,11 @@ public class Bundle : MonoBehaviour
                 ResourceManager.ObjectDictionary.UniqueAdd(sprites[i].name, sprites[i]);
             }
 
-            Object[] objects = Scene.LoadAssetWithSubAssets("stand_texture", typeof(Sprite));
+            List<Object> objects = new List<Object>();
+            objects.AddRange(Scene.LoadAssetWithSubAssets("stand_texture_0", typeof(Sprite)));
+            objects.AddRange(Scene.LoadAssetWithSubAssets("stand_texture_1", typeof(Sprite)));
 
-            for (int i = 0; i < objects.Length; i++)
+            for (int i = 0; i < objects.Count; i++)
             {
                 Sprite sprite = (Sprite) objects[i];
 
@@ -818,7 +824,7 @@ public class Bundle : MonoBehaviour
                 needUpdate = localMD5 != HttpManager.Md5;
                 //Debug.LogWarning($"NeedUpdate : {needUpdate}");
             }
-            if (Application.isEditor)
+            if (Application.isEditor || Application.isMobilePlatform)
             {
                 needUpdate = false;
             }

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: []

第五期.txt

@@ -1,8 +1,10 @@
-上衣1的Offset
+增加服装流程 骨骼位置 UI上的位置 语言文档 存档
+
 
-进入搭配秀界面蜜蜂动画会死机
 
-角色的鞋子没有Alpha动画(试衣间)
+打开EditPage
+
+上衣1的Offset
 
 5兆金币成就