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

# Conflicts:
#	Assets/Scenes/testCombat.scene   resolved by origin/master(远端) version
#	UserSettings/Layouts/default-2022.dwlt   resolved by master version

Assets/Art/UIAssets/TextrueJson/battle.txt

@@ -1 +1 @@
-{"packName":"battle","isTyPack":false,"newTextureJson":[{"textrueName":"bg_dz_jht1","filePath":"/bg/bg_dz_jht1.png"},{"textrueName":"dec_dazuo","filePath":"/decorate/dec_dazuo.png"},{"textrueName":"dec_gf_di_xingchendao","filePath":"/decorate/dec_gf_di_xingchendao.png"},{"textrueName":"dec_loading_05","filePath":"/decorate/dec_loading_05.png"},{"textrueName":"dec_name_01","filePath":"/decorate/dec_name_01.png"},{"textrueName":"dec_name_02","filePath":"/decorate/dec_name_02.png"},{"textrueName":"dec_slot_01","filePath":"/decorate/dec_slot_01.png"},{"textrueName":"dec_slot_02","filePath":"/decorate/dec_slot_02.png"},{"textrueName":"dec_slot_03","filePath":"/decorate/dec_slot_03.png"}],"keyToValue":{}}
+{"packName":"battle","isTyPack":false,"newTextureJson":[{"textrueName":"bg_dz_jht1","filePath":"/bg/bg_dz_jht1.png"},{"textrueName":"dec_dazuo","filePath":"/decorate/dec_dazuo.png"},{"textrueName":"dec_diyuan","filePath":"/decorate/dec_diyuan.png"},{"textrueName":"dec_gf_di_xingchendao","filePath":"/decorate/dec_gf_di_xingchendao.png"},{"textrueName":"dec_name_01","filePath":"/decorate/dec_name_01.png"},{"textrueName":"dec_name_02","filePath":"/decorate/dec_name_02.png"},{"textrueName":"dec_slot_01","filePath":"/decorate/dec_slot_01.png"},{"textrueName":"dec_slot_02","filePath":"/decorate/dec_slot_02.png"},{"textrueName":"dec_slot_03","filePath":"/decorate/dec_slot_03.png"},{"textrueName":"dec_yuandian","filePath":"/decorate/dec_yuandian.png"},{"textrueName":"dec_yuanhuan1","filePath":"/decorate/dec_yuanhuan1.png"},{"textrueName":"dec_yuanhuan2","filePath":"/decorate/dec_yuanhuan2.png"},{"textrueName":"dec_yuanhuan_quse","filePath":"/decorate/dec_yuanhuan_quse.png"}],"keyToValue":{}}

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

@@ -52,7 +52,7 @@ TextureImporter:
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteBorder: {x: 29, y: 73, z: 26, w: 55}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaIsTransparency: 1
@@ -112,6 +112,76 @@ TextureImporter:
     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: []
@@ -119,7 +189,7 @@ TextureImporter:
     physicsShape: []
     bones: []
     spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
+    internalID: 1537655665
     vertices: []
     indices: 
     edges: []

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

@@ -52,7 +52,7 @@ TextureImporter:
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteBorder: {x: 24, y: 56, z: 22, w: 54}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaIsTransparency: 1
@@ -112,6 +112,76 @@ TextureImporter:
     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: []
@@ -119,7 +189,7 @@ TextureImporter:
     physicsShape: []
     bones: []
     spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
+    internalID: 1537655665
     vertices: []
     indices: 
     edges: []

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

@@ -52,7 +52,7 @@ TextureImporter:
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteBorder: {x: 20, y: 62, z: 20, w: 62}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaIsTransparency: 1
@@ -112,6 +112,76 @@ TextureImporter:
     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: []
@@ -119,7 +189,7 @@ TextureImporter:
     physicsShape: []
     bones: []
     spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
+    internalID: 1537655665
     vertices: []
     indices: 
     edges: []

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

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: C3MfvH75UXOT2AJHDRnjAVBNg3DwvKgUlI1Dz7HLk2TF2AUCndVaNLs1q3tD
+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
+  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_duihua_04.png.meta

@@ -52,7 +52,7 @@ TextureImporter:
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteBorder: {x: 67, y: 47, z: 32, w: 8}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaIsTransparency: 1
@@ -112,6 +112,76 @@ TextureImporter:
     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: []
@@ -119,7 +189,7 @@ TextureImporter:
     physicsShape: []
     bones: []
     spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
+    internalID: 1537655665
     vertices: []
     indices: 
     edges: []

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

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: DC9N4HytAXLiqETy4gELT17nWAFz998jKeZpvKrbioCqdJ7U4fFM82GFB2qD
+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
+  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_yuanhuan1.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: DntOtS+tAHM/+p1ClqcRY88eahR2BhzqjkNt9/Ba75/sp5mGSqG7DnBmxxhK
+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
+  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_yuanhuan2.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: XHlKvCqlW3iP0J+e+cBe9oPxPBNGqFw0OxlIIWnjLWlYNfFodYam0HVMwfdt
+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
+  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_yuanhuan_quse.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: CyxNtXuoUX/d2rY1jBgsIXOy+3gOYT/z4tQtrOLZEyBi413fd2d9E8wrWeRc
+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
+  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/AppBarPanel/AppBarPanel.prefab

@@ -866,8 +866,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: 3.4843, y: -32.893013}
-  m_SizeDelta: {x: 108.2985, y: 31.8101}
+  m_AnchoredPosition: {x: 13.0859995, y: -32.893013}
+  m_SizeDelta: {x: 127.5019, y: 31.8101}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8586065168883585880
 CanvasRenderer:

Assets/Res/UI/DialoguePanel/DialogueBubblePanel.prefab

@@ -216,7 +216,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: 129, y: -95}
+  m_AnchoredPosition: {x: 129, y: -45}
   m_SizeDelta: {x: 230, y: 0}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &8563214976376415512
@@ -260,7 +260,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: 123123123123123123121312312321321321312
+  m_Text: 
 --- !u!114 &7854699503480604488
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Res/UI/DialoguePanel/DialoguePanel.prefab

@@ -36,7 +36,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: 357.7, y: -230.3}
+  m_AnchoredPosition: {x: 357.7, y: -244.3}
   m_SizeDelta: {x: 131, y: 0}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &1752607932964163169

Assets/Res/UI/DivineSence/DivineSenceEventResultPanel.prefab

