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

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

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

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: Xnwdsnj7VCiMeeh0ojyhX8taYKhteURwcMKFZLfoekxaJB4Nmm1ERb9ckFJN
+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: 22, y: 0, z: 139, 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: 1537655665
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: CC4b5C38W3v+6tdChKiDnzq228A6ciBOGXGiXFpTjOkSwJVbQ0bqGAnFGKhe
+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_map_fg2.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: Bn5OtH+kW30ZCnRGKEOHWUvWMHrahOfNHAk/zJSdYnQ7V5TgseSLNr4et+uz
+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_map_suo.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: CS8Z53j+AX0eNmL85SH0E4qjVVHU6wDWN3fxku0CGW8OVYFB5Mc10e3gRTOB
+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_mingyunfeng.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: XShL43v+AXPHFdWWF87scsYS6GKVr9CCAbXzOSdbah/nqxiNzC5BBxg9QCpY
+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_zhandou_biaoji.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: C3gWt3v4VSjUvvpaXjD6wLaunKGOD0/mqV8XLlwMdongZ5MXPBZuqeUCTJle
+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/AnimtionCurveLibrary/GameAnimationCurveLibrary.asset

@@ -217,3 +217,27 @@ MonoBehaviour:
     m_PreInfinity: 2
     m_PostInfinity: 2
     m_RotationOrder: 4
+  switchSceneCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 2
+      outSlope: 2
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0
+      outWeight: 0
+    - serializedVersion: 3
+      time: 1
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0
+      outWeight: 0
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4

Assets/Res/Config/EventConfig.json

@@ -4428,7 +4428,7 @@
       "EventType": 1,
       "Score": 0,
       "EventQuality": 3,
-      "RefreshProbability": 30,
+      "RefreshProbability": 100,
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 1,

Assets/Res/Config/EventLinkConfig.json

@@ -2051,7 +2051,7 @@
       "EventConditionMessage": 5175,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 101,
+      "NPCID": 0,
       "LanID": [
         5176
       ],
@@ -2075,7 +2075,7 @@
       "EventConditionMessage": 5175,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 102,
+      "NPCID": 100,
       "LanID": [
         5178
       ],

Assets/Res/Config/GroupConfig.json

@@ -757,10 +757,10 @@
     {
       "ID": 10001,
       "GroupMonsterLevel": [
-        5
+        205
       ],
       "GroupMonster": [
-        9002
+        9005
       ]
     },
     {

Assets/Res/Config/HeroModelConfig.json

@@ -1050,7 +1050,7 @@
       "model": "Boss_fenghuang",
       "isUseGpu": false,
       "heroType": 4,
-      "attack": 105,
+      "attack": 150,
       "hp": 300,
       "def": 100,
       "shield": 300,

Assets/Res/Config/LevelbattleConfig.json

@@ -543,7 +543,7 @@
     {
       "ID": 10001,
       "Group": [
-        100001
+        10001
       ],
       "combatTime": 120.0,
       "combatType": 1,

Assets/Res/Config/PlayerGuideConfig.json

@@ -584,7 +584,7 @@
       "FingerType": 1,
       "dialogPos": [
         -182,
-        -517
+        53
       ],
       "NpcPos": [
         422,
@@ -656,7 +656,7 @@
       "FingerType": -1,
       "dialogPos": [
         -182,
-        -517
+        177
       ],
       "NpcPos": [
         422,
@@ -692,7 +692,7 @@
       "FingerType": 1,
       "dialogPos": [
         -182,
-        -517
+        177
       ],
       "NpcPos": [
         422,
@@ -743,7 +743,7 @@
       "SpeakerImage": 3,
       "desc": 10149,
       "Highlighting": 1,
-      "blackAlpha": 0.55,
+      "blackAlpha": 0.1,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [

Assets/Res/UI/AppBarPanel/AppBarPanel.prefab

@@ -1404,6 +1404,8 @@ GameObject:
   - component: {fileID: 2609989254926019074}
   - component: {fileID: 759492161019403368}
   - component: {fileID: 7252785412647633890}
+  - component: {fileID: 3784346057485665382}
+  - component: {fileID: 3312526319194180165}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_Menu
@@ -1425,6 +1427,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7487176804920089040}
+  - {fileID: 7541755658825833766}
   m_Father: {fileID: 8996942401071482941}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
@@ -1540,6 +1543,65 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   audioName: ui_button
+--- !u!114 &3784346057485665382
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1973807357976626307}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ef7878ea2dacc454894d556c1d97bca0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - StateInfos:
+    - Target: {fileID: 5848168123700866973}
+      UIStateV4Types: 04000000
+      UIStateV4Datas:
+      - {x: 1, y: 0, z: 0, w: 0}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+    - Target: {fileID: 4371168351228159499}
+      UIStateV4Types: 04000000
+      UIStateV4Datas:
+      - {x: 0, y: 0, z: 0, w: 0}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+  - StateInfos:
+    - Target: {fileID: 5848168123700866973}
+      UIStateV4Types: 04000000
+      UIStateV4Datas:
+      - {x: 0, y: 0, z: 0, w: 0}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+    - Target: {fileID: 4371168351228159499}
+      UIStateV4Types: 04000000
+      UIStateV4Datas:
+      - {x: 1, y: 0, z: 0, w: 0}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+  AllComs:
+  - {fileID: 5848168123700866973}
+  - {fileID: 4371168351228159499}
+  AllComsStateTypes: 0400000004000000
+  CurrIndex: 0
+--- !u!114 &3312526319194180165
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1973807357976626307}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 09a9a136688f46fbb2a843418fc53144, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isScriptControl: 1
+  uiToggleList: {fileID: 0}
+  CustomStateController: {fileID: 0}
 --- !u!1 &2349479014257640583
 GameObject:
   m_ObjectHideFlags: 0
@@ -2277,6 +2339,95 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &4371168351228159499
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7541755658825833766}
+  - component: {fileID: 2581001375578908508}
+  - component: {fileID: 3005866034869510406}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: icon2
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &7541755658825833766
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4371168351228159499}
+  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: 4560051099169459486}
+  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: 4.3118896, y: 0.87323}
+  m_SizeDelta: {x: 95, y: 83}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2581001375578908508
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4371168351228159499}
+  m_CullTransparentMesh: 1
+--- !u!114 &3005866034869510406
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4371168351228159499}
+  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_gongneng2
+  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: 79efd91d4f98d1967eff87055daf4492
+  imageH: 45
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &4383204072351547665
 GameObject:
   m_ObjectHideFlags: 0
@@ -2982,6 +3133,7 @@ MonoBehaviour:
   - {fileID: 8687067159130349924}
   - {fileID: 4539428625316042701}
   - {fileID: 7753631802842447130}
+  - {fileID: 3312526319194180165}
   _allChildObj: []
 --- !u!1 &5301195012147280119
 GameObject:
@@ -3411,7 +3563,7 @@ GameObject:
   - component: {fileID: 2090444370474109629}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: myImage
+  m_Name: icon1
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

Assets/Res/UI/DaoYouPanel/DaoYouInfoPanel.prefab

@@ -1232,7 +1232,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 197.0892, y: -53}
+  m_AnchoredPosition: {x: 197.0892, y: -38}
   m_SizeDelta: {x: 394.1784, y: 0}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &8219955351092879517

Assets/Res/UI/DivineSence/DivineSenceEventResultPanel.prefab

@@ -1,970 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:yousandi.cn,2023:
---- !u!1 &650584255987892480
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 8599819629026832582}
-  - component: {fileID: 7897761964867798499}
-  m_Layer: 5
-  m_HasEditorInfo: 1
-  m_Name: DivineSenceEventResultPanel
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &8599819629026832582
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 650584255987892480}
-  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: 2896655462721008753}
-  - {fileID: 2569128129379278262}
-  - {fileID: 3581464887972855309}
-  - {fileID: 9037408276187403176}
-  - {fileID: 4737429402125406338}
-  - {fileID: 4688522053669353716}
-  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 &7897761964867798499
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 650584255987892480}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  data:
-  - key: bg
-    gameObject: {fileID: 8488195482551738332}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
-  - key: Content
-    gameObject: {fileID: 8646134070111592716}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
-  - key: ContentRoot
-    gameObject: {fileID: 5944675064355718479}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
-  - key: Btn_Close
-    gameObject: {fileID: 3651346582420827263}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
-  - key: Btn_Ok
-    gameObject: {fileID: 3169074378938001994}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
-  isAssetBundle: 1
---- !u!1 &2132268725135064903
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 2569128129379278262}
-  - component: {fileID: 9156533754913033698}
-  - component: {fileID: 8488195482551738332}
-  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 &2569128129379278262
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2132268725135064903}
-  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: 8599819629026832582}
-  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: 46.5656}
-  m_SizeDelta: {x: 475.8763, y: 777.9515}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &9156533754913033698
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2132268725135064903}
-  m_CullTransparentMesh: 1
---- !u!114 &8488195482551738332
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2132268725135064903}
-  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: 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_dadi_01
-  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: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
-  useGradient: 0
-  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
-  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
-  direction: 0
---- !u!1 &2360665792630318950
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 5944675064355718479}
-  - component: {fileID: 6191317521368894502}
-  - component: {fileID: 8839471078149707097}
-  - component: {fileID: 8646134070111592716}
-  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 &5944675064355718479
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2360665792630318950}
-  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: 6744614164039454483}
-  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: -4.7759, y: 635.16}
-  m_Pivot: {x: 0, y: 1}
---- !u!114 &6191317521368894502
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2360665792630318950}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Padding:
-    m_Left: 0
-    m_Right: 0
-    m_Top: 0
-    m_Bottom: 0
-  m_ChildAlignment: 4
-  m_Spacing: 5.07
-  m_ChildForceExpandWidth: 1
-  m_ChildForceExpandHeight: 1
-  m_ChildControlWidth: 0
-  m_ChildControlHeight: 0
-  m_ChildScaleWidth: 0
-  m_ChildScaleHeight: 0
-  m_ReverseArrangement: 0
---- !u!114 &8839471078149707097
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2360665792630318950}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_HorizontalFit: 0
-  m_VerticalFit: 2
---- !u!114 &8646134070111592716
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2360665792630318950}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 468e09835aeba9b4e84172dbf122fdef, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  ScrollRect: {fileID: 7883865494936010614}
-  ScrollRectSizedata: {x: 0, y: 0}
-  Page: {x: 1, y: 1}
-  bottom: 0
-  wdiget: {fileID: 0}
-  sizeData: {x: 444.0557, y: 218}
-  isCustomizeHeight: 0
-  posOff: {x: 13, y: 0}
-  isDelay: 0
-  delayTime: 0
-  isAdaptationWidth: 0
-  layoutType: 0
-  overflowDistance: 0
---- !u!1 &2553589566839113697
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 4688522053669353716}
-  - component: {fileID: 2934276402299459566}
-  - component: {fileID: 2433990691951363383}
-  - component: {fileID: 3169074378938001994}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Btn_Ok
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &4688522053669353716
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2553589566839113697}
-  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: 6150498200931894423}
-  m_Father: {fileID: 8599819629026832582}
-  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: -9, y: -288.69}
-  m_SizeDelta: {x: 132.3538, y: 50.3799}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &2934276402299459566
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2553589566839113697}
-  m_CullTransparentMesh: 1
---- !u!114 &2433990691951363383
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2553589566839113697}
-  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.6509804, g: 0.6509804, b: 0.6509804, 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: btn_23
-  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: 
-  useGradient: 0
-  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
-  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
-  direction: 0
---- !u!114 &3169074378938001994
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2553589566839113697}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 3
-    m_WrapAround: 0
-    m_SelectOnUp: {fileID: 0}
-    m_SelectOnDown: {fileID: 0}
-    m_SelectOnLeft: {fileID: 0}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
-  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
-    m_ColorMultiplier: 1
-    m_FadeDuration: 0.1
-  m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
-    m_PressedSprite: {fileID: 0}
-    m_SelectedSprite: {fileID: 0}
-    m_DisabledSprite: {fileID: 0}
-  m_AnimationTriggers:
-    m_NormalTrigger: Normal
-    m_HighlightedTrigger: Highlighted
-    m_PressedTrigger: Pressed
-    m_SelectedTrigger: Selected
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 2433990691951363383}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
---- !u!1 &3552915526930824737
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 6150498200931894423}
-  - component: {fileID: 2944092694878402809}
-  - component: {fileID: 2519922024915380815}
-  m_Layer: 5
-  m_HasEditorInfo: 1
-  m_Name: Text (Legacy) (1)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &6150498200931894423
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3552915526930824737}
-  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: 4688522053669353716}
-  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: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &2944092694878402809
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3552915526930824737}
-  m_CullTransparentMesh: 1
---- !u!114 &2519922024915380815
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3552915526930824737}
-  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: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 21
-    m_FontStyle: 0
-    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: "\u786E\u5B9A"
---- !u!1 &3651587731235081858
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 9037408276187403176}
-  - component: {fileID: 3637005864510300227}
-  - component: {fileID: 5727746862753107768}
-  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 &9037408276187403176
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3651587731235081858}
-  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: 8599819629026832582}
-  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: -2.9302979, y: 390.72327}
-  m_SizeDelta: {x: 450.1394, y: 78.9535}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &3637005864510300227
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3651587731235081858}
-  m_CullTransparentMesh: 1
---- !u!114 &5727746862753107768
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3651587731235081858}
-  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: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 34
-    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: "\u4ED9\u9014\u4E8B\u4EF6"
---- !u!1 &4665951811628086642
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 3581464887972855309}
-  - component: {fileID: 5904849993517078433}
-  - component: {fileID: 381179604564797926}
-  - component: {fileID: 7883865494936010614}
-  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 &3581464887972855309
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4665951811628086642}
-  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: 6744614164039454483}
-  m_Father: {fileID: 8599819629026832582}
-  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: -2.147, y: 52.137726}
-  m_SizeDelta: {x: 471.58, y: 553.7293}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &5904849993517078433
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4665951811628086642}
-  m_CullTransparentMesh: 1
---- !u!114 &381179604564797926
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4665951811628086642}
-  m_Enabled: 0
-  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: 0.392}
-  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: 10907, 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 &7883865494936010614
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4665951811628086642}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Content: {fileID: 5944675064355718479}
-  m_Horizontal: 0
-  m_Vertical: 1
-  m_MovementType: 1
-  m_Elasticity: 0.1
-  m_Inertia: 1
-  m_DecelerationRate: 0.135
-  m_ScrollSensitivity: 1
-  m_Viewport: {fileID: 6744614164039454483}
-  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 &6864546897549033815
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 2896655462721008753}
-  - component: {fileID: 1550575800954493607}
-  - component: {fileID: 8853780473327312120}
-  - component: {fileID: 3651346582420827263}
-  m_Layer: 5
-  m_HasEditorInfo: 1
-  m_Name: Btn_Close
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &2896655462721008753
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6864546897549033815}
-  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: 8599819629026832582}
-  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: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &1550575800954493607
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6864546897549033815}
-  m_CullTransparentMesh: 1
---- !u!114 &8853780473327312120
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6864546897549033815}
-  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: 0, g: 0, b: 0, a: 0.69411767}
-  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
---- !u!114 &3651346582420827263
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6864546897549033815}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 3
-    m_WrapAround: 0
-    m_SelectOnUp: {fileID: 0}
-    m_SelectOnDown: {fileID: 0}
-    m_SelectOnLeft: {fileID: 0}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
-  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
-    m_ColorMultiplier: 1
-    m_FadeDuration: 0.1
-  m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
-    m_PressedSprite: {fileID: 0}
-    m_SelectedSprite: {fileID: 0}
-    m_DisabledSprite: {fileID: 0}
-  m_AnimationTriggers:
-    m_NormalTrigger: Normal
-    m_HighlightedTrigger: Highlighted
-    m_PressedTrigger: Pressed
-    m_SelectedTrigger: Selected
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 8853780473327312120}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
---- !u!1 &6879381305336152130
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 4737429402125406338}
-  - component: {fileID: 7642327290700519805}
-  - component: {fileID: 3433724065042445742}
-  m_Layer: 5
-  m_HasEditorInfo: 1
-  m_Name: Text_Tips
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &4737429402125406338
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6879381305336152130}
-  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: 8599819629026832582}
-  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.0000021458, y: -248.5}
-  m_SizeDelta: {x: 228, y: 30}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &7642327290700519805
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6879381305336152130}
-  m_CullTransparentMesh: 1
---- !u!114 &3433724065042445742
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6879381305336152130}
-  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: 0.5019608, g: 0.5019608, b: 0.5019608, 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: 16
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 1
-    m_MaxSize: 40
-    m_Alignment: 4
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: "\u53EF\u7A0D\u540E\u5728\u4E3B\u754C\u9762\u7EE7\u7EED\u5904\u7406"
---- !u!1 &9135198254365544974
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 6744614164039454483}
-  - component: {fileID: 5322424460263804303}
-  - component: {fileID: 8187640928662968955}
-  - component: {fileID: 5511738281904160630}
-  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 &6744614164039454483
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9135198254365544974}
-  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: 5944675064355718479}
-  m_Father: {fileID: 3581464887972855309}
-  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 &5322424460263804303
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9135198254365544974}
-  m_CullTransparentMesh: 1
---- !u!114 &8187640928662968955
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9135198254365544974}
-  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 &5511738281904160630
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9135198254365544974}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_ShowMaskGraphic: 0

