Merge branch 'master' of http://192.168.123.2:3000/fort23/XY001

# Conflicts:
#	Assets/StreamingAssets/assetConfig.txt   resolved by master version
#	UserSettings/Layouts/default-2022.dwlt   resolved by master version

Assets/Art/UIAssets/Button/btn_Round06_Red.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: Cnsc5H//VH/cv7eUr0oRPwKRmt/46DBgKwDmWEHIK/1RXz1NAwerQx0=
+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: 41, y: 47, z: 53, w: 49}
+  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: 1537655665
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

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

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: CCkXvCirBnKsC2Re+IE6aQ59MhJGcC2sH1vhwDNPexzN14muqOg+6cA=
+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_Close02.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: Wiga5CqtVy+a1nMj8nrR5HQW7ROTAoqSiuMdjbhgnACb7CXUqpXT36M=
+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/Layer Lab/GUI Pro-SuperCasual/Scene/DemoScene_SuperCasual.unity

@@ -188658,6 +188658,86 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 809926767}
   m_CullTransparentMesh: 1
+--- !u!1 &810058500
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 810058501}
+  - component: {fileID: 810058503}
+  - component: {fileID: 810058502}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &810058501
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 810058500}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 5, y: 5, z: 5}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1165331220}
+  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: 298, y: -919}
+  m_SizeDelta: {x: 197.1, y: 112.6}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &810058502
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 810058500}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.754717, g: 0.754717, b: 0.754717, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: b7c777c059b175a48aa53e19d188f3ff, type: 2}
+    m_FontSize: 141
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 0
+    m_MaxSize: 151
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 123
+--- !u!222 &810058503
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 810058500}
+  m_CullTransparentMesh: 1
 --- !u!1 &810775001
 GameObject:
   m_ObjectHideFlags: 0
@@ -270892,6 +270972,11 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1165130996}
   m_CullTransparentMesh: 1
+--- !u!224 &1165331220 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 74902944732340735, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
+  m_PrefabInstance: {fileID: 5883069234991959761}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1165481439
 GameObject:
   m_ObjectHideFlags: 0
@@ -394708,7 +394793,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &1686514844
 RectTransform:
   m_ObjectHideFlags: 0
