Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

# Conflicts:
#	Excel2Json/Excel/Language.xlsx   resolved by origin/master(远端) version

Assets/Art/UIAssets/bg/bg_daoyou.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: DXwW4ymuWnu24K4gFSNLxJOKTqzpkxqqphR23Tq255pP8Ua1SjKQq8w4fCVx
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: HMIAndroid
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: OpenHarmony
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/UIAssets/decorate/dec_daoyou_yeqian1.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: XilOsi+qAX4sjlAraEgiu4xh1cpeN7RbHdGC+bsQzZ++1aH0A/0VMCpwTUJU
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: HMIAndroid
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: OpenHarmony
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/UIAssets/decorate/dec_daoyou_yeqian2.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: Bn1M5Hn5UHvnM9Sb7K+T5GT1AuZJDqxjVSTaDAStkucskD0lBeNOCcm/utmo
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: HMIAndroid
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: OpenHarmony
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/UIAssets/decorate/dec_gongneng2.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: DnhLsymrAigwAKbco16ii2airLubXaB3KAOFx8+IWWmLizSD2sAgYAoGTUiU
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: HMIAndroid
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: OpenHarmony
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/UIAssets/decorate/dec_lingxing2.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: CHpMsSKtVXs/h1rRolPNQBhZSDr3tjiMbJGISN94M2Qt5OpI7/nMiqpzVj7t
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: HMIAndroid
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: OpenHarmony
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/UIAssets/decorate/dec_taoxin.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: D3hOsimvAHuZEvs8cAszHT0VJLswJgsIic1+yYeyHEQDkZ9/fwT+Y7J2sTod
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: HMIAndroid
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: OpenHarmony
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/UIAssets/decorate/dec_taoxin_bai.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: WS4csSiqUHMgYzJKBRtVy9KRaIrKMF3kQiIGmCeAembxCSzFoaNxlfxqaATT
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: HMIAndroid
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: OpenHarmony
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/UIAssets/decorate/dec_xuanxiang_beibao.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: CH0etCKuU3y7ETud2HuNd04iacpo8YcrViPXxIcBwJgssIhGgz8LI0kxOmAf
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: HMIAndroid
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: OpenHarmony
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/UIAssets/decorate/dec_xuanxiang_daoyou.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: WnkYsSv4VH2T3yopuVmMd5eQd4EFWyiY/HTBp0v34gXSHUK469ljA9Vwqigs
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: HMIAndroid
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: OpenHarmony
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/UIAssets/decorate/dec_xuanxiang_db.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: D3tKt3ysV30z955Od2U29Zu6kkSysUgKkfgjoLFQAoA+8r4pbEokwfxNWwR6
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: HMIAndroid
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: OpenHarmony
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/UIAssets/decorate/dec_xudb.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: WnMavCyuU3xiMp1Gq00GNrUKb2uoRhWRSf6JLzI+cIiQ8qwHzojiwKR5Ojce
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: HMIAndroid
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: OpenHarmony
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Config/EventConfig.json

@@ -2655,345 +2655,6 @@
       "EventName": 4191,
       "Description": 4192
     },
-    {
-      "ID": 20001,
-      "EventLinksId": [
-        1001,
-        1002,
-        1003,
-        1004,
-        1005,
-        102
-      ],
-      "EventTriggerType": 5,
-      "EventTag": 0,
-      "EventType": 1,
-      "Score": 0,
-      "EventQuality": 1,
-      "PrizeIDs": [
-        1001
-      ],
-      "PrizeNums": [
-        10
-      ],
-      "RefreshProbability": 0,
-      "RefreshCount": 0,
-      "placeID": 0,
-      "SmallPlacesId": 0,
-      "XiantuID": 0,
-      "EventConditionId": 0,
-      "EventCount": 0,
-      "EventName": 4058,
-      "Description": 4133
-    },
-    {
-      "ID": 20002,
-      "EventLinksId": [
-        1010,
-        1011,
-        1012,
-        1013,
-        1014,
-        1015,
-        1016,
-        102
-      ],
-      "EventTriggerType": 5,
-      "EventTag": 0,
-      "EventType": 1,
-      "Score": 0,
-      "EventQuality": 1,
-      "PrizeIDs": [
-        1001
-      ],
-      "PrizeNums": [
-        10
-      ],
-      "RefreshProbability": 0,
-      "RefreshCount": 0,
-      "placeID": 0,
-      "SmallPlacesId": 0,
-      "XiantuID": 0,
-      "EventConditionId": 0,
-      "EventCount": 0,
-      "EventName": 4059,
-      "Description": 4134
-    },
-    {
-      "ID": 20003,
-      "EventLinksId": [
-        1001,
-        1002,
-        1003,
-        1004,
-        1005,
-        102
-      ],
-      "EventTriggerType": 5,
-      "EventTag": 0,
-      "EventType": 1,
-      "Score": 0,
-      "EventQuality": 1,
-      "PrizeIDs": [
-        1001
-      ],
-      "PrizeNums": [
-        10
-      ],
-      "RefreshProbability": 0,
-      "RefreshCount": 0,
-      "placeID": 0,
-      "SmallPlacesId": 0,
-      "XiantuID": 0,
-      "EventConditionId": 0,
-      "EventCount": 0,
-      "EventName": 4060,
-      "Description": 4135
-    },
-    {
-      "ID": 9001,
-      "EventLinksId": [
-        1001,
-        1002,
-        1003,
-        1004,
-        1005,
-        102
-      ],
-      "EventTriggerType": 6,
-      "EventTag": 3,
-      "EventType": 1,
-      "Score": 0,
-      "EventQuality": 1,
-      "PrizeIDs": [
-        1001
-      ],
-      "PrizeNums": [
-        10
-      ],
-      "RefreshProbability": 0,
-      "RefreshCount": 0,
-      "placeID": 0,
-      "SmallPlacesId": 0,
-      "XiantuID": 0,
-      "EventConditionId": 0,
-      "EventCount": 0,
-      "EventName": 4061,
-      "Description": 4136
-    },
-    {
-      "ID": 9002,
-      "EventLinksId": [
-        1010,
-        1011,
-        1012,
-        1013,
-        1014,
-        1015,
-        1016,
-        102
-      ],
-      "EventTriggerType": 6,
-      "EventTag": 3,
-      "EventType": 1,
-      "Score": 0,
-      "EventQuality": 1,
-      "PrizeIDs": [
-        1001
-      ],
-      "PrizeNums": [
-        10
-      ],
-      "RefreshProbability": 0,
-      "RefreshCount": 0,
-      "placeID": 0,
-      "SmallPlacesId": 0,
-      "XiantuID": 0,
-      "EventConditionId": 0,
-      "EventCount": 0,
-      "EventName": 4062,
-      "Description": 4137
-    },
-    {
-      "ID": 9025,
-      "EventLinksId": [
-        102
-      ],
-      "EventTriggerType": 6,
-      "EventTag": 3,
-      "EventType": 1,
-      "Score": 0,
-      "EventQuality": 1,
-      "PrizeIDs": [
-        1001
-      ],
-      "PrizeNums": [
-        10
-      ],
-      "RefreshProbability": 0,
-      "RefreshCount": 0,
-      "placeID": 1,
-      "SmallPlacesId": 0,
-      "XiantuID": 2,
-      "EventConditionId": 0,
-      "EventCount": 0,
-      "EventName": 4063,
-      "Description": 4138
-    },
-    {
-      "ID": 9014,
-      "EventLinksId": [
-        9014,
-        102
-      ],
-      "EventTriggerType": 6,
-      "EventTag": 3,
-      "EventType": 1,
-      "Score": 0,
-      "EventQuality": 1,
-      "PrizeIDs": [
-        1001
-      ],
-      "PrizeNums": [
-        10
-      ],
-      "RefreshProbability": 0,
-      "RefreshCount": 0,
-      "placeID": 2,
-      "SmallPlacesId": 0,
-      "XiantuID": 2,
-      "EventConditionId": 0,
-      "EventCount": 0,
-      "EventName": 4064,
-      "Description": 4139
-    },
-    {
-      "ID": 9031,
-      "EventLinksId": [
-        9031,
-        102
-      ],
-      "EventTriggerType": 6,
-      "EventTag": 3,
-      "EventType": 1,
-      "Score": 0,
-      "EventQuality": 1,
-      "PrizeIDs": [
-        1001
-      ],
-      "PrizeNums": [
-        10
-      ],
-      "RefreshProbability": 30,
-      "RefreshCount": 2,
-      "placeID": 3,
-      "SmallPlacesId": 0,
-      "XiantuID": 2,
-      "EventConditionId": 0,
-      "EventCount": 0,
-      "EventName": 4065,
-      "Description": 4140
-    },
-    {
-      "ID": 9003,
-      "EventLinksId": [
-        9003,
-        9004,
-        9005,
-        9006,
-        9007,
-        9008,
-        102
-      ],
-      "EventTriggerType": 6,
-      "EventTag": 5,
-      "EventType": 1,
-      "Score": 0,
-      "EventQuality": 1,
-      "PrizeIDs": [
-        1001
-      ],
-      "PrizeNums": [
-        10
-      ],
-      "RefreshProbability": 0,
-      "RefreshCount": 0,
-      "placeID": 0,
-      "SmallPlacesId": 0,
-      "XiantuID": 0,
-      "EventConditionId": 0,
-      "EventCount": 0,
-      "EventName": 4066,
-      "Description": 4141
-    },
-    {
-      "ID": 3,
-      "EventLinksId": [
-        1020,
-        1021,
-        1022,
-        1023,
-        1024,
-        1025,
-        1026,
-        102
-      ],
-      "EventTriggerType": 99,
-      "EventTag": 2,
-      "EventType": 1,
-      "Score": 10,
-      "EventQuality": 1,
-      "PrizeIDs": [
-        1001
-      ],
-      "PrizeNums": [
-        10
-      ],
-      "RefreshProbability": 0,
-      "RefreshCount": 0,
-      "placeID": 1,
-      "SmallPlacesId": 0,
-      "XiantuID": 4,
-      "EventConditionId": 1,
-      "EventValue": [
-        1004
-      ],
-      "EventCount": 1,
-      "EventName": 4067,
-      "Description": 4142
-    },
-    {
-      "ID": 1001,
-      "EventLinksId": [
-        1001,
-        1002,
-        1003,
-        1004,
-        1005,
-        100,
-        102
-      ],
-      "EventTriggerType": 99,
-      "EventTag": 4,
-      "EventType": 1,
-      "Score": 10,
-      "EventQuality": 1,
-      "PrizeIDs": [
-        1001
-      ],
-      "PrizeNums": [
-        10
-      ],
-      "RefreshProbability": 0,
-      "RefreshCount": 0,
-      "placeID": 0,
-      "SmallPlacesId": 0,
-      "XiantuID": 0,
-      "EventConditionId": 0,
-      "EventCount": 0,
-      "EventName": 4068,
-      "Description": 4143
-    },
     {
       "ID": 30001,
       "EventLinksId": [
@@ -3604,151 +3265,6 @@
       "EventName": 4276,
       "Description": 0
     },
-    {
-      "ID": 5001,
-      "EventLinksId": [
-        500101,
-        500102,
-        500103,
-        500104,
-        500105,
-        500106,
-        500107,
-        500108,
-        500109,
-        500110,
-        500111,
-        500112,
-        500113,
-        500114,
-        500115,
-        500116,
-        500117,
-        500118,
-        500119,
-        102
-      ],
-      "EventTriggerType": 99,
-      "EventTag": 5,
-      "EventType": 1,
-      "Score": 10,
-      "EventQuality": 1,
-      "PrizeType": [
-        10
-      ],
-      "PrizeIDs": [
-        1501
-      ],
-      "PrizeNums": [
-        1
-      ],
-      "RefreshProbability": 0,
-      "RefreshCount": 0,
-      "placeID": 1,
-      "SmallPlacesId": 0,
-      "XiantuID": 1,
-      "EventConditionId": 0,
-      "EventCount": 0,
-      "EventName": 4069,
-      "Description": 4144
-    },
-    {
-      "ID": 5002,
-      "EventLinksId": [
-        500201,
-        500202,
-        500203,
-        500204,
-        500205,
-        500206,
-        500207,
-        500208,
-        500209,
-        500210,
-        500211,
-        500212,
-        500213,
-        500214,
-        500215,
-        500216,
-        102
-      ],
-      "EventTriggerType": 99,
-      "EventTag": 5,
-      "EventType": 1,
-      "Score": 10,
-      "EventQuality": 1,
-      "PrizeType": [
-        11
-      ],
-      "PrizeIDs": [
-        1601
-      ],
-      "PrizeNums": [
-        1
-      ],
-      "RefreshProbability": 0,
-      "RefreshCount": 0,
-      "placeID": 1,
-      "SmallPlacesId": 0,
-      "XiantuID": 1,
-      "EventConditionId": 10,
-      "EventValue": [
-        5001
-      ],
-      "EventCount": 0,
-      "EventName": 4070,
-      "Description": 4145
-    },
-    {
-      "ID": 5003,
-      "EventLinksId": [
-        500301,
-        500302,
-        500303,
-        500304,
-        500305,
-        500306,
-        500307,
-        500308,
-        500309,
-        500310,
-        500311,
-        500312,
-        500313,
-        500314,
-        500315,
-        500316,
-        500317,
-        500318,
-        500319,
-        500320,
-        102
-      ],
-      "EventTriggerType": 99,
-      "EventTag": 2,
-      "EventType": 1,
-      "Score": 0,
-      "EventQuality": 1,
-      "PrizeType": [
-        1
-      ],
-      "PrizeIDs": [
-        1001
-      ],
-      "PrizeNums": [
-        500
-      ],
-      "RefreshProbability": 0,
-      "RefreshCount": 0,
-      "placeID": 1,
-      "SmallPlacesId": 0,
-      "XiantuID": 1,
-      "EventConditionId": 0,
-      "EventCount": 0,
-      "EventName": 4071,
-      "Description": 4146
-    },
     {
       "ID": 5004,
       "EventLinksId": [

Assets/Res/Config/LanguageChineseConfig.json

@@ -13342,111 +13342,111 @@
     },
     {
       "ID": 4076,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4077,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4078,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4079,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4080,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4081,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4082,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4083,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4084,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4085,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4086,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4087,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4088,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4089,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4090,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4091,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4092,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4093,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4094,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4095,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4096,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4097,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4098,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4099,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4100,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4101,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4102,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4103,
@@ -13494,7 +13494,7 @@
     },
     {
       "ID": 4114,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4115,
@@ -13558,11 +13558,11 @@
     },
     {
       "ID": 4130,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4131,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4132,
@@ -13806,7 +13806,7 @@
     },
     {
       "ID": 4192,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4193,
@@ -38122,47 +38122,83 @@
     },
     {
       "ID": 10271,
-      "txt": "0"
+      "txt": "道友"
     },
     {
       "ID": 10272,
-      "txt": "0"
+      "txt": "人物介绍"
     },
     {
       "ID": 10273,
-      "txt": "0"
+      "txt": "逍遥宗弟子，宗门经常派其出门需要找药材"
     },
     {
       "ID": 10274,
-      "txt": "0"
+      "txt": "喜欢礼物"
     },
     {
       "ID": 10275,
-      "txt": "0"
+      "txt": "送玩家喜欢得物品好感度加得更多哟"
     },
     {
       "ID": 10276,
-      "txt": "0"
+      "txt": "道友送礼"
     },
     {
       "ID": 10277,
-      "txt": "0"
+      "txt": "礼物："
     },
     {
       "ID": 10278,
-      "txt": "0"
+      "txt": "送礼概率：{0}%"
     },
     {
       "ID": 10279,
-      "txt": "0"
+      "txt": "道友词缀"
     },
     {
       "ID": 10280,
-      "txt": "0"
+      "txt": "成为道侣后可为英雄带来加成"
     },
     {
       "ID": 10281,
-      "txt": "0"
+      "txt": "基础信息"
+    },
+    {
+      "ID": 10282,
+      "txt": "好感度"
+    },
+    {
+      "ID": 10283,
+      "txt": "送礼"
+    },
+    {
+      "ID": 10284,
+      "txt": "通用"
+    },
+    {
+      "ID": 10285,
+      "txt": "喜爱"
+    },
+    {
+      "ID": 10286,
+      "txt": "当前选择数量"
+    },
+    {
+      "ID": 10287,
+      "txt": "取消"
+    },
+    {
+      "ID": 10288,
+      "txt": "确认赠送"
+    },
+    {
+      "ID": 10289,
+      "txt": "好感度+{0} ({1} - {2})"
+    },
+    {
+      "ID": 10290,
+      "txt": "心情+{0} "
     }
   ]
 }

