增加一套服装

Assets/Resource/Logo.unity

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

Assets/Resource/Prefab/Object/DebugMode.prefab

@@ -299,3 +299,17 @@ MonoBehaviour:
   - {fileID: 4900000, guid: 37bda6257ca3a7f4e82ee65e8fde6832, type: 3}
   DiscardList: []
   PlazaRoomList: []
+  DressList:
+  - {fileID: 4900000, guid: 578290abd89616344820081776adb70a, type: 3}
+  - {fileID: 2800000, guid: 605aad146433a1d459ac657b1d0d7710, type: 3}
+  - {fileID: 4900000, guid: 474b844c27d8bf94e807b68f790c39d3, type: 3}
+  - {fileID: 2800000, guid: 595ba4eea8a77cd488494ec8664afc81, type: 3}
+  - {fileID: 4900000, guid: 4ed6a8f18430d8743addbcb7bb976b48, type: 3}
+  - {fileID: 2800000, guid: 9134c52440e84c94691416af2d76f4e6, type: 3}
+  - {fileID: 4900000, guid: 11194f1ec403c4b478fd9c3fb3ef8e6c, type: 3}
+  - {fileID: 2800000, guid: 5fa5bf8d920e02e478f5f48fd4a17c4d, type: 3}
+  - {fileID: 4900000, guid: 0c710b3abfc5cf7429d8ebd1a555598f, type: 3}
+  - {fileID: 21300000, guid: 605aad146433a1d459ac657b1d0d7710, type: 3}
+  - {fileID: 21300000, guid: 595ba4eea8a77cd488494ec8664afc81, type: 3}
+  - {fileID: 21300000, guid: 9134c52440e84c94691416af2d76f4e6, type: 3}
+  - {fileID: 21300000, guid: 5fa5bf8d920e02e478f5f48fd4a17c4d, type: 3}

Assets/Resource/Prefab/PrefabUI/Canvas.prefab

@@ -908,7 +908,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!1 &1053465316034782
 GameObject:
   m_ObjectHideFlags: 1
@@ -48723,7 +48723,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 0
+  m_RaycastTarget: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []

Assets/Resource/Sprite/Editor/Dress.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 68e05245b424f4643bb7cc3ede9f586c
+folderAsset: yes
+timeCreated: 1516588704
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resource/Sprite/Editor/Dress/Dress_ske.json.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 578290abd89616344820081776adb70a
+timeCreated: 1516589539
+licenseType: Pro
+TextScriptImporter:
+  userData: 
+  assetBundleName: dress
+  assetBundleVariant: 

Assets/Resource/Sprite/Editor/Dress/上衣14.png.meta

@@ -0,0 +1,100 @@
+fileFormatVersion: 2
+guid: 605aad146433a1d459ac657b1d0d7710
+timeCreated: 1516589527
+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
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: iPhone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: WebGL
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: dress
+  assetBundleVariant: 

Assets/Resource/Sprite/Editor/Dress/上衣14_tex.json

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

Assets/Resource/Sprite/Editor/Dress/上衣14_tex.json.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 474b844c27d8bf94e807b68f790c39d3
+timeCreated: 1516598870
+licenseType: Pro
+TextScriptImporter:
+  userData: 
+  assetBundleName: dress
+  assetBundleVariant: 

Assets/Resource/Sprite/Editor/Dress/下衣14.png.meta

@@ -0,0 +1,100 @@
+fileFormatVersion: 2
+guid: 595ba4eea8a77cd488494ec8664afc81
+timeCreated: 1516589527
+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
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: iPhone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: WebGL
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: dress
+  assetBundleVariant: 

Assets/Resource/Sprite/Editor/Dress/下衣14_tex.json

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

Assets/Resource/Sprite/Editor/Dress/下衣14_tex.json.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4ed6a8f18430d8743addbcb7bb976b48
+timeCreated: 1516598870
+licenseType: Pro
+TextScriptImporter:
+  userData: 
+  assetBundleName: dress
+  assetBundleVariant: 

Assets/Resource/Sprite/Editor/Dress/头发14（粉色）.png.meta

@@ -0,0 +1,100 @@
+fileFormatVersion: 2
+guid: 9134c52440e84c94691416af2d76f4e6
+timeCreated: 1516589527
+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
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: iPhone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: WebGL
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: dress
+  assetBundleVariant: 

Assets/Resource/Sprite/Editor/Dress/头发14（粉色）_tex.json

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

Assets/Resource/Sprite/Editor/Dress/头发14（粉色）_tex.json.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 11194f1ec403c4b478fd9c3fb3ef8e6c
+timeCreated: 1516598870
+licenseType: Pro
+TextScriptImporter:
+  userData: 
+  assetBundleName: dress
+  assetBundleVariant: 

Assets/Resource/Sprite/Editor/Dress/装饰14.png.meta

@@ -0,0 +1,100 @@
+fileFormatVersion: 2
+guid: 5fa5bf8d920e02e478f5f48fd4a17c4d
+timeCreated: 1516589527
+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
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: iPhone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: WebGL
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: dress
+  assetBundleVariant: 

Assets/Resource/Sprite/Editor/Dress/装饰14_tex.json

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

Assets/Resource/Sprite/Editor/Dress/装饰14_tex.json.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0c710b3abfc5cf7429d8ebd1a555598f
+timeCreated: 1516598870
+licenseType: Pro
+TextScriptImporter:
+  userData: 
+  assetBundleName: dress
+  assetBundleVariant: 

Assets/Resource/XML/Config/dressRoom_config.xml

@@ -29,6 +29,7 @@
   <item id="28" jump_frequency="" type="1" index="26" bodypart="1" level="50" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="115" iconOffset="" icon1offset="" icon2offset="" spriteName="头发8(紫)" spriteAlpha="" armatureName="头发8(紫)" extraBodypart="" extraArmatureName="" ignore="" />
   <item id="29" jump_frequency="" type="1" index="27" bodypart="1" level="50" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="115" iconOffset="" icon1offset="" icon2offset="" spriteName="头发8(绿)" spriteAlpha="" armatureName="头发8(绿)" extraBodypart="" extraArmatureName="" ignore="" />
   <item id="30" jump_frequency="" type="1" index="28" bodypart="1" level="50" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="115" iconOffset="" icon1offset="" icon2offset="" spriteName="头发8(黑)" spriteAlpha="" armatureName="头发8(黑)" extraBodypart="" extraArmatureName="" ignore="" />
+  <item id="31" jump_frequency="" type="1" index="29" bodypart="1" level="50" buy_currency="2" buy_amt="500" buy_advance_currency="" buy_advance_amt="" pixelSize="90" iconOffset="" icon1offset="" icon2offset="" spriteName="头发14（粉色）" spriteAlpha="" armatureName="头发14（粉色）" extraBodypart="" extraArmatureName="" ignore="" />
   <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="" icon1offset="" icon2offset="" spriteName="鞋子1" spriteAlpha="" armatureName="鞋子1" extraBodypart="" extraArmatureName="" ignore="" />
   <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="" icon1offset="" icon2offset="" spriteName="2" spriteAlpha="" armatureName="鞋子4" extraBodypart="" extraArmatureName="" ignore="" />
   <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="" icon1offset="" icon2offset="" spriteName="3" spriteAlpha="" armatureName="鞋子5" extraBodypart="" extraArmatureName="" ignore="" />
@@ -61,6 +62,7 @@
   <item id="215" jump_frequency="" type="3" index="14" bodypart="2" level="50" buy_currency="2" buy_amt="1500" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="裙子12" spriteAlpha="" armatureName="裙子12" extraBodypart="" extraArmatureName="" ignore="" />
   <item id="216" jump_frequency="" type="3" index="15" bodypart="2" level="50" buy_currency="2" buy_amt="2000" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="裙子13" spriteAlpha="" armatureName="裙子13" extraBodypart="" extraArmatureName="" ignore="" />
   <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="" />
+  <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="" />
   <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="" />
   <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="" />
   <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="" />
@@ -73,6 +75,7 @@
   <item id="610" jump_frequency="" type="4" index="9" bodypart="4" level="40" buy_currency="2" buy_amt="300" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="头饰10" spriteAlpha="" armatureName="头饰10" extraBodypart="" extraArmatureName="" ignore="" />
   <item id="611" jump_frequency="" type="4" index="10" bodypart="4" level="50" buy_currency="2" buy_amt="350" buy_advance_currency="" buy_advance_amt="" pixelSize="100" iconOffset="" icon1offset="" icon2offset="" spriteName="头饰11" spriteAlpha="" armatureName="头饰11" extraBodypart="" extraArmatureName="" ignore="" />
   <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="" />
+  <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="" />
   <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="" />
   <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="" />
   <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="" />
@@ -90,6 +93,7 @@
   <item id="815" jump_frequency="" type="2" index="14" bodypart="5" level="50" buy_currency="2" buy_amt="600" buy_advance_currency="" buy_advance_amt="" pixelSize="80" iconOffset="" icon1offset="-59.77,16.52" icon2offset="56.81,13.58" spriteName="上衣12,上衣12袖子右,上衣12袖子左" spriteAlpha="" armatureName="上衣12" extraBodypart="10,9" extraArmatureName="短袖12右,短袖12左" ignore="" />
   <item id="816" jump_frequency="" type="2" index="15" bodypart="5" level="50" buy_currency="2" buy_amt="650" buy_advance_currency="" buy_advance_amt="" pixelSize="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="" />
   <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="" />
+  <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="" />
   <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="" />
   <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="" />
   <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="" />

Assets/Resource/XML/PlayerConfig.xml

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

Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -817,6 +817,7 @@
     <Armature28 desc=""><![CDATA[洋娃娃(紫)]]></Armature28>
     <Armature29 desc=""><![CDATA[洋娃娃(绿)]]></Armature29>
     <Armature30 desc=""><![CDATA[洋娃娃(黑)]]></Armature30>
+    <Armature31 desc=""><![CDATA[]]></Armature31>
     <Armature201 desc=""><![CDATA[蛋糕诱惑]]></Armature201>
     <Armature202 desc=""><![CDATA[小纯真]]></Armature202>
     <Armature203 desc=""><![CDATA[清凉之夏]]></Armature203>
@@ -834,6 +835,7 @@
     <Armature215 desc=""><![CDATA[蓝宝石]]></Armature215>
     <Armature216 desc=""><![CDATA[粉梦公主]]></Armature216>
     <Armature217 desc=""><![CDATA[青梦公主]]></Armature217>
+    <Armature218 desc=""><![CDATA[]]></Armature218>
     <Armature401 desc=""><![CDATA[小皮鞋]]></Armature401>
     <Armature402 desc=""><![CDATA[小靴子(黑)]]></Armature402>
     <Armature403 desc=""><![CDATA[小靴子(蓝)]]></Armature403>
@@ -861,6 +863,7 @@
     <Armature610 desc=""><![CDATA[蓝梦圆点]]></Armature610>
     <Armature611 desc=""><![CDATA[小皇冠]]></Armature611>
     <Armature612 desc=""><![CDATA[小黄鸭]]></Armature612>
+    <Armature613 desc=""><![CDATA[]]></Armature613>
     <Armature801 desc=""><![CDATA[小鱼]]></Armature801>
     <Armature802 desc=""><![CDATA[可爱宝贝]]></Armature802>
     <Armature803 desc=""><![CDATA[浮生小白]]></Armature803>
@@ -878,6 +881,7 @@
     <Armature815 desc=""><![CDATA[水手服]]></Armature815>
     <Armature816 desc=""><![CDATA[小洋装(粉)]]></Armature816>
     <Armature817 desc=""><![CDATA[小洋装(蓝)]]></Armature817>
+    <Armature818 desc=""><![CDATA[]]></Armature818>
     <Armature1001 desc=""><![CDATA[无翅膀]]></Armature1001>
     <Armature1002 desc=""><![CDATA[薄翼]]></Armature1002>
     <Armature1003 desc=""><![CDATA[精灵之翼]]></Armature1003>

Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -817,6 +817,7 @@
     <Armature28 desc=""><![CDATA[洋娃娃(紫)]]></Armature28>
     <Armature29 desc=""><![CDATA[洋娃娃(綠)]]></Armature29>
     <Armature30 desc=""><![CDATA[洋娃娃(黑)]]></Armature30>
+    <Armature31 desc=""><![CDATA[]]></Armature31>
     <Armature201 desc=""><![CDATA[蛋糕誘惑]]></Armature201>
     <Armature202 desc=""><![CDATA[小純真]]></Armature202>
     <Armature203 desc=""><![CDATA[清涼之夏]]></Armature203>
@@ -834,6 +835,7 @@
     <Armature215 desc=""><![CDATA[藍寶石]]></Armature215>
     <Armature216 desc=""><![CDATA[粉夢公主]]></Armature216>
     <Armature217 desc=""><![CDATA[青夢公主]]></Armature217>
+    <Armature218 desc=""><![CDATA[]]></Armature218>
     <Armature401 desc=""><![CDATA[小皮鞋]]></Armature401>
     <Armature402 desc=""><![CDATA[小靴子(黑)]]></Armature402>
     <Armature403 desc=""><![CDATA[小靴子(藍)]]></Armature403>
@@ -861,6 +863,7 @@
     <Armature610 desc=""><![CDATA[藍夢圓點]]></Armature610>
     <Armature611 desc=""><![CDATA[小皇冠]]></Armature611>
     <Armature612 desc=""><![CDATA[小黃鴨]]></Armature612>
+    <Armature613 desc=""><![CDATA[]]></Armature613>
     <Armature801 desc=""><![CDATA[小魚]]></Armature801>
     <Armature802 desc=""><![CDATA[可愛寶貝]]></Armature802>
     <Armature803 desc=""><![CDATA[浮生小白]]></Armature803>
@@ -878,6 +881,7 @@
     <Armature815 desc=""><![CDATA[水手服]]></Armature815>
     <Armature816 desc=""><![CDATA[小洋裝(粉)]]></Armature816>
     <Armature817 desc=""><![CDATA[小洋裝(藍)]]></Armature817>
+    <Armature818 desc=""><![CDATA[]]></Armature818>
     <Armature1001 desc=""><![CDATA[無翅膀]]></Armature1001>
     <Armature1002 desc=""><![CDATA[薄翼]]></Armature1002>
     <Armature1003 desc=""><![CDATA[精靈之翼]]></Armature1003>

Assets/Resource/XML/lan/English.xml

@@ -818,6 +818,7 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack12>
     <Armature28 desc=""><![CDATA[Doll(Purple)]]></Armature28>
     <Armature29 desc=""><![CDATA[Doll(Green)]]></Armature29>
     <Armature30 desc=""><![CDATA[Doll(Black)]]></Armature30>
+    <Armature31 desc=""><![CDATA[]]></Armature31>
     <Armature201 desc=""><![CDATA[Cake]]></Armature201>
     <Armature202 desc=""><![CDATA[Innocence]]></Armature202>
     <Armature203 desc=""><![CDATA[Cool Summer]]></Armature203>
@@ -835,6 +836,7 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack12>
     <Armature215 desc=""><![CDATA[Sapphire]]></Armature215>
     <Armature216 desc=""><![CDATA[Sleeping Princess(Pink)]]></Armature216>
     <Armature217 desc=""><![CDATA[Sleeping Princess(Blue)]]></Armature217>
+    <Armature218 desc=""><![CDATA[]]></Armature218>
     <Armature401 desc=""><![CDATA[Leather Shoes]]></Armature401>
     <Armature402 desc=""><![CDATA[Boots(Black)]]></Armature402>
     <Armature403 desc=""><![CDATA[Boots(Blue)]]></Armature403>
@@ -862,6 +864,7 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack12>
     <Armature610 desc=""><![CDATA[Dots(Blue)]]></Armature610>
     <Armature611 desc=""><![CDATA[Crown]]></Armature611>
     <Armature612 desc=""><![CDATA[Yellow Duck]]></Armature612>
+    <Armature613 desc=""><![CDATA[]]></Armature613>
     <Armature801 desc=""><![CDATA[Fish]]></Armature801>
     <Armature802 desc=""><![CDATA[Lovely Baby]]></Armature802>
     <Armature803 desc=""><![CDATA[The White]]></Armature803>
@@ -879,6 +882,7 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack12>
     <Armature815 desc=""><![CDATA[Sailor]]></Armature815>
     <Armature816 desc=""><![CDATA[Cute Dress(Pink)]]></Armature816>
     <Armature817 desc=""><![CDATA[Cute Dress(Blue)]]></Armature817>
+    <Armature818 desc=""><![CDATA[]]></Armature818>
     <Armature1001 desc=""><![CDATA[No Wings]]></Armature1001>
     <Armature1002 desc=""><![CDATA[Thin Wings]]></Armature1002>
     <Armature1003 desc=""><![CDATA[Elf Wings]]></Armature1003>

Assets/Script/Editor/EditorAuxiliary.cs

@@ -6,7 +6,7 @@ using System.IO;
 using System.Linq;
 using System.Collections;
 using System.Collections.Generic;
-
+using System.Text.RegularExpressions;
 using LitJson;
 
 [CustomEditor(typeof(Auxiliary))]
@@ -27,9 +27,16 @@ public class EditorAuxiliary : Editor
     {
         base.OnInspectorGUI();
 
-        if (GUILayout.Button("Temp"))
+        if (GUILayout.Button("CreateDragonboneTex"))
         {
-            
+            Match match = Regex.Match(Script.DragonboneSke.text, "\"name\":\"[^\"]+\"", RegexOptions.RightToLeft);
+            string projectName = match.Value.Replace("\"name\":\"", "").Replace("\"", "");
+            foreach (var sprite in Script.Sprites)
+            {
+                string content = $"{{ \"imagePath\":\"{sprite.name}.png\",\"SubTexture\":[{{\"width\":{sprite.rect.width},\"y\":0,\"height\":{sprite.rect.height},\"name\":\"{sprite.name}\",\"x\":0}}],\"name\":\"{projectName}\"}}";
+                File.WriteAllText($"{Application.dataPath}/Resource/Sprite/Editor/Dress/{sprite.name}_tex.json", content);
+            }
+            AssetDatabase.Refresh();
         }
 
         if (GUILayout.Button("PrintBounds"))

Assets/Script/Label/DressLabel.cs

@@ -0,0 +1,16 @@
+using System.Collections;
+using System.Collections.Generic;
+
+using UnityEngine;
+
+public class DressLabel
+{
+    public static string Dress_ske = "Dress_ske";
+    public static List<string> dressNames = new List<string>
+    {
+        "上衣14",
+        "下衣14",
+        "头发14（粉色）",
+        "装饰14",
+    };
+}

Assets/Script/Label/DressLabel.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 6f170228f63c20e459016a721eac5ffe
+timeCreated: 1516592487
+licenseType: Pro
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Script/Manage/ConfigManager.cs

@@ -1230,6 +1230,11 @@ public class ConfigManager : Regist
         return -1;
     }
 
+    public static int GetConfigVersion(XmlDocument xmlDocument)
+    {
+        return int.Parse(xmlDocument.SelectSingleNode(PlayerConfigLabel.RootNode + "/" + PlayerConfigLabel.Version).Attributes[0].Value);
+    }
+
 
     public static XmlDocument GetXmlDocument(string ConfigName)
     {
@@ -1364,6 +1369,13 @@ public class ConfigManager : Regist
             ToVersion16(nativeDoc, defaultDoc);
         }
 
+        if (nativeVersion < 17)
+        {
+            Debug.LogWarning("UpdateArchive to 17");
+
+            ToVersion17(nativeDoc, defaultDoc);
+        }
+
         return nativeDoc;
     }
 
@@ -1642,4 +1654,11 @@ public class ConfigManager : Regist
 
         return nativeDoc;
     }
+
+    public static XmlDocument ToVersion17(XmlDocument nativeDoc, XmlDocument defaultDoc)
+    {
+        nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value = 17.ToString();
+
+        return nativeDoc;
+    }
 }

Assets/Script/Manage/HttpManager.cs

@@ -171,7 +171,7 @@ public class HttpManager : Regist
 
     public void Awake()
     {
-        //GetConfigBySerialNumber("1801210030252368362", data => Debug.Log(data.ToJson()));
+        //GetConfigBySerialNumber("1712103823186989213", data => Debug.Log(data.ToJson()));
         //台式机 1709207727231988804
         //笔记本 1710065808151506837
         //阔达的网络 1709110751808885702 
@@ -1207,15 +1207,18 @@ public class HttpManager : Regist
             requestData,
             jData =>
             {
-                //Debug.Log(jData.ToJson());
+                //Debug.Log(jData);
+                //Debug.Log(jData.ToString());
                 if (jData.Inst_Object.ContainsKey("l"))
                 {
                     jData = jData["l"];
+                    //Debug.Log(jData.ToString());
                     List<AccountData> accountDatas = new List<AccountData>();
                     for (int i = 0; i < jData.Count; i++)
                     {
+                        //Debug.Log(jData[i].ToJson());
                         string serialNumber = (string)jData[i]["i"];
-                        string nickname = (string)jData[i]["n"];
+                        string nickname = jData[i]["n"] != null ? (string)jData[i]["n"] : Language.GetStr(LanguageLabel.UI__Unnamed);
                         string dateString = (string)jData[i]["t"];
                         accountDatas.Add(new AccountData(nickname, serialNumber, dateString));
                     }

Assets/Script/Manage/IAPManager.cs

@@ -138,7 +138,7 @@ public class IAPManager : MonoBehaviour, IStoreListener
         if (Application.isMobilePlatform || Application.platform == RuntimePlatform.IPhonePlayer)
         {
             ShareSdk = Instance.gameObject.AddComponent<ShareSDK>();
-            DebugManager.Log("0");
+
             ShareSdk.Initialize();
 
             ShareSdk.shareHandler = ShareCallback;

Assets/Script/Manage/Initializer.cs

@@ -28,6 +28,7 @@ public class Initializer : MonoBehaviour
     public GameObject DebugModeGo;
 
     public static bool Inited;
+    public static bool IsGameActivated;
     public static string InitScriptProgress;
     public static Text DebugText;
     public static Initializer Instance;
@@ -294,6 +295,8 @@ public class Initializer : MonoBehaviour
 
         Bundle.LoadAtlasSprites();
         DebugText.text = "Error code : 1-11";
+        Bundle.LoadAllDressBundleAssetsIntoDragonbone();
+        DebugText.text = "Error code : 1-11-1";
 
         for (int i = 0; i < RegistList.Count; i++)
         {
@@ -443,10 +446,17 @@ public class Initializer : MonoBehaviour
 
     private static void ActivateGame()
     {
-        ResourceManager.Get(CanvasLabel.U_LoadingPanel).TweenForCG();
         ResourceManager.Get<CanvasGroup>(CanvasLabel.C_Main).alpha = 1;
 
+        TweenRoot tweenRoot = ResourceManager.Get(CanvasLabel.U_LoadingPanel).TweenForCG();
+        tweenRoot.AddEventOnetime
+        (
+            EventType.ForwardFinish,
+            () => ResourceManager.Get(CanvasLabel.U_Icon).GetTweenEuler().Pause()
+        );
+
         AudioManager.GardenThemeAudio.TweenForAudio();
+        IsGameActivated = true;
     }
 
     public static void EnableDebugLab()

Assets/Script/Manage/Manager.cs

@@ -1142,7 +1142,7 @@ public class Manager : Regist
         {
             return;
         }
-        DebugManager.Log(PlayerPrefManager.GetBool(PlayerPrefManager.INTERACT_CONFIG, false).ToString());
+
         HttpManager.GetBuyPackLimitFlag();
 
         if (HttpManager.IsConnect)
@@ -1290,6 +1290,11 @@ public class Manager : Regist
                     return;
                 }
 
+                if (!Initializer.IsGameActivated)
+                {
+                    return;
+                }
+
                 if (DownloadConfigFlag)
                 {
                     return;

Assets/Script/Manage/ResourceManager.cs

@@ -23,6 +23,7 @@ public enum Folder
     Config,
     Discard,
     PlazaRoom,
+    Dress,
 }
 
 public enum ObjType

Assets/Script/Manage/VisitManager.cs

@@ -383,6 +383,12 @@ public class VisitManager : Regist
             return;
         }
 
+        if (ConfigManager.GetConfigVersion(ConfigManager.ConfigDocument) < ConfigManager.GetConfigVersion(VisiteeDocument))
+        {
+            ShowVisitFailPanelFromSelfGarden();
+            return;
+        }
+
         ResourceManager.Get(CanvasLabel.I_BlackMask).TweenForCG();
         //Debug.Log(Document.OuterXml);
         SetVisiteePraise(VisiteeDocument);
@@ -712,7 +718,7 @@ public class VisitManager : Regist
         InVisit = true;
     }
 
-    public static void ShowVisitFailPanel()
+    public static void ShowVisitFailPanelFromSelfGarden()
     {
         Bubble.Show
         (
@@ -723,7 +729,14 @@ public class VisitManager : Regist
             () =>
             {
                 ResourceManager.Get(CanvasLabel.I_BlackMask).TweenForCG();
-                OnStartExitVisiteeGarden();
+                if (InVisit)
+                {
+                    ResourceManager.SetActive(CanvasLabel.C_Return, true);
+                }
+                else
+                {
+                    OnStartExitVisiteeGarden();
+                }
             },
             null,
             false
@@ -922,7 +935,7 @@ public class VisitManager : Regist
                     PullConfigCallback
                     (
                         data,
-                        ShowVisitFailPanel,
+                        ShowVisitFailPanelFromSelfGarden,
                         (jData) =>
                         {
                             //Debug.Log(jData.ToJson());
@@ -949,7 +962,7 @@ public class VisitManager : Regist
             }
             else
             {
-                ShowVisitFailPanel();
+                ShowVisitFailPanelFromSelfGarden();
             }
         }
     }

Assets/Script/Object/Player.cs

@@ -659,8 +659,8 @@ public class CloseItem
         {
             return;
         }
-
-        if (BuyLevel < Manager.GardenLevel)
+        
+        if (BuyLevel <= Manager.GardenLevel)
         {
             BuyBtn.interactable = true;
             BuyBtn.image.material = null;
@@ -746,6 +746,7 @@ public class Player : Regist , IPointerClickHandler
     public bool PlayAnimFlag2;
     public string CurrentAnimationName;
 
+    public Material Material;
     public MeshFilter ExpressionMeshFilter;
 
     public Dictionary<string, Transform> ChildDic = new Dictionary<string, Transform>();
@@ -864,10 +865,6 @@ public class Player : Regist , IPointerClickHandler
         MeshFilter meshFilter = Shadow.GetComponent<MeshFilter>();
         meshFilter.mesh = SpriteUtility.CreateMesh(ResourceManager.LoadSprite(ResourceLabel.FlowerShadow, Folder.Scene));
         meshFilter.mesh.SetUVs(1, Enumerable.Repeat(new Vector2(0, 1), meshFilter.mesh.vertices.Length).ToList());
-        Shadow.GetComponent<MeshRenderer>().sharedMaterial = UnityFactory.Materials[0];
-
-        ExpressionMeshFilter = ChildDic[PlayerLabel.ExpressionMeshFilter].GetComponent<MeshFilter>();
-        ExpressionMeshFilter.GetComponent<MeshRenderer>().sharedMaterial = UnityFactory.Materials[0];
 
         return false;
     }
@@ -1450,7 +1447,6 @@ 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);
 
             PlayerManager.Inited = true;
@@ -1512,6 +1508,11 @@ public class Player : Regist , IPointerClickHandler
 
         CorrectPivot();
 
+        Material = UAC.GetComponentInChildren<MeshRenderer>().sharedMaterial;
+        Shadow.GetComponent<MeshRenderer>().sharedMaterial = Material;
+        ExpressionMeshFilter = ChildDic[PlayerLabel.ExpressionMeshFilter].GetComponent<MeshFilter>();
+        ExpressionMeshFilter.GetComponent<MeshRenderer>().sharedMaterial = Material;
+
         return UAC;
     }
 

Assets/Script/Object/PlazaRoomChest.cs

@@ -358,9 +358,9 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
 
         SetColliders(true);
 
-        ParentMR.sharedMaterial = UnityFactory.Materials[0];
-        ChestMR.sharedMaterial = UnityFactory.Materials[0];
-        ShadowMR.sharedMaterial = UnityFactory.Materials[0];
+        ParentMR.sharedMaterial = PlayerManager.Player.Material;
+        ChestMR.sharedMaterial = PlayerManager.Player.Material;
+        ShadowMR.sharedMaterial = PlayerManager.Player.Material;
 
         GetMesh(chestData.ChestType);
 

Assets/Script/Tool/Auxiliary.cs

@@ -62,6 +62,11 @@ public class Auxiliary : Regist
     public string String1;
     public string String2;
 
+
+    public TextAsset DragonboneSke;
+    public List<Sprite> Sprites;
+
+
     public Sprite Sprite;
     public TextAsset TextAsset;
     public Texture2D Texture;
@@ -71,7 +76,6 @@ public class Auxiliary : Regist
 
     public Font Font;
     public GameObject Go;
-    public List<Sprite> Sprites; 
     public List<GameObject> GoList;
     public List<SpriteRenderer> SrList;
 
@@ -202,12 +206,14 @@ public class Auxiliary : Regist
         //    FashionShowEditPage.DisplayPlayer.ChangeClose(BodyPart.Eye, "眼睛3");
         //}
 
-        //if (Input.GetKeyDown(KeyCode.S))
-        //{
-        //    PlayerManager.Player.DisplayInScene();
-        //    Manager.Coin = 0;
-        //    Manager.Diamond = 0;
-        //}
+        if (Input.GetKeyDown(KeyCode.S))
+        {
+            DebugManager.ResetGardenLevel(49);
+            //PlayerManager.Player.ChangeClose(BodyPart.Top, "上衣14");
+            //PlayerManager.Player.DisplayInScene();
+            //Manager.Coin = 0;
+            //Manager.Diamond = 0;
+        }
 
         //if (Input.GetKeyDown(KeyCode.D))
         //{

Assets/Script/Tool/Bundle.cs

@@ -5,7 +5,7 @@ using UnityEngine.Events;
 using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
-
+using DragonBones;
 #if UNITY_EDITOR
 using UnityEditor;
 #endif
@@ -31,6 +31,7 @@ public class Bundle : MonoBehaviour
     public static AssetBundle Config;
     public static AssetBundle Discard;
     public static AssetBundle PlazaRoom;
+    public static AssetBundle Dress;
 
     public Texture2D AtlasTexture;
     public Texture2D ExpressionTexture;
@@ -43,6 +44,7 @@ public class Bundle : MonoBehaviour
     public List<Object> ConfigList;
     public List<Object> DiscardList;
     public List<Object> PlazaRoomList;
+    public List<Object> DressList;
 
     #endregion
 
@@ -152,6 +154,16 @@ public class Bundle : MonoBehaviour
                     }
                 }
             }
+            else if (folder == Folder.Dress)
+            {
+                for (int i = 0; i < Instance.DressList.Count; i++)
+                {
+                    if (Instance.DressList[i].name == goName)
+                    {
+                        return (T)Instance.DressList[i];
+                    }
+                }
+            }
 
             #endregion
         }
@@ -191,6 +203,10 @@ public class Bundle : MonoBehaviour
             {
                 return PlazaRoom.LoadAsset<T>(goName);
             }
+            else if (folder == Folder.Dress)
+            {
+                return Dress.LoadAsset<T>(goName);
+            }
 
             #endregion
         }
@@ -265,6 +281,40 @@ public class Bundle : MonoBehaviour
         }
     }
 
+    public static void LoadAllDressBundleAssetsIntoDragonbone()
+    {
+        UnityFactory.factory.LoadDragonBonesData(ResourceManager.Load<TextAsset>(DressLabel.Dress_ske, Folder.Dress));
+
+        foreach (var dressName in DressLabel.dressNames)
+        {
+            ResourceManager.Load<Texture2D>(dressName, Folder.Dress);
+            UnityFactory.factory.LoadTextureAtlasData(ResourceManager.Load<TextAsset>(dressName + "_tex", Folder.Dress), dressName);
+        }
+
+        Sprite[] sprites = Dress.LoadAllAssets<Sprite>();
+
+        if (Initializer.Instance.DebugMode)
+        {
+            for (int i = 0; i < Instance.DressList.Count; i++)
+            {
+                Sprite sprite = Instance.DressList[i] as Sprite;
+                if (sprite != null)
+                {
+                    PlayerManager.CloseSpriteDictionary.Add(sprite.name, sprite);
+                    ResourceManager.ObjectDictionary.UniqueAdd(sprite.name, sprite);
+                }
+            }
+        }
+        else
+        {
+            for (int i = 0; i < sprites.Length; i++)
+            {
+                PlayerManager.CloseSpriteDictionary.Add(sprites[i].name, sprites[i]);
+                ResourceManager.ObjectDictionary.UniqueAdd(sprites[i].name, sprites[i]);
+            }
+        }
+    }
+
 
     public static AssetBundleRequest LoadAsync<T>(string goName, Folder folder)
     {
@@ -434,6 +484,7 @@ public class Bundle : MonoBehaviour
 
         yield return LoadAtlas();
         yield return LoadEffect();
+        yield return LoadDress();
         //yield return LoadPlazaRoom();
 
         SpriteAsset.AddAllBundleSpriteInfo();
@@ -588,4 +639,20 @@ public class Bundle : MonoBehaviour
             Debug.Log(www.error);
         }
     }
+
+    public static IEnumerator LoadDress()
+    {
+        WWW www = new WWW(GetStreamPath() + "dress");
+
+        yield return www;
+
+        if (string.IsNullOrEmpty(www.error))
+        {
+            Dress = www.assetBundle;
+        }
+        else
+        {
+            Debug.Log(www.error);
+        }
+    }
 }

ProjectSettings/ProjectSettings.asset

@@ -68,7 +68,7 @@ PlayerSettings:
   disableDepthAndStencilBuffers: 0
   defaultIsFullScreen: 1
   defaultIsNativeResolution: 1
-  runInBackground: 1
+  runInBackground: 0
   captureSingleScreen: 0
   muteOtherAudioSources: 0
   Prepare IOS For Recording: 0

第五期.txt

@@ -1,5 +1,13 @@
 微信支付
 
+服务器端返回的昵称可能为null
+
+访问闪屏的问题
+
+玉树樱花升了级要能看到效果
+
+每分钟访问人数和每次访问收益也要Shrink
+
 
 //关闭DebugMode 开启CatchException