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

# Conflicts:
#	Assets/Res/Config/EventLinkConfig.json   resolved by origin/master(远端) version
#	Excel2Json/Excel/EventConfig.xlsx   resolved by origin/master(远端) version
#	Excel2Json/Excel/LevelBattle.xlsx   resolved by origin/master(远端) version

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

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: W35O53utBn78uwhvkBSOjJnHnkkUvkCKiUp6nFCDD/rH/sDxZsKE2QRiUNMQ
+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/bg/bg_shenshishijian_ding.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: WnIb5yOkV3+Ios4sPvCajlKB6DBR1s6zfnfOZdmjTZwqTsVBCbRFEZahOKJq
+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_ewaijiangli.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: WysWvS+uV3zyJ+N+lPyXhl2zQ9B/6ZaLWY7zXkVxSszg+mbXNcaAxuvJ5ToO
+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_guanbi.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: XnobtiP4Ui/1QcgecA1DsMFMEQpDDVUymFPCRff3pi+uj54Cf/nTGikOAey6
+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_shenshi_fengling.png.meta

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

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

Assets/Res/Config/EventConfig.json

@@ -1248,6 +1248,7 @@
         1000812,
         1000813,
         1000814,
+        1000815,
         102
       ],
       "EventTriggerType": 4,
@@ -1914,6 +1915,7 @@
         1002607,
         1002608,
         1002609,
+        1002610,
         102
       ],
       "EventTriggerType": 4,
@@ -3697,6 +3699,7 @@
         601509,
         601510,
         601511,
+        601512,
         102
       ],
       "EventTriggerType": 7,

Assets/Res/Config/GroupConfig.json

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

Assets/Res/Config/HeroModelConfig.json

@@ -58,6 +58,64 @@
       ],
       "heroStory": 0
     },
+    {
+      "ID": 102,
+      "nickName": -1,
+      "name": 1,
+      "headicon": "icon_tx102",
+      "model": "Nanzhu",
+      "isUseGpu": false,
+      "heroType": 1,
+      "attack": 250,
+      "hp": 250,
+      "def": 100,
+      "shield": 250,
+      "speed_atk": 0.0,
+      "Linggen": [
+        100,
+        100,
+        100,
+        100,
+        100
+      ],
+      "skillID": [
+        2006,
+        1103,
+        -1,
+        2011,
+        1105,
+        -1,
+        2003,
+        1101,
+        2012,
+        1102
+      ],
+      "skillActiveLv": [
+        -1,
+        -1,
+        -1,
+        -1,
+        -1,
+        -1,
+        -1,
+        -1,
+        -1,
+        -1
+      ],
+      "fa_bao_id": [
+        10010,
+        10001,
+        10006,
+        10002
+      ],
+      "fabaoActiveLv": [
+        -1,
+        -1,
+        -1,
+        -1
+      ],
+      "heroStory": 0
+    },
     {
       "ID": 1001,
       "nickName": -1,
@@ -1163,7 +1221,7 @@
       "nickName": -1,
       "name": 5,
       "headicon": "icon_tx9005",
-      "model": "Boss_fenghuang",
+      "model": "Nanzhu",
       "isUseGpu": false,
       "heroType": 4,
       "attack": 270,
@@ -1179,16 +1237,16 @@
         100
       ],
       "skillID": [
+        2005,
+        1404,
+        2002,
+        1401,
+        2007,
         -1,
-        9061,
-        -1,
-        9064,
-        9062,
-        9063,
-        -1,
-        -1,
-        -1,
-        9063
+        1402,
+        2017,
+        1403,
+        -1
       ],
       "skillActiveLv": [
         1,
@@ -1203,10 +1261,10 @@
         1
       ],
       "fa_bao_id": [
-        -1,
-        -1,
-        -1,
-        -1
+        10007,
+        10010,
+        10002,
+        10004
       ],
       "fabaoActiveLv": [
         1,

Assets/Res/Config/LevelbattleConfig.json

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

Assets/Res/UI/CombatPanel.prefab

@@ -178,7 +178,7 @@ MonoBehaviour:
     packgJsonPath: 
     packgSpritePath: 
     lasetJsonGUID: 
-  imageH: 0
+  imageH: 16
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -483,7 +483,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
-  imageH: 0
+  imageH: -122222
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -1350,7 +1350,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\battle.txt
     packgSpritePath: Assets/Res/UIAtlas/battle.spriteatlasv2
     lasetJsonGUID: e3255755c2d07e4fdeef12a0d5361a43
-  imageH: 0
+  imageH: 15
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -1853,7 +1853,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 8de890b954c861b7d182629dcafc0d3a
-  imageH: 0
+  imageH: 68
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -2220,7 +2220,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
-  imageH: 0
+  imageH: -122222
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -2726,7 +2726,7 @@ MonoBehaviour:
     packgJsonPath: 
     packgSpritePath: 
     lasetJsonGUID: 
-  imageH: 0
+  imageH: 6
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -2996,7 +2996,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\battle.txt
     packgSpritePath: Assets/Res/UIAtlas/battle.spriteatlasv2
     lasetJsonGUID: b16af8f38185cf96d8030bb6e121b19f
-  imageH: 0
+  imageH: 256
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -4306,7 +4306,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\battle.txt
     packgSpritePath: Assets/Res/UIAtlas/battle.spriteatlasv2
     lasetJsonGUID: e3255755c2d07e4fdeef12a0d5361a43
-  imageH: 0
+  imageH: 76
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -4395,7 +4395,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\battle.txt
     packgSpritePath: Assets/Res/UIAtlas/battle.spriteatlasv2
     lasetJsonGUID: 5091d0e4e0fc6634b01064dd45e707d7
-  imageH: 0
+  imageH: 24.8
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -5125,7 +5125,7 @@ MonoBehaviour:
     packgJsonPath: 
     packgSpritePath: 
     lasetJsonGUID: 
-  imageH: 0
+  imageH: 8
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -6034,7 +6034,7 @@ MonoBehaviour:
     packgJsonPath: 
     packgSpritePath: 
     lasetJsonGUID: 
-  imageH: 0
+  imageH: 13
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -6523,7 +6523,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/skillIcon.txt
     packgSpritePath: Assets/Res/UIAtlas/skillIcon.spriteatlasv2
     lasetJsonGUID: ba8dbdc12cfea95132d75e229eac99b8
-  imageH: 0
+  imageH: 55
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -6737,7 +6737,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\battle.txt
     packgSpritePath: Assets/Res/UIAtlas/battle.spriteatlasv2
     lasetJsonGUID: 5091d0e4e0fc6634b01064dd45e707d7
-  imageH: 0
+  imageH: 100
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -6945,7 +6945,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: icon_fb3401
+  _icon_name: icon_s3101
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: 77f77eea85838ad4b8734050364b4892, type: 3}
   packInfo:
@@ -6953,7 +6953,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\daoju.txt
     packgSpritePath: Assets/Res/UIAtlas/daoju.spriteatlasv2
     lasetJsonGUID: c45843c862c85b511b3874f8c3cfa401
-  imageH: 0
+  imageH: 90
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -7370,7 +7370,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\battle.txt
     packgSpritePath: Assets/Res/UIAtlas/battle.spriteatlasv2
     lasetJsonGUID: 5091d0e4e0fc6634b01064dd45e707d7
-  imageH: 0
+  imageH: 68
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -7615,7 +7615,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\battle.txt
     packgSpritePath: Assets/Res/UIAtlas/battle.spriteatlasv2
     lasetJsonGUID: 5091d0e4e0fc6634b01064dd45e707d7
-  imageH: 0
+  imageH: 65
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -7808,7 +7808,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\battle.txt
     packgSpritePath: Assets/Res/UIAtlas/battle.spriteatlasv2
     lasetJsonGUID: b16af8f38185cf96d8030bb6e121b19f
-  imageH: 0
+  imageH: -122222
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -7897,7 +7897,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
-  imageH: 0
+  imageH: 130
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -8563,7 +8563,7 @@ MonoBehaviour:
   m_FillOrigin: 1
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: icon_fb3501
+  _icon_name: icon_s3101
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: 77f77eea85838ad4b8734050364b4892, type: 3}
   packInfo:
@@ -8571,7 +8571,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\daoju.txt
     packgSpritePath: Assets/Res/UIAtlas/daoju.spriteatlasv2
     lasetJsonGUID: c45843c862c85b511b3874f8c3cfa401
-  imageH: 0
+  imageH: 90
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -8927,7 +8927,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
-  imageH: 0
+  imageH: 21.5391
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -9064,7 +9064,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\battle.txt
     packgSpritePath: Assets/Res/UIAtlas/battle.spriteatlasv2
     lasetJsonGUID: b16af8f38185cf96d8030bb6e121b19f
-  imageH: 0
+  imageH: 55
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -9276,7 +9276,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
-  imageH: 0
+  imageH: 140
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -9485,7 +9485,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\battle.txt
     packgSpritePath: Assets/Res/UIAtlas/battle.spriteatlasv2
     lasetJsonGUID: b16af8f38185cf96d8030bb6e121b19f
-  imageH: 0
+  imageH: 55
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}

Assets/Res/UI/DivineSence/ShengShiEventWidgetType2.prefab

@@ -171,7 +171,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.49411768, g: 0.48235297, b: 0.4666667, a: 1}
+  m_Color: {r: 0.34509805, g: 0.3137255, b: 0.3019608, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -317,7 +317,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: 222.42291, y: -93.9532}
+  m_AnchoredPosition: {x: 221.6, y: -90.7}
   m_SizeDelta: {x: 192.4328, y: 52.7449}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8044263114105609004
@@ -341,7 +341,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.7830189, g: 0.7819636, b: 0.7793254, a: 1}
+  m_Color: {r: 0.40000004, g: 0.6509804, b: 0.64705884, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -447,7 +447,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1007467258602941415
 RectTransform:
   m_ObjectHideFlags: 0
@@ -598,7 +598,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: 7.100006, y: -7.0699997}
+  m_AnchoredPosition: {x: 49.4, y: -5.3}
   m_SizeDelta: {x: 69.9286, y: 32.8052}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &5479443627435669674
@@ -622,7 +622,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.48627454, g: 0.36862746, b: 0.19607845, a: 1}
+  m_Color: {r: 0.25882354, g: 0.4039216, b: 0.3529412, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -664,6 +664,7 @@ GameObject:
   - component: {fileID: 4485080243282319686}
   - component: {fileID: 5018190062906650215}
   - component: {fileID: 1530431928590719805}
+  - component: {fileID: 1929591076646090578}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_ZuiZhong
@@ -689,8 +690,8 @@ RectTransform:
   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: -20, y: 17}
-  m_SizeDelta: {x: 68, y: 68}
+  m_AnchoredPosition: {x: -31.305, y: 10}
+  m_SizeDelta: {x: 61.1748, y: 61.1748}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &4485080243282319686
 CanvasRenderer:
@@ -713,7 +714,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.6627451, g: 0.7686275, b: 0.74509805, a: 1}
+  m_Color: {r: 0.60784316, g: 0.78823537, b: 0.61960787, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -787,6 +788,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &1929591076646090578
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2987942260868545690}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &3348088768749406642
 GameObject:
   m_ObjectHideFlags: 0