@@ -35,8 +35,7 @@ RectTransform:
   - {fileID: 3581464887972855309}
   - {fileID: 9037408276187403176}
   - {fileID: 4737429402125406338}
-  - {fileID: 4316220808628158048}
-  - {fileID: 5376868448112468229}
+  - {fileID: 4688522053669353716}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -57,11 +56,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   data:
-  - key: myButton
-    gameObject: {fileID: 0}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
   - key: bg
     gameObject: {fileID: 8488195482551738332}
     isAssetBundle: 0
@@ -82,18 +76,8 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
-  - key: Text_AllEvent
-    gameObject: {fileID: 3433724065042445742}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
-  - key: Text_Teshu
-    gameObject: {fileID: 684429506329786227}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
-  - key: Text_Result
-    gameObject: {fileID: 2826526502033341643}
+  - key: Btn_Ok
+    gameObject: {fileID: 3169074378938001994}
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
@@ -286,6 +270,216 @@ MonoBehaviour:
   isAdaptationWidth: 0
   layoutType: 0
   overflowDistance: 0
+--- !u!1 &2553589566839113697
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4688522053669353716}
+  - component: {fileID: 2934276402299459566}
+  - component: {fileID: 2433990691951363383}
+  - component: {fileID: 3169074378938001994}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Btn_Ok
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4688522053669353716
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2553589566839113697}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 6150498200931894423}
+  m_Father: {fileID: 8599819629026832582}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -9, y: -288.69}
+  m_SizeDelta: {x: 132.3538, y: 50.3799}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2934276402299459566
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2553589566839113697}
+  m_CullTransparentMesh: 1
+--- !u!114 &2433990691951363383
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2553589566839113697}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.6509804, g: 0.6509804, b: 0.6509804, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: btn_23
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 
+--- !u!114 &3169074378938001994
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2553589566839113697}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 2433990691951363383}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &3552915526930824737
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6150498200931894423}
+  - component: {fileID: 2944092694878402809}
+  - component: {fileID: 2519922024915380815}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy) (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6150498200931894423
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3552915526930824737}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4688522053669353716}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2944092694878402809
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3552915526930824737}
+  m_CullTransparentMesh: 1
+--- !u!114 &2519922024915380815
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3552915526930824737}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 21
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u786E\u5B9A"
 --- !u!1 &3651587731235081858
 GameObject:
   m_ObjectHideFlags: 0
@@ -365,7 +559,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u795E\u8BC6\u63A2\u7D22\u7ED3\u679C"
+  m_Text: "\u4ED9\u9014\u4E8B\u4EF6"
 --- !u!1 &4665951811628086642
 GameObject:
   m_ObjectHideFlags: 0
@@ -403,8 +597,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: -2.147, y: -38.5947}
-  m_SizeDelta: {x: 471.58, y: 586.101}
+  m_AnchoredPosition: {x: -2.147, y: 52.137726}
+  m_SizeDelta: {x: 471.58, y: 553.7293}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5904849993517078433
 CanvasRenderer:
@@ -608,7 +802,7 @@ GameObject:
   - component: {fileID: 3433724065042445742}
   m_Layer: 5
   m_HasEditorInfo: 1
-  m_Name: Text_AllEvent
+  m_Name: Text_Tips
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -630,7 +824,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: -99.399994, y: 350.9001}
+  m_AnchoredPosition: {x: -0.0000021458, y: -248.5}
   m_SizeDelta: {x: 228, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7642327290700519805
@@ -654,7 +848,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_Color: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -668,173 +862,13 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
-    m_Alignment: 3
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: "\u4E00\u5171\u63A2\u5BFB\u523010\u4E2A\u4E8B\u4EF6"
---- !u!1 &8069783746261929962
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 4316220808628158048}
-  - component: {fileID: 332447216940605213}
-  - component: {fileID: 684429506329786227}
-  m_Layer: 5
-  m_HasEditorInfo: 1
-  m_Name: Text_Teshu
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &4316220808628158048
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8069783746261929962}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 8599819629026832582}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -99.399994, y: 314.00006}
-  m_SizeDelta: {x: 228, y: 30}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &332447216940605213
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8069783746261929962}
-  m_CullTransparentMesh: 1
---- !u!114 &684429506329786227
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8069783746261929962}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 16
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 1
-    m_MaxSize: 40
-    m_Alignment: 3
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: "3\u4E2A\u7279\u6B8A"
---- !u!1 &8717336479815438225
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 5376868448112468229}
-  - component: {fileID: 3816265697136476390}
-  - component: {fileID: 2826526502033341643}
-  m_Layer: 5
-  m_HasEditorInfo: 1
-  m_Name: Text_Result
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &5376868448112468229
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8717336479815438225}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 8599819629026832582}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -99.4, y: 282.3}
-  m_SizeDelta: {x: 228, y: 30}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &3816265697136476390
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8717336479815438225}
-  m_CullTransparentMesh: 1
---- !u!114 &2826526502033341643
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8717336479815438225}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 16
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 1
-    m_MaxSize: 40
-    m_Alignment: 3
+    m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "7\u4E2A\u5DF2\u5904\u7406"
+  m_Text: "\u53EF\u7A0D\u540E\u5728\u4E3B\u754C\u9762\u7EE7\u7EED\u5904\u7406"
 --- !u!1 &9135198254365544974
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/DivineSence/DivineSenceInfoPanel.prefab