@@ -499093,19 +499178,19 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 633556119156740559, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 633556119156740559, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 633556119156740559, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 27.42
       objectReference: {fileID: 0}
     - target: {fileID: 633556119156740559, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -29
       objectReference: {fileID: 0}
     - target: {fileID: 717000741117709065, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_IsActive
@@ -499113,7 +499198,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1304097413173983624, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 54.84
       objectReference: {fileID: 0}
     - target: {fileID: 1320401648568631059, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_Value
@@ -499121,63 +499206,63 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1603543821887793293, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 1603543821887793293, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 1603543821887793293, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 84
       objectReference: {fileID: 0}
     - target: {fileID: 1603543821887793293, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -28
       objectReference: {fileID: 0}
     - target: {fileID: 2210322157374921795, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchorMax.x
-      value: 0
+      value: 0.708
       objectReference: {fileID: 0}
     - target: {fileID: 2210322157374921795, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2358080822167749276, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2358080822167749276, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2358080822167749276, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 278
       objectReference: {fileID: 0}
     - target: {fileID: 2358080822167749276, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 1023
       objectReference: {fileID: 0}
     - target: {fileID: 2358080822167749276, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -89.85001
       objectReference: {fileID: 0}
     - target: {fileID: 2485815262242607507, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2485815262242607507, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2485815262242607507, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 662.6
       objectReference: {fileID: 0}
     - target: {fileID: 2485815262242607507, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -28
       objectReference: {fileID: 0}
     - target: {fileID: 2554430180816756616, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_Name
@@ -499185,27 +499270,27 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2554430180816756616, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3596372810887163893, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3596372810887163893, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3596372810887163893, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 278
       objectReference: {fileID: 0}
     - target: {fileID: 3596372810887163893, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 417
       objectReference: {fileID: 0}
     - target: {fileID: 3596372810887163893, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -89.85001
       objectReference: {fileID: 0}
     - target: {fileID: 3664411922232336669, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_IsActive
@@ -499213,47 +499298,47 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3894586330948321654, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3894586330948321654, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3894586330948321654, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 328
       objectReference: {fileID: 0}
     - target: {fileID: 3894586330948321654, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 720
       objectReference: {fileID: 0}
     - target: {fileID: 3894586330948321654, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -85.20001
       objectReference: {fileID: 0}
     - target: {fileID: 3942119357474447327, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3942119357474447327, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3942119357474447327, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 278
       objectReference: {fileID: 0}
     - target: {fileID: 3942119357474447327, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 1301
       objectReference: {fileID: 0}
     - target: {fileID: 3942119357474447327, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -89.85001
       objectReference: {fileID: 0}
     - target: {fileID: 4029056082544636664, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 54.84
       objectReference: {fileID: 0}
     - target: {fileID: 4515790728460935930, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_IsActive
@@ -499265,11 +499350,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 5122476276599886461, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchorMax.x
-      value: 0
+      value: 0.279
       objectReference: {fileID: 0}
     - target: {fileID: 5122476276599886461, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5708904672404966800, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_IsActive
@@ -499281,19 +499366,19 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6464757117435473793, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6464757117435473793, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6464757117435473793, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 27.42
       objectReference: {fileID: 0}
     - target: {fileID: 6464757117435473793, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -29
       objectReference: {fileID: 0}
     - target: {fileID: 6678662444514587225, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_Pivot.x
@@ -499377,51 +499462,54 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7926931914951179676, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 7926931914951179676, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 7926931914951179676, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 371.5
       objectReference: {fileID: 0}
     - target: {fileID: 7926931914951179676, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -28
       objectReference: {fileID: 0}
     - target: {fileID: 8581528108883261822, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8581528108883261822, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8581528108883261822, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 278
       objectReference: {fileID: 0}
     - target: {fileID: 8581528108883261822, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 139
       objectReference: {fileID: 0}
     - target: {fileID: 8581528108883261822, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -89.85001
       objectReference: {fileID: 0}
     - target: {fileID: 8814903607347438053, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchorMax.x
-      value: 0
+      value: 0.526
       objectReference: {fileID: 0}
     - target: {fileID: 8814903607347438053, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
-    m_AddedGameObjects: []
+    m_AddedGameObjects:
+    - targetCorrespondingSourceObject: {fileID: 74902944732340735, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 810058501}
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
 --- !u!1660057539 &9223372036854775807

Assets/Res/Config/LanguageChineseConfig.json

@@ -127,6 +127,118 @@
     {
       "ID": 32,
       "txt": "精英"
+    },
+    {
+      "ID": 33,
+      "txt": "向周围释放多道剑气，造成<color=#7AC180>{0}%</color>攻击力的伤害。"
+    },
+    {
+      "ID": 34,
+      "txt": "造成的伤害提升至<color=#7AC180>{0}%</color>。"
+    },
+    {
+      "ID": 35,
+      "txt": "造成的伤害提升至<color=#7AC180>{0}%</color>。"
+    },
+    {
+      "ID": 36,
+      "txt": "造成的伤害提升至<color=#7AC180>{0}%</color>。"
+    },
+    {
+      "ID": 37,
+      "txt": "英雄提升至{0}级强化该技能"
+    },
+    {
+      "ID": 38,
+      "txt": "英雄提升至{0}级解锁该技能"
+    },
+    {
+      "ID": 39,
+      "txt": "英雄提升至{0}星强化该技能"
+    },
+    {
+      "ID": 40,
+      "txt": "英雄提升至{0}星解锁该技能"
+    },
+    {
+      "ID": 41,
+      "txt": "{0}级："
+    },
+    {
+      "ID": 42,
+      "txt": "({0}级解锁)"
+    },
+    {
+      "ID": 43,
+      "txt": "({0}星解锁)"
+    },
+    {
+      "ID": 44,
+      "txt": "技能已达最高等级"
+    },
+    {
+      "ID": 45,
+      "txt": "旋风斩"
+    },
+    {
+      "ID": 46,
+      "txt": "对前方范围释放火焰，对范围内的敌人进行多次灼烧，每次造成<color=#7AC180>{0}%</color>攻击力的伤害，持续<color=#7AC180>{1}秒</color>"
+    },
+    {
+      "ID": 47,
+      "txt": "每次造成的伤害提升至<color=#7AC180>{0}%</color>。"
+    },
+    {
+      "ID": 48,
+      "txt": "每次造成的伤害提升至<color=#7AC180>{0}%</color>。"
+    },
+    {
+      "ID": 49,
+      "txt": "持续时间提升至<color=#7AC180>{1}秒</color>。"
+    },
+    {
+      "ID": 50,
+      "txt": "火焰烧烤"
+    },
+    {
+      "ID": 51,
+      "txt": "对全体英雄进行治疗，恢复<color=#7AC180>{0}%</color>攻击力的血量。"
+    },
+    {
+      "ID": 52,
+      "txt": "恢复的血量提升至<color=#7AC180>{0}%</color>。"
+    },
+    {
+      "ID": 53,
+      "txt": "恢复的血量提升至<color=#7AC180>{0}%</color>。"
+    },
+    {
+      "ID": 54,
+      "txt": "恢复的血量提升至<color=#7AC180>{0}%</color>。"
+    },
+    {
+      "ID": 55,
+      "txt": "全体治疗"
+    },
+    {
+      "ID": 56,
+      "txt": "向前方连续射出多支魔法箭，造成<color=#7AC180>{0}%</color>攻击力的伤害。"
+    },
+    {
+      "ID": 57,
+      "txt": "造成的伤害提升至<color=#7AC180>{0}%</color>。"
+    },
+    {
+      "ID": 58,
+      "txt": "造成的伤害提升至<color=#7AC180>{0}%</color>。"
+    },
+    {
+      "ID": 59,
+      "txt": "造成的伤害提升至<color=#7AC180>{0}%</color>。"
+    },
+    {
+      "ID": 60,
+      "txt": "万箭齐发"
     }
   ]
 }

Assets/Res/Config/SkillConfig.json

@@ -9,6 +9,7 @@
       "SkillType": 1,
       "level": 1,
       "name": 405077,
+      "desc": null,
       "effectValue": [
         100.0
       ]
@@ -21,7 +22,8 @@
       "cd": 4,
       "SkillType": 2,
       "level": 1,
-      "name": 405077,
+      "name": 45,
+      "desc": 33,
       "effectValue": [
         400.0
       ]
@@ -34,7 +36,8 @@
       "cd": 4,
       "SkillType": 2,
       "level": 2,
-      "name": 405077,
+      "name": 45,
+      "desc": 34,
       "effectValue": [
         440.0
       ]
@@ -47,7 +50,8 @@
       "cd": 4,
       "SkillType": 2,
       "level": 3,
-      "name": 405077,
+      "name": 45,
+      "desc": 35,
       "effectValue": [
         480.0
       ]
@@ -60,7 +64,8 @@
       "cd": 4,
       "SkillType": 2,
       "level": 4,
-      "name": 405077,
+      "name": 45,
+      "desc": 36,
       "effectValue": [
         520.0
       ]
@@ -73,7 +78,8 @@
       "cd": 6,
       "SkillType": 2,
       "level": 1,
-      "name": 405077,
+      "name": 50,
+      "desc": 46,
       "effectValue": [
         60.0,
         3.0
@@ -87,7 +93,8 @@
       "cd": 6,
       "SkillType": 2,
       "level": 2,
-      "name": 405077,
+      "name": 50,
+      "desc": 47,
       "effectValue": [
         66.0,
         3.0
@@ -101,7 +108,8 @@
       "cd": 6,
       "SkillType": 2,
       "level": 3,
-      "name": 405077,
+      "name": 50,
+      "desc": 48,
       "effectValue": [
         72.0,
         3.0
@@ -115,10 +123,11 @@
       "cd": 6,
       "SkillType": 2,
       "level": 4,
-      "name": 405077,
+      "name": 50,
+      "desc": 49,
       "effectValue": [
         78.0,
-        3.0
+        4.0
       ]
     },
     {
@@ -129,7 +138,8 @@
       "cd": 5,
       "SkillType": 2,
       "level": 1,
-      "name": 405077,
+      "name": 55,
+      "desc": 51,
       "effectValue": [
         250.0
       ]
@@ -142,7 +152,8 @@
       "cd": 5,
       "SkillType": 2,
       "level": 2,
-      "name": 405077,
+      "name": 55,
+      "desc": 52,
       "effectValue": [
         275.0
       ]
@@ -155,7 +166,8 @@
       "cd": 5,
       "SkillType": 2,
       "level": 3,
-      "name": 405077,
+      "name": 55,
+      "desc": 53,
       "effectValue": [
         300.0
       ]
@@ -168,7 +180,8 @@
       "cd": 5,
       "SkillType": 2,
       "level": 4,
-      "name": 405077,
+      "name": 55,
+      "desc": 54,
       "effectValue": [
         325.0
       ]
@@ -181,7 +194,8 @@
       "cd": 10,
       "SkillType": 2,
       "level": 1,
-      "name": 405077,
+      "name": 60,
+      "desc": 56,
       "effectValue": [
         333.333344
       ]
@@ -194,7 +208,8 @@
       "cd": 10,
       "SkillType": 2,
       "level": 2,
-      "name": 405077,
+      "name": 60,
+      "desc": 57,
       "effectValue": [
         366.666656
       ]
@@ -207,7 +222,8 @@
       "cd": 10,
       "SkillType": 2,
       "level": 3,
-      "name": 405077,
+      "name": 60,
+      "desc": 58,
       "effectValue": [
         400.0
       ]
@@ -220,7 +236,8 @@
       "cd": 10,
       "SkillType": 2,
       "level": 4,
-      "name": 405077,
+      "name": 60,
+      "desc": 59,
       "effectValue": [
         433.333344
       ]
@@ -234,6 +251,7 @@
       "SkillType": 2,
       "level": 1,
       "name": 405077,
+      "desc": null,
       "effectValue": [
         500.0
       ]
@@ -247,6 +265,7 @@
       "SkillType": 2,
       "level": 2,
       "name": 405077,
+      "desc": null,
       "effectValue": [
         550.0
       ]
@@ -260,6 +279,7 @@
       "SkillType": 2,
       "level": 3,
       "name": 405077,
+      "desc": null,
       "effectValue": [
         600.0
       ]
@@ -273,6 +293,7 @@
       "SkillType": 2,
       "level": 4,
       "name": 405077,
+      "desc": null,
       "effectValue": [
         650.0
       ]
@@ -286,6 +307,7 @@
       "SkillType": 2,
       "level": 1,
       "name": 405077,
+      "desc": null,
       "effectValue": [
         250.0
       ]
@@ -299,6 +321,7 @@
       "SkillType": 2,
       "level": 2,
       "name": 405077,
+      "desc": null,
       "effectValue": [
         275.0
       ]
@@ -312,6 +335,7 @@
       "SkillType": 2,
       "level": 3,
       "name": 405077,
+      "desc": null,
       "effectValue": [
         300.0
       ]
@@ -325,6 +349,7 @@
       "SkillType": 2,
       "level": 4,
       "name": 405077,
+      "desc": null,
       "effectValue": [
         325.0
       ]
@@ -338,6 +363,7 @@
       "SkillType": 2,
       "level": 1,
       "name": 405077,
+      "desc": null,
       "effectValue": [
         400.0
       ]
@@ -351,6 +377,7 @@
       "SkillType": 2,
       "level": 2,
       "name": 405077,
+      "desc": null,
       "effectValue": [
         440.0
       ]
@@ -364,6 +391,7 @@
       "SkillType": 2,
       "level": 3,
       "name": 405077,
+      "desc": null,
       "effectValue": [
         480.0
       ]
@@ -377,6 +405,7 @@
       "SkillType": 2,
       "level": 4,
       "name": 405077,
+      "desc": null,
       "effectValue": [
         520.0
       ]
@@ -390,6 +419,7 @@
       "SkillType": 2,
       "level": 1,
       "name": 405077,
+      "desc": null,
       "effectValue": [
         500.0
       ]
@@ -403,6 +433,7 @@
       "SkillType": 2,
       "level": 2,
       "name": 405077,
+      "desc": null,
       "effectValue": [
         550.0
       ]
@@ -416,6 +447,7 @@
       "SkillType": 2,
       "level": 3,
       "name": 405077,
+      "desc": null,
       "effectValue": [
         600.0
       ]
@@ -429,6 +461,7 @@
       "SkillType": 2,
       "level": 4,
       "name": 405077,
+      "desc": null,
       "effectValue": [
         650.0
       ]
@@ -442,6 +475,7 @@
       "SkillType": 2,
       "level": 1,
       "name": 405077,
+      "desc": null,
       "effectValue": [
         300.0
       ]
@@ -455,6 +489,7 @@
       "SkillType": 2,
       "level": 2,
       "name": 405077,
+      "desc": null,
       "effectValue": [
         330.0
       ]
@@ -468,6 +503,7 @@
       "SkillType": 2,
       "level": 3,
       "name": 405077,
+      "desc": null,
       "effectValue": [
         360.0
       ]
@@ -481,6 +517,7 @@
       "SkillType": 2,
       "level": 4,
       "name": 405077,
+      "desc": null,
       "effectValue": [
         390.0
       ]
@@ -494,6 +531,7 @@
       "SkillType": 2,
       "level": 1,
       "name": 405077,
+      "desc": null,
       "effectValue": [
         800.0
       ]
@@ -507,6 +545,7 @@
       "SkillType": 2,
       "level": 2,
       "name": 405077,
+      "desc": null,
       "effectValue": [
         880.0
       ]
@@ -520,6 +559,7 @@
       "SkillType": 2,
       "level": 3,
       "name": 405077,
+      "desc": null,
       "effectValue": [
         960.0
       ]
@@ -533,6 +573,7 @@
       "SkillType": 2,
       "level": 4,
       "name": 405077,
+      "desc": null,
       "effectValue": [
         1040.0
       ]

Assets/Res/UI/SkillUIComponent.prefab

@@ -83,7 +83,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &637797717169572563
 RectTransform:
   m_ObjectHideFlags: 0
@@ -198,8 +198,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -304.69998, y: 158}
-  m_SizeDelta: {x: 104.1, y: 30}
+  m_AnchoredPosition: {x: -298, y: 158}
+  m_SizeDelta: {x: 120, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6310280512319826708
 CanvasRenderer:
@@ -283,7 +283,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 344, y: -54}
+  m_AnchoredPosition: {x: 344, y: -81.915886}
   m_SizeDelta: {x: 688, y: 0}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &4396069779853996381
@@ -316,7 +316,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 24
+    m_FontSize: 28
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
@@ -327,7 +327,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u5927\u86C7\u7B2C\u4E00\u4E2A\u6280\u80FD\uFF0C\u5BF9\u654C\u4EBA\u7167\u6210\u4F24\u5BB3\uFF0C\u5E76\u5C06\u654C\u4EBA\u51FB\u9000\u4E00\u6BB5\u8DDD\u79BB"
+  m_Text: "\u5927\u86C7\u7B2C\u4E00\u4E2A\u6280\u80FD\uFF0C\u5E76\u5C06\u654C\u4EBA\u51FB\u9000\u4E00\u6BB5\u8DDD\u79BB1"
 --- !u!114 &4297473089771174117
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -378,7 +378,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 344, y: -27}
+  m_AnchoredPosition: {x: 344, y: -40.957943}
   m_SizeDelta: {x: 688, y: 0}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &7568156432243018947
@@ -411,7 +411,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 24
+    m_FontSize: 28
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
@@ -422,7 +422,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u5927\u86C7\u7B2C\u4E00\u4E2A\u6280\u80FD\uFF0C\u5BF9\u654C\u4EBA\u7167\u6210\u4F24\u5BB3\uFF0C\u5E76\u5C06\u654C\u4EBA\u51FB\u9000\u4E00\u6BB5\u8DDD\u79BB"
+  m_Text: "\u5927\u86C7\u7B2C\u4E00\u4E2A\u6280\u80FD\uFF0C\u5E76\u5C06\u654C\u4EBA\u51FB\u9000\u4E00\u6BB5\u8DDD\u79BB1"
 --- !u!114 &5596254405228865015
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -506,7 +506,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 24
+    m_FontSize: 28
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
@@ -517,7 +517,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u5927\u86C7\u7B2C\u4E00\u4E2A\u6280\u80FD\uFF0C\u5BF9\u654C\u4EBA\u7167\u6210\u4F24\u5BB3\uFF0C\u5E76\u5C06\u654C\u4EBA\u51FB\u9000\u4E00\u6BB5\u8DDD\u79BB1"
+  m_Text: "\u5927\u86C7\u7B2C\u4E00\u4E2A\u6280\u80FD\uFF0C\u5E76\u5C06\u654C\u4EBA\u51FB\u9000\u4E00\u6BB5\u8DDD\u79BB1"
 --- !u!114 &2292706173671014847
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -532,6 +532,106 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 0
   m_VerticalFit: 2
+--- !u!1 &2070624122955120047
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2937261174254495495}
+  - component: {fileID: 4112740142923895958}
+  - component: {fileID: 1872949983710189169}
+  - component: {fileID: 2284744616038149915}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: dec
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2937261174254495495
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2070624122955120047}
+  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: 3627910858691465121}
+  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: 45, y: 45}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4112740142923895958
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2070624122955120047}
+  m_CullTransparentMesh: 1
+--- !u!114 &1872949983710189169
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2070624122955120047}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cfabb0440166ab443bba8876756fdfa9, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
+  m_EffectDistance: {x: 0, y: -4}
+  m_UseGraphicAlpha: 0
+--- !u!114 &2284744616038149915
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2070624122955120047}
+  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_Close01
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  packInfo:
+    packName: all
+    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
+    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
+    lasetJsonGUID: ace5466faa841bb7b9046587aae54d38
 --- !u!1 &2456279290738976765
 GameObject:
   m_ObjectHideFlags: 0
@@ -591,7 +691,7 @@ MonoBehaviour:
     m_Top: 0
     m_Bottom: 0
   m_ChildAlignment: 0
-  m_Spacing: 0
+  m_Spacing: 10
   m_ChildForceExpandWidth: 0
   m_ChildForceExpandHeight: 1
   m_ChildControlWidth: 0
@@ -706,7 +806,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 20
+    m_FontSize: 24
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
@@ -757,7 +857,7 @@ RectTransform:
   - {fileID: 4388396417434440462}
   - {fileID: 4397437230936891047}
   - {fileID: 4105650447501009726}
-  - {fileID: 723490014355934592}
+  - {fileID: 3627910858691465121}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
@@ -786,7 +886,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.16862746, g: 0.23921569, b: 0.22352941, a: 1}
+  m_Color: {r: 0.130874, g: 0.16037738, b: 0.15382107, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -880,7 +980,7 @@ MonoBehaviour:
     - gameObject: {fileID: 1806108059677379203}
     - gameObject: {fileID: 7033063365279083689}
   - key: btnBack
-    gameObject: {fileID: 2711588293977141334}
+    gameObject: {fileID: 1159812790296790387}
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas:
@@ -969,136 +1069,6 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u6280\u80FD\u5DF2\u8FBE\u6700\u9AD8\u7B49\u7EA7"
---- !u!1 &4310102973561622993
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 723490014355934592}
-  - component: {fileID: 516774113589680700}
-  - component: {fileID: 2711588293977141334}
-  - component: {fileID: 1690155598512094183}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Button_Back
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &723490014355934592
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4310102973561622993}
-  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: 6405333098484184124}
-  m_Father: {fileID: 8459636219199963279}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 613, y: 445}
-  m_SizeDelta: {x: 134, y: 100}
-  m_Pivot: {x: 0, y: 0.5}
---- !u!222 &516774113589680700
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4310102973561622993}
-  m_CullTransparentMesh: 1
---- !u!114 &2711588293977141334
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4310102973561622993}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 3
-    m_WrapAround: 0
-    m_SelectOnUp: {fileID: 0}
-    m_SelectOnDown: {fileID: 0}
-    m_SelectOnLeft: {fileID: 0}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
-  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
-    m_ColorMultiplier: 1
-    m_FadeDuration: 0.1
-  m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
-    m_PressedSprite: {fileID: 0}
-    m_SelectedSprite: {fileID: 0}
-    m_DisabledSprite: {fileID: 0}
-  m_AnimationTriggers:
-    m_NormalTrigger: Normal
-    m_HighlightedTrigger: Highlighted
-    m_PressedTrigger: Pressed
-    m_SelectedTrigger: Selected
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 1690155598512094183}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
---- !u!114 &1690155598512094183
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4310102973561622993}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 0}
-  m_Type: 1
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_LeftFlush_Dark
-  isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
-  packInfo:
-    packName: all
-    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
-    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: ace5466faa841bb7b9046587aae54d38
 --- !u!1 &4356462366393647132
 GameObject:
   m_ObjectHideFlags: 0
@@ -1167,7 +1137,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 20
+    m_FontSize: 24
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
@@ -1179,7 +1149,7 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u7B49\u7EA7:"
---- !u!1 &5657990910231637639
+--- !u!1 &5993052203131053859
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1187,74 +1157,58 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 6405333098484184124}
-  - component: {fileID: 4906605461895174008}
-  - component: {fileID: 2547591136658460327}
-  - component: {fileID: 7459821602363042982}
+  - component: {fileID: 8089296172921106170}
+  - component: {fileID: 3066398490269742563}
+  - component: {fileID: 6293627713428882785}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: Icon
+  m_Name: Border
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &6405333098484184124
+--- !u!224 &8089296172921106170
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5657990910231637639}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_GameObject: {fileID: 5993052203131053859}
+  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: 723490014355934592}
+  m_Father: {fileID: 4105650447501009726}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -9, y: 4}
-  m_SizeDelta: {x: 80.6, y: 69}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0.000015258789, y: -0.0000076293945}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &4906605461895174008
+--- !u!222 &3066398490269742563
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5657990910231637639}
+  m_GameObject: {fileID: 5993052203131053859}
   m_CullTransparentMesh: 1
---- !u!114 &2547591136658460327
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5657990910231637639}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: cfabb0440166ab443bba8876756fdfa9, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
-  m_EffectDistance: {x: 0, y: -4}
-  m_UseGraphicAlpha: 0
---- !u!114 &7459821602363042982
+--- !u!114 &6293627713428882785
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5657990910231637639}
+  m_GameObject: {fileID: 5993052203131053859}
   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_Color: {r: 0, g: 0, b: 0, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1262,7 +1216,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_Sprite: {fileID: 0}
-  m_Type: 0
+  m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -1271,15 +1225,15 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: btn_Back
+  _icon_name: dec_00_04_06_Border
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
   packInfo:
     packName: all
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: ace5466faa841bb7b9046587aae54d38
---- !u!1 &5993052203131053859
+    lasetJsonGUID: 8fbc3902b8b4a448719eb520746784cf
+--- !u!1 &6307184681931449058
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1287,54 +1241,54 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 8089296172921106170}
-  - component: {fileID: 3066398490269742563}
-  - component: {fileID: 6293627713428882785}
+  - component: {fileID: 8357257302712234465}
+  - component: {fileID: 1416142448490798761}
+  - component: {fileID: 7886407335460711750}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: Border
+  m_Name: txtCD
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &8089296172921106170
+--- !u!224 &8357257302712234465
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5993052203131053859}
+  m_GameObject: {fileID: 6307184681931449058}
   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: 4105650447501009726}
+  m_Father: {fileID: 4388396417434440462}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
+  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: 0.000015258789, y: -0.0000076293945}
+  m_SizeDelta: {x: 100, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &3066398490269742563
+--- !u!222 &1416142448490798761
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5993052203131053859}
+  m_GameObject: {fileID: 6307184681931449058}
   m_CullTransparentMesh: 1
---- !u!114 &6293627713428882785
+--- !u!114 &7886407335460711750
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5993052203131053859}
+  m_GameObject: {fileID: 6307184681931449058}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
@@ -1345,25 +1299,21 @@ MonoBehaviour:
   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_00_04_06_Border
-  isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
-  packInfo:
-    packName: all
-    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
-    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: 8fbc3902b8b4a448719eb520746784cf
---- !u!1 &6307184681931449058
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 24
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u51B7\u53743\u79D2"
+--- !u!1 &6620188333875513315
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1371,78 +1321,98 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 8357257302712234465}
-  - component: {fileID: 1416142448490798761}
-  - component: {fileID: 7886407335460711750}
+  - component: {fileID: 1363224240556191930}
+  - component: {fileID: 8783540377736138095}
+  - component: {fileID: 9136242422465954576}
+  - component: {fileID: 2232901402214778235}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: txtCD
+  m_Name: bgBorder
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &8357257302712234465
+--- !u!224 &1363224240556191930
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6307184681931449058}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_GameObject: {fileID: 6620188333875513315}
+  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: 4388396417434440462}
+  m_Father: {fileID: 3627910858691465121}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 2, y: 0}
-  m_SizeDelta: {x: 79.1, y: 30}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 50, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &1416142448490798761
+--- !u!222 &8783540377736138095
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6307184681931449058}
+  m_GameObject: {fileID: 6620188333875513315}
   m_CullTransparentMesh: 1