@@ -915,6 +929,7 @@ RectTransform:
   m_Children:
   - {fileID: 8807649875490934103}
   - {fileID: 1357522047238736597}
+  - {fileID: 5225875953063125181}
   - {fileID: 3650536308811846443}
   - {fileID: 7566769296908980725}
   - {fileID: 712579681456886399}
@@ -978,7 +993,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: -3.5069, y: -50.50203}
+  m_AnchoredPosition: {x: -3.5069, y: -41.1}
   m_SizeDelta: {x: 646.882, y: 1.4916}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2294293068954379236
@@ -1002,7 +1017,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.6, g: 0.6039216, b: 0.6117647, a: 1}
+  m_Color: {r: 0.2509804, g: 0.24313727, b: 0.21568629, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1032,6 +1047,95 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &4231878762216119874
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5225875953063125181}
+  - component: {fileID: 2412484749260562235}
+  - component: {fileID: 113776996774915988}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5225875953063125181
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4231878762216119874}
+  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: 3764721290890148754}
+  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: -319.9, y: -3.0615}
+  m_SizeDelta: {x: 36.877, y: 36.877}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &2412484749260562235
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4231878762216119874}
+  m_CullTransparentMesh: 1
+--- !u!114 &113776996774915988
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4231878762216119874}
+  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_shenshi_dengji_sheng
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: cdfc87cecacbc6d43a18b124c77cdb3c, type: 3}
+  packInfo:
+    packName: shenshi
+    packgJsonPath: /Art/UIAssets/TextrueJson\shenshi.txt
+    packgSpritePath: Assets/Res/UIAtlas/shenshi.spriteatlasv2
+    lasetJsonGUID: 390613cb2a0c25f30d6ab3483d292479
+  imageH: 53.466114
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &4442584923359408203
 GameObject:
   m_ObjectHideFlags: 0
@@ -1067,8 +1171,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: -52.941902, y: 107.13}
-  m_SizeDelta: {x: 388.5786, y: 42.713}
+  m_AnchoredPosition: {x: -10.2, y: 107.13}
+  m_SizeDelta: {x: 388.5786, y: 47.752}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6912937265734038597
 CanvasRenderer:
@@ -1091,7 +1195,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.86666673, g: 0.8352942, b: 0.7803922, a: 1}
+  m_Color: {r: 0.9960785, g: 0.9921569, b: 0.98823535, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1147,8 +1251,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.000014781952, y: 0}
-  m_SizeDelta: {x: 683, y: 262}
+  m_AnchoredPosition: {x: -0.24937, y: 0}
+  m_SizeDelta: {x: 683.5, y: 262}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2778409128145198339
 CanvasRenderer:
@@ -1171,7 +1275,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.95294124, g: 0.9294118, b: 0.8431373, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1346,38 +1450,100 @@ MonoBehaviour:
     - Target: {fileID: 6730899750744253868}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 0.5529412, y: 0.47450984, z: 0.3529412, w: 1}
+      - {x: 0.70980394, y: 0.68235296, z: 0.64705884, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
     - Target: {fileID: 1904131733610652650}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 0.48627454, y: 0.36862746, z: 0.19607845, w: 1}
+      - {x: 0.40784317, y: 0.5058824, z: 0.40000004, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
     - Target: {fileID: 8552613376447685522}
       UIStateV4Types: 80000000
       UIStateV4Datas:
-      - {x: 0.86666673, y: 0.7294118, z: 0.4901961, w: 1}
+      - {x: 1, y: 1, z: 1, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
     - Target: {fileID: 6198714990258003341}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 0.86666673, y: 0.7294118, z: 0.4901961, w: 1}
+      - {x: 1, y: 1, z: 1, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
-    - Target: {fileID: 6161269103075097772}
+    - Target: {fileID: 4231878762216119874}
+      UIStateV4Types: 
+      UIStateV4Datas: []
+      UIStateStrTypes: 00020000
+      UIStateStrDatas:
+      - dec_shenshi_dengji_fan
+  - StateInfos:
+    - Target: {fileID: 6730899750744253868}
+      UIStateV4Types: 40000000
+      UIStateV4Datas:
+      - {x: 0.5568628, y: 0.6901961, z: 0.8196079, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+    - Target: {fileID: 1904131733610652650}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 0.7830189, y: 0.67551905, z: 0.49123356, w: 1}
+      - {x: 0.25882354, y: 0.4039216, z: 0.3529412, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
+    - Target: {fileID: 8552613376447685522}
+      UIStateV4Types: 80000000
+      UIStateV4Datas:
+      - {x: 0.54509807, y: 0.69411767, z: 0.6156863, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+    - Target: {fileID: 6198714990258003341}
+      UIStateV4Types: 40000000
+      UIStateV4Datas:
+      - {x: 0.5686275, y: 0.72156864, z: 0.6392157, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+    - Target: {fileID: 4231878762216119874}
+      UIStateV4Types: 
+      UIStateV4Datas: []
+      UIStateStrTypes: 00020000
+      UIStateStrDatas:
+      - dec_shenshi_dengji_yi
+  - StateInfos:
+    - Target: {fileID: 6730899750744253868}
+      UIStateV4Types: 40000000
+      UIStateV4Datas:
+      - {x: 0.7411765, y: 0.5921569, z: 0.8431373, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+    - Target: {fileID: 1904131733610652650}
+      UIStateV4Types: 40000000
+      UIStateV4Datas:
+      - {x: 0.25882354, y: 0.4039216, z: 0.3529412, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+    - Target: {fileID: 8552613376447685522}
+      UIStateV4Types: 80000000
+      UIStateV4Datas:
+      - {x: 0.54509807, y: 0.69411767, z: 0.6156863, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+    - Target: {fileID: 6198714990258003341}
+      UIStateV4Types: 40000000
+      UIStateV4Datas:
+      - {x: 0.5686275, y: 0.72156864, z: 0.6392157, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+    - Target: {fileID: 4231878762216119874}
+      UIStateV4Types: 
+      UIStateV4Datas: []
+      UIStateStrTypes: 00020000
+      UIStateStrDatas:
+      - dec_shenshi_dengji_qi
   - StateInfos:
     - Target: {fileID: 6730899750744253868}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 0.36862746, y: 0.48235297, z: 0.41960788, w: 1}
+      - {x: 0.81568635, y: 0.73333335, z: 0.5568628, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
     - Target: {fileID: 1904131733610652650}
@@ -1398,20 +1564,82 @@ MonoBehaviour:
       - {x: 0.5686275, y: 0.72156864, z: 0.6392157, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
-    - Target: {fileID: 6161269103075097772}
+    - Target: {fileID: 4231878762216119874}
+      UIStateV4Types: 
+      UIStateV4Datas: []
+      UIStateStrTypes: 00020000
+      UIStateStrDatas:
+      - dec_shenshi_dengji_ling
+  - StateInfos:
+    - Target: {fileID: 6730899750744253868}
+      UIStateV4Types: 40000000
+      UIStateV4Datas:
+      - {x: 0.81568635, y: 0.64705884, z: 0.54509807, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+    - Target: {fileID: 1904131733610652650}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 0.46274513, y: 0.7568628, z: 0.59607846, w: 1}
+      - {x: 0.25882354, y: 0.4039216, z: 0.3529412, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+    - Target: {fileID: 8552613376447685522}
+      UIStateV4Types: 80000000
+      UIStateV4Datas:
+      - {x: 0.54509807, y: 0.69411767, z: 0.6156863, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
+    - Target: {fileID: 6198714990258003341}
+      UIStateV4Types: 40000000
+      UIStateV4Datas:
+      - {x: 0.5686275, y: 0.72156864, z: 0.6392157, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+    - Target: {fileID: 4231878762216119874}
+      UIStateV4Types: 
+      UIStateV4Datas: []
+      UIStateStrTypes: 00020000
+      UIStateStrDatas:
+      - dec_shenshi_dengji_xuan
+  - StateInfos:
+    - Target: {fileID: 6730899750744253868}
+      UIStateV4Types: 40000000
+      UIStateV4Datas:
+      - {x: 0.7960785, y: 0.5686275, z: 0.5411765, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+    - Target: {fileID: 1904131733610652650}
+      UIStateV4Types: 40000000
+      UIStateV4Datas:
+      - {x: 0.25882354, y: 0.4039216, z: 0.3529412, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+    - Target: {fileID: 8552613376447685522}
+      UIStateV4Types: 80000000
+      UIStateV4Datas:
+      - {x: 0.54509807, y: 0.69411767, z: 0.6156863, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+    - Target: {fileID: 6198714990258003341}
+      UIStateV4Types: 40000000
+      UIStateV4Datas:
+      - {x: 0.5686275, y: 0.72156864, z: 0.6392157, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+    - Target: {fileID: 4231878762216119874}
+      UIStateV4Types: 
+      UIStateV4Datas: []
+      UIStateStrTypes: 00020000
+      UIStateStrDatas:
+      - dec_shenshi_dengji_sheng
   AllComs:
   - {fileID: 6730899750744253868}
   - {fileID: 1904131733610652650}
   - {fileID: 8552613376447685522}
   - {fileID: 6198714990258003341}
-  - {fileID: 6161269103075097772}
-  AllComsStateTypes: 4000000040000000800000004000000040000000
-  CurrIndex: 0
+  - {fileID: 4231878762216119874}
+  AllComsStateTypes: 4000000040000000800000004000000000020000
+  CurrIndex: 5
 --- !u!1 &6161269103075097772
 GameObject:
   m_ObjectHideFlags: 0
@@ -1424,6 +1652,7 @@ GameObject:
   - component: {fileID: 8916865937304356244}
   - component: {fileID: 1194226542967252147}
   - component: {fileID: 6612899029550089941}
+  - component: {fileID: 1443081443139902709}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Btn_RemoveEvent
@@ -1448,8 +1677,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -11.700012, y: -10}
-  m_SizeDelta: {x: 28, y: 29}
+  m_AnchoredPosition: {x: -4.100006, y: -2.874298}
+  m_SizeDelta: {x: 42, y: 42}
   m_Pivot: {x: 1, y: 1}
 --- !u!222 &8916865937304356244
 CanvasRenderer:
@@ -1472,7 +1701,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.7830189, g: 0.67551905, b: 0.49123356, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1489,7 +1718,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_ty_x
+  _icon_name: dec_guanbi
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
@@ -1546,6 +1775,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &1443081443139902709
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6161269103075097772}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &6198714990258003341
 GameObject:
   m_ObjectHideFlags: 0
@@ -1605,7 +1847,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.86666673, g: 0.7294118, b: 0.4901961, a: 1}
+  m_Color: {r: 0.5686275, g: 0.72156864, b: 0.6392157, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1750,7 +1992,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: -0.24751, y: 0}
+  m_AnchoredPosition: {x: -0.24876, y: 0}
   m_SizeDelta: {x: 683.5, y: 47.7486}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &8013943971233128026
@@ -1774,7 +2016,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.5529412, g: 0.47450984, b: 0.3529412, a: 1}
+  m_Color: {r: 0.7960785, g: 0.5686275, b: 0.5411765, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -2036,7 +2278,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &8173313993394265504
 RectTransform:
   m_ObjectHideFlags: 0
@@ -2044,18 +2286,18 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8193172811373753691}
-  m_LocalRotation: {x: -0, y: -0, z: -0.20965268, w: 0.97777593}
+  m_LocalRotation: {x: 0, y: 0, z: -0.20791169, w: 0.9781476}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1132527634272378842}
   m_Father: {fileID: 3764721290890148754}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: -24.204}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: -24}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 307.4, y: 108.4}
-  m_SizeDelta: {x: 104.2876, y: 38.2108}
+  m_AnchoredPosition: {x: 307.5, y: 109.63}
+  m_SizeDelta: {x: 104.507, y: 36.614}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3700033355154013030
 CanvasRenderer:
@@ -2078,7 +2320,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.65882355, g: 0.41176474, b: 0.34901962, a: 1}
+  m_Color: {r: 0.72156864, g: 0.3803922, b: 0.28627452, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -2095,7 +2337,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_juxing
+  _icon_name: dec_juxing_135
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
@@ -2144,7 +2386,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: 224.25584, y: 106.1}
+  m_AnchoredPosition: {x: 252.6, y: 106.1}
   m_SizeDelta: {x: 151.6817, y: 36.6236}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3905264220941356025
@@ -2168,7 +2410,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.86666673, g: 0.7294118, b: 0.4901961, a: 1}
+  m_Color: {r: 0.54509807, g: 0.69411767, b: 0.6156863, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -2207,7 +2449,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &6639653483637829207
 RectTransform:
   m_ObjectHideFlags: 0

Assets/Res/UI/Task/仙途事件-事件详情.png.meta → Assets/Res/UI/DivineSence/仙途事件-改png.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: WytJvHj+Un6K6n0WttTGmGzbYG+/6H1kQJ8nzZhND8nu2/T5pEH4yX4HADlb
+guid: XXwesy+sASq20yiQ3dKoPBW2GPvlwyQ1N41zCNV6S3O9D21KidINNbw2fY13
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/Res/UI/GuidePanel/GuidePanel.prefab

@@ -1279,13 +1279,17 @@ PrefabInstance:
       propertyPath: m_Name
       value: DialogBox
       objectReference: {fileID: 0}
+    - target: {fileID: 4272906380317684913, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 4950131656056151462, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
       propertyPath: m_Name
       value: Text_Dialogue04
       objectReference: {fileID: 0}
     - target: {fileID: 5168131489409188947, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
       propertyPath: m_SizeDelta.y
-      value: 0
+      value: 59
       objectReference: {fileID: 0}
     - target: {fileID: 5785473085463611746, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
       propertyPath: CurrIndex
@@ -1445,7 +1449,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 5965670436055349096, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6671338867877508527, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
       propertyPath: m_AnchorMax.y
@@ -1485,7 +1489,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7188427380891585191, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
       propertyPath: m_SizeDelta.y
-      value: 0
+      value: 25
       objectReference: {fileID: 0}
     - target: {fileID: 7188427380891585191, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
       propertyPath: m_AnchoredPosition.x

Assets/Res/UI/HeroInformainPanel/CaveMainPanel.prefab

@@ -159,8 +159,8 @@ GameObject:
   m_Component:
   - component: {fileID: 8727043245965595146}
   - component: {fileID: 4789227125964645736}
-  - component: {fileID: 5419414090562956040}
   - component: {fileID: 1893575841581847031}
+  - component: {fileID: 1352136709878795668}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Viewport
@@ -197,7 +197,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2179581233926790995}
   m_CullTransparentMesh: 1
---- !u!114 &5419414090562956040
+--- !u!114 &1893575841581847031
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -206,7 +206,20 @@ MonoBehaviour:
   m_GameObject: {fileID: 2179581233926790995}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ShowMaskGraphic: 0
+--- !u!114 &1352136709878795668
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2179581233926790995}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
@@ -217,7 +230,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -227,19 +240,19 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!114 &1893575841581847031
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2179581233926790995}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_ShowMaskGraphic: 0
+  _icon_name: dec_juxing_fang
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: b39e74e42cc681f983ecfc42f07a793d
+  imageH: 1624
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &2713101091723102553
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/SkillSelectPanel/WuXingGongFaWidget.prefab

@@ -383,6 +383,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/skillIcon.txt
     packgSpritePath: Assets/Res/UIAtlas/skillIcon.spriteatlasv2
     lasetJsonGUID: ba8dbdc12cfea95132d75e229eac99b8
+  imageH: 30
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -471,6 +472,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 8de890b954c861b7d182629dcafc0d3a
+  imageH: 50
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -560,6 +562,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/skillIcon.txt
     packgSpritePath: Assets/Res/UIAtlas/skillIcon.spriteatlasv2
     lasetJsonGUID: ba8dbdc12cfea95132d75e229eac99b8
+  imageH: 20
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}

Assets/Res/UI/Task/TaskInfoPanel.prefab

@@ -127,10 +127,10 @@ RectTransform:
   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_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 499, y: 1081}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &358993056284816294
 CanvasRenderer:
@@ -160,7 +160,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: daf9bc156dff8ea4095ba8999515604e, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 77a2c64e56d1dc94aa2c2a7e245ae77e, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -211,14 +211,14 @@ RectTransform:
   m_GameObject: {fileID: 1408015899473625068}
   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_LocalScale: {x: 1.4, y: 1.4, z: 1.4}
+  m_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 2569128129379278262}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 197.4, y: -421.38263}
+  m_AnchoredPosition: {x: 295, y: -624}
   m_SizeDelta: {x: 388.5915, y: 114.5688}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &4283077157061789222
@@ -288,8 +288,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0.000015258789, y: 0}
-  m_SizeDelta: {x: 0, y: 45.4981}
+  m_AnchoredPosition: {x: 0.000030517578, y: 0}
+  m_SizeDelta: {x: 0, y: 69.2}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &5055091540865727381
 CanvasRenderer:
@@ -379,8 +379,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 4.2281, y: 32.5174}
-  m_SizeDelta: {x: 166.1559, y: 47.0466}
+  m_AnchoredPosition: {x: 5.1485, y: 51.4956}
+  m_SizeDelta: {x: 249.4528, y: 66.451}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &1252414563731702906
 CanvasRenderer:
@@ -522,8 +522,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.8297, y: 46.45099}
-  m_SizeDelta: {x: 401.1988, y: 521.1722}
+  m_AnchoredPosition: {x: 1.9702, y: 69.98932}
+  m_SizeDelta: {x: 604.5302, y: 782.8624}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9156533754913033698
 CanvasRenderer:
@@ -746,8 +746,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 200.5994, y: -69.20005}
-  m_SizeDelta: {x: 359.0693, y: 85.1549}
+  m_AnchoredPosition: {x: 302.27, y: -102.9}
+  m_SizeDelta: {x: 539.2167, y: 124.6087}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &9047568930966635103
 CanvasRenderer:
@@ -779,7 +779,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 18
+    m_FontSize: 24
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 1
@@ -838,10 +838,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 2569128129379278262}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -111.4, y: -276.7}
-  m_SizeDelta: {x: -287.1213, y: 3.1027}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 120.4, y: -26.100006}
+  m_SizeDelta: {x: 170.6728, y: 3.1026917}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &824729706875111370
 CanvasRenderer:
@@ -963,7 +963,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 28
+    m_FontSize: 37
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
@@ -1026,8 +1026,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 194.49939, y: -277.69998}
-  m_SizeDelta: {x: 91.5303, y: 25.9394}
+  m_AnchoredPosition: {x: 289.2, y: -418.35}
+  m_SizeDelta: {x: 152.2567, y: 59.3625}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1806185420655456625
 CanvasRenderer:
@@ -1059,7 +1059,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 22
+    m_FontSize: 32
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
@@ -1248,7 +1248,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: 200.5994, y: -164.50005}
+  m_AnchoredPosition: {x: 277.4, y: -246.4}
   m_SizeDelta: {x: 400.6232, y: 75.5206}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &3214678112079635339
@@ -1281,7 +1281,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 16
+    m_FontSize: 26
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
@@ -1340,10 +1340,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 2569128129379278262}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 101.729324, y: -276.7}
-  m_SizeDelta: {x: -287.1213, y: 3.1027}
+  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: -138.1, y: -25.799988}
+  m_SizeDelta: {x: 170.67279, y: 3.1026917}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &8250381170657316525
 CanvasRenderer:
@@ -1431,8 +1431,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 200.6, y: -22.749}
-  m_SizeDelta: {x: 401.2, y: 45.498}
+  m_AnchoredPosition: {x: 302.27, y: -34.6}
+  m_SizeDelta: {x: 604.53, y: 69.2}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &126500885704442088
 CanvasRenderer:
@@ -1464,7 +1464,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 26
+    m_FontSize: 30
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2

Assets/Res/UI/Task/仙途事件-事件详情 1.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: CH1Ot3mrVy5I9YM8QOkj0kIWtTkUjWP3WTK4MGAQDuTj2mrz6UyUgff/t42f
+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/WidgetItem.prefab

@@ -215,6 +215,7 @@ RectTransform:
   - {fileID: 5439489424817645504}
   - {fileID: 5126391295778819725}
   - {fileID: 7511937068176871878}
+  - {fileID: 5738742128793975259}
   m_Father: {fileID: 1515036893769208877}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -593,6 +594,95 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!1 &7449426115042760147
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5738742128793975259}
+  - component: {fileID: 8516978430190664473}
+  - component: {fileID: 917252801775961981}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_shenshiJiangli
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &5738742128793975259
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7449426115042760147}
+  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: 6062762002596746888}
+  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: 33.583, y: -33.979}
+  m_SizeDelta: {x: 33.166, y: 32.042}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8516978430190664473
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7449426115042760147}
+  m_CullTransparentMesh: 1
+--- !u!114 &917252801775961981
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7449426115042760147}
+  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_ewaijiangli
+  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: 009d01eadc79b5b12c19322b6a4cd057
+  imageH: 36
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &8072384164870005523
 GameObject:
   m_ObjectHideFlags: 0
@@ -779,6 +869,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Icon_shenshiJiangli
+    gameObject: {fileID: 917252801775961981}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!114 &259851968356172009
 MonoBehaviour:

Assets/Res/UIAtlas/tongyong.spriteatlasv2

@@ -39,6 +39,7 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: 48bc9ebf2521a0e4ba05629c238ff562, type: 3}
     - {fileID: 2800000, guid: 8d23bd6df991bc6409f6b98f584e7296, type: 3}
     - {fileID: 2800000, guid: 9b116a8b642a3c04298780f10d94e7fe, type: 3}
+    - {fileID: 2800000, guid: da985347d9c869e43affe58a0528f584, type: 3}
     - {fileID: 2800000, guid: a5ccafc312c87454980e5ecb377412c2, type: 3}
     - {fileID: 2800000, guid: a8adb5f9798a7a34eae5b6fcd60714e5, type: 3}
     - {fileID: 2800000, guid: 54c8c2c415e515049a7094c35cc44570, type: 3}
@@ -54,6 +55,7 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: 17b5819cad711404c975f429ddaacb35, type: 3}
     - {fileID: 2800000, guid: 471869ab4e95d7148ae33f596ff58701, type: 3}
     - {fileID: 2800000, guid: 6c45afd6bc7e1db429d58030b64f1609, type: 3}