@@ -0,0 +1,701 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &650584255987892480
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8599819629026832582}
+  - component: {fileID: 7897761964867798499}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: DivineSenceInfoPanel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8599819629026832582
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 650584255987892480}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 2896655462721008753}
+  - {fileID: 2569128129379278262}
+  - {fileID: 3815014095560193181}
+  - {fileID: 4688522053669353716}
+  - {fileID: 3172523473754877981}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 750, y: 1624}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &7897761964867798499
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 650584255987892480}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: Btn_Close
+    gameObject: {fileID: 3651346582420827263}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Btn_Ok
+    gameObject: {fileID: 3169074378938001994}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Btn_Back
+    gameObject: {fileID: 7999342064140219678}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 1
+--- !u!1 &2132268725135064903
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2569128129379278262}
+  - component: {fileID: 9156533754913033698}
+  - component: {fileID: 8488195482551738332}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2569128129379278262
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2132268725135064903}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8599819629026832582}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0.00048065, y: 0}
+  m_SizeDelta: {x: 750, y: 389.979}
+  m_Pivot: {x: 0.5, y: 0}
+--- !u!222 &9156533754913033698
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2132268725135064903}
+  m_CullTransparentMesh: 1
+--- !u!114 &8488195482551738332
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2132268725135064903}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_dadi_01
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
+--- !u!1 &2553589566839113697
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4688522053669353716}
+  - component: {fileID: 2934276402299459566}
+  - component: {fileID: 2433990691951363383}
+  - component: {fileID: 3169074378938001994}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Btn_Ok
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4688522053669353716
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2553589566839113697}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 6150498200931894423}
+  m_Father: {fileID: 8599819629026832582}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: -16.607, y: 194.98999}
+  m_SizeDelta: {x: 194.7858, y: 74.14441}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2934276402299459566
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2553589566839113697}
+  m_CullTransparentMesh: 1
+--- !u!114 &2433990691951363383
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2553589566839113697}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.2627451, g: 0.8117648, b: 0.48627454, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: btn_23
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 
+--- !u!114 &3169074378938001994
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2553589566839113697}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 2433990691951363383}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &2836601531323164921
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3815014095560193181}
+  - component: {fileID: 2341404445985193318}
+  - component: {fileID: 1082849405984939373}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3815014095560193181
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2836601531323164921}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8599819629026832582}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 100}
+  m_Pivot: {x: 0.5, y: 0}
+--- !u!222 &2341404445985193318
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2836601531323164921}
+  m_CullTransparentMesh: 1
+--- !u!114 &1082849405984939373
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2836601531323164921}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.5686275, g: 0.5686275, b: 0.5686275, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: 
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 0}
+  packInfo:
+    packName: 
+    packgJsonPath: 
+    packgSpritePath: 
+    lasetJsonGUID: 
+--- !u!1 &3552915526930824737
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6150498200931894423}
+  - component: {fileID: 2944092694878402809}
+  - component: {fileID: 2519922024915380815}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy) (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6150498200931894423
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3552915526930824737}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4688522053669353716}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2944092694878402809
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3552915526930824737}
+  m_CullTransparentMesh: 1
+--- !u!114 &2519922024915380815
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3552915526930824737}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 22
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u5F00\u59CB\u63A2\u7D22"
+--- !u!1 &6526267881818557425
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3172523473754877981}
+  - component: {fileID: 3696280240812117840}
+  - component: {fileID: 251939513631090253}
+  - component: {fileID: 7999342064140219678}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Btn_Back
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3172523473754877981
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6526267881818557425}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8599819629026832582}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 19, y: 15}
+  m_SizeDelta: {x: 68, y: 59}
+  m_Pivot: {x: 0, y: 0}
+--- !u!222 &3696280240812117840
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6526267881818557425}
+  m_CullTransparentMesh: 1
+--- !u!114 &251939513631090253
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6526267881818557425}
+  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: btn_close_02
+  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: 
+--- !u!114 &7999342064140219678
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6526267881818557425}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 251939513631090253}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &6864546897549033815
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2896655462721008753}
+  - component: {fileID: 1550575800954493607}
+  - component: {fileID: 8853780473327312120}
+  - component: {fileID: 3651346582420827263}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Btn_Close
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &2896655462721008753
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6864546897549033815}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8599819629026832582}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1550575800954493607
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6864546897549033815}
+  m_CullTransparentMesh: 1
+--- !u!114 &8853780473327312120
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6864546897549033815}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.69411767}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &3651346582420827263
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6864546897549033815}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 8853780473327312120}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []

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

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: WS5NsH/8UXKHpGdvEXLFojIfKx0/XHj0+IwQ3XMWiJ3/Dv0AiBUbDtfREe2d
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/UI/DivineSence/ShengShiEventWidgetType3.prefab

@@ -476,6 +476,7 @@ RectTransform:
   - {fileID: 712579681456886399}
   - {fileID: 2581404301119584838}
   - {fileID: 1928953398721837283}
+  - {fileID: 5700846322996692730}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -601,6 +602,102 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\event.txt
     packgSpritePath: Assets/Res/UIAtlas/event.spriteatlasv2
     lasetJsonGUID: df80f818a4f258d33b8038600af6f215
+--- !u!1 &7639731894752679497
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7117316534246028533}
+  - component: {fileID: 415215015298378740}
+  - component: {fileID: 576612968966692761}
+  - component: {fileID: 2910925411919575758}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_Type
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7117316534246028533
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7639731894752679497}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5700846322996692730}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &415215015298378740
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7639731894752679497}
+  m_CullTransparentMesh: 1
+--- !u!114 &576612968966692761
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7639731894752679497}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 16
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u4E8B\u4EF6\u5B8C\u6210"
+--- !u!114 &2910925411919575758
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7639731894752679497}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0.4811321, g: 0.43347278, b: 0.43347278, a: 0.5}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
 --- !u!1 &8294489962711393459
 GameObject:
   m_ObjectHideFlags: 0
@@ -697,3 +794,80 @@ MonoBehaviour:
   m_EffectColor: {r: 0.4811321, g: 0.43347278, b: 0.43347278, a: 0.5}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!1 &8558440621453229158
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5700846322996692730}
+  - component: {fileID: 1932774545571088901}
+  - component: {fileID: 6871118366495012920}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Image (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5700846322996692730
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8558440621453229158}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 7117316534246028533}
+  m_Father: {fileID: 3370061335406075943}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 355.36053, y: -6.052101}
+  m_SizeDelta: {x: 79.4075, y: 28.4624}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &1932774545571088901
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8558440621453229158}
+  m_CullTransparentMesh: 1
+--- !u!114 &6871118366495012920
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8558440621453229158}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.9686275, g: 0.9450981, b: 0.6901961, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1

Assets/Res/UIAtlas/battle.spriteatlasv2

@@ -12,12 +12,16 @@ SpriteAtlasAsset:
   m_ImporterData:
     packables:
     - {fileID: 2800000, guid: 289e281c65c1c5547bbf5637330a92b9, type: 3}
+    - {fileID: 2800000, guid: 4909dd28f612aba43aafc836ea21c1d2, type: 3}
     - {fileID: 2800000, guid: c764dca922d22104d883d11a2ba097ce, type: 3}