---- !u!114 &7886407335460711750
+--- !u!114 &9136242422465954576
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6307184681931449058}
+  m_GameObject: {fileID: 6620188333875513315}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Script: {fileID: 11500000, guid: cfabb0440166ab443bba8876756fdfa9, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
+  m_EffectDistance: {x: 0, y: -4}
+  m_UseGraphicAlpha: 0
+--- !u!114 &2232901402214778235
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6620188333875513315}
+  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: 1}
+  m_Color: {r: 0.54509807, g: 0.007843138, b: 0.20784314, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 20
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 2
-    m_MaxSize: 40
-    m_Alignment: 3
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: "\u51B7\u53743\u79D2"
+  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_Close01_Border
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  packInfo:
+    packName: all
+    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
+    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
+    lasetJsonGUID: ace5466faa841bb7b9046587aae54d38
 --- !u!1 &7033063365279083689
 GameObject:
   m_ObjectHideFlags: 0
@@ -1479,7 +1449,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 344, y: -81}
+  m_AnchoredPosition: {x: 344, y: -122.873825}
   m_SizeDelta: {x: 688, y: 0}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &5946602135712632191
@@ -1512,7 +1482,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 24
+    m_FontSize: 28
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
@@ -1523,7 +1493,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u5927\u86C7\u7B2C\u4E00\u4E2A\u6280\u80FD\uFF0C\u5BF9\u654C\u4EBA\u7167\u6210\u4F24\u5BB3\uFF0C\u5E76\u5C06\u654C\u4EBA\u51FB\u9000\u4E00\u6BB5\u8DDD\u79BB"
+  m_Text: "\u5927\u86C7\u7B2C\u4E00\u4E2A\u6280\u80FD\uFF0C\u5E76\u5C06\u654C\u4EBA\u51FB\u9000\u4E00\u6BB5\u8DDD\u79BB1"
 --- !u!114 &1273081727955350729
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1618,6 +1588,137 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u6280\u80FD\u540D\u5B57"
+--- !u!1 &8273166758513733113
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3627910858691465121}
+  - component: {fileID: 3044300648206569428}
+  - component: {fileID: 1159812790296790387}
+  - component: {fileID: 3263896625059769442}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Button_Back
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3627910858691465121
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8273166758513733113}
+  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: 1363224240556191930}
+  - {fileID: 2937261174254495495}
+  m_Father: {fileID: 8459636219199963279}
+  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: 316, y: 200}
+  m_SizeDelta: {x: 80, y: 80}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3044300648206569428
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8273166758513733113}
+  m_CullTransparentMesh: 1
+--- !u!114 &1159812790296790387
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8273166758513733113}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 3263896625059769442}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &3263896625059769442
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8273166758513733113}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: btn_Round06_Red
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  packInfo:
+    packName: all
+    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
+    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
+    lasetJsonGUID: ace5466faa841bb7b9046587aae54d38
 --- !u!1001 &2249487104835043702
 PrefabInstance:
   m_ObjectHideFlags: 0

Assets/Res/UIAtlas/all.spriteatlasv2

@@ -27,6 +27,7 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: 137d66878d81240e08b1f9e634dd03e5, type: 3}
     - {fileID: 2800000, guid: c9076402f3d8e4f14b590c121f9c99d0, type: 3}
     - {fileID: 2800000, guid: 620836cccebfa47d69f3604400cda9d1, type: 3}
+    - {fileID: 2800000, guid: 7c8926e9485cb44518cbd710f654f4c3, type: 3}
     - {fileID: 2800000, guid: dd5f2c8c6196c4f2da80fb80e8d302c1, type: 3}
     - {fileID: 2800000, guid: 036dc8ba1666442588bd4900d7967f74, type: 3}
     - {fileID: 2800000, guid: df1cd931072aa4a118088d9e27a0a603, type: 3}
@@ -54,13 +55,16 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: 644d6a9935ab8468f91bccdf0e81217e, type: 3}
     - {fileID: 2800000, guid: 0107877e5f4474feeb6c3a48ddbd0181, type: 3}
     - {fileID: 2800000, guid: e6614d7880f624bebb9eb042438465e7, type: 3}
+    - {fileID: 2800000, guid: 513aeb74bd03e47a89e20193a6ed1b19, type: 3}
     - {fileID: 2800000, guid: 11f8939ed19d74afd9f1ec5c2cd1ed40, type: 3}
     - {fileID: 2800000, guid: 58233a1daedbb4a24b2ddca6bcb864fd, type: 3}
     - {fileID: 2800000, guid: 03108c847a5054b63971245729018c27, type: 3}
+    - {fileID: 2800000, guid: eb5a004d027914b13abea711a54675e5, type: 3}
     - {fileID: 2800000, guid: e4a00da9d5759447c948b8fa241afc3e, type: 3}
     - {fileID: 2800000, guid: dd87b4353a45646fbbeaafe8c13a4632, type: 3}
     - {fileID: 2800000, guid: 7c661cddbbc49467d8441a35766809e1, type: 3}
     - {fileID: 2800000, guid: 0e2733676e1be451a8519a89c49798c1, type: 3}
+    - {fileID: 2800000, guid: b2e467ec8826146c494188b3c7fbdef7, type: 3}
     - {fileID: 2800000, guid: 7529bbf4240db4e31a7b6f4df456a36a, type: 3}
     - {fileID: 2800000, guid: 082c2d0dec6374c548992e3de4c3cc17, type: 3}
     - {fileID: 2800000, guid: ab7ed8048d1084deca39266a82de2fbc, type: 3}

Assets/Scripts/GameData/ExcelConfig/SkillConfig.cs

@@ -58,11 +58,17 @@ public int level;
 
 
 		/// <summary>
-		///名称语言表ID
+		///技能名 语言表ID
 		/// </summary>
 public int name;
 
 
+		/// <summary>
+		///技能描述 语言表ID
+		/// </summary>
+public int desc;
+
+
 		/// <summary>
 		///效果值
 		/// </summary>

Assets/Scripts/GameLogic/Hero/HeroController.cs

@@ -122,7 +122,13 @@ namespace GameLogic.Hero
                 SkillUpConfig upConfig = PlayerManager.Instance.heroController
                     .IsLevelUpGetNewSkill(heroInfo.level.Value);
                 
-                data.isSkillUp = upConfig.ID > 0;
+                
+                if (upConfig.ID > 0)
+                {
+                    heroInfo.SkillData.UpdateSkills();
+                    data.isSkillUp = true;
+                }
+                
                 EventManager.Instance.Dispatch(CustomEventType.HeroLvUp, data);
             }
             else if (upType == HeroUpType.Promote)
@@ -130,7 +136,14 @@ namespace GameLogic.Hero
                 SkillUpConfig upConfig = PlayerManager.Instance.heroController
                     .IsStarUpGetNewSkill(heroInfo.star.Value);
                 
-                data.isSkillUp = upConfig.ID > 0;
+                // data.isSkillUp = upConfig.ID > 0;
+                
+                if (upConfig.ID > 0)
+                {
+                    heroInfo.SkillData.UpdateSkills();
+                    data.isSkillUp = true;
+                }
+                
                 EventManager.Instance.Dispatch(CustomEventType.HeroPromote, data);
             }
         }
@@ -268,9 +281,9 @@ namespace GameLogic.Hero
             SkillConfig skillConfig = new SkillConfig();
             
             int lv = 0;