+    - {fileID: 2800000, guid: a0439e1df4e2afe40aff329d48b7fe81, type: 3}
     - {fileID: 2800000, guid: a3178eda8f1ba914b82935602d128450, type: 3}
     - {fileID: 2800000, guid: 38eaee97ee6e25b4aa8c8bbad454f1e1, type: 3}
     - {fileID: 2800000, guid: eb44227a93f162245ab5ca2598da46f6, type: 3}
@@ -91,6 +93,7 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: fe6662c83ebd78340b62221b3ec48983, type: 3}
     - {fileID: 2800000, guid: 2c76705c429acb647a771571c350cc63, type: 3}
     - {fileID: 2800000, guid: b2018e9616f1890438f6f28bc67f50fa, type: 3}
+    - {fileID: 2800000, guid: 4108b85a7bc649a4baffe24066ff4351, type: 3}
     - {fileID: 2800000, guid: 60a33a59f5029d84bb8be15fa6d8fd3b, type: 3}
     - {fileID: 2800000, guid: aab5d08daf2ba124b8b06d79a6fac235, type: 3}
     - {fileID: 2800000, guid: c193021d18c48174fa2774c5bb9ce942, type: 3}
@@ -129,6 +132,7 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: e8b66ebe511cc1d4e85937a30bccd4a3, type: 3}
     - {fileID: 2800000, guid: 7e5ce0d678f92704a9674a80dc521664, type: 3}
     - {fileID: 2800000, guid: aec6227823c7f75498752720902c7876, type: 3}
+    - {fileID: 2800000, guid: e8edecac0b831f64e9c6b3c6111ada46, type: 3}
     - {fileID: 2800000, guid: 416044e3ca43d5d47adb73e0b3c82e5e, type: 3}
     - {fileID: 2800000, guid: f35dc32a18ad6fb489c4dbf540976a3d, type: 3}
     - {fileID: 2800000, guid: 2d8b2d09e8a3bcf4c9c2758292dbe4a7, type: 3}

Assets/Resources/Shader/Shader Graphs_ShengShiShader.mat

@@ -66,5 +66,5 @@ Material:
     m_Colors:
     - _mainColor: {r: 0.21314356, g: 1.4060051, b: 2.1517377, a: 0}
     - _off: {r: 0.01, g: 0.01, b: 0, a: 0}
-    - _pos: {r: 0, g: -5, b: -30, a: 0}
+    - _pos: {r: -1.8000001, g: -5.3999996, b: -30, a: 0}
   m_BuildTextureStacks: []

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

@@ -180,14 +180,18 @@ namespace GameLogic.Combat.CombatType
             heroEntity.IsEnemy = false;
             heroEntity.number = 0;
 