Assets/Res/UI/DivineSence/DivineSenceEventResultPanel.prefab.meta

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

Assets/Res/UI/DivineSence/ShengShiEventWidgetType3.prefab

@@ -1,958 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:yousandi.cn,2023:
---- !u!1 &869698564475441709
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 712579681456886399}
-  - component: {fileID: 2062974483703860703}
-  - component: {fileID: 690487615239233780}
-  - component: {fileID: 889280321881254045}
-  m_Layer: 5
-  m_HasEditorInfo: 1
-  m_Name: Text_EventDesc
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &712579681456886399
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 869698564475441709}
-  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: 8704413967189924930}
-  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: -87.55634, y: -18.936792}
-  m_SizeDelta: {x: 258.6584, y: 79.7284}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &2062974483703860703
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 869698564475441709}
-  m_CullTransparentMesh: 1
---- !u!114 &690487615239233780
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 869698564475441709}
-  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: 1
-    m_MaxSize: 40
-    m_Alignment: 0
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: "\u8FD9\u662F\u4E00\u6BB5\u63CF\u8FF0"
---- !u!114 &889280321881254045
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 869698564475441709}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_EffectColor: {r: 0.4811321, g: 0.43347278, b: 0.43347278, a: 0.5}
-  m_EffectDistance: {x: 1, y: -1}
-  m_UseGraphicAlpha: 1
---- !u!1 &2866411676261796578
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 8704413967189924930}
-  - component: {fileID: 522430348914269042}
-  - component: {fileID: 9002364251388751492}
-  m_Layer: 5
-  m_HasEditorInfo: 1
-  m_Name: Button
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &8704413967189924930
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2866411676261796578}
-  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: 8807649875490934103}
-  - {fileID: 1357522047238736597}
-  - {fileID: 3650536308811846443}
-  - {fileID: 712579681456886399}
-  - {fileID: 2581404301119584838}
-  - {fileID: 1928953398721837283}
-  - {fileID: 5700846322996692730}
-  m_Father: {fileID: 3370061335406075943}
-  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: 100, y: 100}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &522430348914269042
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2866411676261796578}
-  m_CullTransparentMesh: 1
---- !u!114 &9002364251388751492
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2866411676261796578}
-  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: 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
---- !u!1 &2893425264750841484
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 2581404301119584838}
-  - component: {fileID: 7008100311386754448}
-  - component: {fileID: 5593797294158318015}
-  - component: {fileID: 7400716166675393664}
-  m_Layer: 5
-  m_HasEditorInfo: 1
-  m_Name: ItemRoot
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &2581404301119584838
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2893425264750841484}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
-  m_ConstrainProportionsScale: 1
-  m_Children: []
-  m_Father: {fileID: 8704413967189924930}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0.5}
-  m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 107.97214, y: -18.5}
-  m_SizeDelta: {x: 0, y: 86.8594}
-  m_Pivot: {x: 0, y: 0.5}
---- !u!222 &7008100311386754448
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2893425264750841484}
-  m_CullTransparentMesh: 1
---- !u!114 &5593797294158318015
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2893425264750841484}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Padding:
-    m_Left: 0
-    m_Right: 0
-    m_Top: 0
-    m_Bottom: 0
-  m_ChildAlignment: 0
-  m_Spacing: 29.18
-  m_ChildForceExpandWidth: 1
-  m_ChildForceExpandHeight: 1
-  m_ChildControlWidth: 0
-  m_ChildControlHeight: 0
-  m_ChildScaleWidth: 0
-  m_ChildScaleHeight: 0
-  m_ReverseArrangement: 0
---- !u!114 &7400716166675393664
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2893425264750841484}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_HorizontalFit: 2
-  m_VerticalFit: 0
---- !u!1 &4442584923359408203
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 3650536308811846443}
-  - component: {fileID: 6912937265734038597}
-  - component: {fileID: 5475241518208705779}
-  - component: {fileID: 9173177645400499500}
-  m_Layer: 5
-  m_HasEditorInfo: 1
-  m_Name: Text_EventName
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &3650536308811846443
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4442584923359408203}
-  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: 8704413967189924930}
-  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: 37.3, y: 46.638}
-  m_SizeDelta: {x: 348.9613, y: 30}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &6912937265734038597
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4442584923359408203}
-  m_CullTransparentMesh: 1
---- !u!114 &5475241518208705779
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4442584923359408203}
-  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: 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_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 16
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 1
-    m_MaxSize: 40
-    m_Alignment: 3
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: "\u8FD9\u662F\u4E00\u6BB5\u63CF\u8FF0"
---- !u!114 &9173177645400499500
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4442584923359408203}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_EffectColor: {r: 0.4811321, g: 0.43347278, b: 0.43347278, a: 0.5}
-  m_EffectDistance: {x: 1, y: -1}
-  m_UseGraphicAlpha: 1
---- !u!1 &4903075935192002470
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 8807649875490934103}
-  - component: {fileID: 2778409128145198339}
-  - component: {fileID: 3193138308975251261}
-  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 &8807649875490934103
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4903075935192002470}
-  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: 8704413967189924930}
-  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: 16.92102}
-  m_SizeDelta: {x: 444, y: 133.84}
-  m_Pivot: {x: 0.5, y: 1}
---- !u!222 &2778409128145198339
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4903075935192002470}
-  m_CullTransparentMesh: 1
---- !u!114 &3193138308975251261
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4903075935192002470}
-  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: 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_di_01
-  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: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
-  useGradient: 0
-  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
-  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
-  direction: 0
---- !u!1 &5621944018372429481
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 1928953398721837283}
-  - component: {fileID: 16038596088903780}
-  - component: {fileID: 1460259740163297268}
-  m_Layer: 5
-  m_HasEditorInfo: 1
-  m_Name: Image
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1928953398721837283
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5621944018372429481}
-  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: 5165619257450353462}
-  m_Father: {fileID: 8704413967189924930}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: -166.88393, y: 10.868919}
-  m_SizeDelta: {x: 64.56799, y: 28.462402}
-  m_Pivot: {x: 0, y: 1}
---- !u!222 &16038596088903780
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5621944018372429481}
-  m_CullTransparentMesh: 1
---- !u!114 &1460259740163297268
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5621944018372429481}
-  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: 0.9622642, g: 0.5582948, b: 0.5582948, 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
---- !u!1 &5808298135736668641
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 3370061335406075943}
-  - component: {fileID: 3748703702239827202}
-  m_Layer: 5
-  m_HasEditorInfo: 1
-  m_Name: ShengShiEventWidgetType3
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &3370061335406075943
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5808298135736668641}
-  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: 8704413967189924930}
-  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.9154, y: 247.47897}
-  m_SizeDelta: {x: 444.0557, y: 133.8421}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &3748703702239827202
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5808298135736668641}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  data:
-  - key: myButton
-    gameObject: {fileID: 0}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
-  - key: Text_EventDesc
-    gameObject: {fileID: 690487615239233780}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
-  - key: Text_EventName
-    gameObject: {fileID: 5475241518208705779}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
-  - key: ItemRoot
-    gameObject: {fileID: 2581404301119584838}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
-  isAssetBundle: 1
---- !u!1 &6730899750744253868
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 1357522047238736597}
-  - component: {fileID: 8013943971233128026}
-  - component: {fileID: 6869502338291853798}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: myImage (1)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1357522047238736597
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6730899750744253868}
-  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: 8704413967189924930}
-  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: 46.637783}
-  m_SizeDelta: {x: 344, y: -59.433495}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &8013943971233128026
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6730899750744253868}
-  m_CullTransparentMesh: 1
---- !u!114 &6869502338291853798
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6730899750744253868}
-  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: 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_duihua_01
-  isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: af8b6f708ee6b254b9e6976ea8852a55, type: 3}
-  packInfo:
-    packName: event
-    packgJsonPath: /Art/UIAssets/TextrueJson\event.txt
-    packgSpritePath: Assets/Res/UIAtlas/event.spriteatlasv2
-    lasetJsonGUID: df80f818a4f258d33b8038600af6f215
-  useGradient: 0
-  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
-  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
-  direction: 0
---- !u!1 &7639731894752679497
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 7117316534246028533}
-  - component: {fileID: 415215015298378740}
-  - component: {fileID: 576612968966692761}
-  - component: {fileID: 2910925411919575758}
-  m_Layer: 5
-  m_HasEditorInfo: 1
-  m_Name: Text_Type
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &7117316534246028533
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7639731894752679497}
-  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: 5700846322996692730}
-  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: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &415215015298378740
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7639731894752679497}
-  m_CullTransparentMesh: 1
---- !u!114 &576612968966692761
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7639731894752679497}
-  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: 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_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 16
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 1
-    m_MaxSize: 40
-    m_Alignment: 4
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: "\u4E8B\u4EF6\u5B8C\u6210"
---- !u!114 &2910925411919575758
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7639731894752679497}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_EffectColor: {r: 0.4811321, g: 0.43347278, b: 0.43347278, a: 0.5}
-  m_EffectDistance: {x: 1, y: -1}
-  m_UseGraphicAlpha: 1
---- !u!1 &8294489962711393459
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 5165619257450353462}
-  - component: {fileID: 4151436703718221587}
-  - component: {fileID: 7532727123116377644}
-  - component: {fileID: 6080848297760275183}
-  m_Layer: 5
-  m_HasEditorInfo: 1
-  m_Name: Text_Type
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &5165619257450353462
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8294489962711393459}
-  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: 1928953398721837283}
-  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: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &4151436703718221587
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8294489962711393459}
-  m_CullTransparentMesh: 1
---- !u!114 &7532727123116377644
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8294489962711393459}
-  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: 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_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 16
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 1
-    m_MaxSize: 40
-    m_Alignment: 3
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: NPC
---- !u!114 &6080848297760275183
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8294489962711393459}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_EffectColor: {r: 0.4811321, g: 0.43347278, b: 0.43347278, a: 0.5}
-  m_EffectDistance: {x: 1, y: -1}
-  m_UseGraphicAlpha: 1
---- !u!1 &8558440621453229158
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 5700846322996692730}
-  - component: {fileID: 1932774545571088901}
-  - component: {fileID: 6871118366495012920}
-  m_Layer: 5
-  m_HasEditorInfo: 1
-  m_Name: Image (1)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &5700846322996692730
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8558440621453229158}
-  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: 7117316534246028533}
-  m_Father: {fileID: 8704413967189924930}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 183.3327, y: 10.868919}
-  m_SizeDelta: {x: 79.4075, y: 28.4624}
-  m_Pivot: {x: 0, y: 1}
---- !u!222 &1932774545571088901
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8558440621453229158}
-  m_CullTransparentMesh: 1
---- !u!114 &6871118366495012920
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8558440621453229158}
-  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: 0.9686275, g: 0.9450981, b: 0.6901961, 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