-    - {fileID: 2800000, guid: 0f53bca37dcd4bb48815fb0bcf5db1c1, type: 3}
     - {fileID: 2800000, guid: f3bf02f43ae683245a9fd08ea3669254, type: 3}
     - {fileID: 2800000, guid: 78191d7c1ee1bc34c87bb6690e8da67f, type: 3}
     - {fileID: 2800000, guid: 17278af695d218f4db68c44f54051175, type: 3}
     - {fileID: 2800000, guid: f812f2cc0fb3e214f957e38d3240cae7, type: 3}
     - {fileID: 2800000, guid: dd29c735c83523c438f49f6c5a84b917, type: 3}
+    - {fileID: 2800000, guid: 3ebef0b933c6a884a9443eb76c68048a, type: 3}
+    - {fileID: 2800000, guid: 11a050c820c03994a83b8d5cb60e55b8, type: 3}
+    - {fileID: 2800000, guid: c3e90883db7078b42966fd3e59cb5bbc, type: 3}
+    - {fileID: 2800000, guid: 4fb0a524cb1413f4ab2740a9e1279736, type: 3}
   m_IsVariant: 0
   m_IsPlaceholder: 0

Assets/Scenes/testCombat.scene

@@ -451,14 +451,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 0
+      x: 358
       y: 364
       width: 101
       height: 101
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 0, y: 364}
+    atlasRectOffset: {x: 358, y: 364}
     settingsRaw: 65
-    uvTransform: {x: 100, y: 50.5, z: 100, w: 414.5}
+    uvTransform: {x: 100, y: 408.5, z: 100, w: 414.5}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: 0.505, y: -0.114999995}
@@ -2233,14 +2233,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 0
+      x: 358
       y: 364
       width: 101
       height: 101
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 0, y: 364}
+    atlasRectOffset: {x: 358, y: 364}
     settingsRaw: 65
-    uvTransform: {x: 100, y: 50.5, z: 100, w: 414.5}
+    uvTransform: {x: 100, y: 408.5, z: 100, w: 414.5}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: 0.505, y: -0.114999995}
@@ -2487,14 +2487,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 0
+      x: 358
       y: 364
       width: 101
       height: 101
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 0, y: 364}
+    atlasRectOffset: {x: 358, y: 364}
     settingsRaw: 65
-    uvTransform: {x: 100, y: 50.5, z: 100, w: 414.5}
+    uvTransform: {x: 100, y: 408.5, z: 100, w: 414.5}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: 0.505, y: -0.114999995}
@@ -3546,14 +3546,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 110
-      y: 255
+      x: 590
+      y: 0
       width: 90
       height: 90
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 110, y: 255}
+    atlasRectOffset: {x: 590, y: 0}
     settingsRaw: 65
-    uvTransform: {x: 100, y: 155, z: 100, w: 300}
+    uvTransform: {x: 100, y: 635, z: 100, w: 45}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: 0.45, y: 0.19999999}
@@ -3950,14 +3950,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 110
-      y: 255
+      x: 590
+      y: 0
       width: 90
       height: 90
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 110, y: 255}
+    atlasRectOffset: {x: 590, y: 0}
     settingsRaw: 65
-    uvTransform: {x: 100, y: 155, z: 100, w: 300}
+    uvTransform: {x: 100, y: 635, z: 100, w: 45}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: 0.45, y: 0.19999999}
@@ -4176,14 +4176,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 0
+      x: 358
       y: 364
       width: 101
       height: 101
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 0, y: 364}
+    atlasRectOffset: {x: 358, y: 364}
     settingsRaw: 65
-    uvTransform: {x: 100, y: 50.5, z: 100, w: 414.5}
+    uvTransform: {x: 100, y: 408.5, z: 100, w: 414.5}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: 0.505, y: -0.114999995}
@@ -5282,14 +5282,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 0
+      x: 358
       y: 364
       width: 101
       height: 101
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 0, y: 364}
+    atlasRectOffset: {x: 358, y: 364}
     settingsRaw: 65
-    uvTransform: {x: 100, y: 50.5, z: 100, w: 414.5}
+    uvTransform: {x: 100, y: 408.5, z: 100, w: 414.5}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: 0.505, y: -0.114999995}
@@ -5910,14 +5910,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 110
-      y: 255
+      x: 590
+      y: 0
       width: 90
       height: 90
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 110, y: 255}
+    atlasRectOffset: {x: 590, y: 0}
     settingsRaw: 65
-    uvTransform: {x: 100, y: 155, z: 100, w: 300}
+    uvTransform: {x: 100, y: 635, z: 100, w: 45}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: 0.45, y: 0.19999999}
@@ -6302,14 +6302,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 110
-      y: 255
+      x: 590
+      y: 0
       width: 90
       height: 90
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 110, y: 255}
+    atlasRectOffset: {x: 590, y: 0}
     settingsRaw: 65
-    uvTransform: {x: 100, y: 155, z: 100, w: 300}
+    uvTransform: {x: 100, y: 635, z: 100, w: 45}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: 0.45, y: 0.19999999}
@@ -6528,14 +6528,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 110
-      y: 255
+      x: 590
+      y: 0
       width: 90
       height: 90
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 110, y: 255}
+    atlasRectOffset: {x: 590, y: 0}
     settingsRaw: 65
-    uvTransform: {x: 100, y: 155, z: 100, w: 300}
+    uvTransform: {x: 100, y: 635, z: 100, w: 45}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: 0.45, y: 0.19999999}
@@ -7566,14 +7566,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 110
-      y: 255
+      x: 590
+      y: 0
       width: 90
       height: 90
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 110, y: 255}
+    atlasRectOffset: {x: 590, y: 0}
     settingsRaw: 65
-    uvTransform: {x: 100, y: 155, z: 100, w: 300}
+    uvTransform: {x: 100, y: 635, z: 100, w: 45}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: 0.45, y: 0.19999999}
@@ -7887,14 +7887,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 110
-      y: 255
+      x: 590
+      y: 0
       width: 90
       height: 90
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 110, y: 255}
+    atlasRectOffset: {x: 590, y: 0}
     settingsRaw: 65
-    uvTransform: {x: 100, y: 155, z: 100, w: 300}
+    uvTransform: {x: 100, y: 635, z: 100, w: 45}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: 0.45, y: 0.19999999}
@@ -8206,14 +8206,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 110
-      y: 255
+      x: 590
+      y: 0
       width: 90
       height: 90
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 110, y: 255}
+    atlasRectOffset: {x: 590, y: 0}
     settingsRaw: 65