-
+            HeroInfo heroInfo = PlayerManager.Instance.myHero;
+            if (_startCombatInfo.levelBattleId== 10001)
+            {
+                heroInfo = PlayerManager.Instance.yindaoHeroData;
+            }
             if (CombatController.currActiveCombat.playerHeroEntity != null)
             {
                 GameObjectPool gameObjectPool = CombatController.currActiveCombat.playerHeroEntity.combatHeroGameObject
                     .GameObjectPool;
                 Vector3 pos = gameObjectPool.own.transform.position;
                 await (heroEntity.InitForObject(gameObjectPool, new CombatHeroAi(),
-                    PlayerManager.Instance.myHero, pos,
+                    heroInfo, pos,
                     delegate(CombatHeroEntity entity)
                     {
                         // entity.CurrCombatHeroInfo.hp = (EncryptionLong)(20000);
@@ -198,11 +202,13 @@ namespace GameLogic.Combat.CombatType
             }
             else
             {
+                
+
                 Vector3 heroPoint = CombatController.currActiveCombat.CombatHeroController.GetTarget(0);
                 CombatController.currActiveCombat.MagicWeaponCombatSence.SetMagicWeaponCombatSence(heroPoint,
                     Vector3.forward);
                 Vector3 pos = heroPoint;
-                await (heroEntity.Init(new CombatHeroAi(), PlayerManager.Instance.myHero, pos,
+                await (heroEntity.Init(new CombatHeroAi(), heroInfo, pos,
                     delegate(CombatHeroEntity entity)
                     {
                         // entity.CurrCombatHeroInfo.hp = (EncryptionLong)(20000);

Assets/Scripts/GameLogic/Combat/Hero/CombatHeroSkillControl.cs

@@ -43,7 +43,6 @@ namespace GameLogic.Combat.Hero
         /// </summary>
         public SkillBasic taoismSkillBasic;
 
-        
 
         public SkillTurntable SkillTurntable;
 
@@ -58,7 +57,15 @@ namespace GameLogic.Combat.Hero
             }
             else
             {
-                await SetNewSkill(PlayerManager.Instance.GongFaControl.allUseSkill);
+                if (_combatHeroEntity.CurrCombatHeroInfo.MonsterPowerUpConfig.ID > 0)
+                {
+                    await SetNewSkill(_combatHeroEntity.CurrCombatHeroInfo.unLockSkills.ToArray());
+                }
+                else
+
+                {
+                    await SetNewSkill(PlayerManager.Instance.GongFaControl.allUseSkill);
+                }
             }
 
             InitTaoismSkill(_combatHeroEntity.CurrCombatHeroInfo.TaoismSkillId);
@@ -96,14 +103,14 @@ namespace GameLogic.Combat.Hero
                 float cd = _combatHeroEntity.CurrCombatHeroInfo.powerUpConfig.MaxActiveGongfaNum *
                     PlayerManager.Instance.gameConstantConfig.BasicCDperSkill / 1000;
                 _combatHeroEntity.CurrCombatHeroInfo.SetSkillAttSpeed(
-                    cd + SkillTurntable.skillAddSkillCd+_combatHeroEntity.CurrCombatHeroInfo.modelConfig.speed_atk);
+                    cd + SkillTurntable.skillAddSkillCd + _combatHeroEntity.CurrCombatHeroInfo.modelConfig.speed_atk);
             }
             else
             {
                 float cd = (SkillTurntable.skillCount * PlayerManager.Instance.gameConstantConfig.BasicCDperSkill) /
                            1000;
                 _combatHeroEntity.CurrCombatHeroInfo.SetSkillAttSpeed(
-                    cd + SkillTurntable.skillAddSkillCd+_combatHeroEntity.CurrCombatHeroInfo.modelConfig.speed_atk);
+                    cd + SkillTurntable.skillAddSkillCd + _combatHeroEntity.CurrCombatHeroInfo.modelConfig.speed_atk);
             }
         }
 
@@ -128,7 +135,6 @@ namespace GameLogic.Combat.Hero
             skill.DelayUseSkillCd = 0.5f;
 
             SkillCommands.Add(skill);
-          
         }
 
         public void RemoveCommandSkill(SkillBasic skill)
@@ -179,7 +185,6 @@ namespace GameLogic.Combat.Hero
             // SkillBasic skillBasic = null;
             for (int i = 0; i < SkillCommands.size; i++)
             {
-               
                 if (!SkillCommands[i].IsCanUse())
                 {
                     continue;

Assets/Scripts/GameLogic/Paritcle/ParitcleLogic/FxParabolaBulletLogic.cs

@@ -42,6 +42,7 @@ namespace Common.Combat.FxAILogic
         // [Header("是否可以穿透")] public bool isPenetrate;
         //
         // protected float maxDisSpr;
+        
 
         // private BesselPath _besselPath;
 

Assets/Scripts/GameLogic/Player/PlayerManager.cs

@@ -61,7 +61,7 @@ public class PlayerManager : Singleton<PlayerManager>
     private TimerEntity _timerEntity;
 
     public bool isLogin;
-    
+
     /// <summary>
     /// 当前引导id
     /// </summary>
@@ -300,16 +300,17 @@ public class PlayerManager : Singleton<PlayerManager>
         myHero.TaoismSkillId = 601011;
 
 
-        HeroInfo yindaoHeroData = new HeroInfo();
-        yindaoHeroData.InitHero(AccountFileInfo.Instance.playerData.yindaoHeroData);
-        yindaoHeroData = heroInfo;
+        yindaoHeroData = new HeroInfo();
+        yindaoHeroData.InitMonster(102, 200);
+        yindaoHeroData.isMonster = false;
+        // yindaoHeroData = heroInfo;
         yindaoHeroData.TaoismSkillId = 601011;
-
+        // myHero= yindaoHeroData;
         BagController.Init();
 
         //初始化关卡
         CurrentsmallPlaces = GetSmallPlacesData(GetMaxSmallPlacesId());
-      
+
         StaticUpdater.Instance.RemoveRenderUpdateCallBack(Update);
         StaticUpdater.Instance.AddRenderUpdateCallBack(Update);
     }
@@ -399,7 +400,9 @@ public class PlayerManager : Singleton<PlayerManager>
                 isUpdate = true;
                 keyValuePair.isLeave = true;
 
-                AccountFileInfo.DaoYouData daoYouData = AccountFileInfo.Instance.playerData.daoYouDatas.FirstOrDefault(d => d.id == keyValuePair.daoyouDataID);
+                AccountFileInfo.DaoYouData daoYouData =
+                    AccountFileInfo.Instance.playerData.daoYouDatas.FirstOrDefault(d =>
+                        d.id == keyValuePair.daoyouDataID);
 
                 DaoyouModelConfig daoyouModelConfig =
                     ConfigComponent.Instance.Get<DaoyouModelConfig>(daoYouData.id);
@@ -449,54 +452,58 @@ public class PlayerManager : Singleton<PlayerManager>
             isUpdate = false;
         }
     }
-    
-        public async void ChangeMap(int mapId)
+
+    public async void ChangeMap(int mapId)
+    {
+        SmallPlacesConfig smallPlacesConfig = ConfigComponent.Instance.Get<SmallPlacesConfig>(mapId);
+        if (smallPlacesConfig.ID == 0)
+            return;
+        AccountFileInfo.SmallPlacesData lastSmallPlacesData =
+            PlayerManager.Instance.GetSmallPlacesData(smallPlacesConfig.ID - 1);
+        SmallPlacesConfig lastSmallPlacesConfig =
+            ConfigComponent.Instance.Get<SmallPlacesConfig>(smallPlacesConfig.ID - 1);
+        if (smallPlacesConfig.ID > 1 && (lastSmallPlacesData == null ||
+                                         lastSmallPlacesData.completionEventCount <
+                                         lastSmallPlacesConfig.CompletionEventCount))
         {
+            return;
+        }
 
-            SmallPlacesConfig smallPlacesConfig = ConfigComponent.Instance.Get<SmallPlacesConfig>(mapId);
-            if (smallPlacesConfig.ID == 0)
-                return;
-            AccountFileInfo.SmallPlacesData lastSmallPlacesData = PlayerManager.Instance.GetSmallPlacesData(smallPlacesConfig.ID - 1);
-            SmallPlacesConfig lastSmallPlacesConfig = ConfigComponent.Instance.Get<SmallPlacesConfig>(smallPlacesConfig.ID - 1);
-            if (smallPlacesConfig.ID > 1 && (lastSmallPlacesData == null || lastSmallPlacesData.completionEventCount < lastSmallPlacesConfig.CompletionEventCount))
+        if (lastSmallPlacesConfig.UnlockEnvetid != 0)
+        {
+            AccountFileInfo.EventList eventList =
+                AccountFileInfo.Instance.playerData.completeEvents.FirstOrDefault(ce =>
+                    ce.eventID == lastSmallPlacesConfig.UnlockEnvetid);
+            if (eventList == null || !eventList.isCompleted)
             {
                 return;
             }
+        }
 
-            if (lastSmallPlacesConfig.UnlockEnvetid != 0)
-            {
-                AccountFileInfo.EventList eventList = AccountFileInfo.Instance.playerData.completeEvents.FirstOrDefault(ce => ce.eventID == lastSmallPlacesConfig.UnlockEnvetid);
-                if (eventList == null || !eventList.isCompleted)
-                {
-                 
-                    return;
-                }
-            }
+        AccountFileInfo.SmallPlacesData smallPlacesData =
+            PlayerManager.Instance.GetSmallPlacesData(smallPlacesConfig.ID);
 
-            AccountFileInfo.SmallPlacesData smallPlacesData = PlayerManager.Instance.GetSmallPlacesData(smallPlacesConfig.ID);
+        if (smallPlacesData == null)
+        {
+            smallPlacesData = new AccountFileInfo.SmallPlacesData();
+            smallPlacesData.id = smallPlacesConfig.ID;
+            AccountFileInfo.Instance.playerData.smallPlacesDatas.Add(smallPlacesData);
+        }
 
-            if (smallPlacesData == null)
-            {
-                smallPlacesData = new AccountFileInfo.SmallPlacesData();
-                smallPlacesData.id = smallPlacesConfig.ID;
-                AccountFileInfo.Instance.playerData.smallPlacesDatas.Add(smallPlacesData);
-            }
 
+        AccountFileInfo.PlacesData currentPlacesData = PlayerManager.Instance.GetPlacesData(smallPlacesConfig.ID);
+        if (currentPlacesData == null)
+        {
+            currentPlacesData = new AccountFileInfo.PlacesData();
+            currentPlacesData.id = smallPlacesConfig.PlacesId;
+            AccountFileInfo.Instance.playerData.placesDatas.Add(currentPlacesData);
+        }
 
-            AccountFileInfo.PlacesData currentPlacesData = PlayerManager.Instance.GetPlacesData(smallPlacesConfig.ID);
-            if (currentPlacesData == null)
-            {
-                currentPlacesData = new AccountFileInfo.PlacesData();
-                currentPlacesData.id = smallPlacesConfig.PlacesId;
-                AccountFileInfo.Instance.playerData.placesDatas.Add(currentPlacesData);
-            }
+        PlayerManager.Instance.CurrentsmallPlaces = smallPlacesData;
 
-            PlayerManager.Instance.CurrentsmallPlaces = smallPlacesData;
-            
 
-  
-            EventManager.Instance.Dispatch(CustomEventType.ChangeMap, null);
-        }
+        EventManager.Instance.Dispatch(CustomEventType.ChangeMap, null);
+    }
 
     public void QianKunDaiAward()
     {
@@ -569,10 +576,15 @@ public class PlayerManager : Singleton<PlayerManager>
     public void CalculateOfflineRewards()
     {
         // return;
-        if (AccountFileInfo.Instance.playerData.QiankundaiDropTimer <= PlayerManager.Instance.gameConstantConfig.qiankundaiMaxTime && AccountFileInfo.Instance.playerData.ExitTime > 0)
+        if (AccountFileInfo.Instance.playerData.QiankundaiDropTimer <=
+            PlayerManager.Instance.gameConstantConfig.qiankundaiMaxTime &&
+            AccountFileInfo.Instance.playerData.ExitTime > 0)
         {
             int miao = (int)((TimeHelper.ClientNow() - AccountFileInfo.Instance.playerData.ExitTime) / 1000);
-            miao = AccountFileInfo.Instance.playerData.QiankundaiDropTimer + miao >= PlayerManager.Instance.gameConstantConfig.qiankundaiMaxTime ? PlayerManager.Instance.gameConstantConfig.qiankundaiMaxTime - miao : miao;
+            miao = AccountFileInfo.Instance.playerData.QiankundaiDropTimer + miao >=
+                   PlayerManager.Instance.gameConstantConfig.qiankundaiMaxTime
+                ? PlayerManager.Instance.gameConstantConfig.qiankundaiMaxTime - miao
+                : miao;
             AccountFileInfo.Instance.playerData.QiankundaiDropTimer += miao;
             for (int i = 0; i < miao; i++)
             {

Assets/Scripts/GameUI/Combat/CombatDrive.cs

@@ -66,6 +66,7 @@ namespace GameLogic.Combat
             startCombatInfo.CombatType = CombatType.CombatType.LevelBattle;
             startCombatInfo.isCombatOverUi = isCombatOverUi;
             startCombatInfo.monsterLevel = level;
+            startCombatInfo.levelBattleId= levelBattleId;
             await StartCombat(startCombatInfo);
 
             LevelBattleCombatType levelBattleCombatType = CombatController.CombatTypeBasic as LevelBattleCombatType;

Assets/Scripts/GameUI/GameApplction.cs

@@ -196,10 +196,10 @@ public class GameApplction : IGameStart
                     LogTool.Log("战斗完成" + isWin);
                     cTask.SetResult();
                 });
-
+            
             await cTask;
 
-            AccountFileInfo.EventList eventList1 = EventSystemManager.Instance.AddEvent(1);
+            AccountFileInfo.EventList eventList1 = EventSystemManager.Instance.AddEvent(10000);
             await EventSystemManager.Instance.TriggerEvent(eventList1);
             AccountFileInfo.Instance.playerData.isTiggerPlot = true;
 

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

@@ -126,6 +126,8 @@ namespace Fort23.Mono
             chargedFinish = null;
             // feng.SetActive(false);
             this.combatMagicWeaponEntity = combatMagicWeaponEntity;
+            icon.icon_name = combatMagicWeaponEntity.FaBaoInfo.SkillConfig.icon;
+            icon_hui.icon_name = combatMagicWeaponEntity.FaBaoInfo.SkillConfig.icon;
         }
 
         private void Update()

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

@@ -33,12 +33,13 @@ namespace Fort23.Mono
             {
                 PlayerGuideManager.Instance.NextGuide();
             }
+
             if (PlayerGuideManager.Instance.GuideIsCanDo(3, 2))
             {
                 PlayerGuideManager.Instance.NextGuide();
             }
-            
-            
+
+
             if (isTriggerEvent)
                 GObjectPoolInterface.SetActive(false);
             AppBarPanel.OpenPanel(this);
@@ -96,7 +97,7 @@ namespace Fort23.Mono
         public async override CTask<bool> AsyncInit(object[] uiData)
         {
             await UpdateContent();
-          
+
             return await base.AsyncInit(uiData);
         }
 
@@ -115,14 +116,17 @@ namespace Fort23.Mono
             {
                 toggleList.ShowTargetIndex(0);
                 TitleRoot.SetActive(true);
-                Rect_Sv.sizeDelta = new Vector2(718.82f, 865.36f);
-                Rect_Sv.anchoredPosition = new Vector2(2.61f, -126.23f);
+                Rect_Sv.sizeDelta = new Vector2(718.82f, 844.7f);
+                Rect_Sv.anchoredPosition = new Vector2(2.61f, -190.52f);
                 Text_Tips.gameObject.SetActive(false);
                 AccountFileInfo.EventList eventList = EventSystemManager.Instance.GetMainEventDta();
                 if (eventList != null)
                 {
                     if (mainShengShiEventWidgetType2 == null)
-                        mainShengShiEventWidgetType2 = await UIManager.Instance.CreateGComponent<ShengShiEventWidgetType2>(null, ShengShiEventWidgetType2Root);
+                        mainShengShiEventWidgetType2 =
+                            await UIManager.Instance.CreateGComponentForObject<ShengShiEventWidgetType2>(
+                                ShengShiEventWidgetType2Game, null, ShengShiEventWidgetType2Root);
+                    mainShengShiEventWidgetType2.own.SetActive(true);
                     mainShengShiEventWidgetType2.CustomInit(eventList, GoOnClick);
                     mainShengShiEventWidgetType2.OnClick = OnClick;
                 }
@@ -131,8 +135,9 @@ namespace Fort23.Mono
             else
             {
                 toggleList.ShowTargetIndex(1);
-                UIManager.Instance.DormancyGComponent(mainShengShiEventWidgetType2);
-                mainShengShiEventWidgetType2 = null;
+                mainShengShiEventWidgetType2?.own.SetActive(false);
+                // UIManager.Instance.DormancyGComponent(mainShengShiEventWidgetType2);
+                // mainShengShiEventWidgetType2 = null;
                 TitleRoot.SetActive(false);
 
                 Rect_Sv.sizeDelta = new Vector2(664, 1210.8f);
@@ -141,7 +146,8 @@ namespace Fort23.Mono
             }
 
 
-            int maxCount = PlayerManager.Instance.myHero.powerUpConfig.ShenshiMax / PlayerManager.Instance.gameConstantConfig.DetectEventCount;
+            int maxCount = PlayerManager.Instance.myHero.powerUpConfig.ShenshiMax /
+                           PlayerManager.Instance.gameConstantConfig.DetectEventCount;
 
             Text_ShenShiCount.text = $"神识({EventSystemManager.Instance.GetShenShiCount()}/{maxCount})";
             SaiXuan(saixuanType);
@@ -194,7 +200,8 @@ namespace Fort23.Mono
             }
 
 
-            ShengShiEventWidgetType2 shengShiEventWidgetType2 = await UIManager.Instance.CreateGComponent<ShengShiEventWidgetType2>(null, ContentRoot);
+            ShengShiEventWidgetType2 shengShiEventWidgetType2 =
+                await UIManager.Instance.CreateGComponent<ShengShiEventWidgetType2>(null, ContentRoot);
             shengShiEventWidgetType2.CustomInit(showEventList[index], GoOnClick);
             shengShiEventWidgetType2.OnClick = OnClick;
             shengShiEventWidgetTypeList.Add(shengShiEventWidgetType2);
@@ -232,7 +239,8 @@ namespace Fort23.Mono
             //条件完成 任务没有完成 是最后一步就直接开始任务
             if (shengShiEventWidgetType2.isComplete && !shengShiEventWidgetType2.eventList.isCompleted)
             {
-                if (shengShiEventWidgetType2.evenkConfig.ResultType == 0 || shengShiEventWidgetType2.evenkConfig.ResultType == 3)
+                if (shengShiEventWidgetType2.evenkConfig.ResultType == 0 ||
+                    shengShiEventWidgetType2.evenkConfig.ResultType == 3)
                 {
                     GoOnClick(shengShiEventWidgetType2);
                     return;
@@ -250,7 +258,8 @@ namespace Fort23.Mono
 
         public async static CTask<DivineSenceEventPreviewPanel> OpenPanel()
         {
-            DivineSenceEventPreviewPanel divineSenceEventPreviewPanel = await UIManager.Instance.LoadAndOpenPanel<DivineSenceEventPreviewPanel>(null, UILayer.Middle);
+            DivineSenceEventPreviewPanel divineSenceEventPreviewPanel =
+                await UIManager.Instance.LoadAndOpenPanel<DivineSenceEventPreviewPanel>(null, UILayer.Middle);
             return divineSenceEventPreviewPanel;
         }
 

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

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

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

@@ -65,9 +65,12 @@ namespace Fort23.Mono
 
         private void UpdateZuiZhongEvent(IEventData e)
         {
-            Btn_ZuiZhong.gameObject.SetActive(AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId != eventList.guid);
-
-            ZuiZhongRoot.gameObject.SetActive(AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId == eventList.guid);
+            Btn_ZuiZhong.gameObject.SetActive(AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId !=
+                                              eventList.guid);
+            Btn_RemoveEvent.gameObject.SetActive(AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId !=
+                                                 eventList.guid);
+            ZuiZhongRoot.gameObject.SetActive(AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId ==
+                                              eventList.guid);
         }
 
         public async void CustomInit(AccountFileInfo.EventList eventList, Action<ItemWidgetBasic> goCallBack)
@@ -84,36 +87,30 @@ namespace Fort23.Mono
             randomEventConfig = ConfigComponent.Instance.Get<EventConfig>(eventList.eventID);
             evenkConfig = ConfigComponent.Instance.Get<EventLinkConfig>(eventList.curStep);
 
-            AccountFileInfo.EventLinkData eventLinkData = eventList.eventLinks.FirstOrDefault(el => el.eventLinkId == eventList.curStep);
+            AccountFileInfo.EventLinkData eventLinkData =
+                eventList.eventLinks.FirstOrDefault(el => el.eventLinkId == eventList.curStep);
 
 
             Text_EventName.text = LanguageManager.Instance.Text(randomEventConfig.EventName);
 
             Text_EventDesc.text = LanguageManager.Instance.Text(evenkConfig.conciseEventMessage);
 
-            Btn_Bag.gameObject.SetActive(false);
-            foreach (var eventListEventLink in eventList.eventLinks)
-            {
-                EventLinkConfig eventLinkConfig = ConfigComponent.Instance.Get<EventLinkConfig>(eventListEventLink.eventLinkId);
-                if (eventLinkConfig.optionType == 3)
-                {
-                    Btn_Bag.gameObject.SetActive(true);
-                    break;
-                }
-            }
+            // Btn_Bag.gameObject.SetActive(false);
+
 
             if (randomEventConfig.EventTag == 1)
             {
-                csc.ChangeState(0);
+                // csc.ChangeState(0);
             }
             else
             {
-                csc.ChangeState(1);
+                csc.ChangeState(randomEventConfig.EventQuality);
             }
 
 
             Text_Go.text = "前往";
-            if (eventLinkData == null || eventLinkData.eventConditions == null || eventLinkData.eventConditions.Count == 0)
+            if (eventLinkData == null || eventLinkData.eventConditions == null ||
+                eventLinkData.eventConditions.Count == 0)
             {
                 if (evenkConfig.EventConditionMessage != 0)
                 {
@@ -169,15 +166,21 @@ namespace Fort23.Mono
             }
 
 
-            Btn_ZuiZhong.gameObject.SetActive(AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId != eventList.guid);
+            Btn_ZuiZhong.gameObject.SetActive(AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId !=
+                                              eventList.guid);
+            Btn_RemoveEvent.gameObject.SetActive(AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId !=
+                                                 eventList.guid);
 
-            ZuiZhongRoot.gameObject.SetActive(AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId == eventList.guid);
+            ZuiZhongRoot.gameObject.SetActive(AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId ==
+                                              eventList.guid);
             Icon_Marsk.gameObject.SetActive(eventList.isCompleted);
             if (randomEventConfig.SmallPlacesId != 0)
             {
-                SmallPlacesConfig smallPlacesConfig = ConfigComponent.Instance.Get<SmallPlacesConfig>(randomEventConfig.SmallPlacesId);
+                SmallPlacesConfig smallPlacesConfig =
+                    ConfigComponent.Instance.Get<SmallPlacesConfig>(randomEventConfig.SmallPlacesId);
                 PlacesConfig placesConfig = ConfigComponent.Instance.Get<PlacesConfig>(smallPlacesConfig.PlacesId);
-                Text_Mapname.text = $"{LanguageManager.Instance.Text(placesConfig.placeName)}-{LanguageManager.Instance.Text(smallPlacesConfig.placeName)}";
+                Text_Mapname.text =
+                    $"{LanguageManager.Instance.Text(placesConfig.placeName)}-{LanguageManager.Instance.Text(smallPlacesConfig.placeName)}";
                 Text_Mapname.gameObject.SetActive(true);
             }
             else if (randomEventConfig.placeID != 0)
@@ -223,6 +226,21 @@ namespace Fort23.Mono
                 widgetItem.InitWidget(new ItemInfo(eventListItemInfo));
                 widgetList.Add(widgetItem);
             }
+
+            foreach (var eventListEventLink in eventList.eventLinks)
+            {
+                if(eventListEventLink.eventLinkId <= eventList.curStep)
+                    continue;
+                EventLinkConfig eventLinkConfig =
+                    ConfigComponent.Instance.Get<EventLinkConfig>(eventListEventLink.eventLinkId);
+                if (eventLinkConfig.optionType == 3)
+                {
+                    WidgetItem widgetItem = await UIManager.Instance.CreateGComponent<WidgetItem>(null, ItemRoot);
+                    widgetItem.ShowShenShiWenHao(() => { TipMessagePanel.OpenTipMessagePanel("事件的选择会影响获得的道具！"); });
+                    widgetList.Add(widgetItem);
+                    break;
+                }
+            }
         }
 
 

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

@@ -132,6 +132,7 @@ namespace Fort23.Mono
             if (dialogTextList.size > curIdx)
             {
                 Content.text = dialogTextList[curIdx++];
+                LayoutRebuilder.ForceRebuildLayoutImmediate(Content.transform.parent.GetComponent<RectTransform>());
                 //最后一条
                 if (dialogTextList.size == curIdx)
                 {

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

@@ -35,7 +35,7 @@ namespace Fort23.Mono
             {
                 // bool isKip = await UIManager.Instance.ShowTips("是否确认跳过引导");
                 // if (isKip)
-                //     SkipGuide();
+                SkipGuide();
             });
             Btn_Bg.onClick.AddListener(() =>
             {

Assets/Scripts/GameUI/UI/GuidePanel/Phases/Phase5.cs

@@ -82,14 +82,14 @@ namespace Fort23.Mono.Phases
             pgm.SetOnClickMask(true);
             await TimerComponent.Instance.WaitAsync(1000);
             pgm.SetOnClickMask(false);
-            CombatDrive.Instance.CombatController.ChangeState(CombatController.idle);
+            CombatDrive.Instance.CombatController.isUpdate = false;
             await pgm.ConfigLogic(501, delegate() { pgm.NextGuide(); });
         }
 
         public async CTask OnStepEnd(UnityEngine.Object obj)
         {
             pgm.StepInit();
-            CombatDrive.Instance.CombatController.ChangeState(CombatController.update);
+            CombatDrive.Instance.CombatController.isUpdate = true;
             pgm.SetBlackBaseVisiable(false);
             ForceGuideOver();
         }

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

@@ -685,8 +685,15 @@ namespace Fort23.Mono
                         guideConfig.AwardItemNum[i]));
                 }
             }
-
-
+            HideDialogBox(false);
+            // if (guideConfig.SpeakerStyle == 3)
+            // {
+            //     HideDialogBox(false);
+            // }
+            // else
+            // {
+            //     HideDialogBox();
+            // }
             // if (IsUseServerData)
             // {
             //     PlayerManager.Instance.PlayerGuideDataComponent.UpdateData(configID);
@@ -882,10 +889,11 @@ namespace Fort23.Mono
             GuidePanel guidePanel = UIManager.Instance.GetComponent<GuidePanel>();
             if (guidePanel != null)
             {
-                if (isHide)
-                {
-                    guidePanel.DialogBoxState.gameObject.SetActive(false);
-                }
+                guidePanel.DialogBoxState.gameObject.SetActive(!isHide);
+                // if (isHide)
+                // {
+                //     guidePanel.DialogBoxState.gameObject.SetActive(false);
+                // }
             }
         }
 