Assets/Res/UI/DivineSence/ShengShiEventWidgetType3.prefab.meta

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

Assets/Res/UI/HeroInformainPanel/HeroBreakthroughPanel.prefab

@@ -3386,7 +3386,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 148, y: -22.3432}
-  m_SizeDelta: {x: 210, y: 43.2862}
+  m_SizeDelta: {x: 0, y: 43.2862}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8334097589539832799
 CanvasRenderer:

Assets/Res/UI/HeroInformainPanel/ImmortalBondPanel.prefab

@@ -32,13 +32,15 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 1322072726797505217}
+  - {fileID: 4517824644815949}
   - {fileID: 1265912874115610471}
   m_Father: {fileID: 9037135992368401232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -253.12628, y: -715.5255}
-  m_SizeDelta: {x: 253, y: 80}
+  m_AnchoredPosition: {x: -230.0028, y: -711.9132}
+  m_SizeDelta: {x: 285.3349, y: 87.2247}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &1426530310761821952
 CanvasRenderer:
@@ -61,7 +63,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.54509807, g: 0.77647066, b: 0.7725491, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -69,7 +71,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_Sprite: {fileID: 0}
-  m_Type: 0
+  m_Type: 2
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -78,14 +80,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: btn_shengji
+  _icon_name: dec_juxing_yuanjiao16
   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: a20ad06748b879474357a40506c919d0
+    lasetJsonGUID: 09e53e644f062a080d02078f52169b6a
   imageH: 100
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
@@ -135,6 +137,95 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &939022109783669696
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5688688799837481103}
+  - component: {fileID: 2150156764810606318}
+  - component: {fileID: 6745282125873110902}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Title (4)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5688688799837481103
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 939022109783669696}
+  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: 1948383451580690238}
+  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: 259.9917, y: -24}
+  m_SizeDelta: {x: 208.5835, y: 21}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &2150156764810606318
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 939022109783669696}
+  m_CullTransparentMesh: 1
+--- !u!114 &6745282125873110902
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 939022109783669696}
+  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.6627451, g: 0.62352943, b: 0.48627454, 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: 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_fengexian1
+  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: de4a477140878ce911aa37d161cbf014
+  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 &1359402998321021210
 GameObject:
   m_ObjectHideFlags: 0
@@ -274,6 +365,8 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 5307292075045082131}
+  - {fileID: 2838780913361254183}
   - {fileID: 9173573771523279921}
   m_Father: {fileID: 9037135992368401232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -303,7 +396,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.5764706, g: 0.5686275, b: 0.48627454, a: 1}
+  m_Color: {r: 0.6039216, g: 0.7254902, b: 0.64705884, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -351,7 +444,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &2996272652403237873
 RectTransform:
   m_ObjectHideFlags: 0
@@ -369,7 +462,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: -4, y: -4}
+  m_SizeDelta: {x: -7.9570312, y: -7.3043213}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4537100828851011740
 CanvasRenderer:
@@ -392,7 +485,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.8980393, g: 0.8980393, b: 0.8980393, a: 1}
+  m_Color: {r: 0.8941177, g: 0.8705883, b: 0.77647066, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -498,6 +591,95 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 2
   m_VerticalFit: 2
+--- !u!1 &3305102378823512034
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2838780913361254183}
+  - component: {fileID: 2100310174260223296}
+  - component: {fileID: 3603959791707695230}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Title (3)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2838780913361254183
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3305102378823512034}
+  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: 7687848880532792628}
+  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: -258.7, y: -24.9}
+  m_SizeDelta: {x: 208.5835, y: 21}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &2100310174260223296
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3305102378823512034}
+  m_CullTransparentMesh: 1
+--- !u!114 &3603959791707695230
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3305102378823512034}
+  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.6627451, g: 0.62352943, b: 0.48627454, 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: 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_fengexian1
+  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: de4a477140878ce911aa37d161cbf014
+  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 &3622374847065832265
 GameObject:
   m_ObjectHideFlags: 0
@@ -529,6 +711,8 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 7763741966606808769}
+  - {fileID: 5688688799837481103}
   - {fileID: 2369668900552869058}
   m_Father: {fileID: 9037135992368401232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -558,7 +742,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.5764706, g: 0.5686275, b: 0.48627454, a: 1}
+  m_Color: {r: 0.6039216, g: 0.7254902, b: 0.64705884, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -668,6 +852,95 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u6211\u7684\u9053\u4FA3"
+--- !u!1 &4175342181274256876
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4517824644815949}
+  - component: {fileID: 3604641163754672195}
+  - component: {fileID: 5525603056318804376}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Btn_YaoQing (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4517824644815949
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4175342181274256876}
+  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: 9175010539118973105}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: -269.5, y: 1.55}
+  m_SizeDelta: {x: 32.1511, y: 32.1511}
+  m_Pivot: {x: 1, y: 0.5}
+--- !u!222 &3604641163754672195
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4175342181274256876}
+  m_CullTransparentMesh: 1
+--- !u!114 &5525603056318804376
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4175342181274256876}
+  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.54509807, g: 0.77647066, b: 0.7725491, 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_lingxing2
+  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 &4464682979606782891
 GameObject:
   m_ObjectHideFlags: 0
@@ -796,7 +1069,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: -1.0009003, y: -5.0307}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 733.82, y: 653.156}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8796266728886944745
@@ -867,6 +1140,95 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &5227725040119072102
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5307292075045082131}
+  - component: {fileID: 5192634941054058725}
+  - component: {fileID: 7371133904544545197}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Title (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5307292075045082131
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5227725040119072102}
+  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: 7687848880532792628}
+  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: 259.9917, y: -24.9}
+  m_SizeDelta: {x: 208.5835, y: 21}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &5192634941054058725
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5227725040119072102}
+  m_CullTransparentMesh: 1
+--- !u!114 &7371133904544545197
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5227725040119072102}
+  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.6627451, g: 0.62352943, b: 0.48627454, 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: 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_fengexian1
+  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: de4a477140878ce911aa37d161cbf014
+  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 &5865721309907835821
 GameObject:
   m_ObjectHideFlags: 0
@@ -1022,7 +1384,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.9450981, g: 0.92549026, b: 0.83921576, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1070,7 +1432,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &303119171736115231
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1088,7 +1450,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: -4, y: -4}
+  m_SizeDelta: {x: -7.9124146, y: -7.675659}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3726298992870609843
 CanvasRenderer:
@@ -1111,7 +1473,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.8980393, g: 0.8980393, b: 0.8980393, a: 1}
+  m_Color: {r: 0.8941177, g: 0.8705883, b: 0.77647066, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1207,7 +1569,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: def0828fe631b294481115604efc6a26, type: 3}
+  m_Sprite: {fileID: 21300000, guid: a8f7e9206a54d274b91af58c0f2ab00e, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1217,14 +1579,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_juxing_fang
+  _icon_name: 
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  CurrSpriteAtlas: {fileID: 0}
   packInfo:
-    packName: tongyong
-    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
-    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
-    lasetJsonGUID: de4a477140878ce911aa37d161cbf014
+    packName: 
+    packgJsonPath: 
+    packgSpritePath: 
+    lasetJsonGUID: 
   imageH: 1624
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
@@ -1241,6 +1603,7 @@ GameObject:
   - component: {fileID: 1265912874115610471}
   - component: {fileID: 5874556968428792340}
   - component: {fileID: 4115606590443511848}
+  - component: {fileID: 8977461836063917559}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -1289,7 +1652,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.9725491, g: 0.9803922, b: 0.93725497, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1298,11 +1661,11 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 25
+    m_FontSize: 66
     m_FontStyle: 1
     m_BestFit: 0
-    m_MinSize: 10
-    m_MaxSize: 40
+    m_MinSize: 6
+    m_MaxSize: 68
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -1310,6 +1673,199 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u9080\u8BF7"
+--- !u!114 &8977461836063917559
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6087147763012461616}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0.24313727, g: 0.38431376, b: 0.40000004, a: 1}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
+--- !u!1 &6100173025123856502
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7763741966606808769}
+  - component: {fileID: 3026896503111289251}
+  - component: {fileID: 1019016744714943343}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Title (5)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7763741966606808769
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6100173025123856502}
+  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: 1948383451580690238}
+  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: -258.7, y: -24.000061}
+  m_SizeDelta: {x: 208.5835, y: 21}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &3026896503111289251
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6100173025123856502}
+  m_CullTransparentMesh: 1
+--- !u!114 &1019016744714943343
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6100173025123856502}
+  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.6627451, g: 0.62352943, b: 0.48627454, 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: 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_fengexian1
+  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: de4a477140878ce911aa37d161cbf014
+  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 &6163252751046475651
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1322072726797505217}
+  - component: {fileID: 8704726951328440695}
+  - component: {fileID: 4444876533082057606}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Btn_YaoQing (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1322072726797505217
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6163252751046475651}
+  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: 9175010539118973105}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: 15.5894, y: 1.55}
+  m_SizeDelta: {x: 32.1511, y: 32.1511}
+  m_Pivot: {x: 1, y: 0.5}
+--- !u!222 &8704726951328440695
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6163252751046475651}
+  m_CullTransparentMesh: 1
+--- !u!114 &4444876533082057606
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6163252751046475651}
+  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.54509807, g: 0.77647066, b: 0.7725491, 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_lingxing2
+  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 &6851337973378442483
 GameObject:
   m_ObjectHideFlags: 0