-            for(int i = 0; i <  PlayerManager.Instance.groupSkillDIc[groupID].Count; i++)
+            for(int i = 0; i <  PlayerManager.Instance.groupSkillDic[groupID].Count; i++)
             {
-                SkillConfig config = PlayerManager.Instance.groupSkillDIc[groupID][i];
+                SkillConfig config = PlayerManager.Instance.groupSkillDic[groupID][i];
 
                 if (i == 0 && !onlyUnLock)
                 {
@@ -305,45 +318,45 @@ namespace GameLogic.Hero
             {
                 //整体可能有点绕，后面再看优化不
                 
-                //取技能ID的后两位，后两位是技能解锁表SkillUpConfig的ID, 取这个ID来判断，这个技能是否解锁，以及还差多少差解锁
+                //取技能ID的后两位，后两位是技能解锁表SkillUpConfig的ID, 取这个ID来判断，这个技能技能的解锁情况
                 int skillUpID = skillID % 100;
-                SkillUpConfig skillUpConfig = ConfigComponent.Instance.Get<SkillUpConfig>(skillUpID);
+                SkillUpConfig upConfig = ConfigComponent.Instance.Get<SkillUpConfig>(skillUpID);
 
                 //取个位
                 int gw = skillUpID % 10;
                 
-                int skillUpID1 = -1;
-                //当个位>1时，需要额外判断一下，技能的1级是否已经解锁（可能1级是星级解锁）
+                int skillUpIDLevel1 = -1;
+                //当个位>1时(表示技能等级>1)，需要额外判断一下，技能的1级是否已经解锁（可能1级是星级解锁）
                 //避免出现，技能是5星解锁解锁1级，200级解锁2级，但玩家现在4星，201级，就不该解锁2级，因为星级不够
                 if (gw > 1)
                 {
                     //技能1级的解锁ID，例如： 33 - 3 + 1 = 31, 31就是技能1级的解锁条件id
-                    skillUpID1 = skillUpID - gw + 1;
+                    skillUpIDLevel1 = skillUpID - gw + 1;
                 }
                 
                 //等级解锁
-                if (skillUpConfig.upType == 1)
+                if (upConfig.upType == 1)
                 {
-                    SkillUpConfig skillUpConfig1 = new SkillUpConfig();
+                    SkillUpConfig skillUpConfigLevel1 = new SkillUpConfig();
                     //准备判断，该技能1级时，是否为星级解锁
-                    if (skillUpID1 > 0)
+                    if (skillUpIDLevel1 > 0)
                     {
-                        skillUpConfig1 = ConfigComponent.Instance.Get<SkillUpConfig>(skillUpID1);
+                        skillUpConfigLevel1 = ConfigComponent.Instance.Get<SkillUpConfig>(skillUpIDLevel1);
                     }
 
                     //如果技能的第一级需要星级解锁，需额外判断一下星级是否达到
-                    bool isStarOk = skillUpConfig1.upType != 2 || star > skillUpConfig1.upValue;
+                    bool isStarEnough = skillUpConfigLevel1.upType != 2 || star > skillUpConfigLevel1.upValue;
                     
 
-                    if (level >= skillUpConfig.upValue && isStarOk)
+                    if (level >= upConfig.upValue && isStarEnough)
                     {
                         isUnLock = true;
                     }
                 }
                 //星级解锁
-                else if (skillUpConfig.upType == 2)
+                else if (upConfig.upType == 2)
                 {
-                    if (star >= skillUpConfig.upValue)
+                    if (star >= upConfig.upValue)
                     {
                         isUnLock = true;
                     }
@@ -354,6 +367,14 @@ namespace GameLogic.Hero
         }
 
 
+        public SkillUpConfig GetSkillUpConfig(int skillID)
+        {
+            //取技能ID的后两位，后两位是技能解锁表SkillUpConfig的ID, 取这个ID来判断，这个技能技能的解锁情况
+            int skillUpID = skillID % 100;
+            SkillUpConfig upConfig = ConfigComponent.Instance.Get<SkillUpConfig>(skillUpID);
+            return upConfig;
+        }
+
         /// <summary>
         /// 判断【等级】是否可以解锁新技能
         /// </summary>
@@ -366,7 +387,7 @@ namespace GameLogic.Hero
             {
                 if (skillUpConfig.upType == 1 && level == skillUpConfig.upValue)
                 {
-                    return upConfig;
+                    return skillUpConfig;
                 }
             }
             return upConfig;

Assets/Scripts/GameLogic/Hero/SkillData.cs

@@ -7,22 +7,22 @@ namespace GameLogic.Hero
 {
     public class SkillData
     {
-        public SkillConfig skillConfig;
+        // public SkillConfig skillConfig;
 
         /// <summary>
         /// 所有技能
         /// </summary>
-        public List<SkillInfo> allSkills = new List<SkillInfo>();
+        // public List<SkillInfo> allSkills = new List<SkillInfo>();
 
         /// <summary>
         /// 已解锁的技能
         /// </summary>
-        public List<SkillInfo> allUnLockSkill = new List<SkillInfo>();
+        // public List<SkillInfo> allUnLockSkill = new List<SkillInfo>();
         
         /// <summary>
         /// 战斗中的技能数据
         /// </summary>
-        public List<SkillInfo> allSkill4Combat = new List<SkillInfo>();
+        // public List<SkillInfo> allSkill4Combat = new List<SkillInfo>();
         
         public Dictionary<int, List<SkillInfo>> mySkillDic = new Dictionary<int, List<SkillInfo>>();
 
@@ -64,6 +64,22 @@ namespace GameLogic.Hero
         // {
         //     this.heroInfo = heroInfo;
         // }
+
+
+        public void UpdateSkills()
+        {
+            // foreach (SkillInfo skillInfo in mySkillDic[groupID])
+            // {
+            //     skillInfo.UpdateInfo();
+            // }
+            foreach (KeyValuePair<int,List<SkillInfo>> keyValuePair in mySkillDic)
+            {
+                foreach (SkillInfo skillInfo in keyValuePair.Value)
+                {
+                    skillInfo.UpdateInfo();
+                }
+            }
+        }
         
         public void InitSkills()
         {
@@ -71,16 +87,16 @@ namespace GameLogic.Hero
             {
                 int skillGroup = heroInfo.modelConfig.skillID[i];
 
-                foreach (SkillConfig config in PlayerManager.Instance.groupSkillDIc[skillGroup])
+                foreach (SkillConfig config in PlayerManager.Instance.groupSkillDic[skillGroup])
                 {
                     SkillInfo skillInfo = new SkillInfo();
                     skillInfo.Init(this, config);
-                    allSkills.Add(skillInfo);
-
-                    if (skillInfo.isUnLock)
-                    {
-                        allUnLockSkill.Add(skillInfo);
-                    }
+                    // allSkills.Add(skillInfo);
+                    //
+                    // if (skillInfo.isUnLock)
+                    // {
+                    //     allUnLockSkill.Add(skillInfo);
+                    // }
 
                     if (mySkillDic.ContainsKey(skillGroup))
                     { 

Assets/Scripts/GameLogic/Hero/SkillInfo.cs

@@ -13,12 +13,18 @@ namespace GameLogic.Hero
         /// </summary>
         public bool isUnLock;
 
-        public SkillUpConfig skillUpConfig;
+        // public SkillUpConfig skillUpConfig;
 
-        private SkillData _skillData;
+        // private SkillData _skillData;
+
+        public void UpdateInfo()
+        {
+            isUnLock = PlayerManager.Instance.heroController.IsUnLockSkill(heroInfo.level.Value, heroInfo.star.Value, skillConfig.ID);
+        }
+        
         public void Init(SkillData skillData, SkillConfig skillConfig)
         {
-            this._skillData = skillData;
+            // this._skillData = skillData;
             this.skillConfig = skillConfig;
             heroInfo = skillData.heroInfo;
             

Assets/Scripts/GameLogic/Player/AccountFileInfo.cs

@@ -160,7 +160,7 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         ItemData heroExp = new ItemData()
         {
             itemId = GlobalParam.Item_HeroExp_ID,
-            itemCount = 100000,
+            itemCount = 99000000,
         };
 
         playerData.ItemListData.Add(coin);

Assets/Scripts/GameLogic/Player/PlayerManager.cs

@@ -18,7 +18,7 @@ public class PlayerManager : Singleton<PlayerManager>
     public SkillUpConfig[] skillUpConfigs;
     public SkillConfig[] SkillConfigs;
     
-    public Dictionary<int, List<SkillConfig>> groupSkillDIc = new Dictionary<int, List<SkillConfig>>();
+    public Dictionary<int, List<SkillConfig>> groupSkillDic = new Dictionary<int, List<SkillConfig>>();
 
     public long coin;
     public long diamond;
@@ -44,13 +44,13 @@ public class PlayerManager : Singleton<PlayerManager>
 
         foreach (var skillConfig in SkillConfigs)
         {
-            if (groupSkillDIc.ContainsKey(skillConfig.IDGroup))
+            if (groupSkillDic.ContainsKey(skillConfig.IDGroup))
             {
-                groupSkillDIc[skillConfig.IDGroup].Add(skillConfig);
+                groupSkillDic[skillConfig.IDGroup].Add(skillConfig);
             }
             else
             {
-                groupSkillDIc.Add(skillConfig.IDGroup, new List<SkillConfig> { skillConfig });
+                groupSkillDic.Add(skillConfig.IDGroup, new List<SkillConfig> { skillConfig });
             }
         }
     }

Assets/Scripts/GameUI/UI/Hero/SkillUIComponent.cs

@@ -1,6 +1,8 @@
 using System.Collections.Generic;
+using System.Linq;
 using Core.Language;
 using Core.Utility;
+using Excel2Json;
 using GameLogic.Hero;
 using UnityEngine;
 using UnityEngine.UI;
@@ -88,11 +90,12 @@ namespace Fort23.Mono
             // SkillInfo skillInfo = heroInfo.skillComponent.GetHighestLevel(groupID);
 
             
-            //最高解锁的SkillInfo
+            //最高解锁的Skill
             SkillInfo maxSkillUnLock = skillInfos[0];
-            //第一个锁的SkillInfo
+            //第一个未解锁的Skill
             SkillInfo firstSkillLock = null;
-            bool once = true;
+            bool maxLv = false;
+            bool oneSet = true;
             int tmpLv = 0;
 
             for (int i = 0; i < skillInfos.Count; i++)
@@ -106,29 +109,66 @@ namespace Fort23.Mono
                         tmpLv = skillInfos[i].skillConfig.level;
                         maxSkillUnLock = skillInfos[i];
                     }
+                    //最后一个技能也解锁了
+                    if (i >= skillInfos.Count - 1)
+                    {
+                        maxLv = true;
+                    }
                 }
                 else
                 {
-                    if (skillInfos[i].skillUpConfig.upType == 1)
+                    //if (skillInfos[i].skillUpConfig.upType == 1)
+                    SkillUpConfig upConfig = PlayerManager.Instance.heroController.GetSkillUpConfig(skillInfos[i].skillConfig.ID);
+                    if (upConfig.upType == 1)
                     {
-                        unLockConditionStr = skillInfos[i].skillUpConfig.upValue + "级解锁";
+                        unLockConditionStr = LanguageManager.Instance.Text(42, upConfig.upValue);
+                        //if (i > 0 && oneSet) 的意思是：没有解锁的且不是1级的技能，这样的技能，只设置一次txtTips
+                        //只设置一次txtTips是满足需求的，给玩家说，下一级什么时候解锁，不限制的话，会提示最后一级什么时候解锁
+                        if (i > 0 && oneSet)
+                        {
+                            // txtTips.text = "等级达到" + firstSkillUpConfig.upValue + "级后解锁";
+                            oneSet = false;
+                            txtTips.text = LanguageManager.Instance.Text(37, upConfig.upValue);
+                        }
+                        
                     }
-                    else
+                    else if(upConfig.upType == 2)
                     {
-                        unLockConditionStr = "星级达到" + skillInfos[i].skillUpConfig.upValue + "星后解锁";
+                        unLockConditionStr = LanguageManager.Instance.Text(43, upConfig.upValue);
+                        //if (i > 0 && oneSet) 的意思是：没有解锁的且不是1级的技能，这样的技能，只设置一次txtTips
+                        //只设置一次txtTips是满足需求的，给玩家说，下一级什么时候解锁，不限制的话，会提示最后一级什么时候解锁
+                        if (i > 0 && oneSet)
+                        {
+                            // txtTips.text = "等级达到" + firstSkillUpConfig.upValue + "级后解锁";
+                            oneSet = false;
+                            txtTips.text = LanguageManager.Instance.Text(39, upConfig.upValue);
+                        }
                     }
 
                     color = new Color(0.65f, 0.65f, 0.65f);
 
-                    if (once)
+                    if (i == 0)
                     {
-                        once = false;
+                        // once = false;
                         firstSkillLock = skillInfos[i];
                     }
                 }
                 
                 GameObject go = skillDesc[i] as GameObject;
-                go.GetComponent<Text>().text = LanguageManager.Instance.Text(skillInfos[i].skillConfig.name, skillInfos[i].skillConfig.effectValue) + unLockConditionStr;
+                object[] data = new object[skillInfos[i].skillConfig.effectValue.Length];
+                for (int j = 0; j < skillInfos[i].skillConfig.effectValue.Length; j++)
+                {
+                    data[j] = skillInfos[i].skillConfig.effectValue[j];
+                }
+                
+                string lvTxt = "";
+                //1级技能直接显示技能效果，从2级开始，UI上要显示 2级：技能效果描述
+                if (i > 0)
+                {
+                    lvTxt = LanguageManager.Instance.Text(41, skillInfos[i].skillConfig.level);
+                }
+                
+                go.GetComponent<Text>().text = lvTxt + LanguageManager.Instance.Text(skillInfos[i].skillConfig.desc, data) + unLockConditionStr;
                 go.GetComponent<Text>().color = color;
                 go.SetActive(true);
             }
@@ -139,25 +179,35 @@ namespace Fort23.Mono
             txtLv.text = maxSkillUnLock.skillConfig.level.ToString();
             txtCD.text = "冷却" + maxSkillUnLock.skillConfig.cd + "秒";
 
+            //第一个技能就没有解锁时
             if (firstSkillLock != null)
             {
-                if (firstSkillLock.skillUpConfig.upType == 1)
+                SkillUpConfig firstSkillUpConfig = PlayerManager.Instance.heroController.GetSkillUpConfig(firstSkillLock.skillConfig.ID);
+                if (firstSkillUpConfig.upType == 1)
                 {
-                    txtTips.text = "等级达到" + firstSkillLock.skillUpConfig.upValue + "级后解锁";
+                    // txtTips.text = "等级达到" + firstSkillUpConfig.upValue + "级后解锁";
+                    txtTips.text = LanguageManager.Instance.Text(38, firstSkillUpConfig.upValue);
                 }
-                else
+                else if (firstSkillUpConfig.upType == 2)
                 {
-                    txtTips.text = "星级达到" + firstSkillLock.skillUpConfig.upValue + "星后解锁";
+                    // txtTips.text = "星级达到" + firstSkillUpConfig.upValue + "星后解锁";
+                    txtTips.text = LanguageManager.Instance.Text(40, firstSkillUpConfig.upValue);
                 }
             }
-            else
+            // else
+            // {
+            //     txtTips.text = "技能已达最高等级";
+            // }
+
+            if (maxLv)
             {
-                txtTips.text = "技能已达最高等级";
+                txtTips.text = LanguageManager.Instance.Text(44);
             }
 
 
-            layoutGroup.enabled = true;
+            // layoutGroup.enabled = true;
             // layoutGroup.enabled = false;
+            LayoutRebuilder.ForceRebuildLayoutImmediate(layoutGroup.GetComponent<RectTransform>());
         }
 
     }

Assets/Scripts/GameUI/UI/Hero/WidgetHero.cs

@@ -64,6 +64,12 @@ namespace Fort23.Mono
             heroClickEventData.heroId = heroInfo.modelID;
             EventManager.Instance.Dispatch(CustomEventType.HeroClick, heroClickEventData);
 
+            // OffsetPos();
+            await OpenHeroDetailPanel();
+        }
+
+        private void OffsetPos()
+        {
             Vector3 curPos = transform.parent.localPosition;
             Vector3 newPos;
             if (curPos.y == 0)
@@ -88,7 +94,6 @@ namespace Fort23.Mono
             }
             transform.parent.localPosition = newPos;
             MainSceneController.Instance.mainUI?.RestWidgetHeroPos(this);
-            
         }
 
         private async Task OpenHeroDetailPanel()

Assets/Scripts/GameUI/UI/Hero/WidgetIconSkill.cs

@@ -1,3 +1,4 @@
+using Excel2Json;
 using Fort23.UTool;
 using GameLogic.Hero;
 using UnityEngine;
@@ -55,7 +56,9 @@ namespace Fort23.Mono
                 lockImgObj.SetActive(true);
                 unLockObj.SetActive(false);
                 //等级解锁: 只留锁，其他都隐藏
-                if (skillInfo.skillUpConfig.upType == 1)
+                SkillUpConfig upConfig =
+                    PlayerManager.Instance.heroController.GetSkillUpConfig(skillInfo.skillConfig.ID);
+                if (upConfig.upType == 1)
                 {
                     lockObj.SetActive(false);
                 }
@@ -63,7 +66,7 @@ namespace Fort23.Mono
                 else
                 {
                     lockObj.SetActive(true);
-                    HeroUITools.SetStarShow(stars, skillInfo.skillUpConfig.upValue);
+                    HeroUITools.SetStarShow(stars, upConfig.upValue);
                 }
                 
                 

UGUIPack/uguiconfig.db

@@ -1 +1 @@
-{"allPackgInfos":[{"packName":"all","packgJsonPath":"/Art/UIAssets/TextrueJson/all.txt","packgSpritePath":"Assets/Res/UIAtlas/all.spriteatlasv2","lasetJsonGUID":"8fbc3902b8b4a448719eb520746784cf"},{"packName":"heroIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/heroIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/heroIcon.spriteatlasv2","lasetJsonGUID":"e21daa5d31e00b95876c58a9ce604a30"},{"packName":"skillIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/skillIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/skillIcon.spriteatlasv2","lasetJsonGUID":"94128d0dbe9cd8207418b750524ba469"}],"isJiaoYan":true}
+{"allPackgInfos":[{"packName":"all","packgJsonPath":"/Art/UIAssets/TextrueJson/all.txt","packgSpritePath":"Assets/Res/UIAtlas/all.spriteatlasv2","lasetJsonGUID":"d3b0b107e23be62afc308a429404810b"},{"packName":"heroIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/heroIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/heroIcon.spriteatlasv2","lasetJsonGUID":"e21daa5d31e00b95876c58a9ce604a30"},{"packName":"skillIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/skillIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/skillIcon.spriteatlasv2","lasetJsonGUID":"94128d0dbe9cd8207418b750524ba469"}],"isJiaoYan":true}