@@ -905,6 +913,7 @@ namespace Fort23.Mono
             }
 
             GuidePanel guidePanel = UIManager.Instance.GetComponent<GuidePanel>();
+
             switch (guideConfig.SpeakerStyle)
             {
                 case 1:
@@ -1196,19 +1205,19 @@ namespace Fort23.Mono
             _customVectorTween = null;
             UIManager.Instance.GetComponent<GuidePanel>().transform.SetAsLastSibling();
 
-            if (guideConfig.SpeakerStyle == 3)
-            {
-                HideDialogBox(false);
-            }
-            else
-            {
-                HideDialogBox();
-            }
-
+            // if (guideConfig.SpeakerStyle == 3)
+            // {
+            //     HideDialogBox(false);
+            // }
+            // else
+            // {
+            //     HideDialogBox();
+            // }
+            HideDialogBox();
             SetfxTransVisiable(false);
             SetMaskTarget(null);
             SetFingerVisiable(false);
-            SetBlackBaseVisiable(true);
+            SetBlackBaseVisiable(false);
         }
 
 

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

@@ -40,10 +40,17 @@ namespace Fort23.Mono
 		public override CTask GetFocus()
 		{
 			AppBarPanel.OpenPanel(this);
-			TitlePanel.ClosePanel();
+			TitlePanel.OpenPanel();
+		
 			return base.GetFocus();
 		}
-		
+
+		public override CTask LoseFocus()
+		{
+			TitlePanel.ClosePanel();
+			return base.LoseFocus();
+		}
+
 		public async static CTask<CaveMainPanel> OpenPanel()
 		{
 			CaveMainPanel heroInformationPanel = await UIManager.Instance.LoadAndOpenPanel<CaveMainPanel>(null);

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

@@ -38,7 +38,7 @@ namespace Fort23.Mono
 
         public override CTask GetFocus()
         {
-            AppBarPanel.OpenPanel(this);
+            AppBarPanel.ClosePanel();
             TitlePanel.OpenPanel();
             return base.GetFocus();
         }
@@ -132,7 +132,6 @@ namespace Fort23.Mono
             {
                 AudioManager.Instance.PlayAudio("ui_fanhui.wav");
                 UIManager.Instance.HideUIUIPanel(this);
-                
             });
         }
 

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

@@ -1,3 +1,4 @@
+using System;
 using Excel2Json;
 using Fort23.UTool;
 using GameLogic.Bag;
@@ -11,6 +12,8 @@ namespace Fort23.Mono
         public ItemInfo itemInfo;
         public bool isClick = false;
 