@@ -1439,8 +1995,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.8928, y: 271.89478}
-  m_SizeDelta: {x: 735.8164, y: 680.1302}
+  m_AnchoredPosition: {x: 0.9567, y: 271.9132}
+  m_SizeDelta: {x: 744.1413, y: 687.8137}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7475908908188556616
 CanvasRenderer:
@@ -1463,7 +2019,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.8235295, g: 0.7960785, b: 0.73333335, a: 1}
+  m_Color: {r: 0.68235296, g: 0.76470596, b: 0.7137255, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1761,8 +2317,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: 4.6061, y: -415.87012}
-  m_SizeDelta: {x: 678.5866, y: 263.2461}
+  m_AnchoredPosition: {x: 5.2047, y: -416.0085}
+  m_SizeDelta: {x: 688.2064, y: 271.8661}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &184292134981056704
 CanvasRenderer:
@@ -1785,7 +2341,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.8235295, g: 0.7960785, b: 0.73333335, a: 1}
+  m_Color: {r: 0.68235296, g: 0.76470596, b: 0.7137255, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1802,7 +2358,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_juxing_fang
+  _icon_name: dec_juxing_fang_hujiao
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:

Assets/Res/UI/HeroInformainPanel/道侣.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: XnJJsn+kUXsxhIdAjzkZ4/0SJfwyHqKHoul7G+Z6ODzOl6spv9aVBmPOiNHt
+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/HeroInformainPanel/道侣邀请未选择.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: Ci8d5y/4B3xpwPP0yi0NW7eNsyXQoeA0jYz2CoiPfOFigw7jSXCGhkKha/cP
+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/UIAtlas/mainUI.spriteatlasv2

@@ -22,8 +22,12 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: ed5c755d642c4154ebee5e36e03b7842, type: 3}
     - {fileID: 2800000, guid: b8fa6983179b3be4783331e63c25e825, type: 3}
     - {fileID: 2800000, guid: a12eb982dbdc0894586e7d39acac50e7, type: 3}
+    - {fileID: 2800000, guid: 12d636aca73b99b4bb5e826f060d4b23, type: 3}
     - {fileID: 2800000, guid: 5473c79ffd6b84e4c9de2b607f6fbb01, type: 3}
     - {fileID: 2800000, guid: caf59be6b62f1ff40b2937ade714bf4d, type: 3}
+    - {fileID: 2800000, guid: 7d4a7a803f84e1845966b3d57df9ebd1, type: 3}
+    - {fileID: 2800000, guid: 94a1e98605bef084cac2665d137cd336, type: 3}
+    - {fileID: 2800000, guid: 6e6bbcb63b5f62e4f903df38b5a4946e, type: 3}
     - {fileID: 2800000, guid: 0b973e74b13091140a3e9ee1c6e106ea, type: 3}
     - {fileID: 2800000, guid: 19448b5e8c48ae748b181fc098a42ebd, type: 3}
     - {fileID: 2800000, guid: 4d4fd799a5a9a7d428a39eb4bbd60b15, type: 3}

Assets/Res/UIAtlas/tongyong.spriteatlasv2

@@ -47,6 +47,7 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: e8252577f847b004fba08b72e220ec54, type: 3}
     - {fileID: 2800000, guid: c1b273efbf5935b44bb183143b5284af, type: 3}
     - {fileID: 2800000, guid: d6021d84335147d4f96768b4cf8e85b6, type: 3}
+    - {fileID: 2800000, guid: a627bf7c838278243b809163867a59f3, type: 3}
     - {fileID: 2800000, guid: 398984150c1ce4a43986a13ec3ca0914, type: 3}
     - {fileID: 2800000, guid: bc21b684e2591474ea6147d9ef997f95, type: 3}
     - {fileID: 2800000, guid: e2c9147f14345e74d80ab86f70f34946, type: 3}
@@ -132,8 +133,10 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: 771183074c65e95498415e16fe987c8b, type: 3}
     - {fileID: 2800000, guid: e3741e76b7d6b6f4ea3228376151cb08, type: 3}
     - {fileID: 2800000, guid: 01e2f146052dd844fb8db9bab92b4512, type: 3}
+    - {fileID: 2800000, guid: bbdfacb8598ff2040a4f3ae3027c9721, type: 3}
     - {fileID: 2800000, guid: 1064e5697afcf2e4380fce9ef6f3716c, type: 3}
     - {fileID: 2800000, guid: e8b66ebe511cc1d4e85937a30bccd4a3, type: 3}
+    - {fileID: 2800000, guid: 4292ae6cbd7cbac43a0ccb0a70eb63a8, type: 3}
     - {fileID: 2800000, guid: 7e5ce0d678f92704a9674a80dc521664, type: 3}
     - {fileID: 2800000, guid: aec6227823c7f75498752720902c7876, type: 3}
     - {fileID: 2800000, guid: e8edecac0b831f64e9c6b3c6111ada46, type: 3}

Assets/Scripts/Core/UI/UTool/CTween/AnimationCurveLibrary.cs

@@ -25,4 +25,5 @@ public class AnimationCurveLibrary : ScriptableObject
     [Header("法宝飞上来的速度")]public float fabaoMoveTopSpeed=6f;
     [Header("法宝飞过去打敌人的速度")]public float fabaoMoveTopEnemySpeed=15;
     [Header("加速飞行的加速度曲线")] public AnimationCurve flightSpeedCurve;
+    [Header("切换场景时的飞行曲线")] public AnimationCurve switchSceneCurve;
 }

Assets/Scripts/GameData/ExcelConfig/SkillConfig.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\skill.xlsx. SheetName: SkillConfig
+// Generate From Excel\Skill.xlsx. SheetName: SkillConfig
 
 using System;
 using Fort23.GameData;

Assets/Scripts/GameData/ExcelConfig/SkillConstant.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\skill.xlsx. SheetName: SkillConstant
+// Generate From Excel\Skill.xlsx. SheetName: SkillConstant
 
 using System;
 using Fort23.GameData;

Assets/Scripts/GameData/ExcelConfig/SkillPowerupConfig.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\skill.xlsx. SheetName: SkillPowerupConfig
+// Generate From Excel\Skill.xlsx. SheetName: SkillPowerupConfig
 
 using System;
 using Fort23.GameData;

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

@@ -62,7 +62,7 @@ namespace GameLogic.Combat.CombatState
             {
                 float add = 0.1f;
                 Vector3 pos = playerHeroEntity.dotPos;
-                Vector3 dir = CombatController.currActiveCombat.CombatHeroController.moveDir;
+                Vector3 dir = CombatController.currActiveCombat.CombatSenceController.moveDir;
                 float fx = 1;
 
                 pos += dir.normalized * CombatController.currActiveCombat.CombatHeroController.moveSpeed * t;

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

@@ -4,6 +4,7 @@ using Fort23.UTool;
 using GameLogic.Combat.CombatTool;
 using GameLogic.Combat.Hero;
 using UnityEngine;
+using Utility.UITool;
 
 namespace GameLogic.Combat.CombatState
 {
@@ -16,6 +17,8 @@ namespace GameLogic.Combat.CombatState
         private int state;
         private Vector3 startPos;
         private Vector3 startEulerAngles;
+        private float speed=0.5f;
+        private float feiXingCurTime;
 
         public CombatSceneSwitchState(CombatController combatController) : base(combatController)
         {
@@ -37,10 +40,12 @@ namespace GameLogic.Combat.CombatState
             startEulerAngles = playerHeroEntity.GameObject.transform.rotation.eulerAngles;
 
             // CombatHeroEntity playerHeroEntity = CombatController.currActiveCombat.playerHeroEntity;
-            Vector3 target = playerHeroEntity.GameObject.transform.TransformPoint(new Vector3(1, 2, 1));
+            Vector3 target = playerHeroEntity.GameObject.transform.TransformPoint(new Vector3(2, 2, 1));
             moveTargetDir = (target - playerHeroEntity.GameObject.transform.forward).normalized;
+            dir = playerHeroEntity.GameObject.transform.forward;
             currTime = 0;
             state = 0;
+            feiXingCurTime = 0;
         }
 
         protected override void ProUpdate(float t)
@@ -52,7 +57,7 @@ namespace GameLogic.Combat.CombatState
             }
 
             currTime += t;
-            if (currTime > 3 && state == 0)
+            if (currTime > 2 && state == 0)
             {
                 state = 1;
                 EventManager.Instance.Dispatch(CustomEventType.ShowLoadingUI, null);
@@ -65,21 +70,23 @@ namespace GameLogic.Combat.CombatState
                 return;
             }
 
+            feiXingCurTime += t * speed;
+            float dirT = AnimationCurveManager.Instance.AnimationCurveLibrary.switchSceneCurve.Evaluate(feiXingCurTime);
             Vector3 pos = playerHeroEntity.dotPos;
 
-            Vector3 currDir = Vector3.Lerp(playerHeroEntity.GameObject.transform.forward, moveTargetDir, 0.3f);
+            Vector3 currDir = Vector3.Lerp(dir, moveTargetDir, dirT);
 
 
             pos += currDir.normalized * 15 * t;
 
             playerHeroEntity.combatHeroGameObject.SetPosition(pos);
             playerHeroEntity.GameObject.transform.rotation =
-                Quaternion.LookRotation(new Vector3(currDir.x, 0, currDir.z));
+                Quaternion.LookRotation(new Vector3(currDir.x, 0, currDir.z).normalized);
         }
 
         private async void InitScenes()
         {
-            await TimerComponent.Instance.WaitAsync(600);
+            await TimerComponent.Instance.WaitAsync(2600);
             state = 2;
             CombatHeroEntity playerHeroEntity = CombatController.currActiveCombat.playerHeroEntity;
             playerHeroEntity.GameObject.transform.position = startPos;
@@ -90,7 +97,6 @@ namespace GameLogic.Combat.CombatState
             EventManager.Instance.Dispatch(CustomEventType.CloseLoadingUI, null);
             CombatController.CombatCameraControllder.isStop = false;
             CombatController.ChangeState(CombatController.fight);
-         
         }
     }
 }

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

@@ -79,7 +79,7 @@ namespace GameLogic.Combat.CombatState
 
             float add = 0.1f;
             Vector3 pos = playerHeroEntity.dotPos;
-            Vector3 dir =  CombatController.currActiveCombat.CombatHeroController.moveDir;
+            Vector3 dir =  CombatController.currActiveCombat.CombatSenceController.moveDir;
             float fx = 1;
             
             pos += dir.normalized * CombatController.currActiveCombat.CombatHeroController.moveSpeed * t;

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

@@ -7,6 +7,7 @@ using Core.State;
 using Core.Utility;
 using Excel2Json;
 using Fort23.Core;
+using Fort23.UTool;
 using GameLogic.Combat.CombatGuide;
 using GameLogic.Combat.CombatState;
 using GameLogic.Combat.CombatTool.CombatReport;
@@ -16,6 +17,7 @@ using GameLogic.Combat.Hero.HeroGPU;
 using GameLogic.CombatScenesTool;
 using UnityEngine;
 using Utility.CustomizeTimeLogic.FxLogic.TimeLineEvent;
+using Utility.UITool;
 using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface;
 using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventLogic;
 
@@ -59,8 +61,7 @@ namespace GameLogic.Combat.CombatTool
 
         public CombatHeroEntity playerHeroEntity;
         public bool isWin;
-
-
+     
         public CombatStateBasic CurrState
         {
             get { return stateControl.CurrIState as CombatStateBasic; }
@@ -140,7 +141,7 @@ namespace GameLogic.Combat.CombatTool
         {
             stateControl.ChangeState(name);
         }
-
+      
         public void Update(float t)
         {
             CombatGestureController.Instance.Update();
@@ -154,7 +155,10 @@ namespace GameLogic.Combat.CombatTool
             {
                ChangeState("sceneSwitch");
             }
-
+            if (Input.GetKeyDown(KeyCode.D))
+            {
+               CombatSenceController.Flight(2, -90, 10);
+            }
          
             
             t *= speed;
@@ -189,6 +193,7 @@ namespace GameLogic.Combat.CombatTool
                     }
                 }
             }
+          
            
         }
 

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

@@ -26,7 +26,7 @@ namespace GameLogic.Combat.CombatTool
         private BetterList<CombatHeroEntity> heroDispose = new BetterList<CombatHeroEntity>();
 
         // public CombatHeroEntity playerHeroEntity;
-        public Vector3 moveDir = Vector3.forward;
+        
         public float moveSpeed = 2f;
         public bool isFlight;
         private bool _isFlightCameraFinish;
@@ -117,15 +117,7 @@ namespace GameLogic.Combat.CombatTool
             combatHeroEntity.HeroResurrection();
         }
 
-        public Vector3 GetTarget(float d)
-        {
-            if (CombatController.currActiveCombat.playerHeroEntity == null)
-            {
-                return new Vector3(0, 20, 0);
-            }
-
-            return CombatController.currActiveCombat.playerHeroEntity.dotPos + moveDir * d;
-        }
+      
 
         public void Update(float t)
         {
@@ -147,30 +139,7 @@ namespace GameLogic.Combat.CombatTool
                 heroDie[i].Update(t);
             }
 
-            if (isFlight)
-            {
-                _flightCurrTime += t * _flightAddTime;
-                moveDir = Vector3.Lerp(_flightStartDir, _flightDir, _flightCurrTime);
-                float flightSpeedCur =
-                    AnimationCurveManager.Instance.AnimationCurveLibrary.flightSpeedCurve.Evaluate(_flightCurrTime);
-                moveSpeed = Mathf.Lerp(_flightStartSpeed, _flightSpeed, flightSpeedCur);
-                if (_flightCurrTime > 0.95f&&!_isFlightCameraFinish)
-                {
-                    _isFlightCameraFinish= true;
-                    CombatController.currActiveCombat.CombatCameraControllder.SetFieldOfView(70, 1);
-                }
-
-                if (_flightCurrTime >= 1)
-                {
-                    moveDir = _flightDir;
-                    isFlight = false;
-                    moveSpeed = 2;
-                    GObjectPool.Instance.Recycle(_flightFx1);
-                    GObjectPool.Instance.Recycle(_flightFx2);
-                    
-                    CombatController.currActiveCombat.playerHeroEntity.PlayAnim("idle", true, 0, false, 1);
-                }
-            }
+         
         }
 
         public void LateUpdate(float t)
@@ -189,38 +158,7 @@ namespace GameLogic.Combat.CombatTool
             }
         }
 
-        public async CTask Flight(float time, float jiaoDu, float speed)
-        {
-            _flightCurrTime = 0;
-            _flightTime = time;
-            _flightAddTime = 1.0f / time;
-            isFlight = true;
-            _isFlightCameraFinish = false;
-            Quaternion quaternion = Quaternion.Euler(0, jiaoDu, 0);
-            _flightDir = quaternion * moveDir;
-            _flightStartDir = moveDir;
-            _flightStartSpeed = moveSpeed;
-            _flightSpeed = speed;
-            CombatController.currActiveCombat.playerHeroEntity.PlayAnim("idle2", true, 0, false, 1);
-            CombatController.currActiveCombat.CombatCameraControllder.SetFieldOfView(90, 0.5f);
-            GObjectPool.Instance.Recycle(_flightFx1);
-            GObjectPool.Instance.Recycle(_flightFx2);
-            GObjectPool.Instance.FetchAsync<ParticleSystemPool>("fx fly qi", delegate(ParticleSystemPool pool)
-            {
-                _flightFx1 = pool;
-                SpecialDotInfo specialDotInfo =
-                    CombatController.currActiveCombat.playerHeroEntity.GetSpecialDotInfo("hitpos");
-                pool.own.transform.SetParent(specialDotInfo.targetTran);
-                pool.own.transform.localPosition = Vector3.zero;
-            });
-            GObjectPool.Instance.FetchAsync<ParticleSystemPool>("fx zq jian loop", delegate(ParticleSystemPool pool)
-            {
-                _flightFx2 = pool;
-
-                pool.own.transform.SetParent(CombatController.currActiveCombat.playerHeroEntity.GameObject.transform);
-                pool.own.transform.localPosition = Vector3.zero;
-            });
-        }
+     
 
         public void AddHeroDie(CombatHeroEntity hero)
         {

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

@@ -8,6 +8,7 @@ using Fort23.UTool;
 using GameLogic.Combat.CombatTool.SceneTool;
 using GameLogic.CombatScenesTool;
 using UnityEngine;
+using Utility.UITool;
 using Random = UnityEngine.Random;
 
 namespace GameLogic.Combat.CombatTool
@@ -46,6 +47,21 @@ namespace GameLogic.Combat.CombatTool
 
         private float shengShiRan;
 
+        
+        public float moveSpeed = 2f;
+        public bool isFlight;
+        private bool _isFlightCameraFinish;
+        private float _flightTime;
+        private float _flightAddTime;
+        private float _flightCurrTime;
+        private Vector3 _flightDir;
+        private Vector3 _flightStartDir;
+        private float _flightStartSpeed;
+        private float _flightSpeed;
+        private ParticleSystemPool _flightFx1;
+        private ParticleSystemPool _flightFx2;
+        public Vector3 moveDir = Vector3.forward;
+
         // private List
         public async CTask InitScenes(string sceneName)
         {
@@ -103,6 +119,49 @@ namespace GameLogic.Combat.CombatTool
             SceneMonoConfig.UpdateScene();
         }
 
+        
+        public Vector3 GetTarget(float d)
+        {
+            if (CombatController.currActiveCombat.playerHeroEntity == null)
+            {
+                return new Vector3(0, 20, 0);
+            }
+
+            return CombatController.currActiveCombat.playerHeroEntity.dotPos + moveDir * d;
+        }
+        public async CTask Flight(float time, float jiaoDu, float speed)
+        {
+            _flightCurrTime = 0;
+            _flightTime = time;
+            _flightAddTime = 1.0f / time;
+            isFlight = true;
+            _isFlightCameraFinish = false;
+            Quaternion quaternion = Quaternion.Euler(0, jiaoDu, 0);
+            _flightDir = quaternion * moveDir;
+            _flightStartDir = moveDir;
+            _flightStartSpeed = moveSpeed;
+            _flightSpeed = speed;
+            CombatController.currActiveCombat.playerHeroEntity.PlayAnim("idle2", true, 0, false, 1);
+            CombatController.currActiveCombat.CombatCameraControllder.SetFieldOfView(90, 0.5f);
+            GObjectPool.Instance.Recycle(_flightFx1);
+            GObjectPool.Instance.Recycle(_flightFx2);
+            GObjectPool.Instance.FetchAsync<ParticleSystemPool>("fx fly qi", delegate(ParticleSystemPool pool)
+            {
+                _flightFx1 = pool;
+                SpecialDotInfo specialDotInfo =
+                    CombatController.currActiveCombat.playerHeroEntity.GetSpecialDotInfo("hitpos");
+                pool.own.transform.SetParent(specialDotInfo.targetTran);
+                pool.own.transform.localPosition = Vector3.zero;
+            });
+            GObjectPool.Instance.FetchAsync<ParticleSystemPool>("fx zq jian loop", delegate(ParticleSystemPool pool)
+            {
+                _flightFx2 = pool;
+
+                pool.own.transform.SetParent(CombatController.currActiveCombat.playerHeroEntity.GameObject.transform);
+                pool.own.transform.localPosition = Vector3.zero;
+            });
+        }
+        
         private async CTask<SceneDecoration> GetSceneDecoration(SceneObjectConfig sceneObjectConfig)
         {
             GameObjectPool gameObjectPool = await sceneObjectConfig.GetNewPrefab();
@@ -130,7 +189,7 @@ namespace GameLogic.Combat.CombatTool
 
         public void Update(float t)
         {
-            moveRoot.transform.position = CombatController.currActiveCombat.CombatHeroController.GetTarget(0);
+            moveRoot.transform.position = GetTarget(0);
             SceneMonoConfig?.UpdateScene();
      
 
@@ -149,7 +208,30 @@ namespace GameLogic.Combat.CombatTool
                     _isUpdateShengShi = false;
                 }
             }
+            if (isFlight)
+            {
+                _flightCurrTime += t * _flightAddTime;
+                moveDir = Vector3.Lerp(_flightStartDir, _flightDir, _flightCurrTime);
+                float flightSpeedCur =
+                    AnimationCurveManager.Instance.AnimationCurveLibrary.flightSpeedCurve.Evaluate(_flightCurrTime);
+                moveSpeed = Mathf.Lerp(_flightStartSpeed, _flightSpeed, flightSpeedCur);
+                if (_flightCurrTime > 0.95f&&!_isFlightCameraFinish)
+                {
+                    _isFlightCameraFinish= true;
+                    CombatController.currActiveCombat.CombatCameraControllder.SetFieldOfView(70, 1);
+                }
 
+                if (_flightCurrTime >= 1)
+                {
+                    moveDir = _flightDir;
+                    isFlight = false;
+                    moveSpeed = 2;
+                    GObjectPool.Instance.Recycle(_flightFx1);
+                    GObjectPool.Instance.Recycle(_flightFx2);
+                    
+                    CombatController.currActiveCombat.playerHeroEntity.PlayAnim("idle", true, 0, false, 1);
+                }
+            }
        
         }
 

Assets/Scripts/GameLogic/Combat/CombatType/LevelBattleCombatType.cs

@@ -142,9 +142,9 @@ namespace GameLogic.Combat.CombatType
             _currBoChi += 1;
 
             Vector3 startPos =
-                CombatController.currActiveCombat.CombatHeroController.GetTarget(20) + new Vector3(0, 1, 0);
+                CombatController.currActiveCombat.CombatSenceController.GetTarget(20) + new Vector3(0, 1, 0);
             Vector3 startPos2 =
-                CombatController.currActiveCombat.CombatHeroController.GetTarget(21) + new Vector3(0, 1, 0);
+                CombatController.currActiveCombat.CombatSenceController.GetTarget(21) + new Vector3(0, 1, 0);
             Vector3 dir = startPos2 - startPos;
             Quaternion quaternion = Quaternion.LookRotation(dir);
 
@@ -204,7 +204,7 @@ namespace GameLogic.Combat.CombatType
             {
                 
 
-                Vector3 heroPoint = CombatController.currActiveCombat.CombatHeroController.GetTarget(0);
+                Vector3 heroPoint = CombatController.currActiveCombat.CombatSenceController.GetTarget(0);
                 CombatController.currActiveCombat.MagicWeaponCombatSence.SetMagicWeaponCombatSence(heroPoint,
                     Vector3.forward);
                 Vector3 pos = heroPoint;

Assets/Scripts/GameLogic/Combat/CombatType/TestCombatType.cs

@@ -96,9 +96,9 @@ namespace GameLogic.Combat.CombatType
 
 
             Vector3 startPos =
-                CombatController.currActiveCombat.CombatHeroController.GetTarget(20) + new Vector3(0, 1, 0);
+                CombatController.currActiveCombat.CombatSenceController.GetTarget(20) + new Vector3(0, 1, 0);
             Vector3 startPos2 =
-                CombatController.currActiveCombat.CombatHeroController.GetTarget(21) + new Vector3(0, 1, 0);
+                CombatController.currActiveCombat.CombatSenceController.GetTarget(21) + new Vector3(0, 1, 0);
             Vector3 dir = startPos2 - startPos;
             Quaternion quaternion = Quaternion.LookRotation(dir);
 
@@ -177,9 +177,9 @@ namespace GameLogic.Combat.CombatType
             _currBoChi += 1;
 
             Vector3 startPos =
-                CombatController.currActiveCombat.CombatHeroController.GetTarget(20) + new Vector3(0, 1, 0);
+                CombatController.currActiveCombat.CombatSenceController.GetTarget(20) + new Vector3(0, 1, 0);
             Vector3 startPos2 =
-                CombatController.currActiveCombat.CombatHeroController.GetTarget(21) + new Vector3(0, 1, 0);
+                CombatController.currActiveCombat.CombatSenceController.GetTarget(21) + new Vector3(0, 1, 0);
             Vector3 dir = startPos2 - startPos;
             Quaternion quaternion = Quaternion.LookRotation(dir);
             for (int i = 0; i < enemyHeroInfo.Count; i++)
@@ -217,7 +217,7 @@ namespace GameLogic.Combat.CombatType
 
         private async CTask TestCombat(CTaskAwaitBuffer cTaskAwaitBuffer)
         {
-            Vector3 heroPoint = CombatController.currActiveCombat.CombatHeroController.GetTarget(0);
+            Vector3 heroPoint = CombatController.currActiveCombat.CombatSenceController.GetTarget(0);
             CombatController.currActiveCombat.MagicWeaponCombatSence.SetMagicWeaponCombatSence(heroPoint,
                 Vector3.forward);
             testCombatHeroConfig = GameObject.FindObjectOfType<TestCombatHeroConfig>();

Assets/Scripts/GameLogic/Combat/Skill/S1401.cs

@@ -57,7 +57,7 @@ namespace GameLogic.Combat.Skill
                 }
             }
 
-            if (SelfSkillConfig.level >= 5) //每个烈焰剑将会对敌人照成爆燃，爆燃额外受到100%伤害
+            if (SelfSkillConfig.level > 5) //每个烈焰剑将会对敌人照成爆燃，爆燃额外受到100%伤害
             {
                 long v2 = CombatCalculateTool.Instance.GetVlaueRatioForLong(
                     CombatHeroEntity.CurrCombatHeroInfo.attack.Value,

Assets/Scripts/GameLogic/Player/PlayerManager.cs

@@ -8,6 +8,7 @@ using Fort23.Core;
 using Fort23.Mono;
 using Fort23.UTool;
 using GameLogic.Bag;
+using GameLogic.Combat.CombatTool;
 using GameLogic.CombatScenesTool;
 using GameLogic.Hero;
 using GameLogic.Player;
@@ -46,6 +47,7 @@ public class PlayerManager : Singleton<PlayerManager>
         set { playerName = value; }
     }
 
+    private CTask _cTask;
 
     public long serverTime => TimeHelper.ServerNow();
     private AccountFileInfo.SmallPlacesData currentPlaces;
@@ -313,6 +315,13 @@ public class PlayerManager : Singleton<PlayerManager>
 
         StaticUpdater.Instance.RemoveRenderUpdateCallBack(Update);
         StaticUpdater.Instance.AddRenderUpdateCallBack(Update);
+        
+        EventManager.Instance.AddEventListener(CustomEventType.CloseLoadingUI,CloseLoadingUI);
+    }
+
+    private void CloseLoadingUI(IEventData e)
+    {
+        _cTask?.SetResult();
     }
 
     private float timer;
@@ -346,11 +355,9 @@ public class PlayerManager : Singleton<PlayerManager>
         }
 
         return (float)Math.Round(((float)placesData.progress / placesConfig.TotalScore) * 100, 1);
-        // AccountFileInfo.Instance.playerData.completeEvents.Where(ce =>placesConfig.MainTaskID.Contains(ce.eventID) || placesConfig.ZhixianID.Contains(ce.eventID) || placesConfig.ZhixianID.Contains(ce.1001
-        // ))
     }
 
-    // List<long> removeKey = new List<long>();
+
 
     private bool isUpdate = false;
 
@@ -453,7 +460,7 @@ public class PlayerManager : Singleton<PlayerManager>
         }
     }
 
-    public async void ChangeMap(int mapId)
+    public async CTask ChangeMap(int mapId)
     {
         SmallPlacesConfig smallPlacesConfig = ConfigComponent.Instance.Get<SmallPlacesConfig>(mapId);
         if (smallPlacesConfig.ID == 0)
@@ -479,7 +486,9 @@ public class PlayerManager : Singleton<PlayerManager>
                 return;
             }
         }
-
+        UIManager.Instance.HindCurrAllShowPanel();
+        _cTask = CTask.Create();
+        
         AccountFileInfo.SmallPlacesData smallPlacesData =
             PlayerManager.Instance.GetSmallPlacesData(smallPlacesConfig.ID);
 
@@ -501,8 +510,11 @@ public class PlayerManager : Singleton<PlayerManager>
 
         PlayerManager.Instance.CurrentsmallPlaces = smallPlacesData;
 
-
+        CombatController.currActiveCombat.ChangeState(CombatController.sceneSwitch);
+        await _cTask;
+        UIManager.Instance.ShowLastHindAllShowPanel();
         EventManager.Instance.Dispatch(CustomEventType.ChangeMap, null);
+
     }
 
     public void QianKunDaiAward()

Assets/Scripts/GameUI/EventManager/DialogueManager.cs

@@ -119,7 +119,7 @@ public class DialogueManager : Singleton<DialogueManager>
         {
             UIManager.Instance.HindCurrAllShowPanel();
             CombatDrive.Instance.CombatController.ChangeState(CombatController.update);
-            CombatController.currActiveCombat.CombatHeroController.Flight(dialogueConfig.PreShowPar, -90, 10);
+            CombatController.currActiveCombat.CombatSenceController.Flight(dialogueConfig.PreShowPar, -90, 10);
             UIManager.Instance.SetEventSystemEnable(false);
             await TimerComponent.Instance.WaitAsync(dialogueConfig.PreShowPar * 1000 + 1200);
             CombatDrive.Instance.CombatController.ChangeState(CombatController.idle);

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -303,41 +303,66 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
         List<AccountFileInfo.EventList> eventLists = new List<AccountFileInfo.EventList>();
 
+        //取消根据主线进度刷新啊支线任务
+        //现在改成优先刷新满足条件的支线任务然后判断概率是否刷新
         //找出可以刷新的支线任务
-        if (bigMap.ZhixianActivatedPercentage != null)
+        // if (bigMap.ZhixianActivatedPercentage != null)
+        // {
+        //     List<EventConfig> zhiXianEvents = new List<EventConfig>();
+        //     for (var i = 0; i < bigMap.ZhixianActivatedPercentage.Length; i++)
+        //     {
+        //         if (PlayerManager.Instance.PlacesBl >= bigMap.ZhixianActivatedPercentage[i])
+        //         {
+        //             if (!BagIsEvent(bigMap.ZhixianID[i]) && !IsEventTrigger(bigMap.ZhixianID[i]) &&
+        //                 CanTriggerEvent(bigMap.ZhixianID[i]))
+        //             {
+        //                 zhiXianEvents.Add(ConfigComponent.Instance.Get<EventConfig>(bigMap.ZhixianID[i]));
+        //             }
+        //         }
+        //     }
+        //
+        //     foreach (var c in zhiXianEvents)
+        //     {
+        //         AccountFileInfo.EventList eventList = AddEvent(c.ID);
+        //         if (eventList != null)
+        //         {
+        //             eventLists.Add(eventList);
+        //             eventCount--;
+        //
+        //             if (eventCount == 0)
+        //             {
+        //                 return eventLists;
+        //             }
+        //         }
+        //     }
+        // }
+
+
+        for (int i = 0; i < eventCount; i++)
         {
-            List<EventConfig> zhiXianEvents = new List<EventConfig>();
-            for (var i = 0; i < bigMap.ZhixianActivatedPercentage.Length; i++)
-            {
-                if (PlayerManager.Instance.PlacesBl >= bigMap.ZhixianActivatedPercentage[i])
-                {
-                    if (!BagIsEvent(bigMap.ZhixianID[i]) && !IsEventTrigger(bigMap.ZhixianID[i]) &&
-                        CanTriggerEvent(bigMap.ZhixianID[i]))
-                    {
-                        zhiXianEvents.Add(ConfigComponent.Instance.Get<EventConfig>(bigMap.ZhixianID[i]));
-                    }
-                }
-            }
+            //刷新支线任务
+            List<EventConfig> zhiXianEvents = eventConfigs.Where(e =>
+                e.EventTriggerType == 6 && !BagIsEvent(e.ID) && !IsEventTrigger(e.ID) &&
+                e.SmallPlacesId == smallPlacesConfig.ID &&
+                eventLists.FirstOrDefault(el => el.eventID == e.ID) == null && CanTriggerEvent(e.ID)).ToList();
 
-            foreach (var c in zhiXianEvents)
+            if (zhiXianEvents.Count > 0)
             {
-                AccountFileInfo.EventList eventList = AddEvent(c.ID);
-                if (eventList != null)
+                var zhixianEvnetConfig = zhiXianEvents[0];
+                int randomValueZhiXian = Random.Range(0, 101);
+                if (randomValueZhiXian <= zhixianEvnetConfig.RefreshProbability)
                 {
-                    eventLists.Add(eventList);
-                    eventCount--;
-
-                    if (eventCount == 0)
+                    AccountFileInfo.EventList eventList = AddEvent(zhixianEvnetConfig.ID);
+                    if (eventList != null)
                     {
-                        return eventLists;
+                        eventLists.Add(eventList);
+                        LogTool.Log("刷新支线任务：id:" + zhixianEvnetConfig.ID);
+                        continue;
                     }
                 }
             }
-        }
 
 
-        for (int i = 0; i < eventCount; i++)
-        {
             int randomValue3 = Random.Range(0, 101);
 
             //先刷事件关联的事件
@@ -428,13 +453,6 @@ public class EventSystemManager : Singleton<EventSystemManager>
             int quality = UtilTools.GetRandomByWeight(qualitys, QualityBonusChance);
 
 
-            // // 获取通用事件
-            // List<EventConfig> globalEvents = eventConfigs.Where(e => e.EventTriggerType == 1 && CanTriggerEvent(e.ID) && e.EventQuality == quality && !BagIsEvent(e.ID) && eventLists.FirstOrDefault(el => el.eventID == e.ID) == null).ToList();
-            //
-            //
-            // //场景特定事件
-            // List<EventConfig> candidateEvents = eventConfigs.Where(e => bigMap.SpecialTaskID.Contains(e.ID) && CanTriggerEvent(e.ID) && e.EventQuality == quality && !BagIsEvent(e.ID) && eventLists.FirstOrDefault(el => el.eventID == e.ID) == null).ToList();
-
             // 获取通用事件
             List<EventConfig> globalEvents = eventConfigs.Where(e =>
                 e.EventTriggerType == 1 && e.EventQuality == quality &&
@@ -473,8 +491,15 @@ public class EventSystemManager : Singleton<EventSystemManager>
             }
             else if (globalEvents.Count > 0)
             {
-                int randomValue2 = Random.Range(0, globalEvents.Count);
-                var eventList = AddEvent(globalEvents[randomValue2].ID);
+                List<int> quanzhong = new List<int>();
+                for (var i1 = 0; i1 < globalEvents.Count; i1++)
+                {
+                    quanzhong.Add(globalEvents[i1].RefreshProbability);
+                }
+
+                var eventconfig = UtilTools.GetRandomByWeight(globalEvents, quanzhong.ToArray());
+                // int randomValue2 = Random.Range(0, globalEvents.Count);
+                var eventList = AddEvent(eventconfig.ID);
 
                 if (eventList != null)
                 {
@@ -482,7 +507,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
                 }
                 else
                 {
-                    LogTool.Error("通用事件没有刷新出来 id:" + globalEvents[randomValue2].ID);
+                    LogTool.Error("通用事件没有刷新出来 id:" + eventconfig.ID);
                 }
             }
         }

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

@@ -50,17 +50,36 @@ namespace Fort23.Mono
 
             Btn_Back.onClick.AddListener(() =>
             {
-                UIManager.Instance.HideUIUIPanel(currentOpenUIPanel);
+                CloseMenu();
+
+                if (!(currentOpenUIPanel is MainPanel))
+                    UIManager.Instance.HideUIUIPanel(currentOpenUIPanel);
+                else
+                {
+                    UpdateUitoggleState();
+                }
+
                 AudioManager.Instance.PlayAudio("ui_fanhui.wav");
+
                 // currentOpenUIPanel = null;
             });
             Btn_Menu.onClick.AddListener(async () =>
             {
+                if (MenuRoot.activeSelf)
+                    return;
                 _backgroundCom = await UIManager.Instance.CreateGComponent<BackgroundCom>(null, root: MenuBgRoot);
-
+                Icon_Di.gameObject.SetActive(true);
+                Btn_Back.gameObject.SetActive(true);
+                bnt_shengShi.gameObject.SetActive(false);
+                BtnRoot.gameObject.SetActive(true);
                 MenuRoot.SetActive(true);
+                Toggle_BtnRoot.ShowTargetIndex(4);
+            });
+            Btn_Back1.onClick.AddListener(() =>
+            {
+                CloseMenu();
+                UpdateUitoggleState();
             });
-            Btn_Back1.onClick.AddListener(() => { CloseMenu(); });
 
             Btn_DaoYou.onClick.AddListener(() =>
             {
@@ -89,12 +108,13 @@ namespace Fort23.Mono
 
         public async void Btn_Shop_Click()
         {
+            CloseMenu();
             if (currentOpenUIPanel is ShopPanel)
             {
                 return;
             }
 
-            CloseMenu();
+
             UIPanel uiPanel = currentOpenUIPanel;
 
             CombatDrive.Instance.CombatController.isUpdate = false;
@@ -112,12 +132,12 @@ namespace Fort23.Mono
 
         public async void Btn_GongFa_Click()
         {
+            CloseMenu();
             if (currentOpenUIPanel is SkillSelectPanel)
             {
                 return;
             }
 
-            CloseMenu();
 
             UIPanel uiPanel = currentOpenUIPanel;
             SkillSelectPanel skillSelectPanel = await SkillSelectPanel.OpenSkillSelectPanel();
@@ -130,12 +150,12 @@ namespace Fort23.Mono
 
         public async void Btn_HeroInfomation_Click()
         {
+            CloseMenu();
             if (currentOpenUIPanel is MainHeroPanel)
             {
                 return;
             }
 
-            CloseMenu();
 
             UIPanel uiPanel = currentOpenUIPanel;
             MainHeroPanel mainHeroPanel = await MainHeroPanel.OpenPanel();
@@ -151,12 +171,13 @@ namespace Fort23.Mono
 
         public async void Bne_dongfu_Click()
         {
+            CloseMenu();
             if (currentOpenUIPanel is CaveMainPanel)
             {
                 return;
             }
 
-            CloseMenu();
+
             UIPanel uiPanel = currentOpenUIPanel;
             CombatDrive.Instance.CombatController.isUpdate = false;
             CaveMainPanel heroInformationPanel = await CaveMainPanel.OpenPanel();
@@ -185,6 +206,11 @@ namespace Fort23.Mono
                 return;
             }
 
+            if (count == 0)
+            {
+                TipMessagePanel.OpenTipMessagePanel("背包数量不足！");
+            }
+
             EventSystemManager.Instance.CancelEvent();
             if (EventSystemManager.Instance.isTriggerEvent)
                 return;
@@ -228,22 +254,29 @@ namespace Fort23.Mono
 
         public void CustomInit(UIPanel uiPanel)
         {
-            if (uiPanel is MainPanel)
+            currentOpenUIPanel = uiPanel;
+
+
+            UpdateUitoggleState();
+        }
+
+        private void UpdateUitoggleState()
+        {
+            if (currentOpenUIPanel is MainPanel)
             {
                 Icon_Di.gameObject.SetActive(true);
                 Btn_Back.gameObject.SetActive(false);
                 bnt_shengShi.gameObject.SetActive(true);
                 BtnRoot.gameObject.SetActive(true);
-                currentOpenUIPanel = uiPanel;
             }
-            else if (uiPanel is CaveMainPanel || uiPanel is SkillSelectPanel || uiPanel is ShopPanel ||
-                     uiPanel is MainHeroPanel)
+            else if (currentOpenUIPanel is CaveMainPanel || currentOpenUIPanel is SkillSelectPanel ||
+                     currentOpenUIPanel is ShopPanel ||
+                     currentOpenUIPanel is MainHeroPanel)
             {
                 Icon_Di.gameObject.SetActive(true);
                 Btn_Back.gameObject.SetActive(true);
                 bnt_shengShi.gameObject.SetActive(false);
                 BtnRoot.gameObject.SetActive(true);
-                currentOpenUIPanel = uiPanel;
             }
             else
             {
@@ -251,22 +284,21 @@ namespace Fort23.Mono
                 BtnRoot.gameObject.SetActive(false);
                 Btn_Back.gameObject.SetActive(true);
                 bnt_shengShi.gameObject.SetActive(false);
-                currentOpenUIPanel = uiPanel;
             }
 
-            if (uiPanel is CaveMainPanel)
+            if (currentOpenUIPanel is CaveMainPanel)
             {
                 Toggle_BtnRoot.ShowTargetIndex(2);
             }
-            else if (uiPanel is SkillSelectPanel)
+            else if (currentOpenUIPanel is SkillSelectPanel)
             {
                 Toggle_BtnRoot.ShowTargetIndex(1);
             }
-            else if (uiPanel is ShopPanel)
+            else if (currentOpenUIPanel is ShopPanel)
             {
                 Toggle_BtnRoot.ShowTargetIndex(3);
             }
-            else if (uiPanel is MainHeroPanel)
+            else if (currentOpenUIPanel is MainHeroPanel)
             {
                 Toggle_BtnRoot.ShowTargetIndex(0);
             }

Assets/Scripts/GameUI/UI/DivineSence/DivineSenceEventPreviewPanel.cs

@@ -146,12 +146,14 @@ namespace Fort23.Mono
                 Text_Tips.gameObject.SetActive(showEventList.Count > 0);
             }
 
-
+            var divineSenseConfig =
+                ConfigComponent.Instance.Get<DivineSenseConfig>(AccountFileInfo.Instance.playerData.divineSenseLevel);
             int maxCount = PlayerManager.Instance.myHero.powerUpConfig.ShenshiMax /
                            PlayerManager.Instance.gameConstantConfig.DetectEventCount;
+            maxCount = maxCount > divineSenseConfig.MaxNum ? divineSenseConfig.MaxNum : maxCount;
+            Text_ShenShiCount.text =
+                LanguageManager.Instance.Text(10239, EventSystemManager.Instance.GetShenShiCount(), maxCount);
 
-            Text_ShenShiCount.text =   LanguageManager.Instance.Text(10239, EventSystemManager.Instance.GetShenShiCount(), maxCount);
-          
             SaiXuan(saixuanType);
             showEventList.Sort(Sort);
             await Content.Init(this, showEventList.Count);

Assets/Scripts/GameUI/UI/DivineSence/DivineSenceEventResultPanel.cs

@@ -1,155 +0,0 @@
-using System.Collections.Generic;
-using Excel2Json;
-using Fort23.Core;
-using Fort23.UTool;
-using UnityEngine;
-using UnityEngine.Rendering;
-
-namespace Fort23.Mono
-{
-    [UIBinding(prefab = "DivineSenceEventResultPanel")]
-    public partial class DivineSenceEventResultPanel : UIPanel, IScrollListContent
-    {
-        List<AccountFileInfo.EventList> eventList = new List<AccountFileInfo.EventList>();
-
-        private void Init()
-        {
-            // isAddStack = true;
-            // IsShowAppBar = false;
-        }
-
-        protected override void AddEvent()
-        {
-            EventManager.Instance.AddEventListener(CustomEventType.RemoveEvent, RemoveEvent);
-        }
-
-
-        protected override void DelEvent()
-        {
-            EventManager.Instance.RemoveEventListener(CustomEventType.RemoveEvent, RemoveEvent);
-        }
-
-        public override void AddButtonEvent()
-        {
-            Btn_Close.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
-            Btn_Ok.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
-        }
-
-        private void RemoveEvent(IEventData e)
-        {
-            UIManager.Instance.DormancyAllGComponent<ShengShiEventWidgetType2>();
-            Content.Init(this, eventList.Count);
-        }
-
-        public override CTask<bool> AsyncInit(object[] uiData)
-        {
-            eventList = uiData[0] as List<AccountFileInfo.EventList>;
-
-            if (eventList != null && eventList.Count > 0)
-                Content.Init(this, eventList.Count);
-
-
-            return base.AsyncInit(uiData);
-        }
-
-
-        public async CTask<IScorllListWidget> GetIScorllListWidget(int index, RectTransform root)
-        {
-            if (index < 0 || index >= eventList.Count)
-            {
-                return null;
-            }
-
-            EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(eventList[index].eventID);
-            // if (eventConfig.EventType == 2)
-            // {
-            //     ShengShiEventWidgetType3 shengShiEventWidgetType2 = await UIManager.Instance.CreateGComponent<ShengShiEventWidgetType3>(null, ContentRoot);
-            //     shengShiEventWidgetType2.CustomInit(eventList[index]);
-            //     shengShiEventWidgetType2.OnClick = ShengShiEventWidgetType3OnClick;
-            //     return shengShiEventWidgetType2;
-            // }
-            // else
-            {
-                ShengShiEventWidgetType2 shengShiEventWidgetType2 = await UIManager.Instance.CreateGComponent<ShengShiEventWidgetType2>(null, ContentRoot);
-                shengShiEventWidgetType2.CustomInit(eventList[index], GoOnClick);
-                shengShiEventWidgetType2.OnClick = OnClick;
-                return shengShiEventWidgetType2;
-            }
-        }
-
-        private void ShengShiEventWidgetType3OnClick(ItemWidgetBasic obj)
-        {
-            if (EventSystemManager.Instance.isTriggerEvent)
-                return;
-
-            ShengShiEventWidgetType3 shengShiEventWidgetType3 = obj as ShengShiEventWidgetType3;
-            //this.GObjectPoolInterface.SetActive(false);
-            EventSystemManager.Instance.isOpenUi = false;
-            EventSystemManager.Instance.TriggerEvent(shengShiEventWidgetType3.eventList, () =>
-            {
-                eventList.Remove(shengShiEventWidgetType3.eventList);
-                Content.Init(this, eventList.Count);
-                EventSystemManager.Instance.isOpenUi = true;
-                //this.GObjectPoolInterface.SetActive(true);
-            });
-        }
-
-        private void OnClick(ItemWidgetBasic obj)
-        {
-            ShengShiEventWidgetType2 shengShiEventWidgetType2 = obj as ShengShiEventWidgetType2;
-
-            TaskInfoPanel.OpenPanel(shengShiEventWidgetType2.eventList,1);
-
-            // if (EventSystemManager.Instance.isTriggerEvent)
-            //     return;
-            //
-
-            // this.GObjectPoolInterface.SetActive(false);
-            // EventSystemManager.Instance.isOpenUi = false;
-            // EventSystemManager.Instance.TriggerEvent(shengShiEventWidgetType2.eventList, () =>
-            // {
-            //     eventList.Remove(shengShiEventWidgetType2.eventList);
-            //     Content.Init(this, eventList.Count);
-            //     EventSystemManager.Instance.isOpenUi = true;
-            //     this.GObjectPoolInterface.SetActive(true);
-            //
-            // });
-        }
-
-        private void GoOnClick(ItemWidgetBasic obj)
-        {
-            if (EventSystemManager.Instance.isTriggerEvent)
-                return;
-
-            ShengShiEventWidgetType2 shengShiEventWidgetType2 = obj as ShengShiEventWidgetType2;
-            //this.GObjectPoolInterface.SetActive(false);
-            EventSystemManager.Instance.isOpenUi = false;
-            EventSystemManager.Instance.TriggerEvent(shengShiEventWidgetType2.eventList, () =>
-            {
-                eventList.Remove(shengShiEventWidgetType2.eventList);
-                Content.Init(this, eventList.Count);
-                EventSystemManager.Instance.isOpenUi = true;
-                //this.GObjectPoolInterface.SetActive(true);
-            });
-        }
-
-
-        public void HindIScorllListWidget(IScorllListWidget widget)
-        {
-            UIManager.Instance.DormancyGComponent(widget as UIComponent);
-        }
-
-        public async static CTask<DivineSenceEventResultPanel> OpenPanel(List<AccountFileInfo.EventList> eventList)
-        {
-            DivineSenceEventResultPanel divineSenceEventPreviewPanel = await UIManager.Instance.LoadAndOpenPanel<DivineSenceEventResultPanel>(null, uiData: new object[] { eventList });
-            return divineSenceEventPreviewPanel;
-        }
-
-        public override void Close()
-        {
-            UIManager.Instance.DormancyAllGComponent<ShengShiEventWidgetType3>();
-            eventList = null;
-            base.Close();
-        }
-    }
-}

Assets/Scripts/GameUI/UI/DivineSence/DivineSenceEventResultPanel.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: B3wbsnysU3p8rIcBzdrKMgBNkzpLPC/88YfMELXgaiM0Ff3Tx/TIMRfQLVIx
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scripts/GameUI/UI/DivineSence/DivineSenceEventResultPanelData.cs

@@ -1,73 +0,0 @@
-using Fort23.Core;
-using Fort23.UTool;
-using UnityEngine.UI;
-using UnityEngine;
-using System.Collections.Generic;
-namespace Fort23.Mono
-{
-	public partial class DivineSenceEventResultPanel 
-	{
-	  #region 自定义数据 
-	  private MyImage _bg;
-	  public MyImage bg
-	   {
-	   get{
-	      if (_bg == null)
-	       {
-	         _bg  = GetUIUnit<MyImage>("bg"); 
-	       }
-	      return _bg;
-	     }
-	   }
-	  private ScrollList _Content;
-	  public ScrollList Content
-	   {
-	   get{
-	      if (_Content == null)
-	       {
-	         _Content  = GetUIUnit<ScrollList>("Content"); 
-	       }
-	      return _Content;
-	     }
-	   }
-	  private RectTransform _ContentRoot;
-	  public RectTransform ContentRoot
-	   {
-	   get{
-	      if (_ContentRoot == null)
-	       {
-	         _ContentRoot  = GetUIUnit<RectTransform>("ContentRoot"); 
-	       }
-	      return _ContentRoot;
-	     }
-	   }
-	  private Button _Btn_Close;
-	  public Button Btn_Close
-	   {
-	   get{
-	      if (_Btn_Close == null)
-	       {
-	         _Btn_Close  = GetUIUnit<Button>("Btn_Close"); 
-	       }
-	      return _Btn_Close;
-	     }
-	   }
-	  private Button _Btn_Ok;
-	  public Button Btn_Ok
-	   {
-	   get{
-	      if (_Btn_Ok == null)
-	       {
-	         _Btn_Ok  = GetUIUnit<Button>("Btn_Ok"); 
-	       }
-	      return _Btn_Ok;
-	     }
-	   }
-	  #endregion 自定义数据结束 
-	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
-	{
-	 await base.SetUIGameObject(gObjectPoolInterface);
-	 Init();
-	}
-	}
-}

Assets/Scripts/GameUI/UI/DivineSence/DivineSenceEventResultPanelData.cs.meta

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

Assets/Scripts/GameUI/UI/DivineSence/ShengShiEventWidgetType3.cs

@@ -1,95 +0,0 @@
-using System.Collections.Generic;
-using Core.Language;
-using Excel2Json;
-using Fort23.UTool;
-using GameLogic.Bag;
-using GameLogic.Player;
-using UnityEngine;
-
-namespace Fort23.Mono
-{
-    [UIBinding(prefab = "ShengShiEventWidgetType3")]
-    public partial class ShengShiEventWidgetType3 : ItemWidgetBasic
-    {
-        List<WidgetItem> widgetList = new List<WidgetItem>();
-        private void Init()
-        {
-        }
-
-        public override void AddEvent()
-        {
-        }
-
-        public override void DelEvent()
-        {
-        }
-
-        public override void AddButtonEvent()
-        {
-            base.AddButtonEvent();
-        }
-
-        // List<WidgetItem> widgetList = new List<WidgetItem>();
-
-        private void Button_onClick()
-        {
-        }
-
-        private EventConfig randomEventConfig;
-        public AccountFileInfo.EventList eventList;
-
-        public async void CustomInit(AccountFileInfo.EventList eventList)
-        {
-            for (var i = 0; i < widgetList.Count; i++)
-            {
-                UIManager.Instance.DormancyGComponent(widgetList[i]);
-            }
-
-            widgetList.Clear();
-
-            this.eventList = eventList;
-            randomEventConfig = ConfigComponent.Instance.Get<EventConfig>(eventList.eventID);
-            Text_EventName.text = LanguageManager.Instance.Text(randomEventConfig.EventName);
-            EventLinkConfig conditionConfig = ConfigComponent.Instance.Get<EventLinkConfig>(randomEventConfig.EventLinksId[0]);
-            // Text_EventDesc.text = LanguageManager.Instance.Text(conditionConfig.LanID[0]);
-            Text_EventDesc.text = LanguageManager.Instance.Text(randomEventConfig.Description);
-            if (conditionConfig.optionType == 3)
-            {
-                List<ItemInfo> itemInfos = new List<ItemInfo>();
-                for (var i = 0; i < conditionConfig.PrizeIDs.Length; i++)
-                {
-                    DropConfig dropConfig = ConfigComponent.Instance.Get<DropConfig>(conditionConfig.PrizeIDs[i]);
-                    if (dropConfig.dropType == 3)
-                    {
-                        ItemInfo itemInfo = new ItemInfo(dropConfig.dropGroupID[0], conditionConfig.PrizeNums[i]);
-                        itemInfos.Add(itemInfo);
-                    }
-                    else
-                    {
-                        List<ItemInfo> items = DropManager.Instance.DropItem(conditionConfig.PrizeIDs[i]);
-                        itemInfos.AddRange(items);
-                    }
-                }
-
-                for (var i = 0; i < itemInfos.Count; i++)
-                {
-                    WidgetItem widgetItem = await UIManager.Instance.CreateGComponent<WidgetItem>(null, ItemRoot);
-                    widgetItem.InitWidget(itemInfos[i]);
-                    widgetList.Add(widgetItem);
-                }
-            }
-        }
-
-        public override void DormancyObj()
-        {
-            for (var i = 0; i < widgetList.Count; i++)
-            {
-                UIManager.Instance.DormancyGComponent(widgetList[i]);
-            }
-
-            widgetList.Clear();
-
-            base.DormancyObj();
-        }
-    }
-}

Assets/Scripts/GameUI/UI/DivineSence/ShengShiEventWidgetType3.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: C3gft3n4USkOl8L3/g9yE2Snog0md5Wpk55pkXObyFEWOzKqXZ4w4AX23b+F
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scripts/GameUI/UI/DivineSence/ShengShiEventWidgetType3Data.cs

@@ -1,62 +0,0 @@
-using Fort23.Core;
-using Fort23.UTool;
-using UnityEngine.UI;
-using UnityEngine;
-using System.Collections.Generic;
-namespace Fort23.Mono
-{
-	public partial class ShengShiEventWidgetType3 
-	{
-	  #region 自定义数据 
-	  private Object _myButton;
-	  public Object myButton
-	   {
-	   get{
-	      if (_myButton == null)
-	       {
-	         _myButton  = GetUIUnit<Object>("myButton"); 
-	       }
-	      return _myButton;
-	     }
-	   }
-	  private Text _Text_EventDesc;
-	  public Text Text_EventDesc
-	   {
-	   get{
-	      if (_Text_EventDesc == null)
-	       {
-	         _Text_EventDesc  = GetUIUnit<Text>("Text_EventDesc"); 
-	       }
-	      return _Text_EventDesc;
-	     }
-	   }
-	  private Text _Text_EventName;
-	  public Text Text_EventName
-	   {
-	   get{
-	      if (_Text_EventName == null)
-	       {
-	         _Text_EventName  = GetUIUnit<Text>("Text_EventName"); 
-	       }
-	      return _Text_EventName;
-	     }
-	   }
-	  private RectTransform _ItemRoot;
-	  public RectTransform ItemRoot
-	   {
-	   get{
-	      if (_ItemRoot == null)
-	       {
-	         _ItemRoot  = GetUIUnit<RectTransform>("ItemRoot"); 
-	       }
-	      return _ItemRoot;
-	     }
-	   }
-	  #endregion 自定义数据结束 
-	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
-	{
-	 await base.SetUIGameObject(gObjectPoolInterface);
-	 Init();
-	}
-	}
-}

Assets/Scripts/GameUI/UI/DivineSence/ShengShiEventWidgetType3Data.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: Xi4Y5yilAnlruO9gfKUs8hVCp8GmYprYfHkV0rJNAn5HgV7Tkl/sGjs/3C4u
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

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

@@ -366,8 +366,8 @@ namespace Fort23.Mono
             }
 
             isForceDone = AccountFileInfo.Instance.playerData.isForceDone;
-            curPhase = AccountFileInfo.Instance.playerData.curPhase;
-            curStep = AccountFileInfo.Instance.playerData.curStep;
+            // curPhase = AccountFileInfo.Instance.playerData.curPhase;
+            // curStep = AccountFileInfo.Instance.playerData.curStep;
 
 
             //完成强制引导

Assets/Scripts/GameUI/UI/HeroInformationPanel/ImmortalBondPanel.cs

@@ -24,6 +24,7 @@ namespace Fort23.Mono
         public override CTask GetFocus()
         {
             AppBarPanel.OpenPanel(this);
+            TitlePanel.ClosePanel();
             return base.GetFocus();
         }
 
@@ -78,7 +79,8 @@ namespace Fort23.Mono
 
             foreach (var i in PlayerManager.Instance.myHero.daolvBl)
             {
-                DaoYouaaFfixWidget daoLvSkillWidget = await UIManager.Instance.CreateGComponent<DaoYouaaFfixWidget>(null, JiachengContent);
+                DaoYouaaFfixWidget daoLvSkillWidget =
+                    await UIManager.Instance.CreateGComponent<DaoYouaaFfixWidget>(null, JiachengContent);
                 daoLvSkillWidget.CustomInit(i);
                 _daoLvSkillWidgets.Add(daoLvSkillWidget);
             }

Assets/Scripts/GameUI/UI/LevelChoosePanel/PlacesInfoPanel.cs

@@ -189,16 +189,16 @@ namespace Fort23.Mono
                 UIManager.Instance.HideUIUIPanel(this);
 
                 //切换下一个地图
-                PlayerManager.Instance.ChangeMap(smallPlacesConfig.ID + 1);
-               
-                UIManager.Instance.HindCurrAllShowPanel();
-                CombatDrive.Instance.CombatController.ChangeState(CombatController.update);
-                CombatController.currActiveCombat.CombatHeroController.Flight(2, -90, 10);
-                UIManager.Instance.SetEventSystemEnable(false);
-                await TimerComponent.Instance.WaitAsync(2 * 1000 + 1200);
-                CombatDrive.Instance.CombatController.ChangeState(CombatController.idle);
-                UIManager.Instance.SetEventSystemEnable(true);
-                UIManager.Instance.ShowLastHindAllShowPanel();
+                await PlayerManager.Instance.ChangeMap(smallPlacesConfig.ID + 1);
+
+
+                // CombatDrive.Instance.CombatController.ChangeState(CombatController.update);
+                // CombatController.currActiveCombat.CombatHeroController.Flight(2, -90, 10);
+                // UIManager.Instance.SetEventSystemEnable(false);
+                // await TimerComponent.Instance.WaitAsync(2 * 1000 + 1200);
+                // CombatDrive.Instance.CombatController.ChangeState(CombatController.idle);
+                // UIManager.Instance.SetEventSystemEnable(true);
+
                 callBack?.Invoke(true);
                 callBack = null;
             }
@@ -242,19 +242,10 @@ namespace Fort23.Mono
                 }
 
                 isChange = true;
-                PlayerManager.Instance.ChangeMap(smallPlacesConfig.ID);
-
                 UIManager.Instance.HideUIUIPanel<LevelChoosePanel>();
                 UIManager.Instance.HideUIUIPanel(this);
-
-                UIManager.Instance.HindCurrAllShowPanel();
-                CombatDrive.Instance.CombatController.ChangeState(CombatController.update);
-                CombatController.currActiveCombat.CombatHeroController.Flight(2, -90, 10);
-                UIManager.Instance.SetEventSystemEnable(false);
-                await TimerComponent.Instance.WaitAsync(2 * 1000 + 1200);
-                CombatDrive.Instance.CombatController.ChangeState(CombatController.idle);
-                UIManager.Instance.SetEventSystemEnable(true);
-                UIManager.Instance.ShowLastHindAllShowPanel();
+                await PlayerManager.Instance.ChangeMap(smallPlacesConfig.ID);
+                
                 callBack?.Invoke(true);
                 callBack = null;
             }

XiuXianGame.sln.DotSettings.user

@@ -1,6 +1,7 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AAbstractProgressBar_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F56d039fe633a4adf8fb266a0b1797e6c17a000_003F40_003Fd60d7bd8_003FAbstractProgressBar_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AAction_00601_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fe4df6db7850b4c40b72002ff5da8188846ac00_003Ff4_003Fcb4805bc_003FAction_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AAnimationCurve_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F61_003F47acc2d2_003FAnimationCurve_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AApplication_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F69_003F6bd97609_003FApplication_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AAppStatusBar_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F1f63769030ae497a94b35af8517071579d5a00_003Fbc_003F8cd214f9_003FAppStatusBar_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AArray_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F9c2967a135e648bdb993c5397a44991b573620_003Fd5_003Fcf947ad8_003FArray_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>