Assets/Res/Config/PlayerGuideConfig.json

@@ -43,8 +43,8 @@
       "groupID": 1,
       "FingerType": -1,
       "dialogPos": [
-        -125,
-        -100
+        -145,
+        92
       ],
       "NpcPos": [
         422,
@@ -55,11 +55,11 @@
         500
       ],
       "SpeakerName": 0,
-      "SpeakerStyle": 3,
+      "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": 10132,
       "Highlighting": 1,
-      "blackAlpha": 0.55,
+      "blackAlpha": 0.8,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -79,8 +79,8 @@
       "groupID": 1,
       "FingerType": 1,
       "dialogPos": [
-        -125,
-        -100
+        -328,
+        -246
       ],
       "NpcPos": [
         422,
@@ -94,8 +94,8 @@
       "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": 10133,
-      "Highlighting": 1,
-      "blackAlpha": 0.55,
+      "Highlighting": 0,
+      "blackAlpha": 0.8,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -116,7 +116,7 @@
       "FingerType": 1,
       "dialogPos": [
         -182,
-        -517
+        -564
       ],
       "NpcPos": [
         422,
@@ -130,8 +130,8 @@
       "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": 10134,
-      "Highlighting": 1,
-      "blackAlpha": 0.55,
+      "Highlighting": 0,
+      "blackAlpha": 0.8,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -167,7 +167,7 @@
       "SpeakerImage": 3,
       "desc": 10135,
       "Highlighting": 1,
-      "blackAlpha": 0.55,
+      "blackAlpha": 0.8,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -203,7 +203,7 @@
       "SpeakerImage": 3,
       "desc": 10136,
       "Highlighting": 1,
-      "blackAlpha": 0.55,
+      "blackAlpha": 0.8,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -223,8 +223,8 @@
       "groupID": 2,
       "FingerType": -1,
       "dialogPos": [
-        -234,
-        -114
+        -180,
+        357
       ],
       "NpcPos": [
         422,
@@ -239,7 +239,7 @@
       "SpeakerImage": 3,
       "desc": 10137,
       "Highlighting": 1,
-      "blackAlpha": 0.55,
+      "blackAlpha": 0.8,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -275,7 +275,7 @@
       "SpeakerImage": 3,
       "desc": 10138,
       "Highlighting": 1,
-      "blackAlpha": 0.55,
+      "blackAlpha": 0.8,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -295,8 +295,8 @@
       "groupID": 2,
       "FingerType": 1,
       "dialogPos": [
-        -125,
-        -100
+        -43,
+        451
       ],
       "NpcPos": [
         422,
@@ -311,7 +311,7 @@
       "SpeakerImage": 3,
       "desc": 10139,
       "Highlighting": 1,
-      "blackAlpha": 0.55,
+      "blackAlpha": 0.8,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -347,7 +347,7 @@
       "SpeakerImage": 3,
       "desc": -1,
       "Highlighting": 1,
-      "blackAlpha": 0.55,
+      "blackAlpha": 0.8,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -490,7 +490,7 @@
       "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": 10142,
-      "Highlighting": 1,
+      "Highlighting": 0,
       "blackAlpha": 0.55,
       "Handle": 1,
       "IsSkip": 0,

Assets/Res/UI/BoxPanel/抽卡-概率一览.png.meta → Assets/Res/UI/AppBarPanel/1d6c8be0cd6a86d0e2c457f2a6a85d04.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: Xnwa5iz+AHno2kRyoBIfPnsBS3AqloF9xhuXDP0qbehIeSHgsPHcrHtDfz7g
+guid: CH0YtymoAHwx4CWYFDZv97+uV/Q6E7/qtSUNmZeU0Z8Nm/QRzlTk36QbyZj9
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/Res/UI/AppBarPanel/AppBarPanel.prefab

@@ -33,11 +33,11 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 125996766480416986}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 1.699997, y: -63.100006}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 124, y: 48.2731}
+  m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &6906827011810667072
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -59,7 +59,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.9215687, g: 0.95294124, b: 0.89019614, a: 1}
+  m_Color: {r: 0.8196079, g: 0.9568628, b: 0.9176471, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -68,10 +68,10 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 30
-    m_FontStyle: 0
+    m_FontSize: 28
+    m_FontStyle: 1
     m_BestFit: 0
-    m_MinSize: 3
+    m_MinSize: 2
     m_MaxSize: 40
     m_Alignment: 4
     m_AlignByGeometry: 0
@@ -111,6 +111,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 7965677479900535406}
   - {fileID: 8996942401071482941}
   - {fileID: 3250744888703642702}
   - {fileID: 3507654321014056427}
@@ -136,7 +137,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 241546257052017169}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 
@@ -172,6 +173,97 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &369993065536483123
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5083944578448688889}
+  - component: {fileID: 1645014420257699704}
+  - component: {fileID: 7033103538648533603}
+  - component: {fileID: 9029694989439902246}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Viewport
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5083944578448688889
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 369993065536483123}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 2303318506788104112}
+  m_Father: {fileID: 523067891320849755}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: -17}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &1645014420257699704
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 369993065536483123}
+  m_CullTransparentMesh: 1
+--- !u!114 &7033103538648533603
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 369993065536483123}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &9029694989439902246
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 369993065536483123}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ShowMaskGraphic: 0
 --- !u!1 &428415581278229151
 GameObject:
   m_ObjectHideFlags: 0
@@ -750,12 +842,13 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 8069595544835125342}
-  m_Father: {fileID: 909808399738442487}
+  - {fileID: 8767125433406234508}
+  m_Father: {fileID: 2303318506788104112}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 37, y: -1048}
-  m_SizeDelta: {x: 140, y: 79}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 125, y: 158}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &1258759336515325394
 CanvasRenderer:
@@ -795,14 +888,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_huodong
+  _icon_name: dec_xuanxiang_db
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: bec1e4479c1593746876da07861f4d67, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
-    packName: mainUI
-    packgJsonPath: /Art/UIAssets/TextrueJson\mainUI.txt
-    packgSpritePath: Assets/Res/UIAtlas/mainUI.spriteatlasv2
-    lasetJsonGUID: bb67f442413bd755b03774cb7d5a173d
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: e097484f6eb94891410dbebf8581b9a8
   imageH: 79
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
@@ -946,6 +1039,95 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   id: 10166
+--- !u!1 &1341631650666236872
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7965677479900535406}
+  - component: {fileID: 3009606291022738818}
+  - component: {fileID: 5953825534861480791}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Icon_Di
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7965677479900535406
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1341631650666236872}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4067893407591069123}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 112.2253}
+  m_Pivot: {x: 0.5, y: 0}
+--- !u!222 &3009606291022738818
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1341631650666236872}
+  m_CullTransparentMesh: 1
+--- !u!114 &5953825534861480791
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1341631650666236872}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.24705884, g: 0.3372549, b: 0.3529412, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_dise
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: bec1e4479c1593746876da07861f4d67, type: 3}
+  packInfo:
+    packName: mainUI
+    packgJsonPath: /Art/UIAssets/TextrueJson\mainUI.txt
+    packgSpritePath: Assets/Res/UIAtlas/mainUI.spriteatlasv2
+    lasetJsonGUID: bb67f442413bd755b03774cb7d5a173d
+  imageH: 112.2253
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &1693697974241859946
 GameObject:
   m_ObjectHideFlags: 0
@@ -981,8 +1163,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: -489.4226}
-  m_SizeDelta: {x: 0, y: -978.8452}
+  m_AnchoredPosition: {x: 0, y: -538.057}
+  m_SizeDelta: {x: 0, y: -1076.114}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7344172054180224780
 CanvasRenderer:
@@ -1005,7 +1187,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.9058824, g: 0.882353, b: 0.82745105, a: 1}
+  m_Color: {r: 0.43921572, g: 0.57254905, b: 0.4901961, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1169,7 +1351,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 750, y: 1613}
+  m_SizeDelta: {x: 750, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2378530030220598865
 CanvasRenderer:
@@ -1199,7 +1381,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 49824d7394e699b44b2c320a63001d35, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 777235c7b94b3a84f9c7bfc7017559cf, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1392,10 +1574,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 909808399738442487}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -295, y: -755.8873}
-  m_SizeDelta: {x: 79, y: 84}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7016129834093877177
 CanvasRenderer:
@@ -1418,7 +1600,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.003921569}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1435,7 +1617,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_fanhui1
+  _icon_name: dec_juxing_fang
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
@@ -1602,6 +1784,95 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   id: 10164
+--- !u!1 &2623060672319664721
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4236613740610922289}
+  - component: {fileID: 3498206428270950348}
+  - component: {fileID: 3852690904900155079}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4236613740610922289
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2623060672319664721}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 125996766480416986}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 11.3}
+  m_SizeDelta: {x: 65, y: 66}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3498206428270950348
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2623060672319664721}
+  m_CullTransparentMesh: 1
+--- !u!114 &3852690904900155079
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2623060672319664721}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 1
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_xuanxiang_daoyou
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: e097484f6eb94891410dbebf8581b9a8
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &2634108884773401188
 GameObject:
   m_ObjectHideFlags: 0
@@ -1769,12 +2040,13 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 524054502728815645}
-  m_Father: {fileID: 909808399738442487}
+  - {fileID: 4236613740610922289}
+  m_Father: {fileID: 2303318506788104112}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 200, y: -1048}
-  m_SizeDelta: {x: 140, y: 79}
+  m_AnchoredPosition: {x: 144.17, y: 0}
+  m_SizeDelta: {x: 125, y: 158}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &3481995393162732135
 CanvasRenderer:
@@ -1814,14 +2086,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_huodong
+  _icon_name: dec_xuanxiang_db
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: bec1e4479c1593746876da07861f4d67, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
-    packName: mainUI
-    packgJsonPath: /Art/UIAssets/TextrueJson\mainUI.txt
-    packgSpritePath: Assets/Res/UIAtlas/mainUI.spriteatlasv2
-    lasetJsonGUID: bb67f442413bd755b03774cb7d5a173d
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: e097484f6eb94891410dbebf8581b9a8
   imageH: 79
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
@@ -2485,8 +2757,8 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 8981283256515512950}
-  - {fileID: 4067893407591069123}
   - {fileID: 909808399738442487}
+  - {fileID: 4067893407591069123}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -2590,6 +2862,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Icon_Di
+    gameObject: {fileID: 1341631650666236872}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &5245840134221701572
 GameObject:
@@ -2706,6 +2983,95 @@ MonoBehaviour:
   - {fileID: 4539428625316042701}
   - {fileID: 7753631802842447130}
   _allChildObj: []
+--- !u!1 &5301195012147280119
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1298634274934091846}
+  - component: {fileID: 6828851503284679853}
+  - component: {fileID: 5940766510631950434}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: MenuRoot (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1298634274934091846
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5301195012147280119}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 909808399738442487}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: -543.25}
+  m_SizeDelta: {x: 0, y: -1086.5}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6828851503284679853
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5301195012147280119}
+  m_CullTransparentMesh: 1
+--- !u!114 &5940766510631950434
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5301195012147280119}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.95294124, g: 0.9294118, b: 0.8431373, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_juxing_fang
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 129d2dfcaa346e2c98412e94b22ff390
+  imageH: 1624
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &5312784774134869399
 GameObject:
   m_ObjectHideFlags: 0
@@ -2739,11 +3105,11 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 7683181027623438140}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 1.699997, y: -63.100006}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 124, y: 48.2731}
+  m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &2716001008184932530
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -2765,7 +3131,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.9215687, g: 0.95294124, b: 0.89019614, a: 1}
+  m_Color: {r: 0.8470589, g: 0.9803922, b: 0.94117653, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -2774,10 +3140,10 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 30
-    m_FontStyle: 0
+    m_FontSize: 28
+    m_FontStyle: 1
     m_BestFit: 0
-    m_MinSize: 3
+    m_MinSize: 2
     m_MaxSize: 40
     m_Alignment: 4
     m_AlignByGeometry: 0
@@ -3154,9 +3520,9 @@ RectTransform:
   m_Children:
   - {fileID: 249986433923533433}
   - {fileID: 7366721648260446241}
-  - {fileID: 7683181027623438140}
-  - {fileID: 125996766480416986}
+  - {fileID: 1298634274934091846}
   - {fileID: 8155081321350717393}
+  - {fileID: 523067891320849755}
   m_Father: {fileID: 6230762972544331517}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -3394,6 +3760,84 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6078518409971090724}
   m_CullTransparentMesh: 1
+--- !u!1 &6254450489256377981
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2303318506788104112}
+  - component: {fileID: 8458182348485034973}
+  - component: {fileID: 1138849642642618802}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Content
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2303318506788104112
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6254450489256377981}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 7683181027623438140}
+  - {fileID: 125996766480416986}
+  m_Father: {fileID: 5083944578448688889}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: -463.1741, y: 158}
+  m_Pivot: {x: 0, y: 1}
+--- !u!114 &8458182348485034973
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6254450489256377981}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 0
+  m_StartCorner: 0
+  m_StartAxis: 0
+  m_CellSize: {x: 125, y: 158}
+  m_Spacing: {x: 19.17, y: 0}
+  m_Constraint: 0
+  m_ConstraintCount: 2
+--- !u!114 &1138849642642618802
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6254450489256377981}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 2
 --- !u!1 &6600899041924302467
 GameObject:
   m_ObjectHideFlags: 0
@@ -3619,6 +4063,95 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   audioName: ui_button
+--- !u!1 &6666866169254925621
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8767125433406234508}
+  - component: {fileID: 5778517210920101383}
+  - component: {fileID: 3775336536665742700}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8767125433406234508
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6666866169254925621}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7683181027623438140}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 11.3}
+  m_SizeDelta: {x: 65, y: 66}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5778517210920101383
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6666866169254925621}
+  m_CullTransparentMesh: 1
+--- !u!114 &3775336536665742700
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6666866169254925621}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_xuanxiang_beibao
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: e097484f6eb94891410dbebf8581b9a8
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &6972003309492748989
 GameObject:
   m_ObjectHideFlags: 0
@@ -4220,6 +4753,83 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   audioName: ui_button
+--- !u!1 &9080464388727916189
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 523067891320849755}
+  - component: {fileID: 1377398502579023603}
+  - component: {fileID: 8459277175472475308}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Scroll View
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &523067891320849755
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9080464388727916189}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 5083944578448688889}
+  m_Father: {fileID: 909808399738442487}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 17.4, y: 182.5379}
+  m_SizeDelta: {x: 732.3441, y: 314.4607}
+  m_Pivot: {x: 0.5, y: 0}
+--- !u!222 &1377398502579023603
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9080464388727916189}
+  m_CullTransparentMesh: 1
+--- !u!114 &8459277175472475308
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9080464388727916189}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Content: {fileID: 2303318506788104112}
+  m_Horizontal: 1
+  m_Vertical: 1
+  m_MovementType: 1
+  m_Elasticity: 0.1
+  m_Inertia: 1
+  m_DecelerationRate: 0.135
+  m_ScrollSensitivity: 1
+  m_Viewport: {fileID: 5083944578448688889}
+  m_HorizontalScrollbar: {fileID: 0}
+  m_VerticalScrollbar: {fileID: 0}
+  m_HorizontalScrollbarVisibility: 2
+  m_VerticalScrollbarVisibility: 2
+  m_HorizontalScrollbarSpacing: -3
+  m_VerticalScrollbarSpacing: -3
+  m_OnValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &9122554430680811667
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/BoxPanel/WidgetItemType2.prefab

@@ -1,5 +1,95 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &263476043213272282
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7198288101045169834}
+  - component: {fileID: 480935744040742697}
+  - component: {fileID: 2295739924984652963}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_New
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &7198288101045169834
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 263476043213272282}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 3552142719674017830}
+  m_Father: {fileID: 8103003509539381039}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 14, y: 11.5}
+  m_SizeDelta: {x: 36.4376, y: 36.4376}
+  m_Pivot: {x: 1, y: 1}
+--- !u!222 &480935744040742697
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 263476043213272282}
+  m_CullTransparentMesh: 1
+--- !u!114 &2295739924984652963
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 263476043213272282}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.9568628, g: 0.454902, b: 0.20784315, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_ty_yuan
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 09e53e644f062a080d02078f52169b6a
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &1023940617352225769
 GameObject:
   m_ObjectHideFlags: 0
@@ -35,6 +125,7 @@ RectTransform:
   - {fileID: 646260402244696982}
   - {fileID: 1825629934269939522}
   - {fileID: 3529386165245114290}
+  - {fileID: 7198288101045169834}
   m_Father: {fileID: 3555197382594190730}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -50,6 +141,86 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1023940617352225769}
   m_CullTransparentMesh: 1
+--- !u!1 &1949387258674314814
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3552142719674017830}
+  - component: {fileID: 3655123532606936731}
+  - component: {fileID: 6297680862885372018}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3552142719674017830
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1949387258674314814}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7198288101045169834}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -0.000011444092, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3655123532606936731
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1949387258674314814}
+  m_CullTransparentMesh: 1
+--- !u!114 &6297680862885372018
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1949387258674314814}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 30
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u65B0"
 --- !u!1 &1959513863254869355
 GameObject:
   m_ObjectHideFlags: 0
@@ -690,6 +861,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Icon_New
+    gameObject: {fileID: 263476043213272282}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!114 &2867608603011516750
 MonoBehaviour:

Assets/Res/UI/DaoYouPanel/583a063c-e96f-4cb5-80bf-ab2eaf2c7b59.png.meta

@@ -1,203 +0,0 @@
-fileFormatVersion: 2
-guid: WXwe4SOpAX2KwQ5IU4U+nCXM6JBWTOEOWXCamnl5gCprf5LL/zdF7StUUvz9
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 13
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-    flipGreenChannel: 0
-  isReadable: 0
-  webStreaming: 0
-  priorityLevel: 0
-  uploadedMode: 2
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMipmapLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 0
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  swizzle: 50462976
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Android
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WeixinMiniGame
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: HMIAndroid
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: OpenHarmony
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Res/UI/DaoYouPanel/7249795b-8dba-4fe2-b85b-0163d2b4dbad.png.meta

@@ -1,203 +0,0 @@
-fileFormatVersion: 2
-guid: Wysf4Sn7Ai1zbcWP/gkfgf/TGTuDFLvaHhySviASuAoOUoqJhFIBxAnYMzsw
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 13
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-    flipGreenChannel: 0
-  isReadable: 0
-  webStreaming: 0
-  priorityLevel: 0
-  uploadedMode: 2
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMipmapLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 0
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  swizzle: 50462976
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Android
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WeixinMiniGame
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: HMIAndroid
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: OpenHarmony
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Res/UI/DaoYouPanel/Btn_Tongyong.prefab

@@ -162,13 +162,13 @@ MonoBehaviour:
     - Target: {fileID: 5873011978638156725}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 0.85098046, y: 0.80392164, z: 0.68235296, w: 1}
+      - {x: 0.9960785, y: 0.94117653, z: 0.79215693, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
   AllComs:
   - {fileID: 5873011978638156725}
   AllComsStateTypes: 40000000
-  CurrIndex: 1
+  CurrIndex: 0
 --- !u!114 &5746295913924572907
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -243,7 +243,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.85098046, g: 0.80392164, b: 0.68235296, a: 1}
+  m_Color: {r: 0.854902, g: 0.82745105, b: 0.7254902, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -332,7 +332,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.4039216, g: 0.40000004, b: 0.36078432, a: 1}
+  m_Color: {r: 0.27058825, g: 0.23529413, b: 0.18823531, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1

Assets/Res/UI/DaoYouPanel/DaoYouIdleEarningsWidget.prefab

@@ -35,7 +35,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -0.0000076293945, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8179811940748105250
@@ -59,7 +59,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.9333334, g: 0.9176471, b: 0.9450981, a: 1}
+  m_Color: {r: 0.9960785, g: 0.9960785, b: 0.9960785, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -68,8 +68,8 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 33
-    m_FontStyle: 1
+    m_FontSize: 26
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 10
     m_MaxSize: 40
@@ -118,7 +118,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 68.29999, y: 235.4986}
-  m_SizeDelta: {x: 90, y: 35}
+  m_SizeDelta: {x: 107, y: 3}
   m_Pivot: {x: 0, y: 0}
 --- !u!222 &566111804867399921
 CanvasRenderer:

Assets/Res/UI/DaoYouPanel/DaoYouLevelWidget.prefab

@@ -41,7 +41,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 337.85995, y: -54.8724}
-  m_SizeDelta: {x: 655, y: 120}
+  m_SizeDelta: {x: 655, y: 127}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7711679328970338775
 CanvasRenderer:
@@ -230,7 +230,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.8745099, g: 0.86274517, b: 0.82745105, a: 1}
+  m_Color: {r: 0.95294124, g: 0.9294118, b: 0.8431373, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -339,7 +339,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 257.29947, y: 0}
+  m_AnchoredPosition: {x: 256.5, y: -6.7}
   m_SizeDelta: {x: 77.7989, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7744756667451952410
@@ -363,7 +363,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.5377358, g: 0.517761, b: 0.48446953, a: 1}
+  m_Color: {r: 0.70980394, g: 0.67058825, b: 0.60784316, a: 1}
   m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -372,7 +372,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 24
+    m_FontSize: 26
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
@@ -550,7 +550,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -163.48969, y: 0}
+  m_AnchoredPosition: {x: -163.48969, y: -11}
   m_SizeDelta: {x: 153.8206, y: 39.0965}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3485848617121057115
@@ -574,7 +574,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.47450984, g: 0.39607847, b: 0.25882354, a: 1}
+  m_Color: {r: 0.5137255, g: 0.45098042, b: 0.38823533, a: 1}
   m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -631,7 +631,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -277.7, y: -0.6}
+  m_AnchoredPosition: {x: -277.7, y: -11.6}
   m_SizeDelta: {x: 55.2432, y: 55.2432}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5084584772679371129

Assets/Res/UI/DaoYouPanel/DaoYouPanel.prefab

@@ -35,8 +35,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -270.7}
-  m_SizeDelta: {x: 750, y: 13.97}
+  m_AnchoredPosition: {x: 0, y: -276.43}
+  m_SizeDelta: {x: 750, y: 12.3412}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &4750585567513358589
 CanvasRenderer:
@@ -59,7 +59,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.39607847, g: 0.45882356, b: 0.54509807, a: 1}
+  m_Color: {r: 0.5019608, g: 0.6392157, b: 0.59607846, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -125,7 +125,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 753, y: 1635}
+  m_SizeDelta: {x: 750, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2943758828349470188
 CanvasRenderer:
@@ -155,7 +155,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 503ceed324ff1f944976890adc8373e4, type: 3}
+  m_Sprite: {fileID: 21300000, guid: cfb1d35c7345e9242acbf0424b366dfc, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -213,8 +213,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: 117.3}
-  m_SizeDelta: {x: 750, y: 388}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 750, y: 287}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &8281134313131396953
 CanvasRenderer:
@@ -237,14 +237,14 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.8078432, g: 0.8000001, b: 0.79215693, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 0b5e2e7b67e8f4f43a3a0edd42e78375, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 269f33907b86d77458a04a85082adb58, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -254,7 +254,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: bg_dongfu
+  _icon_name: bg_daoyou
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 0}
   packInfo:
@@ -278,6 +278,8 @@ GameObject:
   - component: {fileID: 7462333329426195189}
   - component: {fileID: 8532944055590825543}
   - component: {fileID: 2455864051919483882}