-    uvTransform: {x: 100, y: 155, z: 100, w: 300}
+    uvTransform: {x: 100, y: 635, z: 100, w: 45}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: 0.45, y: 0.19999999}
@@ -10098,14 +10098,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 0
+      x: 358
       y: 364
       width: 101
       height: 101
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 0, y: 364}
+    atlasRectOffset: {x: 358, y: 364}
     settingsRaw: 65
-    uvTransform: {x: 100, y: 50.5, z: 100, w: 414.5}
+    uvTransform: {x: 100, y: 408.5, z: 100, w: 414.5}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: 0.505, y: -0.114999995}
@@ -10384,14 +10384,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 110
-      y: 255
+      x: 590
+      y: 0
       width: 90
       height: 90
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 110, y: 255}
+    atlasRectOffset: {x: 590, y: 0}
     settingsRaw: 65
-    uvTransform: {x: 100, y: 155, z: 100, w: 300}
+    uvTransform: {x: 100, y: 635, z: 100, w: 45}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: 0.45, y: 0.19999999}

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

@@ -360,7 +360,7 @@ namespace Fort23.Mono
                 // TDManager.Instance.PartCount(uiBindingAttribute.prefab);
                 if (isFocus)
                 {
-                    if (currOpenPanel != null )
+                    if (currOpenPanel != null)
                     {
                         if (currOpenPanel.isShow)
                         {
@@ -877,16 +877,13 @@ namespace Fort23.Mono
                 {
                     uiPanel.IsBreadcrumbBarPanel = false;
                     UIPanel uiPanel1 = CloseTopUI();
-
-
-                    LastUIPanel = uiPanel1;
-                    OpenTopUI();
-                    return;
+                    if (uiPanel != null)
+                    {
+                        LastUIPanel = uiPanel1;
+                        OpenTopUI();
+                        return;
+                    }
                 }
-
-                // uiPanel.Hide();
-
-                // return;
             }
 
             if (!NoFocusTopUIPanels.Contains(uiPanel)) NoFocusTopUIPanels.Remove(uiPanel);

Assets/Scripts/Core/UI/Core/UIPanel.cs

@@ -279,7 +279,7 @@ namespace Fort23.Mono
             {
                 if (!IsShowAppBar)
                 {
-                    Assembly assembly =Assembly.Load("Fort23.Mono");
+                    Assembly assembly = Assembly.Load("Fort23.Mono");
                     Type AppBarPanel = assembly.GetType(" Fort23.Mono.AppBarPanel");
                     UIPanel uiPanel = UIManager.Instance.GetComponent(AppBarPanel) as UIPanel;
                     if (uiPanel != null)
@@ -287,11 +287,8 @@ namespace Fort23.Mono
                         uiPanel.Hide();
                     }
                 }
+
                 UIManager.Instance.currOpenPanel = this;
-                // if (UIManager.Instance.lastOpenPropSourcePanel == this)
-                // {
-                //     UIManager.Instance.GetComponent<PropSourcePanel>().Show();
-                // }
             }
         }
 

Assets/Scripts/GameLogic/EventManager/DialogueManager.cs

@@ -34,7 +34,15 @@ public class DialogueManager : Singleton<DialogueManager>
         currentDialogueID = dialogueID;
         onDialogueComplete = onComplete;
         eventConfig = ConfigComponent.Instance.Get<EventConfig>(eventId);
-        PlayDialogue(dialogueID);
+        if (eventConfig.EventType == 2)
+        {
+            EndDialogue1();
+        }
+        else
+        {
+            PlayDialogue(dialogueID);
+        }
+      
     }
 
     private void PlayDialogue(int dialogueID)

Assets/Scripts/GameLogic/EventManager/EventSystemManager.cs

@@ -29,6 +29,8 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
     public bool isOpenUi;
 
+    Action onCompleteCallback;
+
     public void CustomInit(IDialogueMono dialogueMono)
     {
         eventConfigs = ConfigComponent.Instance.GetAll<EventConfig>().ToList();
@@ -207,10 +209,12 @@ public class EventSystemManager : Singleton<EventSystemManager>
     /// <summary>
     /// 触发事件
     /// </summary>
-    public void TriggerEvent(AccountFileInfo.EventList evt)
+    public async CTask TriggerEvent(AccountFileInfo.EventList evt, Action oncompleteCallBack = null)
     {
         if (isTriggerEvent)
             return;
+        CTask cTask = CTask.Create();
+        this.onCompleteCallback = oncompleteCallBack;
         isTriggerEvent = true;
         EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(evt.eventID);
         LogTool.Log($"触发事件: {LanguageManager.Instance.Text(eventConfig.Description)} (ID: {eventConfig.ID}, 品质: {eventConfig.EventQuality})");
@@ -227,7 +231,12 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
         CurrentEventList = evt;
         dialogueMono.ChangeComabtState(CombatController.idle);
-        DialogueManager.Instance.StartDialogue(dialogueID, eventConfig.ID, () => { CompleteEvent(CurrentEventList); });
+        DialogueManager.Instance.StartDialogue(dialogueID, eventConfig.ID, () =>
+        {
+            CompleteEvent(CurrentEventList);
+            cTask.SetResult();
+        });
+        await cTask;
     }
 
     /// <summary>
@@ -326,6 +335,8 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
         EventManager.Instance.Dispatch(CustomEventType.CompleteEvent, null);
         dialogueMono.ChangeComabtState(CombatController.update);
+        onCompleteCallback?.Invoke();
+        onCompleteCallback = null;
     }
 
     public void RemoveEvent(AccountFileInfo.EventList eventList)

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

