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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_glow_add.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.000063378386
+    - _Alpha: 0.5627777
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_quan.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0
+    - _Alpha: 0.0010102458
     - _AlphaCutoff: 0.5
     - _ColorMask: 0
     - _EnableExternalAlpha: 0

Assets/Res/Config/EventConfig.json

@@ -1394,6 +1394,7 @@
         1000019,
         1000020,
         1000021,
+        1000022,
         102
       ],
       "EventTriggerType": 99,
@@ -1714,6 +1715,7 @@
         1001004,
         1001005,
         1001006,
+        1001007,
         102
       ],
       "EventTriggerType": 4,
@@ -4606,7 +4608,7 @@
       "SmallPlacesId": 1,
       "XiantuID": 0,
       "EventName": 4244,
-      "Description": 0
+      "Description": 4326
     },
     {
       "ID": 9112,
@@ -4643,7 +4645,7 @@
         9111
       ],
       "EventName": 4245,
-      "Description": 0
+      "Description": 4327
     },
     {
       "ID": 9113,
@@ -4678,7 +4680,7 @@
         9112
       ],
       "EventName": 4246,
-      "Description": 0
+      "Description": 4328
     },
     {
       "ID": 9114,
@@ -4716,7 +4718,7 @@
         9113
       ],
       "EventName": 4247,
-      "Description": 0
+      "Description": 4329
     },
     {
       "ID": 9115,
@@ -4742,7 +4744,7 @@
         9114
       ],
       "EventName": 4248,
-      "Description": 0
+      "Description": 4330
     },
     {
       "ID": 9116,
@@ -4795,7 +4797,7 @@
         3
       ],
       "EventName": 4249,
-      "Description": 0
+      "Description": 4331
     },
     {
       "ID": 9117,
@@ -4824,7 +4826,7 @@
       "SmallPlacesId": 2,
       "XiantuID": 0,
       "EventName": 4250,
-      "Description": 0
+      "Description": 4332
     },
     {
       "ID": 9118,
@@ -4862,7 +4864,7 @@
         9117
       ],
       "EventName": 4251,
-      "Description": 0
+      "Description": 4333
     },
     {
       "ID": 9119,
@@ -4899,7 +4901,7 @@
         9118
       ],
       "EventName": 4252,
-      "Description": 0
+      "Description": 4334
     },
     {
       "ID": 9120,
@@ -4937,7 +4939,7 @@
         9119
       ],
       "EventName": 4253,
-      "Description": 0
+      "Description": 4335
     },
     {
       "ID": 9121,
@@ -4967,7 +4969,7 @@
         9120
       ],
       "EventName": 4254,
-      "Description": 0
+      "Description": 4336
     },
     {
       "ID": 9122,
@@ -5012,7 +5014,7 @@
         9121
       ],
       "EventName": 4255,
-      "Description": 0
+      "Description": 4337
     },
     {
       "ID": 9123,
@@ -5059,7 +5061,7 @@
       "SmallPlacesId": 4,
       "XiantuID": 0,
       "EventName": 4256,
-      "Description": 0
+      "Description": 4338
     },
     {
       "ID": 9124,
@@ -5092,7 +5094,7 @@
         9123
       ],
       "EventName": 4257,
-      "Description": 0
+      "Description": 4339
     },
     {
       "ID": 9125,
@@ -5125,7 +5127,7 @@
         9124
       ],
       "EventName": 4258,
-      "Description": 0
+      "Description": 4340
     },
     {
       "ID": 9126,
@@ -5159,7 +5161,7 @@
         9125
       ],
       "EventName": 4259,
-      "Description": 0
+      "Description": 4341
     },
     {
       "ID": 9127,
@@ -5186,7 +5188,7 @@
       "SmallPlacesId": 5,
       "XiantuID": 0,
       "EventName": 4260,
-      "Description": 0
+      "Description": 4342
     },
     {
       "ID": 9128,
@@ -5223,7 +5225,7 @@
         9127
       ],
       "EventName": 4261,
-      "Description": 0
+      "Description": 4343
     },
     {
       "ID": 9129,
@@ -5262,7 +5264,7 @@
         9128
       ],
       "EventName": 4262,
-      "Description": 0
+      "Description": 4344
     },
     {
       "ID": 9130,
@@ -5293,7 +5295,7 @@
       "SmallPlacesId": 5,
       "XiantuID": 0,
       "EventName": 4263,
-      "Description": 0
+      "Description": 4345
     },
     {
       "ID": 9131,
@@ -5321,7 +5323,7 @@
         9130
       ],
       "EventName": 4264,
-      "Description": 0
+      "Description": 4346
     },
     {
       "ID": 9132,
@@ -5364,7 +5366,7 @@
         9131
       ],
       "EventName": 4265,
-      "Description": 0
+      "Description": 4347
     },
     {
       "ID": 9133,
@@ -5391,7 +5393,7 @@
       "SmallPlacesId": 6,
       "XiantuID": 0,
       "EventName": 4266,
-      "Description": 0
+      "Description": 4348
     },
     {
       "ID": 9134,
@@ -5438,7 +5440,7 @@
         9133
       ],
       "EventName": 4267,
-      "Description": 0
+      "Description": 4349
     },
     {
       "ID": 9135,
@@ -5466,7 +5468,7 @@
         9134
       ],
       "EventName": 4268,
-      "Description": 0
+      "Description": 4350
     },
     {
       "ID": 9136,
@@ -5501,7 +5503,7 @@
         9135
       ],
       "EventName": 4269,
-      "Description": 0
+      "Description": 4351
     },
     {
       "ID": 9137,
@@ -5532,7 +5534,7 @@
         9136
       ],
       "EventName": 4270,
-      "Description": 0
+      "Description": 4352
     },
     {
       "ID": 9138,
@@ -5571,7 +5573,7 @@
         9140
       ],
       "EventName": 4271,
-      "Description": 0
+      "Description": 4353
     },
     {
       "ID": 9139,
@@ -5598,7 +5600,7 @@
       "SmallPlacesId": 7,
       "XiantuID": 0,
       "EventName": 4272,
-      "Description": 0
+      "Description": 4354
     },
     {
       "ID": 9140,
@@ -5631,7 +5633,7 @@
         9139
       ],
       "EventName": 4273,
-      "Description": 0
+      "Description": 4355
     },
     {
       "ID": 9141,
@@ -5657,7 +5659,7 @@
       "SmallPlacesId": 8,
       "XiantuID": 0,
       "EventName": 4274,
-      "Description": 0
+      "Description": 4356
     },
     {
       "ID": 9142,
@@ -5693,7 +5695,7 @@
         30023
       ],
       "EventName": 4277,
-      "Description": 0
+      "Description": 4357
     },
     {
       "ID": 9143,
@@ -5723,7 +5725,7 @@
       "SmallPlacesId": 9,
       "XiantuID": 0,
       "EventName": 4278,
-      "Description": 0
+      "Description": 4358
     },
     {
       "ID": 9144,
@@ -5757,7 +5759,7 @@
         30024
       ],
       "EventName": 4279,
-      "Description": 0
+      "Description": 4359
     },
     {
       "ID": 9145,
@@ -5794,7 +5796,7 @@
         9144
       ],
       "EventName": 4280,
-      "Description": 0
+      "Description": 4360
     },
     {
       "ID": 9146,
@@ -5835,7 +5837,7 @@
         9145
       ],
       "EventName": 4281,
-      "Description": 0
+      "Description": 4361
     },
     {
       "ID": 9147,
@@ -5863,7 +5865,7 @@
         9111
       ],
       "EventName": 4282,
-      "Description": 0
+      "Description": 4362
     },
     {
       "ID": 9148,
@@ -5893,7 +5895,7 @@
         20
       ],
       "EventName": 4283,
-      "Description": 0
+      "Description": 4363
     },
     {
       "ID": 9149,
@@ -5924,7 +5926,7 @@
         40
       ],
       "EventName": 4284,
-      "Description": 0
+      "Description": 4364
     },
     {
       "ID": 9150,
@@ -5953,7 +5955,7 @@
       "SmallPlacesId": 0,
       "XiantuID": 0,
       "EventName": 4285,
-      "Description": 0
+      "Description": 4365
     },
     {
       "ID": 9151,
@@ -5985,7 +5987,7 @@
       "SmallPlacesId": 0,
       "XiantuID": 0,
       "EventName": 4286,
-      "Description": 0
+      "Description": 4366
     },
     {
       "ID": 9152,
@@ -6017,7 +6019,7 @@
       "SmallPlacesId": 0,
       "XiantuID": 0,
       "EventName": 4287,
-      "Description": 0
+      "Description": 4367
     },
     {
       "ID": 9153,
@@ -6051,7 +6053,7 @@
       "SmallPlacesId": 0,
       "XiantuID": 0,
       "EventName": 4288,
-      "Description": 0
+      "Description": 4368
     },
     {
       "ID": 9154,
@@ -6082,7 +6084,7 @@
       "SmallPlacesId": 0,
       "XiantuID": 0,
       "EventName": 4289,
-      "Description": 0
+      "Description": 4369
     },
     {
       "ID": 9155,
@@ -6111,7 +6113,7 @@
       "SmallPlacesId": 0,
       "XiantuID": 0,
       "EventName": 4290,
-      "Description": 0
+      "Description": 4370
     },
     {
       "ID": 9156,
@@ -6142,7 +6144,7 @@
       "SmallPlacesId": 0,
       "XiantuID": 0,
       "EventName": 4291,
-      "Description": 0
+      "Description": 4371
     },
     {
       "ID": 9157,
@@ -6170,7 +6172,7 @@
       "SmallPlacesId": 0,
       "XiantuID": 0,
       "EventName": 4292,
-      "Description": 0
+      "Description": 4372
     },
     {
       "ID": 9158,
@@ -6198,7 +6200,7 @@
       "SmallPlacesId": 0,
       "XiantuID": 0,
       "EventName": 4293,
-      "Description": 0
+      "Description": 4373
     },
     {
       "ID": 9159,
@@ -6226,7 +6228,7 @@
       "SmallPlacesId": 0,
       "XiantuID": 0,
       "EventName": 4294,
-      "Description": 0
+      "Description": 4374
     },
     {
       "ID": 9160,
@@ -6255,7 +6257,7 @@
       "SmallPlacesId": 0,
       "XiantuID": 0,
       "EventName": 4295,
-      "Description": 0
+      "Description": 4375
     },
     {
       "ID": 9161,
@@ -6284,7 +6286,7 @@
       "SmallPlacesId": 0,
       "XiantuID": 0,
       "EventName": 4296,
-      "Description": 0
+      "Description": 4376
     },
     {
       "ID": 9162,
@@ -6313,7 +6315,7 @@
       "SmallPlacesId": 0,
       "XiantuID": 0,
       "EventName": 4297,
-      "Description": 0
+      "Description": 4377
     }
   ]
 }

Assets/Res/Config/EventLinkConfig.json

@@ -1673,11 +1673,17 @@
       "PreShowPar": 0,
       "NPCID": 137,
       "LanID": [
-        5147
+        5145
       ],
       "DialogueType": 0,
       "EventID": 10000,
-      "optionType": 0,
+      "optionType": 1,
+      "optionPara1": [
+        1000019
+      ],
+      "optionPara2": [
+        5146
+      ],
       "ResultType": 1,
       "ResultOptions": [
         1000019
@@ -1689,9 +1695,9 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 157,
+      "NPCID": 137,
       "LanID": [
-        5148
+        5147
       ],
       "DialogueType": 0,
       "EventID": 10000,
@@ -1707,9 +1713,9 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 161,
+      "NPCID": 157,
       "LanID": [
-        5149
+        5148
       ],
       "DialogueType": 0,
       "EventID": 10000,
@@ -1725,6 +1731,24 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
+      "NPCID": 161,
+      "LanID": [
+        5149
+      ],
+      "DialogueType": 0,
+      "EventID": 10000,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000022
+      ]
+    },
+    {
+      "ID": 1000022,
+      "conciseEventMessage": 0,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
       "NPCID": 0,
       "LanID": [
         5150
@@ -3080,6 +3104,24 @@
         101
       ]
     },
+    {
+      "ID": 1001007,
+      "conciseEventMessage": 5247,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        5249
+      ],
+      "DialogueType": 0,
+      "EventID": 10010,
+      "optionType": 0,
+      "ResultType": 3,
+      "ResultOptions": [
+        10011
+      ]
+    },
     {
       "ID": 1001101,
       "conciseEventMessage": 5249,
@@ -22237,7 +22279,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 0,
+      "NPCID": 151,
       "LanID": [
         6644
       ],
@@ -22265,7 +22307,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 0,
+      "NPCID": 151,
       "LanID": [
         6648
       ],
@@ -22280,7 +22322,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 0,
+      "NPCID": 151,
       "LanID": [
         6649
       ],
@@ -22295,7 +22337,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 0,
+      "NPCID": 151,
       "LanID": [
         6650
       ],
@@ -22310,7 +22352,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 0,
+      "NPCID": 152,
       "LanID": [
         6652
       ],
@@ -22338,7 +22380,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 0,
+      "NPCID": 152,
       "LanID": [
         6656
       ],
@@ -22353,7 +22395,7 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 0,
+      "NPCID": 152,
       "LanID": [
         6657
       ],

Assets/Res/Config/HeroModelConfig.json

@@ -355,9 +355,9 @@
       "isUseGpu": false,
       "heroType": 2,
       "attack": 80,
-      "hp": 500,
+      "hp": 200,
       "def": 100,
-      "shield": 500,
+      "shield": 200,
       "speed_atk": 0.0,
       "Linggen": [
         100,

Assets/Res/Config/LanguageChineseConfig.json

@@ -13314,15 +13314,15 @@
     },
     {
       "ID": 4069,
-      "txt": "风影为二"
+      "txt": ""
     },
     {
       "ID": 4070,
-      "txt": "风影合一"
+      "txt": ""
     },
     {
       "ID": 4071,
-      "txt": "北海剑妖"
+      "txt": ""
     },
     {
       "ID": 4072,
@@ -13342,111 +13342,111 @@
     },
     {
       "ID": 4076,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4077,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4078,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4079,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4080,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4081,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4082,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4083,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4084,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4085,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4086,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4087,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4088,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4089,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4090,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4091,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4092,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4093,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4094,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4095,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4096,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4097,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4098,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4099,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4100,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4101,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4102,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4103,
@@ -13494,7 +13494,7 @@
     },
     {
       "ID": 4114,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4115,
@@ -13558,11 +13558,11 @@
     },
     {
       "ID": 4130,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4131,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4132,
@@ -13614,15 +13614,15 @@
     },
     {
       "ID": 4144,
-      "txt": "风影为二详情占位"
+      "txt": ""
     },
     {
       "ID": 4145,
-      "txt": "风影合一详情占位"
+      "txt": ""
     },
     {
       "ID": 4146,
-      "txt": "百年化妖为红颜，一剑焚海断孽缘"
+      "txt": ""
     },
     {
       "ID": 4147,
@@ -13646,7 +13646,7 @@
     },
     {
       "ID": 4152,
-      "txt": "雀灵儿1"
+      "txt": "调皮的麻雀精灵儿缠着你去树顶赛跑，却被护短的姐姐云枝强行制止。"
     },
     {
       "ID": 4153,
@@ -13654,7 +13654,7 @@
     },
     {
       "ID": 4154,
-      "txt": "雀灵儿2"
+      "txt": "灵儿让你找回风铃，听到铃声就不再害怕北海的寂寞。"
     },
     {
       "ID": 4155,
@@ -13662,7 +13662,7 @@
     },
     {
       "ID": 4156,
-      "txt": "雀灵儿3"
+      "txt": "灵儿拉着你击退风妖，月光下的树林从战场变回她最珍视的乐园。"
     },
     {
       "ID": 4157,
@@ -13670,7 +13670,7 @@
     },
     {
       "ID": 4158,
-      "txt": "雀灵儿4"
+      "txt": "灵儿在你的陪伴下初尝飞翔远方，从此向往更远的天空。"
     },
     {
       "ID": 4159,
@@ -13678,7 +13678,7 @@
     },
     {
       "ID": 4160,
-      "txt": "雀灵儿5"
+      "txt": "你从风妖口中救下灵儿，破碎的飞翔梦在她紧握的手中愈合。"
     },
     {
       "ID": 4161,
@@ -13686,7 +13686,7 @@
     },
     {
       "ID": 4162,
-      "txt": "雀灵儿6"
+      "txt": "灵儿褪去怯懦，主动牵起你的手奔向比天池更远的未来"
     },
     {
       "ID": 4163,
@@ -13722,27 +13722,27 @@
     },
     {
       "ID": 4171,
-      "txt": "云枝1"
+      "txt": "云枝以风妖为考题，冰冷试探你保护灵儿的资格。"
     },
     {
       "ID": 4172,
-      "txt": "云枝2"
+      "txt": "云枝借风妖试探玩家实力，冰冷态度随妖兽溃败而稍缓。"
     },
     {
       "ID": 4173,
-      "txt": "云枝3"
+      "txt": "云枝抚琴护草，你剑斩风妖，冷傲守护者首次交付信任。"
     },
     {
       "ID": 4174,
-      "txt": "云枝4"
+      "txt": "云枝泪诉父母殒于风暴的往事，袒露束缚灵儿的真相。"
     },
     {
       "ID": 4175,
-      "txt": "云枝5"
+      "txt": "妖兽群袭中，云枝重伤仍护妹，你的剑光成为姐妹新的守护结界。"
     },
     {
       "ID": 4176,
-      "txt": "云枝6"
+      "txt": "云枝褪尽冷傲，与你携手飞向象征自由的云海尽头。"
     },
     {
       "ID": 4177,
@@ -13778,27 +13778,27 @@
     },
     {
       "ID": 4185,
-      "txt": "风瑶1"
+      "txt": "在浮岛邂逅风瑶，接过她收集风灵碎片的委托。"
     },
     {
       "ID": 4186,
-      "txt": "风瑶2"
+      "txt": "你集齐碎片，风瑶透露云隐宗长老勾结外域的魔气线索。"
     },
     {
       "ID": 4187,
-      "txt": "风瑶3"
+      "txt": "收集云隐宗异常线索，风瑶确认长老勾结魔修的猜测。"
     },
     {
       "ID": 4188,
-      "txt": "风瑶4"
+      "txt": "妖兽体内灵石惊现禁地阵纹，宗门黑幕终现端倪。"
     },
     {
       "ID": 4189,
-      "txt": "风瑶5"
+      "txt": "截获风信证实长老禁术，风瑶急寻疯道人相助。"
     },
     {
       "ID": 4190,
-      "txt": "风瑶6"
+      "txt": "疯道人坦露早知宗门黑幕，兄妹对峙揭示正道抉择。"
     },
     {
       "ID": 4191,
@@ -13806,7 +13806,7 @@
     },
     {
       "ID": 4192,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4193,
@@ -13866,27 +13866,27 @@
     },
     {
       "ID": 4207,
-      "txt": "婉溪1"
+      "txt": "隐士婉溪邀你共护灵田，茶香中暗藏七道心境线索。"
     },
     {
       "ID": 4208,
-      "txt": "婉溪2"
+      "txt": "灵田水影映照道心蜕变，婉溪以茶道为引助玩家悟境。"
     },
     {
       "ID": 4209,
-      "txt": "婉溪3"
+      "txt": "你讲述外界故事，婉溪茶雾中的眼眸初现波澜。"
     },
     {
       "ID": 4210,
-      "txt": "婉溪4"
+      "txt": "玩家寻来尧都玉佩稳茶树灵气，婉溪展露隐世家族的秘辛。"
     },
     {
       "ID": 4211,
-      "txt": "婉溪5"
+      "txt": "玩家清除溪水灵影，发现暗藏外来修士的窥探痕迹。"
     },
     {
       "ID": 4212,
-      "txt": "婉溪6"
+      "txt": "许由婉溪对峙家族秘密，旧敌阴影随溪流暗涌。"
     },
     {
       "ID": 4213,
@@ -13922,27 +13922,27 @@
     },
     {
       "ID": 4221,
-      "txt": "许由1"
+      "txt": "拜访许由，受托采药延续修行机缘。"
     },
     {
       "ID": 4222,
-      "txt": "许由2"
+      "txt": "许由借采药时辰喻修道机缘，点化玩家顺时而行。"
     },
     {
       "ID": 4223,
-      "txt": "许由3"
+      "txt": "许由控火时流露道心困惑，避世与执着之辩随丹烟升起。"
     },
     {
       "ID": 4224,
-      "txt": "许由4"
+      "txt": "许由借秘境种子引发大小之辩，你应答展露修道悟性。"
     },
     {
       "ID": 4225,
-      "txt": "许由5"
+      "txt": "许由借茶论道，以三则典故诘问修道本质。"
     },
     {
       "ID": 4226,
-      "txt": "许由6"
+      "txt": "许以茶烟送别，将修行感悟系于你未来旅途。"
     },
     {
       "ID": 4227,
@@ -13986,23 +13986,23 @@
     },
     {
       "ID": 4237,
-      "txt": "疯道人1"
+      "txt": "疯道人笑揽清风，讨甜果润喉"
     },
     {
       "ID": 4238,
-      "txt": "疯道人2"
+      "txt": "为疯仙寻得灵果，巧避守护兽归来"
     },
     {
       "ID": 4239,
-      "txt": "疯道人3"
+      "txt": "疯道人需灵果驱妖，你冒险采集相助"
     },
     {
       "ID": 4240,
-      "txt": "疯道人4"
+      "txt": "疯道人灵石耗尽，你慷慨相助"
     },
     {
       "ID": 4241,
-      "txt": "疯道人5"
+      "txt": "疯道人把借的灵石全赌输了，你气得直接动手"
     },
     {
       "ID": 4242,
@@ -14150,7 +14150,7 @@
     },
     {
       "ID": 4278,
-      "txt": "在遇馨儿"
+      "txt": "再遇馨儿"
     },
     {
       "ID": 4279,
@@ -14342,211 +14342,211 @@
     },
     {
       "ID": 4326,
-      "txt": ""
+      "txt": "渔民遇海怪求助，你收下线索准备行动"
     },
     {
       "ID": 4327,
-      "txt": ""
+      "txt": "傀儡真相终揭晓，神秘龙鳞引争夺"
     },
     {
       "ID": 4328,
-      "txt": ""
+      "txt": "水怪虽除，老李攥着儿子的平安符沉默不语"
     },
     {
       "ID": 4329,
-      "txt": ""
+      "txt": "灵姬托你取三颗幽魂石，镇压古战场暴动怨魂。"
     },
     {
       "ID": 4330,
-      "txt": ""
+      "txt": "击败幽魂石守护兽"
     },
     {
       "ID": 4331,
-      "txt": ""
+      "txt": "灵姬借幽魂石镇压仙宗怨魂，赠龙鳞指引圣地之谜。"
     },
     {
       "ID": 4332,
-      "txt": ""
+      "txt": "馨儿强拉你去寻密信，雾林中铃铛与威胁齐飞。"
     },
     {
       "ID": 4333,
-      "txt": ""
+      "txt": "雾妖伏诛，密信危机现转机。"
     },
     {
       "ID": 4334,
-      "txt": ""
+      "txt": "你亲自护法助馨儿破阵，云隐密信危机终解。"
     },
     {
       "ID": 4335,
-      "txt": ""
+      "txt": "助馨儿智擒偷盗灵草的风灵鸟。"
     },
     {
       "ID": 4336,
-      "txt": ""
+      "txt": "协馨儿斩泉中妖物，灵泉复清，暗藏宗门算计。"
     },
     {
       "ID": 4337,
-      "txt": ""
+      "txt": "协助馨儿击败浮岛盗修获得宝盒"
     },
     {
       "ID": 4338,
-      "txt": ""
+      "txt": "被迫卷入秘钥争夺，重伤柳轻烟托付宗门存亡重任。"
     },
     {
       "ID": 4339,
-      "txt": ""
+      "txt": "击败血海宗敌人"
     },
     {
       "ID": 4340,
-      "txt": ""
+      "txt": "击败血海宗敌人"
     },
     {
       "ID": 4341,
-      "txt": ""
+      "txt": "归还秘钥，柳轻烟以宗门承诺相赠，江湖再会。"
     },
     {
       "ID": 4342,
-      "txt": ""
+      "txt": "协战夺灵花，馨儿邀你前去拍卖会"
     },
     {
       "ID": 4343,
-      "txt": ""
+      "txt": "馨儿笑退拦路散修，你警觉暗处危机。"
     },
     {
       "ID": 4344,
-      "txt": ""
+      "txt": "斩除精英散修，馨儿拐楚云缪组队奔赴拍卖会。"
     },
     {
       "ID": 4345,
-      "txt": ""
+      "txt": "楚云缪遇袭失碧云佩，你赶赴东南救援被追击的馨儿。"
     },
     {
       "ID": 4346,
-      "txt": ""
+      "txt": "你与馨儿发现偷袭者另有接应，劫案背后暗藏更大阴谋。"
     },
     {
       "ID": 4347,
-      "txt": ""
+      "txt": "你与馨儿击败青狼散人夺回碧云佩，青狼帮的威胁还未散。"
     },
     {
       "ID": 4348,
-      "txt": ""
+      "txt": "击杀劫道的血海宗弟子，宗门恩怨初现端倪。"
     },
     {
       "ID": 4349,
-      "txt": ""
+      "txt": "救下被追杀的林风，携玄冥晶踏上危机四伏的护送路。"
     },
     {
       "ID": 4350,
-      "txt": ""
+      "txt": "击退三波追兵，护送林风抵达青云镇。"
     },
     {
       "ID": 4351,
-      "txt": ""
+      "txt": "婉拒柳清清谢礼，为玄冥晶护送画上侠义句点。"
     },
     {
       "ID": 4352,
-      "txt": ""
+      "txt": "血海宗夺晶重伤柳清清，携林风赠宝再赴杀局。"
     },
     {
       "ID": 4353,
-      "txt": ""
+      "txt": "归还部分玄冥晶，血海宗秘密仍藏于迷雾。"
     },
     {
       "ID": 4354,
-      "txt": ""
+      "txt": "击杀血海宗修士却触发求救信号，携玄冥晶紧急撤离。"
     },
     {
       "ID": 4355,
-      "txt": ""
+      "txt": "血海宗为师弟复仇而来，立誓以血还血。"
     },
     {
       "ID": 4356,
-      "txt": ""
+      "txt": "受玄水真人所托，探查被紫光污染的灵泉核心。"
     },
     {
       "ID": 4357,
-      "txt": ""
+      "txt": "玩家平息灵泉异变获采药权，玄水真人暗示山顶新危机。"
     },
     {
       "ID": 4358,
-      "txt": ""
+      "txt": "与馨儿、柳如烟重逢，组队清剿仙山异象引来的妖物。"
     },
     {
       "ID": 4359,
-      "txt": ""
+      "txt": "妖物清剿完毕，与馨儿、柳如烟暂别分头行动。"
     },
     {
       "ID": 4360,
-      "txt": ""
+      "txt": "击败守护圣地的云霄龙鹰，龙族再现预言随灵气震荡天地。"
     },
     {
       "ID": 4361,
-      "txt": ""
+      "txt": "龙鳞不足难启石门，双姝回宗禀报，玩家留待后续。"
     },
     {
       "ID": 4362,
-      "txt": ""
+      "txt": "鲤鱼卖惨求丹"
     },
     {
       "ID": 4363,
-      "txt": ""
+      "txt": "鲤鱼二次卖惨求丹"
     },
     {
       "ID": 4364,
-      "txt": ""
+      "txt": "鲤鱼假扮化龙继续骗丹"
     },
     {
       "ID": 4365,
-      "txt": ""
+      "txt": "剑仙化石，是真？是假？"
     },
     {
       "ID": 4366,
-      "txt": ""
+      "txt": "天下真有白吃的灵石午餐。"
     },
     {
       "ID": 4367,
-      "txt": ""
+      "txt": "石头精不服输再挑战，猜拳博弈变尊严之战。"
     },
     {
       "ID": 4368,
-      "txt": ""
+      "txt": "石头精画假布设陷阱"
     },
     {
       "ID": 4369,
-      "txt": ""
+      "txt": "石头精识破玩家善意，归还灵石领悟游戏真谛。"
     },
     {
       "ID": 4370,
-      "txt": ""
+      "txt": "一只浑身带电的小兽蜷缩在树洞"
     },
     {
       "ID": 4371,
-      "txt": ""
+      "txt": "一只肥大的蚊子在你神识中嗡嗡直叫"
     },
     {
       "ID": 4372,
-      "txt": ""
+      "txt": "一只小灵雀坠落在林间"
     },
     {
       "ID": 4373,
-      "txt": ""
+      "txt": "一只瘦骨嶙峋的老犬趴在一座坟前"
     },
     {
       "ID": 4374,
-      "txt": ""
+      "txt": "一群萤火虫被困在蛛网中"
     },
     {
       "ID": 4375,
-      "txt": ""
+      "txt": "一只小妖在地上嚎啕大哭"
     },
     {
       "ID": 4376,
-      "txt": ""
+      "txt": "一只老龟趴在溪水边"
     },
     {
       "ID": 4377,
-      "txt": ""
+      "txt": "一块灵石长出嘴巴，正跑调唱歌？"
     },
     {
       "ID": 4378,
@@ -17618,11 +17618,11 @@
     },
     {
       "ID": 5145,
-      "txt": "天机不可泄露。\n（说罢，从袖中拿出一个风铃..）\n但此风铃，可以为你指引前路。"
+      "txt": "参透七道心境，才有望窥见天道..\n去吧，历红尘，破心障，游三界，方能领悟。"
     },
     {
       "ID": 5146,
-      "txt": "多谢前辈赠铃.."
+      "txt": "七道心境？那是何物，请前辈指点？"
     },
     {
       "ID": 5147,
@@ -18034,7 +18034,7 @@
     },
     {
       "ID": 5249,
-      "txt": "与鲲鹏对话"
+      "txt": "与鲲鹏对话妖兽被击退了。"
     },
     {
       "ID": 5250,
@@ -23714,7 +23714,7 @@
     },
     {
       "ID": 6669,
-      "txt": "只老龟趴在溪水边，神识触及"
+      "txt": "一只老龟趴在溪水边，神识触及"
     },
     {
       "ID": 6670,

Assets/Res/Config/ShopItemConfig.json

@@ -1635,7 +1635,7 @@
     },
     {
       "ID": 301,
-      "giftID": "",
+      "giftID": "com.xysj.goodsid_301_6",
       "itemId": [
         10002
       ],
@@ -1658,7 +1658,7 @@
     },
     {
       "ID": 302,
-      "giftID": "",
+      "giftID": "com.xysj.goodsid_302_6",
       "itemId": [
         12016
       ],
@@ -1681,7 +1681,7 @@
     },
     {
       "ID": 303,
-      "giftID": "",
+      "giftID": "com.xysj.goodsid_303_6",
       "itemId": [
         12518
       ],
@@ -1704,7 +1704,7 @@
     },
     {
       "ID": 304,
-      "giftID": "",
+      "giftID": "com.xysj.goodsid_304_12",
       "itemId": [
         1703
       ],
@@ -1727,7 +1727,7 @@
     },
     {
       "ID": 305,
-      "giftID": "",
+      "giftID": "com.xysj.goodsid_305_12",
       "itemId": [
         21013
       ],
@@ -1750,7 +1750,7 @@
     },
     {
       "ID": 306,
-      "giftID": "",
+      "giftID": "com.xysj.goodsid_306_30",
       "itemId": [
         23002
       ],

Assets/Res/UI/CombatPanel.prefab

@@ -1389,7 +1389,7 @@ RectTransform:
   m_Father: {fileID: 2485395400814881333}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 10, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -1431,6 +1431,95 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &2059263766864856372
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1626123898874144172}
+  - component: {fileID: 752635417748224051}
+  - component: {fileID: 6878332116769142553}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1626123898874144172
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2059263766864856372}
+  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: 9154117758663817888}
+  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: -47, y: 0}
+  m_SizeDelta: {x: 59, y: 59}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &752635417748224051
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2059263766864856372}
+  m_CullTransparentMesh: 1
+--- !u!114 &6878332116769142553
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2059263766864856372}
+  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_zanting
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 08bcd577b76e3c94cacfc8e9783bd09a, type: 3}
+  packInfo:
+    packName: battle
+    packgJsonPath: /Art/UIAssets/TextrueJson\battle.txt
+    packgSpritePath: Assets/Res/UIAtlas/battle.spriteatlasv2
+    lasetJsonGUID: e3255755c2d07e4fdeef12a0d5361a43
+  imageH: 76
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &2104282035482693050
 GameObject:
   m_ObjectHideFlags: 0
@@ -2067,6 +2156,7 @@ RectTransform:
   m_Children:
   - {fileID: 1811249814091911294}
   - {fileID: 6278296954147936113}
+  - {fileID: 9154117758663817888}
   m_Father: {fileID: 943568758315423495}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -2748,7 +2838,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &6474916107440211306
 RectTransform:
   m_ObjectHideFlags: 0
@@ -4180,7 +4270,7 @@ RectTransform:
   m_Father: {fileID: 8236420421261262979}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90.47}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 0, y: -0.30499268}
   m_SizeDelta: {x: 40, y: 15.35}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -8273,6 +8363,88 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &7494926396586769475
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 9154117758663817888}
+  - component: {fileID: 3032265437901632859}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: ZhanTing
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &9154117758663817888
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7494926396586769475}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 1626123898874144172}
+  m_Father: {fileID: 3110366166440421900}
+  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: 56, y: 225}
+  m_SizeDelta: {x: 160, y: 43.9699}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &3032265437901632859
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7494926396586769475}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 0
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 0}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &7790788168690589102
 GameObject:
   m_ObjectHideFlags: 0
@@ -9621,6 +9793,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: ZhanTing
+    gameObject: {fileID: 3032265437901632859}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &9048783764069595547
 GameObject:

Assets/Res/UI/CombatPuasePanel.prefab

@@ -0,0 +1,603 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &2057452870888875413
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4202026612452094680}
+  - component: {fileID: 2584886624654969235}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: CombatPuasePanel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4202026612452094680
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2057452870888875413}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 3190497540882875350}
+  - {fileID: 2128051441581476715}
+  - {fileID: 6670566960034558026}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 750, y: 1624}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &2584886624654969235
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2057452870888875413}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: JiXu
+    gameObject: {fileID: 4274198529094444920}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: TuiChu
+    gameObject: {fileID: 8675729300284759539}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 1
+--- !u!1 &2998927439283164228
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3190497540882875350}
+  - component: {fileID: 6806422645424225771}
+  - component: {fileID: 1771677231819467193}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3190497540882875350
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2998927439283164228}
+  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: 4202026612452094680}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 800, y: 2000}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6806422645424225771
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2998927439283164228}
+  m_CullTransparentMesh: 1
+--- !u!114 &1771677231819467193
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2998927439283164228}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.80784315}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: 
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 0}
+  packInfo:
+    packName: 
+    packgJsonPath: 
+    packgSpritePath: 
+    lasetJsonGUID: 
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &3591535627247191034
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8607046890090167354}
+  - component: {fileID: 7798961259810263775}
+  - component: {fileID: 1291835810789404280}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8607046890090167354
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3591535627247191034}
+  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: 2128051441581476715}
+  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.7, y: 0}
+  m_SizeDelta: {x: 59, y: 53}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7798961259810263775
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3591535627247191034}
+  m_CullTransparentMesh: 1
+--- !u!114 &1291835810789404280
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3591535627247191034}
+  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_fuhao_cz
+  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: d570df61e5e429dc2d9169bbaecec167
+  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 &4129549414827253199
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4860858023539524685}
+  - component: {fileID: 1547619875768023638}
+  - component: {fileID: 2596323858079111722}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4860858023539524685
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4129549414827253199}
+  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: 6670566960034558026}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 1, y: 4}
+  m_SizeDelta: {x: 59, y: 53}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1547619875768023638
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4129549414827253199}
+  m_CullTransparentMesh: 1
+--- !u!114 &2596323858079111722
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4129549414827253199}
+  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_ty_x
+  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: d570df61e5e429dc2d9169bbaecec167
+  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 &5734380188375769178
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2128051441581476715}
+  - component: {fileID: 3757140388240556968}
+  - component: {fileID: 4274198529094444920}
+  - component: {fileID: 3945635134592693363}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: JiXu
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2128051441581476715
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5734380188375769178}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 8607046890090167354}
+  m_Father: {fileID: 4202026612452094680}
+  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: -65, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3757140388240556968
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5734380188375769178}
+  m_CullTransparentMesh: 1
+--- !u!114 &4274198529094444920
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5734380188375769178}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 0
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 0}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &3945635134592693363
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5734380188375769178}
+  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.05660379, g: 0.05660379, b: 0.05660379, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: btn_24
+  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: d570df61e5e429dc2d9169bbaecec167
+  imageH: 30
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &7347659349234046901
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6670566960034558026}
+  - component: {fileID: 8287751716906394220}
+  - component: {fileID: 8675729300284759539}
+  - component: {fileID: 8479993713293833217}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: TuiChu
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6670566960034558026
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7347659349234046901}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 4860858023539524685}
+  m_Father: {fileID: 4202026612452094680}
+  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: 98, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8287751716906394220
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7347659349234046901}
+  m_CullTransparentMesh: 1
+--- !u!114 &8675729300284759539
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7347659349234046901}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 0
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 8479993713293833217}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &8479993713293833217
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7347659349234046901}
+  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.05660379, g: 0.05660379, b: 0.05660379, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: btn_24
+  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: d570df61e5e429dc2d9169bbaecec167
+  imageH: 30
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0

Assets/Res/UI/CombatPuasePanel.prefab.meta

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

Assets/Resources/Shader/Shader Graphs_ShengShiShader.mat

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

Assets/Scripts/GameData/ExcelConfig/SkillConfig.cs

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

Assets/Scripts/GameData/ExcelConfig/SkillConstant.cs

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

Assets/Scripts/GameData/ExcelConfig/SkillPowerupConfig.cs

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

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

@@ -185,6 +185,20 @@ namespace Fort23.Mono
                 CombatController.currActiveCombat.playerHeroEntity.heroMagicWeaponControl.isAutoUse =
                     x;
             });
+            ZhanTing.onClick.AddListener(() =>
+            {
+                CombatController.currActiveCombat.isUpdate = false;
+                CombatPuasePanel.OpenCombatPuasePanel(ZhanTing_onClick);
+            });
+        }
+
+        private void ZhanTing_onClick(bool isOk)
+        {
+            CombatController.currActiveCombat.isUpdate = true;
+            if (isOk)
+            {
+                CombatController.currActiveCombat.GameOver(false);
+            }
         }
 
 

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

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

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

@@ -0,0 +1,46 @@
+namespace Fort23.Mono
+{
+    [UIBinding(prefab = "CombatPuasePanel")]
+    public partial class CombatPuasePanel : UIPanel
+    {
+        private System.Action<bool> callBack;
+
+        public static async void OpenCombatPuasePanel(System.Action<bool> callBack)
+        {
+            CombatPuasePanel combatPuasePanel =
+                await UIManager.Instance.LoadAndOpenPanel<CombatPuasePanel>(null, UILayer.Top, isFocus: true);
+            combatPuasePanel.ShowUI(callBack);
+        }
+
+        public void ShowUI(System.Action<bool> callBack)
+        {
+            this.callBack = callBack;
+        }
+
+        private void Init()
+        {
+        }
+
+        protected override void AddEvent()
+        {
+        }
+
+        protected override void DelEvent()
+        {
+        }
+
+        public override void AddButtonEvent()
+        {
+            JiXu.onClick.AddListener(() =>
+            {
+                UIManager.Instance.HideUIUIPanel(this);
+                callBack.Invoke(false);
+            });
+            TuiChu.onClick.AddListener(() =>
+            {
+                UIManager.Instance.HideUIUIPanel(this);
+                callBack.Invoke(true);
+            });
+        }
+    }
+}

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

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

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

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

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

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

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

@@ -182,11 +182,19 @@ namespace Fort23.Mono
                 }
                 else
                 {
-                    playerLevel.text =
-                        LanguageManager.Instance.Text(
-                            combatHeroEntity.CurrCombatHeroInfo.powerUpConfig.jingjieLanIDs[0])
-                        + LanguageManager.Instance.Text(
-                            combatHeroEntity.CurrCombatHeroInfo.powerUpConfig.jingjieLanIDs[1])+combatHeroEntity.CurrCombatHeroInfo.powerUpConfig.jingjie3;
+                    if (combatHeroEntity.CurrCombatHeroInfo.powerUpConfig.jingjieLanIDs != null)
+                    {
+                        playerLevel.text =
+                            LanguageManager.Instance.Text(
+                                combatHeroEntity.CurrCombatHeroInfo.powerUpConfig.jingjieLanIDs[0])
+                            + LanguageManager.Instance.Text(
+                                combatHeroEntity.CurrCombatHeroInfo.powerUpConfig.jingjieLanIDs[1]) +
+                            combatHeroEntity.CurrCombatHeroInfo.powerUpConfig.jingjie3;
+                    }
+                    else
+                    {
+                        playerLevel.text = "";
+                    }
                 }
             }