+        public Action callBack;
+
 
         private void Init()
         {
@@ -30,6 +33,11 @@ namespace Fort23.Mono
             {
                 if (!isClick)
                     return;
+                if (callBack != null)
+                {
+                    callBack?.Invoke();
+                    return;
+                }
                 if (itemInfo.config.associateID == 3)
                 {
                     GongFaDetailsPanel.Open(itemInfo);
@@ -141,6 +149,7 @@ namespace Fort23.Mono
             icon.gameObject.SetActive(true);
 
             Icon_WenHao.gameObject.SetActive(false);
+            Icon_shenshiJiangli.gameObject.SetActive(false);
 
             if (itemInfo.count.Value > 0)
             {
@@ -159,12 +168,25 @@ namespace Fort23.Mono
             Icon_WenHao.gameObject.SetActive(true);
             icon.gameObject.SetActive(false);
             Text_Count.gameObject.SetActive(false);
+          
         }
 
         public override void DormancyObj()
         {
             transform.RecoverColor();
+            Icon_WenHao.gameObject.SetActive(false);
+            Icon_shenshiJiangli.gameObject.SetActive(false);
+            callBack = null;
             base.DormancyObj();
         }
+
+        public void ShowShenShiWenHao(Action callBack = null)
+        {
+            this.callBack = callBack;
+            Icon_shenshiJiangli.gameObject.SetActive(true);
+            Icon_WenHao.gameObject.SetActive(true);
+            icon.gameObject.SetActive(false);
+            Text_Count.gameObject.SetActive(false);
+        }
     }
 }

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

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

UserSettings/Layouts/default-2022.dwlt

@@ -1,6 +1,54 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
 --- !u!114 &1
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_PixelRect:
+    serializedVersion: 2
+    x: -2553
+    y: 377
+    width: 2560
+    height: 1015
+  m_ShowMode: 0
+  m_Title: 
+  m_RootView: {fileID: 5}
+  m_MinSize: {x: 100, y: 121}
+  m_MaxSize: {x: 4000, y: 4021}
+  m_Maximized: 0
+--- !u!114 &2
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_PixelRect:
+    serializedVersion: 2
+    x: -2054
+    y: 328
+    width: 892
+    height: 541
+  m_ShowMode: 0
+  m_Title: Console
+  m_RootView: {fileID: 7}
+  m_MinSize: {x: 100, y: 121}
+  m_MaxSize: {x: 4000, y: 4021}
+  m_Maximized: 0
+--- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -15,16 +63,16 @@ MonoBehaviour:
   m_PixelRect:
     serializedVersion: 2
     x: 0
-    y: 32.000004
-    width: 1920.0002
-    height: 1012.0001
+    y: 43
+    width: 2560
+    height: 1349
   m_ShowMode: 4
-  m_Title: "\u9879\u76EE"
-  m_RootView: {fileID: 3}
+  m_Title: Inspector
+  m_RootView: {fileID: 8}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_Maximized: 1
---- !u!114 &2
+--- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -34,23 +82,23 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: GameView
+  m_Name: HotReloadWindow
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 553.50006
-    height: 962.00006
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 14}
+    width: 2560
+    height: 1015
+  m_MinSize: {x: 100, y: 121}
+  m_MaxSize: {x: 4000, y: 4021}
+  m_ActualView: {fileID: 16}
   m_Panes:
-  - {fileID: 14}
+  - {fileID: 16}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &3
+--- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -58,27 +106,103 @@ MonoBehaviour:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 0}
   m_Enabled: 1
-  m_EditorHideFlags: 1
-  m_Script: {fileID: 12008, guid: 0000000000000000e000000000000000, type: 0}
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
   - {fileID: 4}
-  - {fileID: 5}
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 2560
+    height: 1015
+  m_MinSize: {x: 100, y: 121}
+  m_MaxSize: {x: 4000, y: 4021}
+  vertical: 0
+  controlID: 166
+  draggingID: 0
+--- !u!114 &6
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: ConsoleWindow
+  m_EditorClassIdentifier: 
+  m_Children: []
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 892
+    height: 541
+  m_MinSize: {x: 100, y: 121}
+  m_MaxSize: {x: 4000, y: 4021}
+  m_ActualView: {fileID: 17}
+  m_Panes:
+  - {fileID: 17}
+  m_Selected: 0
+  m_LastSelected: 0
+--- !u!114 &7
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Children:
   - {fileID: 6}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1920.0001
-    height: 1012.00006
+    width: 892
+    height: 541
+  m_MinSize: {x: 100, y: 121}
+  m_MaxSize: {x: 4000, y: 4021}
+  vertical: 0
+  controlID: 18
+  draggingID: 0
+--- !u!114 &8
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 12008, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Children:
+  - {fileID: 9}
+  - {fileID: 10}
+  - {fileID: 11}
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 2560
+    height: 1349
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_UseTopView: 1
   m_TopViewHeight: 30
   m_UseBottomView: 1
   m_BottomViewHeight: 20
---- !u!114 &4
+--- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -95,12 +219,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1920.0001
+    width: 2560
     height: 30
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
   m_LastLoadedLayoutName: 
---- !u!114 &5
+--- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -113,23 +237,22 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 2}
-  - {fileID: 10}
-  - {fileID: 7}
-  - {fileID: 8}
-  - {fileID: 9}
+  - {fileID: 15}
+  - {fileID: 12}
+  - {fileID: 13}
+  - {fileID: 14}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 30
-    width: 1920.0001
-    height: 962.00006
-  m_MinSize: {x: 500, y: 50}
-  m_MaxSize: {x: 40480, y: 8096}
+    width: 2560
+    height: 1299
+  m_MinSize: {x: 400, y: 50}
+  m_MaxSize: {x: 32384, y: 8096}
   vertical: 0
-  controlID: 40
+  controlID: 66
   draggingID: 0
---- !u!114 &6
+--- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -145,12 +268,12 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 992.00006
-    width: 1920.0001
+    y: 1329
+    width: 2560
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
---- !u!114 &7
+--- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -165,18 +288,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 879.50006
+    x: 1209
     y: 0
-    width: 469.50006
-    height: 962.00006
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 11}
+    width: 411
+    height: 1299
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 19}
   m_Panes:
-  - {fileID: 11}
+  - {fileID: 19}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &8
+--- !u!114 &13
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -191,18 +314,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1349.0001
+    x: 1620
     y: 0
-    width: 326.5
-    height: 962.00006
+    width: 366
+    height: 1299
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
-  m_ActualView: {fileID: 13}
+  m_ActualView: {fileID: 21}
   m_Panes:
-  - {fileID: 13}
+  - {fileID: 21}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &9
+--- !u!114 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -217,18 +340,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1675.5001
+    x: 1986
     y: 0
-    width: 244.5
-    height: 962.00006
-  m_MinSize: {x: 276, y: 71}
-  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 12}
+    width: 574
+    height: 1299
+  m_MinSize: {x: 275, y: 50}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 20}
   m_Panes:
-  - {fileID: 12}
+  - {fileID: 20}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &10
+--- !u!114 &15
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -243,18 +366,158 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 553.50006
+    x: 0
     y: 0
-    width: 326
-    height: 962.00006
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 15}
+    width: 1209
+    height: 1299
+  m_MinSize: {x: 201, y: 221}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 23}
   m_Panes:
-  - {fileID: 15}
+  - {fileID: 23}
+  - {fileID: 22}
+  - {fileID: 18}
   m_Selected: 0
-  m_LastSelected: 0
---- !u!114 &11
+  m_LastSelected: 1
+--- !u!114 &16
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f62a84c0b148b0a4582bdd9f1a69e6d3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: ' Hot Reload'
+    m_Image: {fileID: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: -2553
+    y: 377
+    width: 2560
+    height: 994
+  m_SerializedDataModeController:
+    m_DataMode: 0
+    m_PreferredDataMode: 0
+    m_SupportedDataModes: 
+    isAutomatic: 1
+  m_ViewDataDictionary: {fileID: 0}
+  m_OverlayCanvas:
+    m_LastAppliedPresetName: Default
+    m_SaveData: []
+    m_OverlaysVisible: 1
+--- !u!114 &17
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: Console
+    m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: -2054
+    y: 328
+    width: 892
+    height: 520
+  m_SerializedDataModeController:
+    m_DataMode: 0
+    m_PreferredDataMode: 0
+    m_SupportedDataModes: 
+    isAutomatic: 1
+  m_ViewDataDictionary: {fileID: 0}
+  m_OverlayCanvas:
+    m_LastAppliedPresetName: Default
+    m_SaveData: []
+    m_OverlaysVisible: 1
+--- !u!114 &18
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12914, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: Animator
+    m_Image: {fileID: -1673928668082335149, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: 0
+    y: 73
+    width: 1208
+    height: 1278
+  m_SerializedDataModeController:
+    m_DataMode: 0
+    m_PreferredDataMode: 0
+    m_SupportedDataModes: 
+    isAutomatic: 1
+  m_ViewDataDictionary: {fileID: 0}
+  m_OverlayCanvas:
+    m_LastAppliedPresetName: Default
+    m_SaveData: []
+    m_OverlaysVisible: 1
+  m_ViewTransforms:
+    m_KeySerializationHelper:
+    - {fileID: -3440584703619950180, guid: f2a7efcd63199ab4795e66e996544127, type: 2}
+    m_ValueSerializationHelper:
+    - e00: 1
+      e01: 0
+      e02: 0
+      e03: 0
+      e10: 0
+      e11: 1
+      e12: 0
+      e13: 0
+      e20: 0
+      e21: 0
+      e22: 1
+      e23: 0
+      e30: 0
+      e31: 0
+      e32: 0
+      e33: 1
+  m_PreviewAnimator: {fileID: 0}
+  m_AnimatorController: {fileID: 9100000, guid: f2a7efcd63199ab4795e66e996544127, type: 2}
+  m_BreadCrumbs:
+  - m_Target: {fileID: -3440584703619950180, guid: f2a7efcd63199ab4795e66e996544127, type: 2}
+    m_ScrollPosition: {x: 0, y: 0}
+  stateMachineGraph: {fileID: 0}
+  stateMachineGraphGUI: {fileID: 0}
+  blendTreeGraph: {fileID: 0}
+  blendTreeGraphGUI: {fileID: 0}
+  m_AutoLiveLink: 1
+  m_MiniTool: 0
+  m_LockTracker:
+    m_IsLocked: 0
+  m_CurrentEditor: 0
+  m_LayerEditor:
+    m_SelectedLayerIndex: 0
+--- !u!114 &19
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -269,15 +532,15 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
-    m_Text: "\u5C42\u7EA7"
-    m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: Hierarchy
+    m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 879.5001
-    y: 62.000008
-    width: 467.50006
-    height: 941.00006
+    x: 1209
+    y: 73
+    width: 409
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -293,23 +556,23 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: debbd2ffe6bbd2ff5427d3ff5c27d3ff3447d8ff6847d8ffbae9e0ffc0e9e0ffbeeae0ffd6eae0ffdaeae0ffdeeae0ffeceae0fff2eae0ff625affff7efafffff4ffffff
+      m_ExpandedIDs: 78faffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
-        m_Name: glow add
-        m_OriginalName: glow add
+        m_Name: 
+        m_OriginalName: 
         m_EditFieldRect:
           serializedVersion: 2
           x: 0
           y: 0
           width: 0
           height: 0
-        m_UserData: 212340
+        m_UserData: 0
         m_IsWaitingForDelay: 0
         m_IsRenaming: 0
-        m_OriginalEventType: 0
+        m_OriginalEventType: 11
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 7}
+        m_ClientGUIView: {fileID: 12}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
@@ -317,7 +580,7 @@ MonoBehaviour:
       m_IsLocked: 0
     m_CurrentSortingName: TransformSorting
   m_WindowGUID: 468457e0d3add1041b6fec0b00b6a014
---- !u!114 &12
+--- !u!114 &20
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -332,15 +595,15 @@ MonoBehaviour:
   m_MinSize: {x: 275, y: 50}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
-    m_Text: "\u68C0\u67E5\u5668"
-    m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: Inspector
+    m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1675.5002
-    y: 62.000008
-    width: 243.5
-    height: 941.00006
+    x: 1986
+    y: 73
+    width: 573
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -354,7 +617,7 @@ MonoBehaviour:
   m_ObjectsLockedBeforeSerialization: []
   m_InstanceIDsLockedBeforeSerialization: 
   m_PreviewResizer:
-    m_CachedPref: 322.00006
+    m_CachedPref: 160
     m_ControlHash: -371814159
     m_PrefName: Preview_InspectorPreview
   m_LastInspectedObjectInstanceID: -1
@@ -364,7 +627,7 @@ MonoBehaviour:
   m_LockTracker:
     m_IsLocked: 0
   m_PreviewWindow: {fileID: 0}
---- !u!114 &13
+--- !u!114 &21
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -379,15 +642,15 @@ MonoBehaviour:
   m_MinSize: {x: 230, y: 250}
   m_MaxSize: {x: 10000, y: 10000}
   m_TitleContent:
-    m_Text: "\u9879\u76EE"
-    m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: Project
+    m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1349.0001
-    y: 62.000008
-    width: 324.5
-    height: 941.00006
+    x: 1620
+    y: 73
+    width: 364
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -399,7 +662,7 @@ MonoBehaviour:
     m_SaveData: []
     m_OverlaysVisible: 1
   m_SearchFilter:
-    m_NameFilter: 
+    m_NameFilter: DivineSenceEventPreviewPanel
     m_ClassNames: []
     m_AssetLabels: []
     m_AssetBundleNames: []
@@ -409,24 +672,24 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Art/VFX
+    - Assets/Res/UI/DivineSence
     m_Globs: []
-    m_OriginalText: 
+    m_OriginalText: DivineSenceEventPreviewPanel
     m_ImportLogFlags: 0
     m_FilterByTypeIntersection: 0
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Art/VFX
-  m_LastFoldersGridSize: 16
-  m_LastProjectPath: E:\XY002\XiuXianGame
+  - Assets/Res/UI/DivineSence
+  m_LastFoldersGridSize: -1
+  m_LastProjectPath: D:\FB\XiuXianGame
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 49.333252}
-    m_SelectedIDs: 0c8c0100
-    m_LastClickedID: 101388
-    m_ExpandedIDs: 000000008c8901008e89010090890100928901009489010096890100988901009a8901009c8901009e890100a0890100a2890100a4890100a6890100a8890100aa890100ac890100ae890100b0890100b2890100b4890100b6890100b8890100ba890100bc890100be890100c0890100c2890100c4890100c6890100c8890100ca890100cc890100ce890100d0890100368b0100548b01000c8c010000ca9a3b
+    scrollPos: {x: 0, y: 0}
+    m_SelectedIDs: 6cc80000
+    m_LastClickedID: 51308
+    m_ExpandedIDs: 00000000ecc70000eec70000f0c70000f2c70000f4c70000f6c70000f8c70000fac70000fcc70000fec7000000c8000002c8000000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -442,7 +705,7 @@ MonoBehaviour:
       m_IsRenaming: 0
       m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 8}
