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

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

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

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

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

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

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

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

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

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

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

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

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

Assets/Res/Config/DivineSenseConfig.json

@@ -10,254 +10,254 @@
         0.0,
         0.0
       ],
-      "exp": 1000,
+      "exp": 500,
       "MaxNum": 2
     },
     {
       "ID": 2,
       "QualityBonusChance": [
-        685.0,
-        210.0,
-        105.0,
+        676.0,
+        216.0,
+        108.0,
         0.0,
         0.0,
         0.0
       ],
-      "exp": 3000,
+      "exp": 500,
       "MaxNum": 3
     },
     {
       "ID": 3,
       "QualityBonusChance": [
-        670.0,
-        220.0,
-        110.0,
+        649.0,
+        234.0,
+        117.0,
         0.0,
         0.0,
         0.0
       ],
-      "exp": 6000,
+      "exp": 500,
       "MaxNum": 4
     },
     {
       "ID": 4,
       "QualityBonusChance": [
-        655.0,
-        230.0,
-        115.0,
+        622.0,
+        252.0,
+        126.0,
         0.0,
         0.0,
         0.0
       ],
-      "exp": 10000,
+      "exp": 500,
       "MaxNum": 5
     },
     {
       "ID": 5,
       "QualityBonusChance": [
-        635.0,
-        240.0,
-        120.0,
-        5.0,
+        595.0,
+        270.0,
+        135.0,
+        0.0,
         0.0,
         0.0
       ],
-      "exp": 15000,
+      "exp": 1000,
       "MaxNum": 6
     },
     {
       "ID": 6,
       "QualityBonusChance": [
-        615.0,
-        250.0,
-        125.0,
-        10.0,
+        550.0,
+        288.0,
+        144.0,
+        18.0,
         0.0,
         0.0
       ],
-      "exp": 21000,
+      "exp": 1000,
       "MaxNum": 6
     },
     {
       "ID": 7,
       "QualityBonusChance": [
-        595.0,
-        260.0,
-        130.0,
-        15.0,
+        515.0,
+        306.0,
+        153.0,
+        26.0,
         0.0,
         0.0
       ],
-      "exp": 27000,
+      "exp": 1000,
       "MaxNum": 6
     },
     {
       "ID": 8,
       "QualityBonusChance": [
-        575.0,
-        270.0,
-        135.0,
-        20.0,
+        480.0,
+        324.0,
+        162.0,
+        34.0,
         0.0,
         0.0
       ],
-      "exp": 33000,
+      "exp": 1000,
       "MaxNum": 6
     },
     {
       "ID": 9,
       "QualityBonusChance": [
-        555.0,
-        280.0,
-        140.0,
-        25.0,
+        445.0,
+        342.0,
+        171.0,
+        42.0,
         0.0,
         0.0
       ],
-      "exp": 39000,
+      "exp": 2000,
       "MaxNum": 6
     },
     {
       "ID": 10,
       "QualityBonusChance": [
-        531.0,
-        290.0,
-        145.0,
-        30.0,
-        4.0,
+        410.0,
+        360.0,
+        180.0,
+        50.0,
+        0.0,
         0.0
       ],
-      "exp": 45000,
+      "exp": 2000,
       "MaxNum": 6
     },
     {
       "ID": 11,
       "QualityBonusChance": [
-        507.0,
-        300.0,
-        150.0,
-        35.0,
-        8.0,
+        369.0,
+        378.0,
+        189.0,
+        58.0,
+        6.0,
         0.0
       ],
-      "exp": 51000,
+      "exp": 2000,
       "MaxNum": 6
     },
     {
       "ID": 12,
       "QualityBonusChance": [
-        483.0,
-        310.0,
-        155.0,
-        40.0,
+        328.0,
+        396.0,
+        198.0,
+        66.0,
         12.0,
         0.0
       ],
-      "exp": 57000,
+      "exp": 2000,
       "MaxNum": 6
     },
     {
       "ID": 13,
       "QualityBonusChance": [
-        459.0,
-        320.0,
-        160.0,
-        45.0,
-        16.0,
+        287.0,
+        414.0,
+        207.0,
+        74.0,
+        18.0,
         0.0
       ],
-      "exp": 63000,
+      "exp": 2000,
       "MaxNum": 6
     },
     {
       "ID": 14,
       "QualityBonusChance": [
-        435.0,
-        330.0,
-        165.0,
-        50.0,
-        20.0,
+        246.0,
+        432.0,
+        216.0,
+        82.0,
+        24.0,
         0.0
       ],
-      "exp": 69000,
+      "exp": 2000,
       "MaxNum": 6
     },
     {
       "ID": 15,
       "QualityBonusChance": [
-        411.0,
-        340.0,
-        170.0,
-        55.0,
-        24.0,
+        205.0,
+        450.0,
+        225.0,
+        90.0,
+        30.0,
         0.0
       ],
-      "exp": 75000,
+      "exp": 2000,
       "MaxNum": 6
     },
     {
       "ID": 16,
       "QualityBonusChance": [
-        387.0,
-        350.0,
-        175.0,
-        60.0,
-        28.0,
+        164.0,
+        468.0,
+        234.0,
+        98.0,
+        36.0,
         0.0
       ],
-      "exp": 81000,
+      "exp": 2000,
       "MaxNum": 6
     },
     {
       "ID": 17,
       "QualityBonusChance": [
-        363.0,
-        360.0,
-        180.0,
-        65.0,
-        32.0,
+        123.0,
+        486.0,
+        243.0,
+        106.0,
+        42.0,
         0.0
       ],
-      "exp": 87000,
+      "exp": 2000,
       "MaxNum": 6
     },
     {
       "ID": 18,
       "QualityBonusChance": [
-        339.0,
-        370.0,
-        185.0,
-        70.0,
-        36.0,
+        82.0,
+        504.0,
+        252.0,
+        114.0,
+        48.0,
         0.0
       ],
-      "exp": 93000,
+      "exp": 2000,
       "MaxNum": 6
     },
     {
       "ID": 19,
       "QualityBonusChance": [
-        315.0,
-        380.0,
-        190.0,
-        75.0,
-        40.0,
+        41.0,
+        522.0,
+        261.0,
+        122.0,
+        54.0,
         0.0
       ],
-      "exp": 99000,
+      "exp": 2000,
       "MaxNum": 6
     },
     {
       "ID": 20,
       "QualityBonusChance": [
-        291.0,
-        390.0,
-        195.0,
-        80.0,
-        44.0,
+        0.0,
+        540.0,
+        270.0,
+        130.0,
+        60.0,
         0.0
       ],
-      "exp": 105000,
+      "exp": 1000000,
       "MaxNum": 6
     }
   ]