+  - component: {fileID: 6712363140131920105}
+  - component: {fileID: 897025699886414178}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -293,17 +295,17 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 952350175352855096}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3899889634570400150}
+  m_Father: {fileID: 9037135992368401232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: -1.2843018}
-  m_SizeDelta: {x: 0, y: -2.5686}
+  m_AnchoredPosition: {x: 0, y: 645.1}
+  m_SizeDelta: {x: -341, y: -1498.5868}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8532944055590825543
 CanvasRenderer:
@@ -326,7 +328,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.9725491, g: 0.96470594, b: 0.94117653, a: 1}
+  m_Color: {r: 0.9725491, g: 0.9803922, b: 0.96470594, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -335,11 +337,11 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 62
+    m_FontSize: 92
     m_FontStyle: 1
     m_BestFit: 0
-    m_MinSize: 10
-    m_MaxSize: 62
+    m_MinSize: 9
+    m_MaxSize: 92
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -347,6 +349,34 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u9053\u53CB"
+--- !u!114 &6712363140131920105
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 952350175352855096}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0.43137258, g: 0.70980394, b: 0.6745098, a: 1}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
+--- !u!114 &897025699886414178
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 952350175352855096}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10271
 --- !u!1 &982856282458991713
 GameObject:
   m_ObjectHideFlags: 0
@@ -384,8 +414,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0.75006, y: -89.23639}
-  m_SizeDelta: {x: 751.5, y: 1186.5994}
+  m_AnchoredPosition: {x: 0.75006, y: -92.64496}
+  m_SizeDelta: {x: 751.5, y: 1179.7822}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8171623730946413461
 CanvasRenderer:
@@ -514,7 +544,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.8078432, g: 0.8000001, b: 0.79215693, a: 1}
+  m_Color: {r: 0.95294124, g: 0.9294118, b: 0.8431373, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -635,96 +665,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_ShowMaskGraphic: 0
---- !u!1 &1555201068484669880
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 3899889634570400150}
-  - component: {fileID: 8618521795793258323}
-  - component: {fileID: 4642937271341553667}
-  m_Layer: 5
-  m_HasEditorInfo: 1
-  m_Name: Image (4)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &3899889634570400150
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1555201068484669880}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 7462333329426195189}
-  m_Father: {fileID: 9037135992368401232}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 1}
-  m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 4.9, y: -174.5}
-  m_SizeDelta: {x: 409, y: 82}
-  m_Pivot: {x: 0.5, y: 1}
---- !u!222 &8618521795793258323
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1555201068484669880}
-  m_CullTransparentMesh: 1
---- !u!114 &4642937271341553667
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1555201068484669880}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 0}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_daoyou_zi_di
-  isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 0d383e80d99516a44a603bb1ccd73209, type: 3}
-  packInfo:
-    packName: daoyou
-    packgJsonPath: /Art/UIAssets/TextrueJson\daoyou.txt
-    packgSpritePath: Assets/Res/UIAtlas/daoyou.spriteatlasv2
-    lasetJsonGUID: edd8757281c361370f022860a59cdd97
-  imageH: 1624
-  useGradient: 0
-  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
-  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
-  direction: 0
 --- !u!1 &6234967713925931694
 GameObject:
   m_ObjectHideFlags: 0
@@ -798,7 +738,7 @@ MonoBehaviour:
   m_StartCorner: 0
   m_StartAxis: 0
   m_CellSize: {x: 223, y: 297}
-  m_Spacing: {x: 21, y: 21}
+  m_Spacing: {x: 21, y: 41.7}
   m_Constraint: 1
   m_ConstraintCount: 3
 --- !u!1 &8994874510214016950
@@ -835,7 +775,7 @@ RectTransform:
   - {fileID: 3118932334846807348}
   - {fileID: 2112352992140343879}
   - {fileID: 7562338260213964218}
-  - {fileID: 3899889634570400150}
+  - {fileID: 7462333329426195189}
   - {fileID: 6295608253630109138}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Res/UI/DaoYouPanel/DaoYouWidget.prefab

@@ -35,7 +35,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 3.2074966, y: 2.7738037}
+  m_AnchoredPosition: {x: 3.207489, y: 2.7738037}
   m_SizeDelta: {x: 216.88, y: 53.359}
   m_Pivot: {x: 0, y: 0}
 --- !u!222 &5623411956765538623
@@ -453,7 +453,7 @@ RectTransform:
   - {fileID: 5903262738701838961}
   - {fileID: 478163653924081884}
   - {fileID: 3875262291450751451}
-  - {fileID: 6643801910764169905}
+  - {fileID: 2736209200660457035}
   - {fileID: 9093301904999720884}
   - {fileID: 7542444514877269234}
   - {fileID: 6812575939048321609}
@@ -519,6 +519,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Slider_Emotion
+    gameObject: {fileID: 4242738042045134088}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!114 &4309724099149842934
 MonoBehaviour:
@@ -767,7 +772,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -0.000015258789, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 40.6109, y: 40.6109}
   m_Pivot: {x: 1, y: 1}
 --- !u!222 &6719389967905816541
@@ -857,7 +862,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: 0.0000076293945, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 42, y: 40}
   m_Pivot: {x: 1, y: 0}
 --- !u!222 &4872629527461810145
@@ -955,6 +960,110 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &5421723427925135863
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2736209200660457035}
+  - component: {fileID: 8734794614212195349}
+  - component: {fileID: 6104747821594720494}
+  - component: {fileID: 2104736237068248475}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_Daoyou (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2736209200660457035
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5421723427925135863}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 6643801910764169905}
+  m_Father: {fileID: 5070300881352391495}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0.14654, y: 25.971}
+  m_SizeDelta: {x: 216.88, y: 230.7419}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8734794614212195349
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5421723427925135863}
+  m_CullTransparentMesh: 1
+--- !u!114 &6104747821594720494
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5421723427925135863}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 1
+  m_PreserveAspect: 1
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_juxing_fang
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: c13218952bde6161116e17f06242217f
+  imageH: 151.51894
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!114 &2104736237068248475
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5421723427925135863}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ShowMaskGraphic: 0
 --- !u!1 &5745186779856990117
 GameObject:
   m_ObjectHideFlags: 0
@@ -985,13 +1094,14 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 8661795095469256590}
   m_Father: {fileID: 5070300881352391495}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 6.1, y: 3.968}
-  m_SizeDelta: {x: 53, y: 47}
+  m_AnchoredPosition: {x: 6.1003, y: 6.7533}
+  m_SizeDelta: {x: 51.8856, y: 45.3999}
   m_Pivot: {x: 0, y: 0}
 --- !u!222 &6786146373864765451
 CanvasRenderer:
@@ -1031,7 +1141,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_daoyou_xingxiang_taoxin
+  _icon_name: dec_taoxin
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: 0d383e80d99516a44a603bb1ccd73209, type: 3}
   packInfo:
@@ -1075,12 +1185,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 5070300881352391495}
+  m_Father: {fileID: 2736209200660457035}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 6.7, y: 27.4}
-  m_SizeDelta: {x: 168.01, y: 233.6}
+  m_AnchoredPosition: {x: 0, y: -132.7}
+  m_SizeDelta: {x: 397.5739, y: 552.7843}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3324098185976957936
 CanvasRenderer:
@@ -1110,9 +1220,9 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: a7a91d47c0162714e983e760e392dd2e, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 7555ba42c145339429e4c693ce3601d7, type: 3}
   m_Type: 0
-  m_PreserveAspect: 0
+  m_PreserveAspect: 1
   m_FillCenter: 1
   m_FillMethod: 4
   m_FillAmount: 1
@@ -1120,8 +1230,8 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: bg_daoyou_lihui1
-  isNotLoadDeftIcon: 1
+  _icon_name: bg_lh_wanxi
+  isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 0}
   packInfo:
     packName: bg
@@ -1133,3 +1243,92 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &7980571675409530362
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8661795095469256590}
+  - component: {fileID: 3313608551637651139}
+  - component: {fileID: 4242738042045134088}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Slider_Emotion
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8661795095469256590
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7980571675409530362}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5414614616448102811}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0.000009536743, y: 0}
+  m_SizeDelta: {x: 50.4809, y: 43.9371}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3313608551637651139
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7980571675409530362}
+  m_CullTransparentMesh: 1
+--- !u!114 &4242738042045134088
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7980571675409530362}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.9607844, g: 0.627451, b: 0.627451, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 3
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 1
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_taoxin_bai
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 0d383e80d99516a44a603bb1ccd73209, type: 3}
+  packInfo:
+    packName: daoyou
+    packgJsonPath: /Art/UIAssets/TextrueJson\daoyou.txt
+    packgSpritePath: Assets/Res/UIAtlas/daoyou.spriteatlasv2
+    lasetJsonGUID: 517694f57c52fa25fbf5a38ef253f2b4
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0

Assets/Res/UI/DaoYouPanel/挂机-道友挂机.png.meta

@@ -1,203 +0,0 @@
-fileFormatVersion: 2
-guid: WngYsy+tUSpDnm7NRyBL6p3+JFtKXXkOYxubJRCog3/WE5sSA5blyJD7Bsrq
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 13
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-    flipGreenChannel: 0
-  isReadable: 0
-  webStreaming: 0
-  priorityLevel: 0
-  uploadedMode: 2
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMipmapLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 0
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  swizzle: 50462976
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Android
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WeixinMiniGame
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: HMIAndroid
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: OpenHarmony
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Res/UI/DaoYouPanel/挂机-道友送礼.JPG.meta

@@ -1,203 +0,0 @@
-fileFormatVersion: 2
-guid: DCsWtiykVS6gB52lR229IVIaueM7bUxKeojsgI1rgvU8Qwo76SMZY+dlSaII
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 13
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-    flipGreenChannel: 0
-  isReadable: 0
-  webStreaming: 0
-  priorityLevel: 0
-  uploadedMode: 2
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMipmapLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 0
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  swizzle: 50462976
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Android
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WeixinMiniGame
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: HMIAndroid
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: OpenHarmony
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Res/UI/DaoYouPanel/道友-好感度.png.meta

@@ -1,203 +0,0 @@
-fileFormatVersion: 2
-guid: WS9NvSqoWy3F3spZ+oB/RLl1BzTkjBZNyeEoLNWff4yK3fCpNwyss21Hv/8Z
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 13
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-    flipGreenChannel: 0
-  isReadable: 0
-  webStreaming: 0
-  priorityLevel: 0
-  uploadedMode: 2
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMipmapLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 0
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  swizzle: 50462976
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Android
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WeixinMiniGame
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: HMIAndroid
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: OpenHarmony
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Res/UI/BoxPanel/抽卡-10连.png.meta → Assets/Res/UI/DaoYouPanel/道友-好感度2.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: Dn9J4y2sVS9ne7grBbYFSdvAskCyEqDbHMJQRLSc/24cBjjiH5IRGI3Y5YkY
+guid: Dy9OsS6lVXtga1yRLwizqETN5ZmWBanZjC/D0VfD1galSjtKVg3pNL30dR2e
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/Res/UI/DaoYouPanel/道友-详情.png.meta

@@ -1,203 +0,0 @@
-fileFormatVersion: 2
-guid: XnNN43j7Wnw/PLpI2rxMA+Ps24Gbe0JgF6qIUkre9iy3xAH4A9+fWiGSn8Of
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 13
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-    flipGreenChannel: 0
-  isReadable: 0
-  webStreaming: 0
-  priorityLevel: 0
-  uploadedMode: 2
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMipmapLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 0
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  swizzle: 50462976
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Android
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WeixinMiniGame
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: HMIAndroid
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: OpenHarmony
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Res/UI/BoxPanel/抽卡-进入.png.meta → Assets/Res/UI/DaoYouPanel/道友-详情2.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: B3xJtn/7BnjYu/vrYUj0loju6+g7TJROAjfA9KrjD20ipK6D6OU3l6XDry20
+guid: WSgYsiP+UH+X3l/tDR91exKKvzsPDp8p60U/4/SHZFmtrIDJqPjEGhVuP7u7
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/Res/UI/DaoYouPanel/道友-送礼.png.meta

@@ -1,203 +0,0 @@
-fileFormatVersion: 2
-guid: XiwZtHn+VX8D5v6xAs1ZEEhTpDIRIkJ+3Gda8G/NGh7U2SDjJCzgaWtDqQO4
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 13
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-    flipGreenChannel: 0
-  isReadable: 0
-  webStreaming: 0
-  priorityLevel: 0
-  uploadedMode: 2
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMipmapLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 0
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  swizzle: 50462976
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Android
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WeixinMiniGame
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: HMIAndroid
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: OpenHarmony
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Res/UI/BoxPanel/抽卡-200次挑战-领取奖励.png.meta → Assets/Res/UI/DaoYouPanel/道友-送礼2.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: Wnob5CqsWyrX4ZDqw44rMGrhbyFCOnGIhz+95p5PCjXmwYTHcOiGqJbRoIYT
+guid: B39J4Sz4WnqJBD2Bsg+BHLj/ukdHAd0Y85ZIpS3LEF2Kk8kg8zt/cCgvjHB/
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/Res/UI/DaoYouPanel/道友.png.meta

@@ -1,203 +0,0 @@
-fileFormatVersion: 2
-guid: Cnoc5n/4B3iW3wWJH8yIau7vC8ZltZwXHBrxZJi9KcbO6ocSsbiyPIOLQSt+
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 13
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-    flipGreenChannel: 0
-  isReadable: 0
-  webStreaming: 0
-  priorityLevel: 0
-  uploadedMode: 2
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMipmapLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 0
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  swizzle: 50462976
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Android
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WeixinMiniGame
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: HMIAndroid
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: OpenHarmony
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Res/UI/DaoYouPanel/道友2.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: XCxNtH6uVihfJO4iq06saKgimVBzosc9TvOliF3RmUPXSwZ19eU9UM8TPUjl
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: HMIAndroid
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: OpenHarmony
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/UI/LoadingPanel.prefab

@@ -0,0 +1,315 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &1384161542311662118
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 360525025617545499}
+  - component: {fileID: 8873409753647705352}
+  - component: {fileID: 6563932251621246387}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &360525025617545499
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1384161542311662118}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8311278189826985699}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 160, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8873409753647705352
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1384161542311662118}
+  m_CullTransparentMesh: 1
+--- !u!114 &6563932251621246387
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1384161542311662118}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 14
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u52A0\u8F7D\u4E2D....."
+--- !u!1 &4993911372966654358
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1669281409109345828}
+  - component: {fileID: 5060074385960820424}
+  - component: {fileID: 8936581939649475887}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1669281409109345828
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4993911372966654358}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8311278189826985699}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 800, y: 2000}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5060074385960820424
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4993911372966654358}
+  m_CullTransparentMesh: 1
+--- !u!114 &8936581939649475887
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4993911372966654358}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: 
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 0}
+  packInfo:
+    packName: 
+    packgJsonPath: 
+    packgSpritePath: 
+    lasetJsonGUID: 
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &5484466371172864172
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8311278189826985699}
+  - component: {fileID: 3407904815957371626}
+  - component: {fileID: 25007533786230534}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: LoadingPanel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8311278189826985699
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5484466371172864172}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 1669281409109345828}
+  - {fileID: 360525025617545499}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 750, y: 1624}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &3407904815957371626
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5484466371172864172}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6a23dadfaa104ddf929b8c98dd02623c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  maxDuration: 0.5
+  isUpdate: 0
+  currTime: 0.5034794
+  GrpupInfos:
+  - Foldout: 1
+    isActive: 1
+    animName: 
+    isLoop: 0
+    allTargets:
+    - {fileID: 25007533786230534}
+    TweenAssetInfo: {fileID: 11400000, guid: 20165957822522a4f94a6a1171ee9be1, type: 2}
+    TargetFoldout: 0
+    maxDuration: 0.5
+    isUpdate: 1
+    currTime: 0
+  MinMaxGradient:
+    m_Mode: 0
+    m_GradientMin:
+      serializedVersion: 2
+      key0: {r: 1, g: 1, b: 1, a: 1}
+      key1: {r: 1, g: 1, b: 1, a: 1}
+      key2: {r: 0, g: 0, b: 0, a: 0}
+      key3: {r: 0, g: 0, b: 0, a: 0}
+      key4: {r: 0, g: 0, b: 0, a: 0}
+      key5: {r: 0, g: 0, b: 0, a: 0}
+      key6: {r: 0, g: 0, b: 0, a: 0}
+      key7: {r: 0, g: 0, b: 0, a: 0}
+      ctime0: 0
+      ctime1: 65535
+      ctime2: 0
+      ctime3: 0
+      ctime4: 0
+      ctime5: 0
+      ctime6: 0
+      ctime7: 0
+      atime0: 0
+      atime1: 65535
+      atime2: 0
+      atime3: 0
+      atime4: 0
+      atime5: 0
+      atime6: 0
+      atime7: 0
+      m_Mode: 0
+      m_ColorSpace: -1
+      m_NumColorKeys: 2
+      m_NumAlphaKeys: 2
+    m_GradientMax:
+      serializedVersion: 2
+      key0: {r: 1, g: 1, b: 1, a: 1}
+      key1: {r: 1, g: 1, b: 1, a: 1}
+      key2: {r: 0, g: 0, b: 0, a: 0}
+      key3: {r: 0, g: 0, b: 0, a: 0}
+      key4: {r: 0, g: 0, b: 0, a: 0}
+      key5: {r: 0, g: 0, b: 0, a: 0}
+      key6: {r: 0, g: 0, b: 0, a: 0}
+      key7: {r: 0, g: 0, b: 0, a: 0}
+      ctime0: 0
+      ctime1: 65535
+      ctime2: 0
+      ctime3: 0
+      ctime4: 0
+      ctime5: 0
+      ctime6: 0
+      ctime7: 0
+      atime0: 0
+      atime1: 65535
+      atime2: 0
+      atime3: 0
+      atime4: 0
+      atime5: 0
+      atime6: 0
+      atime7: 0
+      m_Mode: 0
+      m_ColorSpace: -1
+      m_NumColorKeys: 2
+      m_NumAlphaKeys: 2
+    m_ColorMin: {r: 0, g: 0, b: 0, a: 0}
+    m_ColorMax: {r: 0, g: 0, b: 0, a: 0}
+  isLoop: 0
+--- !u!225 &25007533786230534
+CanvasGroup:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5484466371172864172}
+  m_Enabled: 1
+  m_Alpha: 1
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0

Assets/Res/UI/LoadingPanel.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: XXkY5iqlBypm23fh8dOBjUgnTxSfXKLvht7qeIBVpx2klTuIsl31LTDNSPVs
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/UIAnimRes/TweenAssetInfoLodingPanel.asset

@@ -0,0 +1,57 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 81c305ba541a4659ad97bd292322e9b3, type: 3}
+  m_Name: TweenAssetInfoLodingPanel
+  m_EditorClassIdentifier: 
+  allTweenInfo:
+  - Foldout: 1
+    TweenType: 1
+    duration: 0.5
+    delay: 0
+    TweenBasic:
+      Foldout: 0
+      duration: 0
+      delay: 0
+      currSchedule: 0
+      TweenRectTransformInfos: []
+    TweenCanvasGroup:
+      Foldout: 1
+      duration: 0.5
+      delay: 0
+      currSchedule: 0
+      TweenLerpType: 0
+      StartAlpha: 0
+      EndAlpha: 1
+      startX:
+        serializedVersion: 2
+        m_Curve: []
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4
+    TweenGraphic:
+      Foldout: 0
+      duration: 0
+      delay: 0
+      currSchedule: 0
+      startColor: {r: 0, g: 0, b: 0, a: 0}
+      endColor: {r: 0, g: 0, b: 0, a: 0}
+      startX:
+        serializedVersion: 2
+        m_Curve: []
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4
+    TweenPlayFx:
+      Foldout: 0
+      duration: 0
+      delay: 0
+      currSchedule: 0

Assets/Res/UIAnimRes/TweenAssetInfoLodingPanel.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: DXoesy+kVnxSk/Q7KvQaN2GS9mgfaYNDHO8VGC74XYoPi8mAznjE3lnAXFRV
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/UIAtlas/daoyou.spriteatlasv2

@@ -28,7 +28,12 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: 1cb76a34abbc73f4a858475c576ae5b6, type: 3}
     - {fileID: 2800000, guid: f60fb128128760d4d98dd01bd8151c02, type: 3}
     - {fileID: 2800000, guid: 458b4d2b39eeb6744860118e7ce17e92, type: 3}
+    - {fileID: 2800000, guid: aca757b586950fa4a9fd769e10e467eb, type: 3}
+    - {fileID: 2800000, guid: 97cacd303a45ee040b9fb23754493568, type: 3}
     - {fileID: 2800000, guid: 7be1ebce8bb60e449925cb98417f2869, type: 3}
     - {fileID: 2800000, guid: bcc9fc139ef095046b682188ab4f1a56, type: 3}
+    - {fileID: 2800000, guid: 02a732c03a39407478a6ca7dfa4a9d56, type: 3}
+    - {fileID: 2800000, guid: fd3427389adcc1649b3052e4ee4aad7c, type: 3}
+    - {fileID: 2800000, guid: e9596307895e7b44bb12b263c4e8cb93, type: 3}
   m_IsVariant: 0
   m_IsPlaceholder: 0

Assets/Res/UIAtlas/tongyong.spriteatlasv2

@@ -83,6 +83,7 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: e1e3be226b84b7d4eb369470fdca7ca3, type: 3}
     - {fileID: 2800000, guid: 3594a49c71c3592429b1536bae91edb8, type: 3}
     - {fileID: 2800000, guid: afd1dd161eb69954ca5bd3f33d067115, type: 3}
+    - {fileID: 2800000, guid: 70c480602f440844daa0aa50fc1aa9b5, type: 3}
     - {fileID: 2800000, guid: a863559153e6e50479f2e9a8e4963f48, type: 3}
     - {fileID: 2800000, guid: 1b9fb0f76ddb6854e96beb35cd49de7e, type: 3}
     - {fileID: 2800000, guid: a65d33338596ffd4a967ebbf07076a2e, type: 3}
@@ -128,6 +129,9 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: 43ee7ca9b6e77b041a5a5c40598a7267, type: 3}
     - {fileID: 2800000, guid: 2d2e9b702b9dc20418741c36f06c90b5, type: 3}
     - {fileID: 2800000, guid: 939cf700d9f1e0344914a17bda374b4a, type: 3}
+    - {fileID: 2800000, guid: 771183074c65e95498415e16fe987c8b, type: 3}
+    - {fileID: 2800000, guid: e3741e76b7d6b6f4ea3228376151cb08, type: 3}
+    - {fileID: 2800000, guid: 01e2f146052dd844fb8db9bab92b4512, type: 3}
     - {fileID: 2800000, guid: 1064e5697afcf2e4380fce9ef6f3716c, type: 3}
     - {fileID: 2800000, guid: e8b66ebe511cc1d4e85937a30bccd4a3, type: 3}
     - {fileID: 2800000, guid: 7e5ce0d678f92704a9674a80dc521664, type: 3}

Assets/Scenes/testCombat.scene

@@ -890,6 +890,110 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 442218246}
   m_CullTransparentMesh: 1
+--- !u!1001 &515822005
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 5394572769830370106, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_Name
+      value: Canvas
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370106, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects:
+    - targetCorrespondingSourceObject: {fileID: 7091770935250694576, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 1895189377}
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
 --- !u!1 &753442135
 GameObject:
   m_ObjectHideFlags: 0
@@ -1205,6 +1309,11 @@ RectTransform:
   m_AnchoredPosition: {x: -5, y: 0}
   m_SizeDelta: {x: -20, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &1113105563 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 7091770935250694576, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+  m_PrefabInstance: {fileID: 515822005}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1312762638
 GameObject:
   m_ObjectHideFlags: 0
@@ -1371,6 +1480,108 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+--- !u!224 &1895189377 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 8311278189826985699, guid: b37c08dad0bf98f42b569bf67e351455, type: 3}
+  m_PrefabInstance: {fileID: 965542112758883088}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &965542112758883088
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 1113105563}
+    m_Modifications:
+    - target: {fileID: 5484466371172864172, guid: b37c08dad0bf98f42b569bf67e351455, type: 3}
+      propertyPath: m_Name
+      value: LoadingPanel
+      objectReference: {fileID: 0}
+    - target: {fileID: 8311278189826985699, guid: b37c08dad0bf98f42b569bf67e351455, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8311278189826985699, guid: b37c08dad0bf98f42b569bf67e351455, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8311278189826985699, guid: b37c08dad0bf98f42b569bf67e351455, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8311278189826985699, guid: b37c08dad0bf98f42b569bf67e351455, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8311278189826985699, guid: b37c08dad0bf98f42b569bf67e351455, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8311278189826985699, guid: b37c08dad0bf98f42b569bf67e351455, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8311278189826985699, guid: b37c08dad0bf98f42b569bf67e351455, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 750
+      objectReference: {fileID: 0}
+    - target: {fileID: 8311278189826985699, guid: b37c08dad0bf98f42b569bf67e351455, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 1624
+      objectReference: {fileID: 0}
+    - target: {fileID: 8311278189826985699, guid: b37c08dad0bf98f42b569bf67e351455, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8311278189826985699, guid: b37c08dad0bf98f42b569bf67e351455, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8311278189826985699, guid: b37c08dad0bf98f42b569bf67e351455, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8311278189826985699, guid: b37c08dad0bf98f42b569bf67e351455, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8311278189826985699, guid: b37c08dad0bf98f42b569bf67e351455, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8311278189826985699, guid: b37c08dad0bf98f42b569bf67e351455, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8311278189826985699, guid: b37c08dad0bf98f42b569bf67e351455, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8311278189826985699, guid: b37c08dad0bf98f42b569bf67e351455, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8311278189826985699, guid: b37c08dad0bf98f42b569bf67e351455, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8311278189826985699, guid: b37c08dad0bf98f42b569bf67e351455, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8311278189826985699, guid: b37c08dad0bf98f42b569bf67e351455, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8311278189826985699, guid: b37c08dad0bf98f42b569bf67e351455, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: b37c08dad0bf98f42b569bf67e351455, type: 3}
 --- !u!114 &4237119297094294473
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1487,3 +1698,4 @@ SceneRoots:
   - {fileID: 5102730602139337721}
   - {fileID: 293130736}
   - {fileID: 6588466611375917160}
+  - {fileID: 515822005}

Assets/Scripts/Core/Event/Event/CustomEventType.cs

@@ -119,7 +119,15 @@ namespace Fort23.Core
       UpdateZuiZhongEvent,
       CancelEvent,
       RefreshULock,
-      NextGuide
+      NextGuide,
+      /// <summary>
+      /// 显示LoadingUI
+      /// </summary>
+      ShowLoadingUI,
+      /// <summary>
+      /// 关闭LoadingUI
+      /// </summary>
+      CloseLoadingUI,
 
     }
 }

Assets/Scripts/Core/UI/Core/UIManager.cs

@@ -175,6 +175,7 @@ namespace Fort23.Mono
                 UILayers[3] = prefab.transform.GetChild(3);
                 UICamera = prefab.transform.GetComponentInChildren<Camera>();
             }
+
             current = EventSystem.current;
             Assembly assembly = Assembly.Load("Fort23.Mono");
             BackgroundPanelType = assembly.GetType(" Fort23.Mono.BackgroundPanel");
@@ -238,7 +239,7 @@ namespace Fort23.Mono
 
         public void SetEventSystemEnable(bool value)
         {
-            if(current != null)
+            if (current != null)
                 current.enabled = value;
         }
 
@@ -335,7 +336,8 @@ namespace Fort23.Mono
             _lastShowPanel.Clear();
         }
 
-        public async CTask<UIPanel> LoadAndOpenPanel(Type uipsnelType, Action<UIPanel> callback, UILayer layer = UILayer.Middle,
+        public async CTask<UIPanel> LoadAndOpenPanel(Type uipsnelType, Action<UIPanel> callback,
+            UILayer layer = UILayer.Middle,
             bool isFocus = true, object[] uiData = null, bool isShowBG = false, bool isFullUI = false,
             bool isActiveAnima = true)
         {
@@ -360,7 +362,7 @@ namespace Fort23.Mono
                 {
                     if (current != null)
                     {
-                        // current.isClose = true;
+                        SetEventSystemEnable(false);
                     }
 
 
@@ -437,7 +439,7 @@ namespace Fort23.Mono
 
                         if (current != null)
                         {
-                            // current.isClose = false;
+                            SetEventSystemEnable(true);
                         }
 
 
@@ -448,13 +450,13 @@ namespace Fort23.Mono
                         RefreshFull();
 
 
-                        if (isShowBG)
-                        {
-                            uiPanel.IsShowCustomBGPanel = true;
-                            if (!AllShowBGUIs.Contains(uiPanel))
-                                AllShowBGUIs.Add(uiPanel);
-                            await GetBackgroundPanel(uiPanel, GetLayer(layer));
-                        }
+                        // if (isShowBG)
+                        // {
+                        //     uiPanel.IsShowCustomBGPanel = true;
+                        //     if (!AllShowBGUIs.Contains(uiPanel))
+                        //         AllShowBGUIs.Add(uiPanel);
+                        //     await GetBackgroundPanel(uiPanel, GetLayer(layer));
+                        // }
 
                         return uiPanel;
                     }
@@ -462,7 +464,7 @@ namespace Fort23.Mono
                     {
                         if (current != null)
                         {
-                            // current.isClose = false;
+                            SetEventSystemEnable(true);
                         }
 
                         // 界面数据没准备好，因此本次操作将被销毁
@@ -477,7 +479,7 @@ namespace Fort23.Mono
             {
                 if (current != null)
                 {
-                    // current.isClose = false;
+                    SetEventSystemEnable(true);
                 }
 
                 LogTool.Error(uipsnelType.ToString() + "  " + e.Message);
@@ -538,6 +540,7 @@ namespace Fort23.Mono
                 {
                     if (current != null)
                     {
+                        SetEventSystemEnable(false);
                         // current.isClose = true;
                     }
 
@@ -574,6 +577,15 @@ namespace Fort23.Mono
                     }
 
                     uiPanel.isFullUI = isFullUI;
+
+                    if (isShowBG)
+                    {
+                        uiPanel.IsShowCustomBGPanel = true;
+                        if (!AllShowBGUIs.Contains(uiPanel))
+                            AllShowBGUIs.Add(uiPanel);
+                        await GetBackgroundPanel(uiPanel, GetLayer(layer));
+                    }
+
                     // 等待数据准备好才初始化UI
                     if (await uiPanel.AsyncInit(uiData))
                     {
@@ -607,15 +619,11 @@ namespace Fort23.Mono
                             NoFocusTopUIPanels.Add(uiPanel);
                         uiPanel.isActiveAnima = isActiveAnima;
                         await uiPanel.Open();
-                        // AudioManager.Instance.PlayAudio("openui.wav");
-                        // if (currOpenPanel.add)
-                        // {
-                        //     currOpenPanel = uiPanel;
-                        // }
+
 
                         if (current != null)
                         {
-                            // current.isClose = false;
+                            SetEventSystemEnable(true);
                         }
 
 
@@ -628,11 +636,14 @@ namespace Fort23.Mono
 
                         if (isShowBG)
                         {
-                            // await TimerComponent.Instance.WaitFrameAsync();
-                            uiPanel.IsShowCustomBGPanel = true;
-                            if (!AllShowBGUIs.Contains(uiPanel))
-                                AllShowBGUIs.Add(uiPanel);
-                            await GetBackgroundPanel(uiPanel, GetLayer(layer));
+                            var popupPanel = GetComponent(BackgroundPanelType) as UIPanel;
+                            // popupPanel.transform.SetAsFirstSibling();
+                            int index01 = uiPanel.GObjectPoolInterface.transform.GetSiblingIndex();
+                            popupPanel.transform.SetSiblingIndex(index01 - 1);
+                            // uiPanel.IsShowCustomBGPanel = true;
+                            // if (!AllShowBGUIs.Contains(uiPanel))
+                            //     AllShowBGUIs.Add(uiPanel);
+                            // await GetBackgroundPanel(uiPanel, GetLayer(layer));
                         }
 
                         return uiPanel;
@@ -641,12 +652,12 @@ namespace Fort23.Mono
                     {
                         if (current != null)
                         {
-                            // current.isClose = false;
+                            SetEventSystemEnable(true);
                         }
 
                         // 界面数据没准备好，因此本次操作将被销毁
                         LogTool.Log($"数据准备失败，请检查{type.Name}的Init方法中的逻辑");
-                        // ShowTips($"数据准备失败，请检查{buildType.Name}的Init方法中的逻辑");
+
                         uiPanel.Close();
                         return null;
                     }
@@ -656,7 +667,7 @@ namespace Fort23.Mono
             {
                 if (current != null)
                 {
-                    // current.isClose = false;
+                    SetEventSystemEnable(true);
                 }
 
                 LogTool.Error(typeof(T).ToString() + "  " + e.Message);
@@ -1334,12 +1345,13 @@ namespace Fort23.Mono
             {
                 popupPanel = Instance.GetComponent(BackgroundPanelType) as UIPanel;
             }
+
             popupPanel.transform.SetParent(parent, false);
-            popupPanel.transform.SetAsFirstSibling();
+            // popupPanel.transform.SetAsFirstSibling();
             int index01 = uiPanel.GObjectPoolInterface.transform.GetSiblingIndex();
             // popupPanel.transform.SetParent(parent, false);
-          
-            popupPanel.transform.SetSiblingIndex(index01-1 );
+
+            popupPanel.transform.SetSiblingIndex(index01 - 1);
             await popupPanel.Open();
 
             return popupPanel;

Assets/Scripts/GameLogic/Combat/CombatState/CombatSceneSwitchState.cs

@@ -0,0 +1,90 @@
+using Fort23.Core;
+using GameLogic.Combat.CombatTool;
+using GameLogic.Combat.Hero;
+using UnityEngine;
+
+namespace GameLogic.Combat.CombatState
+{
+    public class CombatSceneSwitchState : CombatStateBasic
+    {
+        private Vector3 dir;
+        private Vector3 moveTargetDir;
+
+        private float currTime;
+        private int state;
+        private Vector3 startPos;
+        private Vector3 startEulerAngles;
+
+        public CombatSceneSwitchState(CombatController combatController) : base(combatController)
+        {
+        }
+
+        protected override void ProEnter()
+        {
+            CombatController.CombatCameraControllder.isStop = true;
+            CombatController.IsFightState = false;
+            CombatController.GameTimeLineParticleFactory.RecycleAllFxAiLogicBasic();
+            CombatHeroEntity playerHeroEntity = CombatController.currActiveCombat.playerHeroEntity;
+            if (playerHeroEntity != null)
+            {
+                playerHeroEntity.PlayAnim(CombatHeroStateType.idle, true, 0, false, 1);
+                CombatController.MagicWeaponCombatSence.CloseSecene();
+            }
+            startPos=playerHeroEntity.GameObject.transform.position;
+            startEulerAngles = playerHeroEntity.GameObject.transform.rotation.eulerAngles;
+
+            // CombatHeroEntity playerHeroEntity = CombatController.currActiveCombat.playerHeroEntity;
+            Vector3 target = playerHeroEntity.GameObject.transform.TransformPoint(new Vector3(1, 2, 1));
+            moveTargetDir = (target - playerHeroEntity.GameObject.transform.forward).normalized;
+            currTime = 0;
+            state = 0;
+        }
+
+        protected override void ProUpdate(float t)
+        {
+            CombatHeroEntity playerHeroEntity = CombatController.currActiveCombat.playerHeroEntity;
+            if (playerHeroEntity == null)
+            {
+                return;
+            }
+
+            currTime += t;
+            if (currTime > 3 && state == 0)
+            {
+                state = 1;
+                EventManager.Instance.Dispatch(CustomEventType.ShowLoadingUI, null);
+                InitScenes();
+                currTime = 0;
+            }
+
+            if (state == 2)
+            {
+                return;
+            }
+
+            Vector3 pos = playerHeroEntity.dotPos;
+
+            Vector3 currDir = Vector3.Lerp(playerHeroEntity.GameObject.transform.forward, moveTargetDir, 0.3f);
+
+
+            pos += currDir.normalized * 15 * t;
+
+            playerHeroEntity.combatHeroGameObject.SetPosition(pos);
+            playerHeroEntity.GameObject.transform.rotation =
+                Quaternion.LookRotation(new Vector3(currDir.x, 0, currDir.z));
+        }
+
+        private async void InitScenes()
+        {
+            await TimerComponent.Instance.WaitAsync(600);
+            state = 2;
+            CombatHeroEntity playerHeroEntity = CombatController.currActiveCombat.playerHeroEntity;
+            playerHeroEntity.GameObject.transform.position = startPos;
+            playerHeroEntity.GameObject.transform.rotation = Quaternion.Euler(startEulerAngles);
+            await CombatController.CombatSenceController.InitScenes("LevelBattle03");
+            EventManager.Instance.Dispatch(CustomEventType.CloseLoadingUI, null);
+            CombatController.CombatCameraControllder.isStop = false;
+            CombatController.ChangeState(CombatController.fight);
+        }
+    }
+}

Assets/Scripts/GameLogic/Combat/CombatState/CombatSceneSwitchState.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 58ae3dac2f2e4eab8d03a055e9328781
+timeCreated: 1758180548

Assets/Scripts/GameLogic/Combat/CombatTool/CombatController.cs

@@ -85,12 +85,13 @@ namespace GameLogic.Combat.CombatTool
                 stateControl.AddState("update", new CombatUpdateState(this));
                 stateControl.AddState("fight", new CombatFightState(this));
                 stateControl.AddState("combatfinish", new CombatFinishState(this));
+                stateControl.AddState("sceneSwitch", new CombatSceneSwitchState(this));
 
              
                 if (CombatSenceController == null)
                 {
                     CombatSenceController = new CombatSenceController();
-                    await CombatSenceController.InitScenes(startCombatInfo.levelBattleId);
+                    await CombatSenceController.InitScenes("LevelBattle02");
                 }
 
                 if (CombatDataController == null)
@@ -147,6 +148,14 @@ namespace GameLogic.Combat.CombatTool
                 return;
             }
 
+            
+            if (Input.GetKeyDown(KeyCode.A))
+            {
+               ChangeState("sceneSwitch");
+            }
+
+         
+            
             t *= speed;
             if (!IsGameOver)
             {
@@ -179,6 +188,7 @@ namespace GameLogic.Combat.CombatTool
                     }
                 }
             }
+           
         }
 
         private void TriggerCombat()

Assets/Scripts/GameLogic/Combat/CombatTool/CombatHeroController.cs

@@ -129,15 +129,7 @@ namespace GameLogic.Combat.CombatTool
 
         public void Update(float t)
         {
-            if (Input.GetKeyDown(KeyCode.A))
-            {
-                CombatController.currActiveCombat.CombatHeroController.Flight(5, -90, 15);
-            }
-
-            if (Input.GetKeyDown(KeyCode.D))
-            {
-                Flight(5, 90, 15);
-            }
+           
 
 
             for (int i = 0; i < myHero.Count; i++)

Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/CombatSenceController.cs

@@ -15,6 +15,7 @@ namespace GameLogic.Combat.CombatTool
     public class CombatSenceController : IDisposable
     {
         private static readonly int Ran = Shader.PropertyToID("_ran");
+
         private static readonly int Pos = Shader.PropertyToID("_pos");
         // public CombatSencePath currBesselPath;
         //
@@ -28,7 +29,7 @@ namespace GameLogic.Combat.CombatTool
         public float currTime;
         public Transform moveRoot;
 
-        private List<CombatSencePath> reclaimSence = new List<CombatSencePath>();
+        // private List<CombatSencePath> reclaimSence = new List<CombatSencePath>();
 
         // protected GameObjectPool ShengShiQiuTi;
 
@@ -46,15 +47,30 @@ namespace GameLogic.Combat.CombatTool
         private float shengShiRan;
 
         // private List
-        public async CTask InitScenes(int levelBattleId)
+        public async CTask InitScenes(string sceneName)
         {
+            if (SceneMonoConfig != null)
+            {
+                SceneMonoConfig.Dispose();
+                GameObject.Destroy(moveRoot.gameObject);
+                GameObject.Destroy(SceneMonoConfig.gameObject);
+                SceneMonoConfig = null;
+            }
+
+            shengShiRan = 0;
+            _isUpdateShengShi = false;
+
             GameObject gameObject = new GameObject("mvoeRoot");
-            string sceneName = "LevelBattle03";
-            LevelbattleConfig levelbattleConfig = ConfigComponent.Instance.Get<LevelbattleConfig>(levelBattleId);
-            if (levelbattleConfig.ID > 0)
+            if (string.IsNullOrEmpty(sceneName))
             {
-                //sceneName= levelbattleConfig.sceneName;
+                sceneName= "LevelBattle03";
             }
+            // string sceneName = "LevelBattle03";
+            // LevelbattleConfig levelbattleConfig = ConfigComponent.Instance.Get<LevelbattleConfig>(levelBattleId);
+            // if (levelbattleConfig.ID > 0)
+            // {
+            //     //sceneName= levelbattleConfig.sceneName;
+            // }
 #if UNITY_EDITOR
             TestCombatHeroConfig testCombatHeroConfig = GameObject.FindObjectOfType<TestCombatHeroConfig>();
             if (testCombatHeroConfig != null)
@@ -78,23 +94,15 @@ namespace GameLogic.Combat.CombatTool
                 });
             cTaskAwaitBuffer.AddTask(task_a);
 
-        
+
             lasetDir = Vector3.forward;
             lasetPos = new Vector3(0, 20, 0);
             await cTaskAwaitBuffer.WaitAll();
             // currBesselPath = InitBesselPath(lasetPos);
             SceneMonoConfig.Init(Camera.main.transform.parent, moveRoot);
-       
+            SceneMonoConfig.UpdateScene();
         }
 
-
-      
-       
-
-      
-
-    
-
         private async CTask<SceneDecoration> GetSceneDecoration(SceneObjectConfig sceneObjectConfig)
         {
             GameObjectPool gameObjectPool = await sceneObjectConfig.GetNewPrefab();
@@ -105,70 +113,6 @@ namespace GameLogic.Combat.CombatTool
             return sceneDecoration;
         }
 
-        // public Vector3 GetTarget(float time)
-        // {
-        //     if (time > 1)
-        //     {
-        //         if (NextBesselPath == null)
-        //         {
-        //             NextBesselPath = InitBesselPath(currBesselPath.b, 0);
-        //         }
-        //
-        //         time = time % 1;
-        //         return NextBesselPath.GetValue(time);
-        //     }
-        //     else
-        //     {
-        //         return currBesselPath.GetValue(time);
-        //     }
-        // }
-
-        // public Vector3 Move(float dis)
-        // {
-        //     float t = dis / currBesselPath.len;
-        //     currTime += t;
-        //     // Debug.Log("移动速度" + t + "/" + currBesselPath.len);
-        //
-        //     Vector3 targetPos = Vector3.zero;
-        //     if (currTime > 0.01f)
-        //     {
-        //         if (NextBesselPath == null)
-        //         {
-        //             // int odds = Random.Range(0, 100);
-        //             // if (odds < 50)
-        //             // {
-        //             //     NextBesselPath = InitBesselPath(currBesselPath.b, Random.Range(0, 100) < 50 ? -1 : 1);
-        //             // }
-        //             // else
-        //             {
-        //                 NextBesselPath = InitBesselPath(currBesselPath.b);
-        //             }
-        //         }
-        //     }
-        //
-        //     if (currTime > 1)
-        //     {
-        //         if (NextBesselPath == null)
-        //         {
-        //             NextBesselPath = InitBesselPath(currBesselPath.b);
-        //         }
-        //
-        //         currTime = currTime % 1;
-        //         // targetPos = NextBesselPath.GetValue(currTime);
-        //         currBesselPath.reclaimTime = 3;
-        //         reclaimSence.Add(currBesselPath);
-        //         currBesselPath = NextBesselPath;
-        //         NextBesselPath = null;
-        //         CombatEventManager.Instance.Dispatch(CombatEventType.SencenBesselPathAlter, null);
-        //     }
-        //     else
-        //     {
-        //     }
-        //
-        //     targetPos = currBesselPath.GetValue(currTime);
-        //     moveRoot.transform.position = targetPos;
-        //     return targetPos;
-        // }
 
         public void StartPayShengShi(Transform root)
         {
@@ -188,15 +132,7 @@ namespace GameLogic.Combat.CombatTool
         {
             moveRoot.transform.position = CombatController.currActiveCombat.CombatHeroController.GetTarget(0);
             SceneMonoConfig?.UpdateScene();
-            // if (currBesselPath != null)
-            // {
-            //     currBesselPath.Update(t);
-            // }
-            //
-            // if (NextBesselPath != null)
-            // {
-            //     NextBesselPath.Update(t);
-            // }
+     
 
 
             if (_isUpdateShengShi)
@@ -214,16 +150,7 @@ namespace GameLogic.Combat.CombatTool
                 }
             }
 
-            for (int i = 0; i < reclaimSence.Count; i++)
-            {
-                CombatSencePath sencePath = reclaimSence[i];
-                sencePath.reclaimTime -= t;
-                if (sencePath.reclaimTime < 0)
-                {
-                    sencePath.DormancyObj();
-                    reclaimSence.RemoveAt(i);
-                }
-            }
+       
         }
 
 

Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/SceneCJ2MonoConfig.cs

@@ -158,5 +158,18 @@ namespace GameLogic.Combat.CombatTool.SceneTool
                 GObjectPool.Instance.FetchAsyncForGameObject<GameObjectPool>(gameObject, gameObject.name);
             return gameObjectPool;
         }
+
+        protected override void ProDispose()
+        {
+            foreach (var VARIABLE in _downAllGameObjectPools.Values)
+            {
+                GObjectPool.Instance.Recycle(_downAllGameObjectPools.Value);
+            }
+
+            _downAllGameObjectPools.Clear();
+            foreach (var VARIABLE in _allGameObjectPools.Values)
+                GObjectPool.Instance.Recycle(_allGameObjectPools.Value);
+            _allGameObjectPools.Clear();
+        }
     }
 }

Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/SceneMonoConfig.cs

@@ -94,5 +94,14 @@ namespace GameLogic.Combat.CombatTool.SceneTool
                 GObjectPool.Instance.FetchAsyncForGameObject<GameObjectPool>(gameObject, gameObject.name);
             return gameObjectPool;
         }
+
+        protected override void ProDispose()
+        {
+            foreach (var VARIABLE in _allGameObjectPools.Values)
+            {
+                GObjectPool.Instance.Recycle(VARIABLE);
+            }
+            _allGameObjectPools.Clear();
+        }
     }
 }

Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/SceneMonoConfigBasic.cs

@@ -1,9 +1,10 @@
+using System;
 using Fort23.UTool;
 using UnityEngine;
 
 namespace GameLogic.Combat.CombatTool.SceneTool
 {
-    public class SceneMonoConfigBasic: MonoBehaviour
+    public class SceneMonoConfigBasic: MonoBehaviour,IDisposable
     {
         public GameObject skyObejct;
 
@@ -31,5 +32,17 @@ namespace GameLogic.Combat.CombatTool.SceneTool
         {
             
         }
+
+
+        public void Dispose()
+        {
+            ProDispose();
+            root = null;
+            moveRoot = null;
+        }
+        protected virtual void ProDispose()
+        {
+            
+        }
     }
 }

Assets/Scripts/GameUI/Combat/CombatDrive.cs

@@ -24,10 +24,20 @@ namespace GameLogic.Combat
             string name = "CombatRoot.prefab";
             AssetHandle assetHandle = await AssetBundleLoadManager.Instance.LoadAssetAsyncTask<GameObject>(name);
             assetHandle.AssetObject<GameObject>().SetActive(true);
+            EventManager.Instance.AddEventListener(CustomEventType.ShowLoadingUI, ShowLoadingUI);
+            EventManager.Instance.AddEventListener(CustomEventType.CloseLoadingUI, CloseLoadingUI);
 
             // 
         }
 
+        private void ShowLoadingUI(IEventData eventData)
+        {
+            LoadingPanel.OpenLodingPanel();
+        }
+        private void CloseLoadingUI(IEventData eventData)
+        {
+            UIManager.Instance.HideUIUIPanel<LoadingPanel>();
+        }
         public void AddCombatController(CombatController combatController)
         {
             this.CombatController = combatController;

Assets/Scripts/GameUI/UI/AppBarPanel/AppBarPanel.cs

@@ -85,8 +85,6 @@ namespace Fort23.Mono
         public async void Bnt_ShengShi_Click()
         {
             await DivineSenceInfoPanel.OpenPanel((count, useItems) => { Bnt_shengShi_onClick(count, useItems); });
-
-      
         }
 
         public async void Btn_Shop_Click()
@@ -96,6 +94,7 @@ namespace Fort23.Mono
                 return;
             }
 
+            CloseMenu();
             UIPanel uiPanel = currentOpenUIPanel;
 
             CombatDrive.Instance.CombatController.isUpdate = false;
@@ -118,6 +117,7 @@ namespace Fort23.Mono
                 return;
             }
 
+            CloseMenu();
 
             UIPanel uiPanel = currentOpenUIPanel;
             SkillSelectPanel skillSelectPanel = await SkillSelectPanel.OpenSkillSelectPanel();
@@ -135,6 +135,7 @@ namespace Fort23.Mono
                 return;
             }
 
+            CloseMenu();
 
             UIPanel uiPanel = currentOpenUIPanel;
             MainHeroPanel mainHeroPanel = await MainHeroPanel.OpenPanel();
@@ -155,6 +156,7 @@ namespace Fort23.Mono
                 return;
             }
 
+            CloseMenu();
             UIPanel uiPanel = currentOpenUIPanel;
             CombatDrive.Instance.CombatController.isUpdate = false;
             CaveMainPanel heroInformationPanel = await CaveMainPanel.OpenPanel();
@@ -187,9 +189,9 @@ namespace Fort23.Mono
             if (EventSystemManager.Instance.isTriggerEvent)
                 return;
             AudioManager.Instance.PlayAudio("ui_shengshitansuo.wav");
-            if(PlayerGuideManager.Instance.curPhase == 2)  
+            if (PlayerGuideManager.Instance.curPhase == 2)
                 PlayerGuideManager.Instance.StepInit();
-            if(PlayerGuideManager.Instance.curPhase == 3)  
+            if (PlayerGuideManager.Instance.curPhase == 3)
                 PlayerGuideManager.Instance.StepInit();
 
             EventSystemManager.Instance.isTriggerEvent = true;
@@ -228,6 +230,7 @@ namespace Fort23.Mono
         {
             if (uiPanel is MainPanel)
             {
+                Icon_Di.gameObject.SetActive(true);
                 Btn_Back.gameObject.SetActive(false);
                 bnt_shengShi.gameObject.SetActive(true);
                 BtnRoot.gameObject.SetActive(true);
@@ -236,6 +239,7 @@ namespace Fort23.Mono
             else if (uiPanel is CaveMainPanel || uiPanel is SkillSelectPanel || uiPanel is ShopPanel ||
                      uiPanel is MainHeroPanel)
             {
+                Icon_Di.gameObject.SetActive(true);
                 Btn_Back.gameObject.SetActive(true);
                 bnt_shengShi.gameObject.SetActive(false);
                 BtnRoot.gameObject.SetActive(true);
@@ -243,6 +247,7 @@ namespace Fort23.Mono
             }
             else
             {
+                Icon_Di.gameObject.SetActive(false);
                 BtnRoot.gameObject.SetActive(false);
                 Btn_Back.gameObject.SetActive(true);
                 bnt_shengShi.gameObject.SetActive(false);

Assets/Scripts/GameUI/UI/AppBarPanel/AppBarPanelData.cs

@@ -173,6 +173,17 @@ namespace Fort23.Mono
 	      return _MenuBgRoot;
 	     }
 	   }
+	  private GameObject _Icon_Di;
+	  public GameObject Icon_Di
+	   {
+	   get{
+	      if (_Icon_Di == null)
+	       {
+	         _Icon_Di  = GetUIUnit<GameObject>("Icon_Di"); 
+	       }
+	      return _Icon_Di;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/BoxPanel/WidgetItemType2.cs

@@ -30,6 +30,7 @@ namespace Fort23.Mono
         public void InitWidget(ItemInfo itemInfo)
         {
             ItemConfig itemConfig = itemInfo.config;
+            Icon_New.gameObject.SetActive(false);
             //法宝
             if (itemInfo.config.itemTag == 11)
             {
@@ -46,6 +47,7 @@ namespace Fort23.Mono
                 else
                 {
                     Icon_SuiPian.gameObject.SetActive(false);
+                    Icon_New.gameObject.SetActive(true);
                 }
             }
             //功法
@@ -60,10 +62,12 @@ namespace Fort23.Mono
                     itemConfig = ConfigComponent.Instance.Get<ItemConfig>(itemInfo.config.associateVlaue[0]);
                     Icon_SuiPian.gameObject.SetActive(true);
                     Text_Count.text = $"x{itemInfo.config.associateVlaue[2]}";
+                    // Icon_New.gameObject.SetActive(true);
                 }
                 else
                 {
                     Icon_SuiPian.gameObject.SetActive(false);
+                    Icon_New.gameObject.SetActive(true);
                 }
             }
             else
@@ -75,7 +79,8 @@ namespace Fort23.Mono
 
             if (itemConfig.associateID == 3)
             {
-                SkillConfig skillConfig = ConfigComponent.Instance.Get<SkillConfig>(itemConfig.associateVlaue[1]*10+1);
+                SkillConfig skillConfig =
+                    ConfigComponent.Instance.Get<SkillConfig>(itemConfig.associateVlaue[1] * 10 + 1);
                 if (skillConfig.attribute == 1)
                 {
                     icon.icon_name = "dec_gfbook_jin";
@@ -96,6 +101,7 @@ namespace Fort23.Mono
                 {
                     icon.icon_name = "dec_gfbook_tu";
                 }
+
                 Icon_Skill.gameObject.SetActive(true);
                 Icon_Skill.icon_name = skillConfig.icon;
             }
@@ -103,7 +109,8 @@ namespace Fort23.Mono
             else if (itemConfig.associateID == 11)
             {
                 ItemConfig itemConfig2 = ConfigComponent.Instance.Get<ItemConfig>(itemConfig.associateVlaue[0]);
-                SkillConfig skillConfig = ConfigComponent.Instance.Get<SkillConfig>(itemConfig2.associateVlaue[1]*10+1);
+                SkillConfig skillConfig =
+                    ConfigComponent.Instance.Get<SkillConfig>(itemConfig2.associateVlaue[1] * 10 + 1);
                 if (skillConfig.attribute == 1)
                 {
                     icon.icon_name = "dec_gfbook_jin";
@@ -124,6 +131,7 @@ namespace Fort23.Mono
                 {
                     icon.icon_name = "dec_gfbook_tu";
                 }
+
                 Icon_Skill.gameObject.SetActive(true);
                 Icon_Skill.icon_name = skillConfig.icon;
             }

Assets/Scripts/GameUI/UI/BoxPanel/WidgetItemType2Data.cs

@@ -107,6 +107,17 @@ namespace Fort23.Mono
 	      return _Icon_Skill;
 	     }
 	   }
+	  private GameObject _Icon_New;
+	  public GameObject Icon_New
+	   {
+	   get{
+	      if (_Icon_New == null)
+	       {
+	         _Icon_New  = GetUIUnit<GameObject>("Icon_New"); 
+	       }
+	      return _Icon_New;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/CombatPanel/LoadingPanel.cs

@@ -0,0 +1,29 @@
+namespace Fort23.Mono
+{
+	[UIBinding(prefab = "LoadingPanel"  )]
+	public partial class LoadingPanel : UIPanel
+	{
+		public static async void OpenLodingPanel()
+		{
+			await UIManager.Instance.LoadAndOpenPanel<LoadingPanel>(null, UILayer.Top);
+		}
+
+		private void Init()
+		{
+
+		}
+		protected override void AddEvent()
+		{
+
+		}
+		protected override void DelEvent()
+		{
+
+		}
+		public override void AddButtonEvent()
+		{
+
+		}
+
+	}
+}

Assets/Scripts/GameUI/UI/CombatPanel/LoadingPanel.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: WygWvXytVyhZDMAkBob/de1+2TYYAFjcz+dLCPzhIVsHACE5drLeWgjufTKx
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouInfoPanel.cs

@@ -92,7 +92,8 @@ namespace Fort23.Mono
                     && EventSystemManager.Instance.BagIsEvent(_daoyouModelConfig.EventCompleteforQuest)
                     && !EventSystemManager.Instance.IsEventTrigger(_daoyouModelConfig.QuestID))
                 {
-                    AccountFileInfo.EventList eventList = EventSystemManager.Instance.AddEvent(_daoyouModelConfig.QuestID);
+                    AccountFileInfo.EventList eventList =
+                        EventSystemManager.Instance.AddEvent(_daoyouModelConfig.QuestID);
                     AccountFileInfo.Instance.playerData.eventList.Add(eventList);
                     AccountFileInfo.Instance.SavePlayerData();
                     EventSystemManager.Instance.TriggerEvent(eventList);
@@ -138,7 +139,8 @@ namespace Fort23.Mono
 
                     emotionConfig emotionConfig = ConfigComponent.Instance.Get<emotionConfig>(daoYouData.emotion);
 
-                    if (_daoyouModelConfig.PreferGiftID.Contains(daoyouGiftConfig.ItemID) && !daoYouData.loveIds.Contains(daoyouGiftConfig.ItemID))
+                    if (_daoyouModelConfig.PreferGiftID.Contains(daoyouGiftConfig.ItemID) &&
+                        !daoYouData.loveIds.Contains(daoyouGiftConfig.ItemID))
                     {
                         daoYouData.loveIds.Add(daoyouGiftConfig.ItemID);
                     }
@@ -258,7 +260,10 @@ namespace Fort23.Mono
                 Btn_Eveent.gameObject.SetActive(false);
             }
 
-            HeroPowerUpConfig heroPowerUpConfig = ConfigComponent.Instance.Get<HeroPowerUpConfig>(PlayerManager.Instance.GetDaoYouLevel(daoYouData));
+            Slider_Emotion.fillAmount = daoYouData.emotionValue / 100;
+
+            HeroPowerUpConfig heroPowerUpConfig =
+                ConfigComponent.Instance.Get<HeroPowerUpConfig>(PlayerManager.Instance.GetDaoYouLevel(daoYouData));
             Text_JingJie.text = LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[0]) +
                                 LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[1]) +
                                 LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[2]);
@@ -278,16 +283,20 @@ namespace Fort23.Mono
 
             // guajibuff guajibuff = ConfigComponent.Instance.Get<guajibuff>(_daoyouModelConfig.guajiBuffID[0]);
             // DaoyouLevelupConfig daoyouLevelupConfig1 = ConfigComponent.Instance.Get<DaoyouLevelupConfig>(daoYouData.favorabilityLv);
-            Text_GiftGailv.text = "送礼概率:" + PlayerManager.Instance.GetBl(daoYouData, _daoyouModelConfig.guajiBuffID[0]) + "%";
+            Text_GiftGailv.text = LanguageManager.Instance.Text(10278,
+                PlayerManager.Instance.GetBl(daoYouData, _daoyouModelConfig.guajiBuffID[0]));
+                // "送礼概率:" + PlayerManager.Instance.GetBl(daoYouData, _daoyouModelConfig.guajiBuffID[0]) + "%";
             for (var i = 1; i < _daoyouModelConfig.guajiBuffID.Length; i++)
             {
-                DaoYouIdleEarningsWidget daoYouIdleEarningsWidget = await UIManager.Instance.CreateGComponent<DaoYouIdleEarningsWidget>(null, GuajiContent);
+                DaoYouIdleEarningsWidget daoYouIdleEarningsWidget =
+                    await UIManager.Instance.CreateGComponent<DaoYouIdleEarningsWidget>(null, GuajiContent);
                 daoYouIdleEarningsWidget.CustomInit(daoYouData, _daoyouModelConfig.guajiBuffID[i]);
                 _daoYouIdleEarningsWidgets.Add(daoYouIdleEarningsWidget);
             }
 
 
-            DaoyouLevelupConfig currentDaoyouLevelupConfig = ConfigComponent.Instance.Get<DaoyouLevelupConfig>(daoYouData.favorabilityLv);
+            DaoyouLevelupConfig currentDaoyouLevelupConfig =
+                ConfigComponent.Instance.Get<DaoyouLevelupConfig>(daoYouData.favorabilityLv);
             Text_CurrentName.text = LanguageManager.Instance.Text(currentDaoyouLevelupConfig.name);
             Text_CurrentLevel.text = daoYouData.favorabilityLv.ToString();
             Slider_LeveUp.maxValue = currentDaoyouLevelupConfig.exp;
@@ -298,9 +307,11 @@ namespace Fort23.Mono
             {
                 foreach (var i in _daoyouModelConfig.PreferGiftID)
                 {
-                    WidgetItem widgetItem = await UIManager.Instance.CreateGComponent<WidgetItem>(null, LoveItemContent);
+                    WidgetItem widgetItem =
+                        await UIManager.Instance.CreateGComponent<WidgetItem>(null, LoveItemContent);
                     widgetItems.Add(widgetItem);
-                    if (_daoyouModelConfig.shownPreferGiftID.Contains(i) || (daoYouData != null && daoYouData.loveIds.Contains(i)))
+                    if (_daoyouModelConfig.shownPreferGiftID.Contains(i) ||
+                        (daoYouData != null && daoYouData.loveIds.Contains(i)))
                     {
                         widgetItem.InitWidget(new ItemInfo(i, 0));
                     }
@@ -315,7 +326,8 @@ namespace Fort23.Mono
             {
                 foreach (var i in _daoyouModelConfig.daolvSkillID)
                 {
-                    DaoYouaaFfixWidget daoYouaaFfixWidge = await UIManager.Instance.CreateGComponent<DaoYouaaFfixWidget>(null, DaoLvContent);
+                    DaoYouaaFfixWidget daoYouaaFfixWidge =
+                        await UIManager.Instance.CreateGComponent<DaoYouaaFfixWidget>(null, DaoLvContent);
                     daoYouaaFfixWidge.CustomInit(i);
                     daoYouaaFfixWidgets.Add(daoYouaaFfixWidge);
                 }
@@ -325,7 +337,8 @@ namespace Fort23.Mono
             DaoyouLevelupConfig[] configs = ConfigComponent.Instance.GetAll<DaoyouLevelupConfig>();
             foreach (var daoyouLevelupConfig in configs)
             {
-                DaoYouLevelWidget daoYouLevelWidget = await UIManager.Instance.CreateGComponent<DaoYouLevelWidget>(null, DaoYouLevelWidgetContent);
+                DaoYouLevelWidget daoYouLevelWidget =
+                    await UIManager.Instance.CreateGComponent<DaoYouLevelWidget>(null, DaoYouLevelWidgetContent);
                 daoYouLevelWidget.CustomInit(daoYouData, daoyouLevelupConfig.ID);
                 _daoYouLevelWidgets.Add(daoYouLevelWidget);
             }
@@ -374,7 +387,8 @@ namespace Fort23.Mono
             {
                 foreach (var itemInfo in allItems)
                 {
-                    if (_daoyouModelConfig.shownPreferGiftID.Contains(itemInfo.itemID) || (daoYouData != null && daoYouData.loveIds.Contains(itemInfo.itemID)))
+                    if (_daoyouModelConfig.shownPreferGiftID.Contains(itemInfo.itemID) ||
+                        (daoYouData != null && daoYouData.loveIds.Contains(itemInfo.itemID)))
                     {
                         shownItems.Add(itemInfo);
                     }
@@ -466,11 +480,14 @@ namespace Fort23.Mono
             Text_Count.text = $"当前选择数量{count}";
             if (widgetItem1 != null && daoyouGiftConfig.ID != 0)
             {
-                Text_GiveGiftDesc.text = $"好感度+{daoyouGiftConfig.emotionValue} ({daoyouGiftConfig.emotionValue * emotionConfig.hanganUpRate[0] * 0.001} - {daoyouGiftConfig.emotionValue * emotionConfig.hanganUpRate[1] * 0.001})";
+                Text_GiveGiftDesc.text = LanguageManager.Instance.Text(10289, daoyouGiftConfig.emotionValue,
+                    daoyouGiftConfig.emotionValue * emotionConfig.hanganUpRate[0] * 0.001,
+                    daoyouGiftConfig.emotionValue * emotionConfig.hanganUpRate[1] * 0.001);
             }
             else if (widgetItem1 != null && daoyouGiftConfig.ID == 0)
             {
-                Text_GiveGiftDesc.text = $"心情+{widgetItem1.itemInfo.config.associateVlaue[0]} )";
+                Text_GiveGiftDesc.text =
+                    LanguageManager.Instance.Text(10290, widgetItem1.itemInfo.config.associateVlaue[0]);
             }
         }
 

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouInfoPanelData.cs

@@ -382,6 +382,17 @@ namespace Fort23.Mono
 	      return _Text_GiftGailv;
 	     }
 	   }
+	  private MyImage _Slider_Emotion;
+	  public MyImage Slider_Emotion
+	   {
+	   get{
+	      if (_Slider_Emotion == null)
+	       {
+	         _Slider_Emotion  = GetUIUnit<MyImage>("Slider_Emotion"); 
+	       }
+	      return _Slider_Emotion;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouWidget.cs

@@ -45,6 +45,15 @@ namespace Fort23.Mono
                 Text_Level.text = 0 + "";
             }
 
+            if (_daoYouData == null)
+            {
+                Slider_Emotion.fillAmount = 1;
+            }
+            else
+            {
+                Slider_Emotion.fillAmount = _daoYouData.emotionValue / 100;
+            }
+           
 
             if (_daoYouData == null)
             {

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouWidgetData.cs

@@ -74,6 +74,17 @@ namespace Fort23.Mono
 	      return _Text_Level;
 	     }
 	   }
+	  private MyImage _Slider_Emotion;
+	  public MyImage Slider_Emotion
+	   {
+	   get{
+	      if (_Slider_Emotion == null)
+	       {
+	         _Slider_Emotion  = GetUIUnit<MyImage>("Slider_Emotion"); 
+	       }
+	      return _Slider_Emotion;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/GuidePanel/PlayerGuideManager.cs

@@ -728,6 +728,10 @@ namespace Fort23.Mono
             {
                 SetfxTransImageVisiable(false);
             }
+            else
+            {
+                SetfxTransImageVisiable(true);
+            }
 
 
             int[] fPos = guideConfig.fingerPos;

Assets/Scripts/GameUI/UI/RewardsPanel/RewardsPanel.cs

@@ -13,6 +13,8 @@ namespace Fort23.Mono
     {
         private void Init()
         {
+            isAddStack = true;
+            IsShowAppBar = false;
         }
 
         protected override void AddEvent()