@@ -11,7 +11,7 @@ namespace Fort23.Mono
     [UIBinding(prefab = "AppBarPanel")]
     public partial class AppBarPanel : UIPanel
     {
-        UIPanel currentOpenUIPanel;
+        public UIPanel currentOpenUIPanel;
 
         private void Init()
         {
@@ -36,7 +36,7 @@ namespace Fort23.Mono
 
         public override void AddButtonEvent()
         {
-            bnt_shengShi.onClick.AddListener(Bnt_shengShi_onClick);
+            bnt_shengShi.onClick.AddListener(() => { DivineSenceInfoPanel.OpenPanel(() => { Bnt_shengShi_onClick(); }); });
             Btn_GongFa.onClick.AddListener(async () =>
             {
                 if (currentOpenUIPanel is SkillSelectPanel)
@@ -46,7 +46,6 @@ namespace Fort23.Mono
 
                 UIManager.Instance.HideUIUIPanel(currentOpenUIPanel);
                 SkillSelectPanel skillSelectPanel = await SkillSelectPanel.OpenSkillSelectPanel();
-                currentOpenUIPanel = skillSelectPanel;
             });
             Btn_HeroInfomation.onClick.AddListener(async () =>
             {
@@ -58,7 +57,6 @@ namespace Fort23.Mono
                 UIManager.Instance.HideUIUIPanel(currentOpenUIPanel);
                 EventSystemManager.Instance.isOpenUi = true;
                 MainHeroPanel mainHeroPanel = await MainHeroPanel.OpenPanel();
-                currentOpenUIPanel = mainHeroPanel;
                 await mainHeroPanel.UIClosed();
                 EventSystemManager.Instance.isOpenUi = false;
             });
@@ -73,7 +71,6 @@ namespace Fort23.Mono
                 EventSystemManager.Instance.isOpenUi = true;
                 CombatDrive.Instance.CombatController.isUpdate = false;
                 HeroInformationPanel heroInformationPanel = await HeroInformationPanel.OpenPanel();
-                currentOpenUIPanel = heroInformationPanel;
                 await heroInformationPanel.UIClosed();
                 CombatDrive.Instance.CombatController.isUpdate = true;
                 EventSystemManager.Instance.isOpenUi = false;
@@ -108,43 +105,29 @@ namespace Fort23.Mono
                 .playerHeroEntity.GameObject.transform);
             List<AccountFileInfo.EventList> eventLists = EventSystemManager.Instance.UseDivinesense(1);
             await TimerComponent.Instance.WaitAsync(800);
+            EventSystemManager.Instance.isTriggerEvent = false;
             if (eventLists == null || eventLists.Count == 0)
             {
-                EventSystemManager.Instance.isTriggerEvent = false;
                 CombatDrive.Instance.CombatController.ChangeState(CombatController.update);
                 return;
             }
 
 
-            List<AccountFileInfo.EventList> reeultEventLists = new List<AccountFileInfo.EventList>();
-            reeultEventLists = eventLists.Where((el) =>
-            {
-                EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(el.eventID);
-                return eventConfig.EventType == 2;
-            }).ToList();
-
-            int count = eventLists.Count;
-            if (reeultEventLists != null && reeultEventLists.Count > 0)
+            if (eventLists != null && eventLists.Count > 0)
             {
-                foreach (var reeultEventList in reeultEventLists)
-                {
-                    EventSystemManager.Instance.CompleteEvent(reeultEventList, true);
-                    eventLists.Remove(reeultEventList);
-                }
+                EventSystemManager.Instance.isOpenUi = true;
 
                 DivineSenceEventResultPanel divineSenceEventResultPanel =
-                    await DivineSenceEventResultPanel.OpenPanel(reeultEventLists, count);
+                    await DivineSenceEventResultPanel.OpenPanel(eventLists);
                 await divineSenceEventResultPanel.UIClosed();
+                EventSystemManager.Instance.isOpenUi = false;
             }
 
-            EventSystemManager.Instance.isTriggerEvent = false;
+
             CombatDrive.Instance.CombatController.ChangeState(CombatController.update);
             AccountFileInfo.Instance.playerData.eventList.AddRange(eventLists);
             AccountFileInfo.Instance.SavePlayerData();
             EventManager.Instance.Dispatch(CustomEventType.ShengShiOnClick, null);
-            // Text_EventNum.text = AccountFileInfo.Instance.playerData.eventList.Count.ToString();
-            // ChagneShenshiBtnActive();
-            // CreatShengShiEvent();
         }
 
         public void CustomInit(UIPanel uiPanel)
@@ -158,6 +141,7 @@ namespace Fort23.Mono
             {
                 Btn_Back.gameObject.SetActive(true);
                 bnt_shengShi.gameObject.SetActive(false);
+                currentOpenUIPanel = uiPanel;
             }
         }
 

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

@@ -32,7 +32,7 @@ namespace Fort23.Mono
 
         private void Init()
         {
-            isAddStack = false;
+            isAddStack = true;
             IsShowAppBar = false;
         }
 

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

@@ -38,7 +38,7 @@ namespace Fort23.Mono
         public static async CTask<SkillSelectPanel> OpenSkillSelectPanel()
         {
             CombatDrive.Instance.CombatController.isUpdate = false;
-            SkillSelectPanel skillSelectPanel  = await UIManager.Instance.LoadAndOpenPanel<SkillSelectPanel>(null, UILayer.Middle);
+            SkillSelectPanel skillSelectPanel = await UIManager.Instance.LoadAndOpenPanel<SkillSelectPanel>(null, UILayer.Middle);
             return skillSelectPanel;
         }
 
@@ -52,9 +52,11 @@ namespace Fort23.Mono
             {
                 AppBarPanel.ClosePanel();
             }
+
             // AppBarPanel.OpenPanel(this);
             return base.GetFocus();
         }
+
         public override CTask LoseFocus()
         {
             // AppBarPanel.ClosePanel();
@@ -551,7 +553,7 @@ namespace Fort23.Mono
                     dianjiSkillKongWidget = skillKongWidget;
                     Btn_RemoveGongFa.transform.position = dianjiSkillKongWidget.RemovePos.position;
                     Btn_RemoveGongFa.gameObject.SetActive(true);
-                    SelectSkill(skillKongWidget.SkillInfo,false);
+                    SelectSkill(skillKongWidget.SkillInfo, false);
                 }
                 else
                 {
@@ -712,11 +714,11 @@ namespace Fort23.Mono
                 Btn_RemoveGongFa.gameObject.SetActive(false);
                 if (count >= 4)
                 {
-                    SelectSkill(skillWidget.skillConfigId,true);
+                    SelectSkill(skillWidget.skillConfigId, true);
                 }
                 else
                 {
-                    SelectSkill(skillWidget.skillConfigId,false);
+                    SelectSkill(skillWidget.skillConfigId, false);
                 }
             }
         }
@@ -751,7 +753,7 @@ namespace Fort23.Mono
             Icon_Select.gameObject.SetActive(false);
             _wuXingGongFaWidgets.Clear();
             CloseSelect();
-            ChangeInfoType(1);
+            // ChangeInfoType(1);
             base.Close();
         }
     }

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

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

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

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

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

@@ -8,17 +8,6 @@ namespace Fort23.Mono
 	public partial class DivineSenceEventResultPanel 
 	{
 	  #region 自定义数据 
-	  private Object _myButton;
-	  public Object myButton
-	   {
-	   get{
-	      if (_myButton == null)
-	       {
-	         _myButton  = GetUIUnit<Object>("myButton"); 
-	       }
-	      return _myButton;
-	     }
-	   }
 	  private MyImage _bg;
 	  public MyImage bg
 	   {
@@ -63,37 +52,15 @@ namespace Fort23.Mono
 	      return _Btn_Close;
 	     }
 	   }
-	  private Text _Text_AllEvent;
-	  public Text Text_AllEvent
-	   {
-	   get{
-	      if (_Text_AllEvent == null)
-	       {
-	         _Text_AllEvent  = GetUIUnit<Text>("Text_AllEvent"); 
-	       }
-	      return _Text_AllEvent;
-	     }
-	   }
-	  private Text _Text_Teshu;
-	  public Text Text_Teshu
-	   {
-	   get{
-	      if (_Text_Teshu == null)
-	       {
-	         _Text_Teshu  = GetUIUnit<Text>("Text_Teshu"); 
-	       }
-	      return _Text_Teshu;
-	     }
-	   }
-	  private Text _Text_Result;
-	  public Text Text_Result
+	  private Button _Btn_Ok;
+	  public Button Btn_Ok
 	   {
 	   get{
-	      if (_Text_Result == null)
+	      if (_Btn_Ok == null)
 	       {
-	         _Text_Result  = GetUIUnit<Text>("Text_Result"); 
+	         _Btn_Ok  = GetUIUnit<Button>("Btn_Ok"); 
 	       }
-	      return _Text_Result;
+	      return _Btn_Ok;
 	     }
 	   }
 	  #endregion 自定义数据结束 

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

@@ -0,0 +1,45 @@
+using System;
+using Fort23.Core;
+
+namespace Fort23.Mono
+{
+    [UIBinding(prefab = "DivineSenceInfoPanel")]
+    public partial class DivineSenceInfoPanel : UIPanel
+    {
+        private Action callback;
+
+        private void Init()
+        {
+        }
+
+        protected override void AddEvent()
+        {
+        }
+
+        protected override void DelEvent()
+        {
+        }
+
+        public override void AddButtonEvent()
+        {
+            Btn_Ok.onClick.AddListener(() =>
+            {
+                callback?.Invoke();
+                UIManager.Instance.HideUIUIPanel(this);
+            });
+            Btn_Back.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
+            Btn_Close.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
+        }
+
+        public void CustomInit(Action callback)
+        {
+            this.callback = callback;
+        }
+
+        public async static CTask OpenPanel(Action callback)
+        {
+            DivineSenceInfoPanel divineSenceInfoPanel = await UIManager.Instance.LoadAndOpenPanel<DivineSenceInfoPanel>(null, UILayer.Top);
+            divineSenceInfoPanel.CustomInit(callback);
+        }
+    }
+}

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

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: WytJ4S2lBn9HmNn+Ax/7k4P+vbh1bHX4mJRpu4O63tnvISwvxB0qGOL/fXg8
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

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

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

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

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

@@ -6,82 +6,70 @@ using UnityEngine;
 
 namespace Fort23.Mono
 {
-	[UIBinding(prefab = "ShengShiEventWidgetType3"  )]
-	public partial class ShengShiEventWidgetType3 : UIComponent , IScorllListWidget
-	{
-		private void Init()
-		{
-		}
-		public override void AddEvent()
-		{
-		}
-		public override void DelEvent()
-		{
-		}	public override void AddButtonEvent()
-		{
-			base.AddButtonEvent();
-			
-		}
-		
-		List<WidgetItem> widgetList = new List<WidgetItem>();
+    [UIBinding(prefab = "ShengShiEventWidgetType3")]
+    public partial class ShengShiEventWidgetType3 : ItemWidgetBasic
+    {
+        private void Init()
+        {
+        }
 
-		private void Button_onClick()
-		{
+        public override void AddEvent()
+        {
+        }
 
-		}
+        public override void DelEvent()
+        {
+        }
 
-		private EventConfig randomEventConfig;
-		public AccountFileInfo.EventList eventList;
+        public override void AddButtonEvent()
+        {
+            base.AddButtonEvent();
+        }
 
-		public async void CustomInit(AccountFileInfo.EventList eventList)
-		{
-			for (var i = 0; i < widgetList.Count; i++)
-			{
-				UIManager.Instance.DormancyGComponent(widgetList[i]);
-			}
-			widgetList.Clear();
+        List<WidgetItem> widgetList = new List<WidgetItem>();
 
-			this.eventList = eventList;
-			randomEventConfig = ConfigComponent.Instance.Get<EventConfig>(eventList.eventID);
-			Text_EventName.text = LanguageManager.Instance.Text(randomEventConfig.Description);
-			EventConditionConfig conditionConfig = ConfigComponent.Instance.Get<EventConditionConfig>(randomEventConfig.EventBeginId);
-			Text_EventDesc.text = LanguageManager.Instance.Text(conditionConfig.LanID[0]);
-			
-			if (conditionConfig.optionType ==3)
-			{
-				for (var i = 0; i < conditionConfig.PrizeIDs.Length; i++)
-				{
-					WidgetItem widgetItem = await UIManager.Instance.CreateGComponent<WidgetItem>(null, ItemRoot);
-					widgetList.Add(widgetItem);
-				}
-			}
-			
-			
+        private void Button_onClick()
+        {
+        }
 
-		}
+        private EventConfig randomEventConfig;
+        public AccountFileInfo.EventList eventList;
 
-		public override void DormancyObj()
-		{
-			for (var i = 0; i < widgetList.Count; i++)
-			{
-				UIManager.Instance.DormancyGComponent(widgetList[i]);
-			}
-			widgetList.Clear();
+        public async void CustomInit(AccountFileInfo.EventList eventList)
+        {
+            for (var i = 0; i < widgetList.Count; i++)
+            {
+                UIManager.Instance.DormancyGComponent(widgetList[i]);
+            }
 
-			base.DormancyObj();
-		}
+            widgetList.Clear();
 
+            this.eventList = eventList;
+            randomEventConfig = ConfigComponent.Instance.Get<EventConfig>(eventList.eventID);
+            Text_EventName.text = LanguageManager.Instance.Text(randomEventConfig.Description);
+            EventConditionConfig conditionConfig = ConfigComponent.Instance.Get<EventConditionConfig>(randomEventConfig.EventBeginId);
+            Text_EventDesc.text = LanguageManager.Instance.Text(conditionConfig.LanID[0]);
 
-		public RectTransform Transform
-		{
-			get { return transform; }
-		}
+            if (conditionConfig.optionType == 3)
+            {
+                for (var i = 0; i < conditionConfig.PrizeIDs.Length; i++)
+                {
+                    WidgetItem widgetItem = await UIManager.Instance.CreateGComponent<WidgetItem>(null, ItemRoot);
+                    widgetList.Add(widgetItem);
+                }
+            }
+        }
 
-		public int index { get; set; }
+        public override void DormancyObj()
+        {
+            for (var i = 0; i < widgetList.Count; i++)
+            {
+                UIManager.Instance.DormancyGComponent(widgetList[i]);
+            }
 
-		public virtual Vector2 GetSize()
-		{
-			return transform.sizeDelta;
-		}
-	}
-}
+            widgetList.Clear();
+
+            base.DormancyObj();
+        }
+    }
+}

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

@@ -37,7 +37,7 @@ namespace Fort23.Mono
         
         public override CTask GetFocus()
         {
-            AppBarPanel.OpenPanel(this);
+             AppBarPanel.OpenPanel(this);
             return base.GetFocus();
         }
         

Assets/Scripts/GameUI/UI/MainPanel/MainPanel.cs

@@ -30,6 +30,7 @@ namespace Fort23.Mono
             AppBarPanel.OpenPanel(this);
             return base.GetFocus();
         }
+
         private void RemoveEvent(IEventData e)
         {
             Text_EventNum.text = AccountFileInfo.Instance.playerData.eventList.Count.ToString();
@@ -171,7 +172,6 @@ namespace Fort23.Mono
                 return eventConfig.EventType == 2;
             }).ToList();
 
-            int count = eventLists.Count;
             if (reeultEventLists != null && reeultEventLists.Count > 0)
             {
                 foreach (var reeultEventList in reeultEventLists)
@@ -180,7 +180,7 @@ namespace Fort23.Mono
                     eventLists.Remove(reeultEventList);
                 }
 
-                DivineSenceEventResultPanel divineSenceEventResultPanel = await DivineSenceEventResultPanel.OpenPanel(reeultEventLists, count);
+                DivineSenceEventResultPanel divineSenceEventResultPanel = await DivineSenceEventResultPanel.OpenPanel(reeultEventLists);
                 await divineSenceEventResultPanel.UIClosed();
             }
 

美术/unity_use_ui/TextrueJson/battle.txt

@@ -1 +1 @@
-{"packName":"battle","isTyPack":false,"newTextureJson":[{"textrueName":"bg_dz_jht1","filePath":"/bg/bg_dz_jht1.png"},{"textrueName":"dec_dazuo","filePath":"/decorate/dec_dazuo.png"},{"textrueName":"dec_gf_di_xingchendao","filePath":"/decorate/dec_gf_di_xingchendao.png"},{"textrueName":"dec_loading_05","filePath":"/decorate/dec_loading_05.png"},{"textrueName":"dec_name_01","filePath":"/decorate/dec_name_01.png"},{"textrueName":"dec_name_02","filePath":"/decorate/dec_name_02.png"},{"textrueName":"dec_slot_01","filePath":"/decorate/dec_slot_01.png"},{"textrueName":"dec_slot_02","filePath":"/decorate/dec_slot_02.png"},{"textrueName":"dec_slot_03","filePath":"/decorate/dec_slot_03.png"}],"keyToValue":{}}
+{"packName":"battle","isTyPack":false,"newTextureJson":[{"textrueName":"bg_dz_jht1","filePath":"/bg/bg_dz_jht1.png"},{"textrueName":"dec_boss_xuetiao","filePath":"/decorate/dec_boss_xuetiao.png"},{"textrueName":"dec_dazuo","filePath":"/decorate/dec_dazuo.png"},{"textrueName":"dec_diyuan","filePath":"/decorate/dec_diyuan.png"},{"textrueName":"dec_fb1","filePath":"/decorate/dec_fb1.png"},{"textrueName":"dec_fb2","filePath":"/decorate/dec_fb2.png"},{"textrueName":"dec_fb3","filePath":"/decorate/dec_fb3.png"},{"textrueName":"dec_fb4","filePath":"/decorate/dec_fb4.png"},{"textrueName":"dec_gf_di_xingchendao","filePath":"/decorate/dec_gf_di_xingchendao.png"},{"textrueName":"dec_huo","filePath":"/decorate/dec_huo.png"},{"textrueName":"dec_jin","filePath":"/decorate/dec_jin.png"},{"textrueName":"dec_mu","filePath":"/decorate/dec_mu.png"},{"textrueName":"dec_name_01","filePath":"/decorate/dec_name_01.png"},{"textrueName":"dec_name_02","filePath":"/decorate/dec_name_02.png"},{"textrueName":"dec_shui","filePath":"/decorate/dec_shui.png"},{"textrueName":"dec_slot_01","filePath":"/decorate/dec_slot_01.png"},{"textrueName":"dec_slot_02","filePath":"/decorate/dec_slot_02.png"},{"textrueName":"dec_slot_03","filePath":"/decorate/dec_slot_03.png"},{"textrueName":"dec_tu","filePath":"/decorate/dec_tu.png"},{"textrueName":"dec_tx","filePath":"/decorate/dec_tx.png"},{"textrueName":"dec_yuandian","filePath":"/decorate/dec_yuandian.png"},{"textrueName":"dec_yuanhuan1","filePath":"/decorate/dec_yuanhuan1.png"},{"textrueName":"dec_yuanhuan2","filePath":"/decorate/dec_yuanhuan2.png"},{"textrueName":"dec_yuanhuan_quse","filePath":"/decorate/dec_yuanhuan_quse.png"},{"textrueName":"dec_yuanhuhei","filePath":"/decorate/dec_yuanhuhei.png"},{"textrueName":"dec_yuanhuhong","filePath":"/decorate/dec_yuanhuhong.png"},{"textrueName":"dec_yuanhulv","filePath":"/decorate/dec_yuanhulv.png"},{"textrueName":"dec_zanting","filePath":"/decorate/dec_zanting.png"}],"keyToValue":{}}