Assets/Res/Config/DropConfig.json

@@ -61,93 +61,113 @@
       ]
     },
     {
-      "ID": 1201,
+      "ID": 1007,
       "dropGroupID": [
-        1201
+        1007
       ],
       "dropType": 3,
       "showItemId": [
-        1201
+        1007
       ]
     },
     {
-      "ID": 1202,
+      "ID": 1101,
       "dropGroupID": [
-        1202
+        1101
       ],
       "dropType": 3,
       "showItemId": [
-        1202
+        1101
       ]
     },
     {
-      "ID": 1203,
+      "ID": 1102,
       "dropGroupID": [
-        1203
+        1102
       ],
       "dropType": 3,
       "showItemId": [
-        1203
+        1102
       ]
     },
     {
-      "ID": 1204,
+      "ID": 1103,
       "dropGroupID": [
-        1204
+        1103
       ],
       "dropType": 3,
       "showItemId": [
-        1204
+        1103
+      ]
+    },
+    {
+      "ID": 1104,
+      "dropGroupID": [
+        1104
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1104
+      ]
+    },
+    {
+      "ID": 1105,
+      "dropGroupID": [
+        1105
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1105
       ]
     },
     {
-      "ID": 1205,
+      "ID": 1106,
       "dropGroupID": [
-        1205
+        1106
       ],
       "dropType": 3,
       "showItemId": [
-        1205
+        1106
       ]
     },
     {
-      "ID": 1206,
+      "ID": 1201,
       "dropGroupID": [
-        1206
+        1201
       ],
       "dropType": 3,
       "showItemId": [
-        1206
+        1201
       ]
     },
     {
-      "ID": 1207,
+      "ID": 1202,
       "dropGroupID": [
-        1207
+        1202
       ],
       "dropType": 3,
       "showItemId": [
-        1207
+        1202
       ]
     },
     {
-      "ID": 1208,
+      "ID": 1203,
       "dropGroupID": [
-        1208
+        1203
       ],
       "dropType": 3,
       "showItemId": [
-        1208
+        1203
       ]
     },
     {
-      "ID": 1209,
+      "ID": 1204,
       "dropGroupID": [
-        1209
+        1204
       ],
       "dropType": 3,
       "showItemId": [
-        1209
+        1204
       ]
     },
     {
@@ -190,6 +210,56 @@
         1304
       ]
     },
+    {
+      "ID": 1305,
+      "dropGroupID": [
+        1305
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1305
+      ]
+    },
+    {
+      "ID": 1306,
+      "dropGroupID": [
+        1306
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1306
+      ]
+    },
+    {
+      "ID": 1307,
+      "dropGroupID": [
+        1307
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1307
+      ]
+    },
+    {
+      "ID": 1308,
+      "dropGroupID": [
+        1308
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1308
+      ]
+    },
+    {
+      "ID": 1309,
+      "dropGroupID": [
+        1309
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1309
+      ]
+    },
     {
       "ID": 1401,
       "dropGroupID": [
@@ -260,6 +330,36 @@
         1601
       ]
     },
+    {
+      "ID": 1701,
+      "dropGroupID": [
+        1701
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1701
+      ]
+    },
+    {
+      "ID": 1702,
+      "dropGroupID": [
+        1702
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1702
+      ]
+    },
+    {
+      "ID": 1703,
+      "dropGroupID": [
+        1703
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1703
+      ]
+    },
     {
       "ID": 10001,
       "dropGroupID": [
@@ -830,6 +930,96 @@
         12510
       ]
     },
+    {
+      "ID": 12511,
+      "dropGroupID": [
+        12511
+      ],
+      "dropType": 3,
+      "showItemId": [
+        12511
+      ]
+    },
+    {
+      "ID": 12512,
+      "dropGroupID": [
+        12512
+      ],
+      "dropType": 3,
+      "showItemId": [
+        12512
+      ]
+    },
+    {
+      "ID": 12513,
+      "dropGroupID": [
+        12513
+      ],
+      "dropType": 3,
+      "showItemId": [
+        12513
+      ]
+    },
+    {
+      "ID": 12514,
+      "dropGroupID": [
+        12514
+      ],
+      "dropType": 3,
+      "showItemId": [
+        12514
+      ]
+    },
+    {
+      "ID": 12515,
+      "dropGroupID": [
+        12515
+      ],
+      "dropType": 3,
+      "showItemId": [
+        12515
+      ]
+    },
+    {
+      "ID": 12516,
+      "dropGroupID": [
+        12516
+      ],
+      "dropType": 3,
+      "showItemId": [
+        12516
+      ]
+    },
+    {
+      "ID": 12517,
+      "dropGroupID": [
+        12517
+      ],
+      "dropType": 3,
+      "showItemId": [
+        12517
+      ]
+    },
+    {
+      "ID": 12518,
+      "dropGroupID": [
+        12518
+      ],
+      "dropType": 3,
+      "showItemId": [
+        12518
+      ]
+    },
+    {
+      "ID": 12519,
+      "dropGroupID": [
+        12519
+      ],
+      "dropType": 3,
+      "showItemId": [
+        12519
+      ]
+    },
     {
       "ID": 13001,
       "dropGroupID": [
@@ -1180,6 +1370,96 @@
         13510
       ]
     },
+    {
+      "ID": 13511,
+      "dropGroupID": [
+        13511
+      ],
+      "dropType": 3,
+      "showItemId": [
+        13511
+      ]
+    },
+    {
+      "ID": 13512,
+      "dropGroupID": [
+        13512
+      ],
+      "dropType": 3,
+      "showItemId": [
+        13512
+      ]
+    },
+    {
+      "ID": 13513,
+      "dropGroupID": [
+        13513
+      ],
+      "dropType": 3,
+      "showItemId": [
+        13513
+      ]
+    },
+    {
+      "ID": 13514,
+      "dropGroupID": [
+        13514
+      ],
+      "dropType": 3,
+      "showItemId": [
+        13514
+      ]
+    },
+    {
+      "ID": 13515,
+      "dropGroupID": [
+        13515
+      ],
+      "dropType": 3,
+      "showItemId": [
+        13515
+      ]
+    },
+    {
+      "ID": 13516,
+      "dropGroupID": [
+        13516
+      ],
+      "dropType": 3,
+      "showItemId": [
+        13516
+      ]
+    },
+    {
+      "ID": 13517,
+      "dropGroupID": [
+        13517
+      ],
+      "dropType": 3,
+      "showItemId": [
+        13517
+      ]
+    },
+    {
+      "ID": 13518,
+      "dropGroupID": [
+        13518
+      ],
+      "dropType": 3,
+      "showItemId": [
+        13518
+      ]
+    },
+    {
+      "ID": 13519,
+      "dropGroupID": [
+        13519
+      ],
+      "dropType": 3,
+      "showItemId": [
+        13519
+      ]
+    },
     {
       "ID": 20001,
       "dropGroupID": [
@@ -1211,27 +1491,113 @@
       ]
     },
     {
-      "ID": 999001,
+      "ID": 20004,
       "dropGroupID": [
-        1,
-        2,
-        3
+        20004
       ],
-      "dropType": 2,
+      "dropType": 3,
       "showItemId": [
-        10001
+        20004
       ]
     },
     {
-      "ID": 999002,
+      "ID": 20005,
       "dropGroupID": [
-        4,
-        5,
-        6
+        20005
       ],
-      "dropType": 2,
+      "dropType": 3,
       "showItemId": [
-        12001
+        20005
+      ]
+    },
+    {
+      "ID": 20006,
+      "dropGroupID": [
+        20006
+      ],
+      "dropType": 3,
+      "showItemId": [
+        20006
+      ]
+    },
+    {
+      "ID": 20007,
+      "dropGroupID": [
+        20007
+      ],
+      "dropType": 3,
+      "showItemId": [
+        20007
+      ]
+    },
+    {
+      "ID": 20008,
+      "dropGroupID": [
+        20008
+      ],
+      "dropType": 3,
+      "showItemId": [
+        20008
+      ]
+    },
+    {
+      "ID": 20009,
+      "dropGroupID": [
+        20009
+      ],
+      "dropType": 3,
+      "showItemId": [
+        20009
+      ]
+    },
+    {
+      "ID": 20010,
+      "dropGroupID": [
+        20010
+      ],
+      "dropType": 3,
+      "showItemId": [
+        20010
+      ]
+    },
+    {
+      "ID": 20011,
+      "dropGroupID": [
+        20011
+      ],
+      "dropType": 3,
+      "showItemId": [
+        20011
+      ]
+    },
+    {
+      "ID": 20012,
+      "dropGroupID": [
+        20012
+      ],
+      "dropType": 3,
+      "showItemId": [
+        20012
+      ]
+    },
+    {
+      "ID": 20013,
+      "dropGroupID": [
+        20013
+      ],
+      "dropType": 3,
+      "showItemId": [
+        20013
+      ]
+    },
+    {
+      "ID": 20014,
+      "dropGroupID": [
+        20014
+      ],
+      "dropType": 3,
+      "showItemId": [
+        20014
       ]
     },
     {
@@ -1434,6 +1800,70 @@
         22007
       ]
     },
+    {
+      "ID": 23001,
+      "dropGroupID": [
+        23001
+      ],
+      "dropType": 3,
+      "showItemId": [
+        23001
+      ]
+    },
+    {
+      "ID": 23002,
+      "dropGroupID": [
+        23002
+      ],
+      "dropType": 3,
+      "showItemId": [
+        23002
+      ]
+    },
+    {
+      "ID": 23101,
+      "dropGroupID": [
+        23101
+      ],
+      "dropType": 3,
+      "showItemId": [
+        23101
+      ]
+    },
+    {
+      "ID": 23102,
+      "dropGroupID": [
+        23102
+      ],
+      "dropType": 3,
+      "showItemId": [
+        23102
+      ]
+    },
+    {
+      "ID": 999001,
+      "dropGroupID": [
+        1,
+        2,
+        3
+      ],
+      "dropType": 2,
+      "showItemId": [
+        10001
+      ]
+    },
+    {
+      "ID": 999002,
+      "dropGroupID": [
+        4,
+        5,
+        6
+      ],
+      "dropType": 2,
+      "showItemId": [
+        12001
+      ]
+    },
     {
       "ID": 999003,
       "dropGroupID": [

Assets/Res/Config/EventConfig.json

@@ -19,7 +19,7 @@
         999001
       ],
       "PrizeNums": [
-        -1000,
+        -500,
         1
       ],
       "RefreshProbability": 10,
@@ -51,7 +51,7 @@
         999002
       ],
       "PrizeNums": [
-        -1000,
+        -500,
         1
       ],
       "RefreshProbability": 10,
@@ -83,7 +83,7 @@
         1001
       ],
       "PrizeNums": [
-        -1000,
+        -500,
         -5000
       ],
       "RefreshProbability": 100,
@@ -115,7 +115,7 @@
         1005
       ],
       "PrizeNums": [
-        -1000,
+        -500,
         -5000
       ],
       "RefreshProbability": 100,
@@ -147,7 +147,7 @@
         1006
       ],
       "PrizeNums": [
-        -1000,
+        -500,
         -5000
       ],
       "RefreshProbability": 100,
@@ -179,7 +179,7 @@
         1002
       ],
       "PrizeNums": [
-        -1000,
+        -500,
         100
       ],
       "RefreshProbability": 30,
@@ -211,7 +211,7 @@
         1004
       ],
       "PrizeNums": [
-        -1000,
+        -500,
         10
       ],
       "RefreshProbability": 20,
@@ -243,7 +243,7 @@
         1501
       ],
       "PrizeNums": [
-        -1000,
+        -500,
         1
       ],
       "RefreshProbability": 60,
@@ -275,7 +275,7 @@
         1601
       ],
       "PrizeNums": [
-        -1000,
+        -500,
         1
       ],
       "RefreshProbability": 40,
@@ -307,7 +307,7 @@
         999001
       ],
       "PrizeNums": [
-        -1100,
+        -750,
         1
       ],
       "RefreshProbability": 15,
@@ -339,7 +339,7 @@
         999002
       ],
       "PrizeNums": [
-        -1100,
+        -750,
         1
       ],
       "RefreshProbability": 15,
@@ -371,7 +371,7 @@
         1001
       ],
       "PrizeNums": [
-        -1100,
+        -750,
         -5000
       ],
       "RefreshProbability": 100,
@@ -403,7 +403,7 @@
         1005
       ],
       "PrizeNums": [
-        -1100,
+        -750,
         -5000
       ],
       "RefreshProbability": 100,
@@ -435,7 +435,7 @@
         1006
       ],
       "PrizeNums": [
-        -1100,
+        -750,
         -5000
       ],
       "RefreshProbability": 100,
@@ -467,7 +467,7 @@
         1002
       ],
       "PrizeNums": [
-        -1100,
+        -750,
         100
       ],
       "RefreshProbability": 35,
@@ -499,7 +499,7 @@
         1004
       ],
       "PrizeNums": [
-        -1100,
+        -750,
         10
       ],
       "RefreshProbability": 25,
@@ -531,7 +531,7 @@
         1501
       ],
       "PrizeNums": [
-        -1100,
+        -750,
         1
       ],
       "RefreshProbability": 65,
@@ -563,7 +563,7 @@
         1601
       ],
       "PrizeNums": [
-        -1100,
+        -750,
         1
       ],
       "RefreshProbability": 45,
@@ -595,7 +595,7 @@
         999001
       ],
       "PrizeNums": [
-        -1200,
+        -1500,
         1
       ],
       "RefreshProbability": 20,
@@ -627,7 +627,7 @@
         999002
       ],
       "PrizeNums": [
-        -1200,
+        -1500,
         1
       ],
       "RefreshProbability": 20,
@@ -659,7 +659,7 @@
         1001
       ],
       "PrizeNums": [
-        -1200,
+        -1500,
         -5000
       ],
       "RefreshProbability": 100,
@@ -691,7 +691,7 @@
         1005
       ],
       "PrizeNums": [
-        -1200,
+        -1500,
         -5000
       ],
       "RefreshProbability": 100,
@@ -723,7 +723,7 @@
         1006
       ],
       "PrizeNums": [
-        -1200,
+        -1500,
         -5000
       ],
       "RefreshProbability": 100,
@@ -755,7 +755,7 @@
         1002
       ],
       "PrizeNums": [
-        -1200,
+        -1500,
         100
       ],
       "RefreshProbability": 40,
@@ -787,7 +787,7 @@
         1004
       ],
       "PrizeNums": [
-        -1200,
+        -1500,
         10
       ],
       "RefreshProbability": 30,
@@ -819,7 +819,7 @@
         1501
       ],
       "PrizeNums": [
-        -1200,
+        -1500,
         1
       ],
       "RefreshProbability": 70,
@@ -851,7 +851,7 @@
         1601
       ],
       "PrizeNums": [
-        -1200,
+        -1500,
         1
       ],
       "RefreshProbability": 50,
@@ -883,7 +883,7 @@
         999001
       ],
       "PrizeNums": [
-        -1300,
+        -3000,
         1
       ],
       "RefreshProbability": 25,
@@ -915,7 +915,7 @@
         999002
       ],
       "PrizeNums": [
-        -1300,
+        -3000,
         1
       ],
       "RefreshProbability": 25,
@@ -947,7 +947,7 @@
         1001
       ],
       "PrizeNums": [
-        -1300,
+        -3000,
         -5000
       ],
       "RefreshProbability": 100,
@@ -979,7 +979,7 @@
         1005
       ],
       "PrizeNums": [
-        -1300,
+        -3000,
         -5000
       ],
       "RefreshProbability": 100,
@@ -1011,7 +1011,7 @@
         1006
       ],
       "PrizeNums": [
-        -1300,
+        -3000,
         -5000
       ],
       "RefreshProbability": 100,
@@ -1043,7 +1043,7 @@
         1002
       ],
       "PrizeNums": [
-        -1300,
+        -3000,
         100
       ],
       "RefreshProbability": 45,
@@ -1075,7 +1075,7 @@
         1004
       ],
       "PrizeNums": [
-        -1300,
+        -3000,
         10
       ],
       "RefreshProbability": 35,
@@ -1107,7 +1107,7 @@
         1501
       ],
       "PrizeNums": [
-        -1300,
+        -3000,
         1
       ],
       "RefreshProbability": 75,
@@ -1139,7 +1139,7 @@
         1601
       ],
       "PrizeNums": [
-        -1300,
+        -3000,
         1
       ],
       "RefreshProbability": 55,
@@ -1171,7 +1171,7 @@
         999001
       ],
       "PrizeNums": [
-        -1400,
+        -5000,
         1
       ],
       "RefreshProbability": 30,
@@ -1203,7 +1203,7 @@
         999002
       ],
       "PrizeNums": [
-        -1400,
+        -5000,
         1
       ],
       "RefreshProbability": 30,
@@ -1235,7 +1235,7 @@
         1001
       ],
       "PrizeNums": [
-        -1400,
+        -5000,
         -5000
       ],
       "RefreshProbability": 100,
@@ -1267,7 +1267,7 @@
         1005
       ],
       "PrizeNums": [
-        -1400,
+        -5000,
         -5000
       ],
       "RefreshProbability": 100,
@@ -1299,7 +1299,7 @@
         1006
       ],
       "PrizeNums": [
-        -1400,
+        -5000,
         -5000
       ],
       "RefreshProbability": 100,
@@ -1331,7 +1331,7 @@
         1002
       ],
       "PrizeNums": [
-        -1400,
+        -5000,
         100
       ],
       "RefreshProbability": 50,
@@ -1363,7 +1363,7 @@
         1004
       ],
       "PrizeNums": [
-        -1400,
+        -5000,
         10
       ],
       "RefreshProbability": 40,
@@ -1395,7 +1395,7 @@
         1501
       ],
       "PrizeNums": [
-        -1400,
+        -5000,
         1
       ],
       "RefreshProbability": 80,
@@ -1427,7 +1427,7 @@
         1601
       ],
       "PrizeNums": [
-        -1400,
+        -5000,
         1
       ],
       "RefreshProbability": 60,
@@ -4428,7 +4428,7 @@
       "EventType": 1,
       "Score": 0,
       "EventQuality": 3,
-      "RefreshProbability": 30,
+      "RefreshProbability": 100,
       "RefreshCount": 1,
       "placeID": 1,
       "SmallPlacesId": 1,

Assets/Res/Config/GameConstantConfig.json

@@ -46,9 +46,9 @@
       ],
       "qiankundaiMaxTime": 43200,
       "shenshiPointRecSPD": [
-        10000.0,
-        2.0,
-        0.05
+        2000.0,
+        0.023148,
+        0.023148
       ]
     }
   ]

Assets/Res/Config/HeroModelConfig.json

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

Assets/Res/UI/AppBarPanel/AppBarPanel.prefab

@@ -1404,6 +1404,8 @@ GameObject:
   - component: {fileID: 2609989254926019074}
   - component: {fileID: 759492161019403368}
   - component: {fileID: 7252785412647633890}
+  - component: {fileID: 3784346057485665382}
+  - component: {fileID: 3312526319194180165}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_Menu
@@ -1425,6 +1427,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7487176804920089040}
+  - {fileID: 7541755658825833766}
   m_Father: {fileID: 8996942401071482941}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
@@ -1540,6 +1543,65 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   audioName: ui_button
+--- !u!114 &3784346057485665382
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1973807357976626307}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ef7878ea2dacc454894d556c1d97bca0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - StateInfos:
+    - Target: {fileID: 5848168123700866973}
+      UIStateV4Types: 04000000
+      UIStateV4Datas:
+      - {x: 1, y: 0, z: 0, w: 0}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+    - Target: {fileID: 4371168351228159499}
+      UIStateV4Types: 04000000
+      UIStateV4Datas:
+      - {x: 0, y: 0, z: 0, w: 0}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+  - StateInfos:
+    - Target: {fileID: 5848168123700866973}
+      UIStateV4Types: 04000000
+      UIStateV4Datas:
+      - {x: 0, y: 0, z: 0, w: 0}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+    - Target: {fileID: 4371168351228159499}
+      UIStateV4Types: 04000000
+      UIStateV4Datas:
+      - {x: 1, y: 0, z: 0, w: 0}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+  AllComs:
+  - {fileID: 5848168123700866973}
+  - {fileID: 4371168351228159499}
+  AllComsStateTypes: 0400000004000000
+  CurrIndex: 0
+--- !u!114 &3312526319194180165
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1973807357976626307}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 09a9a136688f46fbb2a843418fc53144, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isScriptControl: 1
+  uiToggleList: {fileID: 0}
+  CustomStateController: {fileID: 0}
 --- !u!1 &2349479014257640583
 GameObject:
   m_ObjectHideFlags: 0
@@ -2277,6 +2339,95 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &4371168351228159499
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7541755658825833766}
+  - component: {fileID: 2581001375578908508}
+  - component: {fileID: 3005866034869510406}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: icon2
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &7541755658825833766
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4371168351228159499}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4560051099169459486}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 4.3118896, y: 0.87323}
+  m_SizeDelta: {x: 95, y: 83}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2581001375578908508
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4371168351228159499}
+  m_CullTransparentMesh: 1
+--- !u!114 &3005866034869510406
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4371168351228159499}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_gongneng2
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: bec1e4479c1593746876da07861f4d67, type: 3}
+  packInfo:
+    packName: mainUI
+    packgJsonPath: /Art/UIAssets/TextrueJson\mainUI.txt
+    packgSpritePath: Assets/Res/UIAtlas/mainUI.spriteatlasv2
+    lasetJsonGUID: 79efd91d4f98d1967eff87055daf4492
+  imageH: 45
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &4383204072351547665
 GameObject:
   m_ObjectHideFlags: 0
@@ -2982,6 +3133,7 @@ MonoBehaviour:
   - {fileID: 8687067159130349924}
   - {fileID: 4539428625316042701}
   - {fileID: 7753631802842447130}
+  - {fileID: 3312526319194180165}
   _allChildObj: []
 --- !u!1 &5301195012147280119
 GameObject:
@@ -3411,7 +3563,7 @@ GameObject:
   - component: {fileID: 2090444370474109629}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: myImage
+  m_Name: icon1
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

Assets/Res/UI/HeroInformainPanel/DaoYouInvitePanel.prefab

@@ -1,5 +1,94 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &448541597899182212
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7172149877330001241}
+  - component: {fileID: 1783413376251909863}
+  - component: {fileID: 7800671931845902958}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Title (5)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7172149877330001241
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 448541597899182212}
+  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: 8559904281704070969}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: -209.1, y: -39.400146}
+  m_SizeDelta: {x: 161, y: 21}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &1783413376251909863
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 448541597899182212}
+  m_CullTransparentMesh: 1
+--- !u!114 &7800671931845902958
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 448541597899182212}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.6627451, g: 0.62352943, b: 0.48627454, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_fengexian1
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: de4a477140878ce911aa37d161cbf014
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &506399724983741923
 GameObject:
   m_ObjectHideFlags: 0
@@ -128,6 +217,8 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6997749063157453271}
+  - {fileID: 7172149877330001241}
+  - {fileID: 8755094941081874266}
   - {fileID: 7490725140173117384}
   - {fileID: 4576285318986263254}
   - {fileID: 5438165848166744141}
@@ -753,6 +844,95 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 2
   m_VerticalFit: 2
+--- !u!1 &3781294011752364376
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8755094941081874266}
+  - component: {fileID: 1789238497336744405}
+  - component: {fileID: 544211859039709593}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Title (6)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8755094941081874266
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3781294011752364376}
+  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: 8559904281704070969}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 213, y: -39.4}
+  m_SizeDelta: {x: 161, y: 21}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &1789238497336744405
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3781294011752364376}
+  m_CullTransparentMesh: 1
+--- !u!114 &544211859039709593
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3781294011752364376}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.6627451, g: 0.62352943, b: 0.48627454, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_fengexian1
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: de4a477140878ce911aa37d161cbf014
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &3815102181536654075
 GameObject:
   m_ObjectHideFlags: 0
@@ -1517,7 +1697,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: aee29a10f2ad5e44b85cc21a47f45d9b, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1

Assets/Res/UI/HeroInformainPanel/HeroBreakthroughPanel.prefab

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

Assets/Res/UI/HeroInformainPanel/ImmortalBondPanel.prefab

@@ -137,6 +137,95 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &939022109783669696
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5688688799837481103}
+  - component: {fileID: 2150156764810606318}
+  - component: {fileID: 6745282125873110902}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Title (4)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5688688799837481103
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 939022109783669696}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1948383451580690238}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 259.9917, y: -24}
+  m_SizeDelta: {x: 208.5835, y: 21}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &2150156764810606318
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 939022109783669696}
+  m_CullTransparentMesh: 1
+--- !u!114 &6745282125873110902
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 939022109783669696}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.6627451, g: 0.62352943, b: 0.48627454, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_fengexian1
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: de4a477140878ce911aa37d161cbf014
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &1359402998321021210
 GameObject:
   m_ObjectHideFlags: 0
@@ -276,6 +365,8 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 5307292075045082131}
+  - {fileID: 2838780913361254183}
   - {fileID: 9173573771523279921}
   m_Father: {fileID: 9037135992368401232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -500,6 +591,95 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 2
   m_VerticalFit: 2
+--- !u!1 &3305102378823512034
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2838780913361254183}
+  - component: {fileID: 2100310174260223296}
+  - component: {fileID: 3603959791707695230}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Title (3)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2838780913361254183
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3305102378823512034}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: -1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7687848880532792628}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: -258.7, y: -24.9}
+  m_SizeDelta: {x: 208.5835, y: 21}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &2100310174260223296
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3305102378823512034}
+  m_CullTransparentMesh: 1
+--- !u!114 &3603959791707695230
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3305102378823512034}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.6627451, g: 0.62352943, b: 0.48627454, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_fengexian1
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: de4a477140878ce911aa37d161cbf014
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &3622374847065832265
 GameObject:
   m_ObjectHideFlags: 0
@@ -531,6 +711,8 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 7763741966606808769}
+  - {fileID: 5688688799837481103}
   - {fileID: 2369668900552869058}
   m_Father: {fileID: 9037135992368401232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -958,6 +1140,95 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &5227725040119072102
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5307292075045082131}
+  - component: {fileID: 5192634941054058725}
+  - component: {fileID: 7371133904544545197}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Title (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5307292075045082131
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5227725040119072102}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7687848880532792628}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 259.9917, y: -24.9}
+  m_SizeDelta: {x: 208.5835, y: 21}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &5192634941054058725
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5227725040119072102}
+  m_CullTransparentMesh: 1
+--- !u!114 &7371133904544545197
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5227725040119072102}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.6627451, g: 0.62352943, b: 0.48627454, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_fengexian1
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: de4a477140878ce911aa37d161cbf014
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &5865721309907835821
 GameObject:
   m_ObjectHideFlags: 0
@@ -1417,6 +1688,95 @@ MonoBehaviour:
   m_EffectColor: {r: 0.24313727, g: 0.38431376, b: 0.40000004, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!1 &6100173025123856502
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7763741966606808769}
+  - component: {fileID: 3026896503111289251}
+  - component: {fileID: 1019016744714943343}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Title (5)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7763741966606808769
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6100173025123856502}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: -1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1948383451580690238}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: -258.7, y: -24.000061}
+  m_SizeDelta: {x: 208.5835, y: 21}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &3026896503111289251
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6100173025123856502}
+  m_CullTransparentMesh: 1
+--- !u!114 &1019016744714943343
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6100173025123856502}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.6627451, g: 0.62352943, b: 0.48627454, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_fengexian1
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: de4a477140878ce911aa37d161cbf014
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &6163252751046475651
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UIAtlas/mainUI.spriteatlasv2

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

Assets/Res/UIAtlas/tongyong.spriteatlasv2

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

Assets/Scripts/GameData/ExcelConfig/DivineSenseConfig.cs

@@ -54,6 +54,11 @@ namespace Excel2Json
 #endif
 		
 
+
+
+
+
+
 	}
 
 }

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

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

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

@@ -81,7 +81,7 @@ namespace GameLogic.Combat.CombatState
 
             playerHeroEntity.combatHeroGameObject.SetPosition(pos);
             playerHeroEntity.GameObject.transform.rotation =
-                Quaternion.LookRotation(new Vector3(currDir.x, 0, currDir.z));
+                Quaternion.LookRotation(new Vector3(currDir.x, 0, currDir.z).normalized);
         }
 
         private async void InitScenes()

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

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

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

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

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

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

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

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

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

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

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

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

Assets/Scripts/GameUI/EventManager/DialogueManager.cs

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

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

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