+      m_ClientGUIView: {fileID: 0}
     m_SearchString: 
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
@@ -454,7 +717,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 000000008c8901008e89010090890100928901009489010096890100988901009a8901009c8901009e890100a0890100a2890100a4890100a6890100a8890100aa890100ac890100ae890100b0890100b2890100b4890100b6890100b8890100ba890100bc890100be890100c0890100c2890100c4890100c6890100c8890100ca890100cc890100ce890100d0890100
+    m_ExpandedIDs: 00000000ecc70000eec70000f0c70000f2c70000f4c70000f6c70000f8c70000fac70000fcc70000fec7000000c8000002c80000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -481,8 +744,8 @@ MonoBehaviour:
   m_ListAreaState:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
-    m_HadKeyboardFocusLastEvent: 1
-    m_ExpandedInstanceIDs: 
+    m_HadKeyboardFocusLastEvent: 0
+    m_ExpandedInstanceIDs: 784b0100
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -498,7 +761,7 @@ MonoBehaviour:
       m_IsRenaming: 0
       m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 8}
+      m_ClientGUIView: {fileID: 13}
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
@@ -509,8 +772,8 @@ MonoBehaviour:
     m_ScrollPosition: {x: 0, y: 0}
     m_GridSize: 16
   m_SkipHiddenPackages: 0
-  m_DirectoriesAreaWidth: 173
---- !u!114 &14
+  m_DirectoriesAreaWidth: 115
+--- !u!114 &22
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -525,15 +788,15 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
-    m_Text: "\u6E38\u620F"
-    m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: Game
+    m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 62.000008
-    width: 552.50006
-    height: 941.00006
+    y: 73
+    width: 1208
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -559,16 +822,16 @@ MonoBehaviour:
   m_VSyncEnabled: 0
   m_Gizmos: 0
   m_Stats: 0
-  m_SelectedSizes: 07000000000000000000000011000000000000000000000000000000000000000000000000000000
+  m_SelectedSizes: 08000000000000000000000012000000000000000000000000000000000000000000000000000000
   m_ZoomArea:
     m_HRangeLocked: 0
     m_VRangeLocked: 0
     hZoomLockedByDefault: 0
     vZoomLockedByDefault: 0
-    m_HBaseRangeMin: -187.50002
-    m_HBaseRangeMax: 187.50002
-    m_VBaseRangeMin: -406.00006
-    m_VBaseRangeMax: 406.00006
+    m_HBaseRangeMin: -375
+    m_HBaseRangeMax: 375
+    m_VBaseRangeMin: -812
+    m_VBaseRangeMax: 812
     m_HAllowExceedBaseRangeMin: 1
     m_HAllowExceedBaseRangeMax: 1
     m_VAllowExceedBaseRangeMin: 1
@@ -577,7 +840,7 @@ MonoBehaviour:
     m_HSlider: 0
     m_VSlider: 0
     m_IgnoreScrollWheelUntilClicked: 0
-    m_EnableMouseInput: 1
+    m_EnableMouseInput: 0
     m_EnableSliderZoomHorizontal: 0
     m_EnableSliderZoomVertical: 0
     m_UniformScale: 1
@@ -586,29 +849,29 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 552.50006
-      height: 920.00006
-    m_Scale: {x: 1, y: 1}
-    m_Translation: {x: 276.25003, y: 460.00003}
+      width: 1208
+      height: 1257
+    m_Scale: {x: 0.7740148, y: 0.7740148}
+    m_Translation: {x: 604, y: 628.5}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -276.25003
-      y: -460.00003
-      width: 552.50006
-      height: 920.00006
+      x: -780.34686
+      y: -812
+      width: 1560.6937
+      height: 1624
     m_MinimalGUI: 1
-  m_defaultScale: 1
-  m_LastWindowPixelSize: {x: 1105, y: 1882}
+  m_defaultScale: 0.7740148
+  m_LastWindowPixelSize: {x: 1208, y: 1278}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000001000000000000
   m_XRRenderMode: 0
   m_RenderTexture: {fileID: 0}
---- !u!114 &15
+--- !u!114 &23
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -623,15 +886,15 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
-    m_Text: "\u573A\u666F"
-    m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: Scene
+    m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 553.50006
-    y: 62.000008
-    width: 324
-    height: 941.00006
+    x: 0
+    y: 73
+    width: 1208
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -646,7 +909,7 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: -164, y: -26}
+      snapOffset: {x: -179, y: -26}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 3
       id: Tool Settings
@@ -862,16 +1125,16 @@ MonoBehaviour:
       layout: 4
       size: {x: 0, y: 0}
       sizeOverriden: 0
-    - dockPosition: 0
-      containerId: Floating
-      floating: 1
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
       collapsed: 0
       displayed: 0
-      snapOffset: {x: -233.50002, y: -208.50006}
+      snapOffset: {x: 0, y: 25}
       snapOffsetDelta: {x: 0, y: 0}
-      snapCorner: 3
+      snapCorner: 0
       id: Scene View/Particles
-      index: 0
+      index: 8
       layout: 4
       size: {x: 0, y: 0}
       sizeOverriden: 0
@@ -949,7 +1212,7 @@ MonoBehaviour:
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/Path
-      index: 8
+      index: 9
       layout: 4
       size: {x: 0, y: 0}
       sizeOverriden: 0
@@ -962,7 +1225,7 @@ MonoBehaviour:
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: APV Overlay
-      index: 9
+      index: 10
       layout: 4
       size: {x: 0, y: 0}
       sizeOverriden: 0
@@ -975,19 +1238,6 @@ MonoBehaviour:
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/TrailRenderer
-      index: 10
-      layout: 4
-      size: {x: 0, y: 0}
-      sizeOverriden: 0
-    - dockPosition: 1
-      containerId: overlay-container--right
-      floating: 0
-      collapsed: 0
-      displayed: 1
-      snapOffset: {x: 48, y: 48}
-      snapOffsetDelta: {x: 0, y: 0}
-      snapCorner: 0
-      id: Hot Reload
       index: 11
       layout: 4
       size: {x: 0, y: 0}
@@ -1000,7 +1250,7 @@ MonoBehaviour:
       snapOffset: {x: 48, y: 48}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
-      id: UnityEditor.SceneViewCameraOverlay
+      id: Hot Reload
       index: 12
       layout: 4
       size: {x: 0, y: 0}
@@ -1016,9 +1266,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 1.3010992, y: 2.5070674, z: 0.08851415}
+    m_Target: {x: -0.11300865, y: -1.5106583, z: 430.86832}
     speed: 2
-    m_Value: {x: 66.59014, y: 1709.6445, z: -1.4318283}
+    m_Value: {x: -0.11300865, y: -1.5106583, z: 430.86832}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -1027,7 +1277,7 @@ MonoBehaviour:
   m_ValidateTrueMetals: 0
   m_DoValidateTrueMetals: 0
   m_SceneViewState:
-    m_AlwaysRefresh: 1
+    m_AlwaysRefresh: 0
     showFog: 1
     showSkybox: 1
     showFlares: 1
@@ -1048,7 +1298,7 @@ MonoBehaviour:
       m_Fade:
         m_Target: 0
         speed: 2
-        m_Value: 1
+        m_Value: 0
       m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
       m_Pivot: {x: 0, y: 0, z: 0}
       m_Size: {x: 1, y: 1}
@@ -1066,11 +1316,11 @@ MonoBehaviour:
   m_Rotation:
     m_Target: {x: 0, y: 0, z: 0, w: 1}
     speed: 2
-    m_Value: {x: -0, y: 0, z: -0, w: -1}
+    m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
-    m_Target: 1.1485728
+    m_Target: 3.2990048
     speed: 2
-    m_Value: 153.18275
+    m_Value: 3.2990048
   m_Ortho:
     m_Target: 1
     speed: 2
@@ -1090,7 +1340,7 @@ MonoBehaviour:
     m_OcclusionCulling: 0
     m_EnableGDRP: 1
     m_BackfaceCulling: 0
-  m_LastSceneViewRotation: {x: -0.13062093, y: 0.7545713, z: -0.15811922, w: -0.623345}
+  m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
   m_LastSceneViewOrtho: 0
   m_ReplacementShader: {fileID: 0}
   m_ReplacementString: