功法更换修改 达到选择更换

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

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

Assets/Art/UIAssets/icon/icon_Check03_l.png.meta

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

Assets/Res/UI/EqRecyclePanel.prefab

@@ -2366,6 +2366,26 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 1377245231049526165}
     m_Modifications:
+    - target: {fileID: 1450320523742611154, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: CurrSpriteAtlas
+      value: 
+      objectReference: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+    - target: {fileID: 1450320523742611154, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: packInfo.packName
+      value: tongyong
+      objectReference: {fileID: 0}
+    - target: {fileID: 1450320523742611154, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: packInfo.lasetJsonGUID
+      value: 8924b78c393d2a2d8f9dd44d02a397a9
+      objectReference: {fileID: 0}
+    - target: {fileID: 1450320523742611154, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: packInfo.packgJsonPath
+      value: /Art/UIAssets/TextrueJson\tongyong.txt
+      objectReference: {fileID: 0}
+    - target: {fileID: 1450320523742611154, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: packInfo.packgSpritePath
+      value: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+      objectReference: {fileID: 0}
     - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5
@@ -2485,6 +2505,26 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 8671987442031274296}
     m_Modifications:
+    - target: {fileID: 1450320523742611154, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: CurrSpriteAtlas
+      value: 
+      objectReference: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+    - target: {fileID: 1450320523742611154, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: packInfo.packName
+      value: tongyong
+      objectReference: {fileID: 0}
+    - target: {fileID: 1450320523742611154, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: packInfo.lasetJsonGUID
+      value: 8924b78c393d2a2d8f9dd44d02a397a9
+      objectReference: {fileID: 0}
+    - target: {fileID: 1450320523742611154, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: packInfo.packgJsonPath
+      value: /Art/UIAssets/TextrueJson\tongyong.txt
+      objectReference: {fileID: 0}
+    - target: {fileID: 1450320523742611154, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: packInfo.packgSpritePath
+      value: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+      objectReference: {fileID: 0}
     - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5

Assets/Res/UI/ItemPanel.prefab

@@ -2441,6 +2441,26 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 5520384173642017202}
     m_Modifications:
+    - target: {fileID: 1450320523742611154, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: CurrSpriteAtlas
+      value: 
+      objectReference: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+    - target: {fileID: 1450320523742611154, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: packInfo.packName
+      value: tongyong
+      objectReference: {fileID: 0}
+    - target: {fileID: 1450320523742611154, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: packInfo.lasetJsonGUID
+      value: 8924b78c393d2a2d8f9dd44d02a397a9
+      objectReference: {fileID: 0}
+    - target: {fileID: 1450320523742611154, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: packInfo.packgJsonPath
+      value: /Art/UIAssets/TextrueJson\tongyong.txt
+      objectReference: {fileID: 0}
+    - target: {fileID: 1450320523742611154, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: packInfo.packgSpritePath
+      value: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+      objectReference: {fileID: 0}
     - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5

Assets/Res/UI/ProfessionEquipmentPanel.prefab

@@ -3992,6 +3992,9 @@ SkinnedMeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 3
   m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_ShadingRate: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -5468,6 +5471,9 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_ShadingRate: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -6143,6 +6149,9 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_ShadingRate: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -6578,6 +6587,9 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_ShadingRate: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -8843,6 +8855,9 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_ShadingRate: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -10191,6 +10206,9 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_ShadingRate: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -10485,6 +10503,9 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_ShadingRate: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -11377,6 +11398,9 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_ShadingRate: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -12324,6 +12348,9 @@ SkinnedMeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 3
   m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_ShadingRate: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -13394,6 +13421,26 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 8482755771180325249}
     m_Modifications:
+    - target: {fileID: 1450320523742611154, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: CurrSpriteAtlas
+      value: 
+      objectReference: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+    - target: {fileID: 1450320523742611154, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: packInfo.packName
+      value: tongyong
+      objectReference: {fileID: 0}
+    - target: {fileID: 1450320523742611154, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: packInfo.lasetJsonGUID
+      value: 8924b78c393d2a2d8f9dd44d02a397a9
+      objectReference: {fileID: 0}
+    - target: {fileID: 1450320523742611154, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: packInfo.packgJsonPath
+      value: /Art/UIAssets/TextrueJson\tongyong.txt
+      objectReference: {fileID: 0}
+    - target: {fileID: 1450320523742611154, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: packInfo.packgSpritePath
+      value: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+      objectReference: {fileID: 0}
     - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5
@@ -13505,6 +13552,26 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 9209274184671893766}
     m_Modifications:
+    - target: {fileID: 1450320523742611154, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: CurrSpriteAtlas
+      value: 
+      objectReference: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+    - target: {fileID: 1450320523742611154, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: packInfo.packName
+      value: tongyong
+      objectReference: {fileID: 0}
+    - target: {fileID: 1450320523742611154, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: packInfo.lasetJsonGUID
+      value: 8924b78c393d2a2d8f9dd44d02a397a9
+      objectReference: {fileID: 0}
+    - target: {fileID: 1450320523742611154, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: packInfo.packgJsonPath
+      value: /Art/UIAssets/TextrueJson\tongyong.txt
+      objectReference: {fileID: 0}
+    - target: {fileID: 1450320523742611154, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: packInfo.packgSpritePath
+      value: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+      objectReference: {fileID: 0}
     - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5
@@ -13616,6 +13683,26 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 697331672591795821}
     m_Modifications:
+    - target: {fileID: 1450320523742611154, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: CurrSpriteAtlas
+      value: 
+      objectReference: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+    - target: {fileID: 1450320523742611154, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: packInfo.packName
+      value: tongyong
+      objectReference: {fileID: 0}
+    - target: {fileID: 1450320523742611154, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: packInfo.lasetJsonGUID
+      value: 8924b78c393d2a2d8f9dd44d02a397a9
+      objectReference: {fileID: 0}
+    - target: {fileID: 1450320523742611154, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: packInfo.packgJsonPath
+      value: /Art/UIAssets/TextrueJson\tongyong.txt
+      objectReference: {fileID: 0}
+    - target: {fileID: 1450320523742611154, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: packInfo.packgSpritePath
+      value: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+      objectReference: {fileID: 0}
     - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5
@@ -13727,6 +13814,26 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 7018788893457309302}
     m_Modifications:
+    - target: {fileID: 1450320523742611154, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: CurrSpriteAtlas
+      value: 
+      objectReference: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+    - target: {fileID: 1450320523742611154, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: packInfo.packName
+      value: tongyong
+      objectReference: {fileID: 0}
+    - target: {fileID: 1450320523742611154, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: packInfo.lasetJsonGUID
+      value: 8924b78c393d2a2d8f9dd44d02a397a9
+      objectReference: {fileID: 0}
+    - target: {fileID: 1450320523742611154, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: packInfo.packgJsonPath
+      value: /Art/UIAssets/TextrueJson\tongyong.txt
+      objectReference: {fileID: 0}
+    - target: {fileID: 1450320523742611154, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: packInfo.packgSpritePath
+      value: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+      objectReference: {fileID: 0}
     - target: {fileID: 1515036893769208877, guid: cadded2fa3ee99949a502d052905a655, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5

Assets/Res/UI/SkillSelectPanel/GongFaUpgradeInfoWidget.prefab

@@ -26,11 +26,12 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 544340637007268772}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  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: 8441426342995145705}
   - {fileID: 8441639509481527171}
   - {fileID: 1997086601353049712}
   - {fileID: 436368807920140684}
@@ -82,6 +83,16 @@ MonoBehaviour:
     - gameObject: {fileID: 2001195971316176758}
     - gameObject: {fileID: 2252680199180135381}
     - gameObject: {fileID: 6118155954852721740}
+  - key: Icon_Select
+    gameObject: {fileID: 6223246852622245331}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 1589540111446213810}
+    - gameObject: {fileID: 6321609247404304824}
+    - gameObject: {fileID: 2001195971316176758}
+    - gameObject: {fileID: 2252680199180135381}
+    - gameObject: {fileID: 6118155954852721740}
   isAssetBundle: 1
 --- !u!1 &655531457772110114
 GameObject:
@@ -499,6 +510,90 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
+--- !u!1 &4929919616811764969
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8441426342995145705}
+  - component: {fileID: 6601645833327092406}
+  - component: {fileID: 6223246852622245331}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_Select
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &8441426342995145705
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4929919616811764969}
+  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: 2626495479702332815}
+  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.6842, y: 0.234}
+  m_SizeDelta: {x: 574.6017, y: 83.7012}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6601645833327092406
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4929919616811764969}
+  m_CullTransparentMesh: 1
+--- !u!114 &6223246852622245331
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4929919616811764969}
+  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: 0.9176218, b: 0, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_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: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 8924b78c393d2a2d8f9dd44d02a397a9
 --- !u!1 &5236118077573103856
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/SkillSelectPanel/GongFaUpgradePanel.prefab

@@ -209,6 +209,90 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
+--- !u!1 &71686367632503874
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6586270893627312966}
+  - component: {fileID: 315075413461184646}
+  - component: {fileID: 3658809785945388472}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (5)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6586270893627312966
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 71686367632503874}
+  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: 7325077240780456121}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 22, y: 22}
+  m_Pivot: {x: 1, y: 0}
+--- !u!222 &315075413461184646
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 71686367632503874}
+  m_CullTransparentMesh: 1
+--- !u!114 &3658809785945388472
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 71686367632503874}
+  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_star_1
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
 --- !u!1 &247502849354470462
 GameObject:
   m_ObjectHideFlags: 0
@@ -1275,6 +1359,7 @@ MonoBehaviour:
     - gameObject: {fileID: 4649527201698735611}
     - gameObject: {fileID: 6899362910355405383}
     - gameObject: {fileID: 2266735464070336714}
+    - gameObject: {fileID: 3658809785945388472}
   - key: Text_Level1
     gameObject: {fileID: 8363264617899274196}
     isAssetBundle: 0
@@ -2106,9 +2191,9 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Padding:
-    m_Left: 0
+    m_Left: 15
     m_Right: 0
-    m_Top: 0
+    m_Top: 12
     m_Bottom: 0
   m_ChildAlignment: 0
   m_Spacing: 21.47
@@ -2416,7 +2501,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 11.709, y: 37.9}
+  m_AnchoredPosition: {x: 2.8, y: 37.9}
   m_SizeDelta: {x: 586.017, y: 513.311}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4335290694010786724
@@ -3439,6 +3524,7 @@ RectTransform:
   - {fileID: 5837794108327954865}
   - {fileID: 7455674247020882449}
   - {fileID: 2968118661804333137}
+  - {fileID: 6586270893627312966}
   m_Father: {fileID: 7374263567999719867}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}

Assets/Res/UI/SkillSelectPanel/SkillSelectPanel.prefab

@@ -88,7 +88,7 @@ MonoBehaviour:
     m_SelectedTrigger: Selected
     m_DisabledTrigger: Disabled
   m_Interactable: 1
-  m_TargetGraphic: {fileID: 0}
+  m_TargetGraphic: {fileID: 6786207131647970863}
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
@@ -460,6 +460,86 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u529F\u6CD5\u6570\u91CF1/4"
+--- !u!1 &675307928623745481
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4927574875558780897}
+  - component: {fileID: 2133244237143657967}
+  - component: {fileID: 1780334426314849626}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text_GongFaCount
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4927574875558780897
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 675307928623745481}
+  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: 8355865228313168032}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: -3.949997}
+  m_SizeDelta: {x: 0, y: -7.8999}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2133244237143657967
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 675307928623745481}
+  m_CullTransparentMesh: 1
+--- !u!114 &1780334426314849626
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 675307928623745481}
+  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: 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_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 28
+    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: "\u4E00\u952E\u88C5\u914D"
 --- !u!1 &857437492319237345
 GameObject:
   m_ObjectHideFlags: 0
@@ -828,7 +908,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.2509804, g: 0.45098042, b: 0.57254905, a: 1}
+  m_Color: {r: 0.2627451, g: 0.8117648, b: 0.48627454, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1047,6 +1127,136 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_ShowMaskGraphic: 0
+--- !u!1 &1454164045923447811
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 400790666199448005}
+  - component: {fileID: 3243743412898019261}
+  - component: {fileID: 6205413608045004763}
+  - component: {fileID: 8239318831176044666}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Btn_Info
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &400790666199448005
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1454164045923447811}
+  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: 87607927935484462}
+  m_Father: {fileID: 6694772361877173011}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 152.33276, y: 77.7761}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &3243743412898019261
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1454164045923447811}
+  m_CullTransparentMesh: 1
+--- !u!114 &6205413608045004763
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1454164045923447811}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.2627451, g: 0.8117648, b: 0.48627454, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 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_23
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
+--- !u!114 &8239318831176044666
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1454164045923447811}
+  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: 6205413608045004763}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &1467704899622376746
 GameObject:
   m_ObjectHideFlags: 0
@@ -1085,8 +1295,8 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 66.7051, y: 63.477}
-  m_Pivot: {x: 0, y: 0.5}
+  m_SizeDelta: {x: 66.70511, y: 63.477}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8562629278153307331
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -1177,6 +1387,136 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &1515688381437741579
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8355865228313168032}
+  - component: {fileID: 3966226649241584167}
+  - component: {fileID: 4786018054025231093}
+  - component: {fileID: 746534647625004429}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Btn_OneKyChange
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8355865228313168032
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1515688381437741579}
+  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: 4927574875558780897}
+  m_Father: {fileID: 3727605509090450065}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 158.8, y: 161.2}
+  m_SizeDelta: {x: 173.044, y: 65.8684}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &3966226649241584167
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1515688381437741579}
+  m_CullTransparentMesh: 1
+--- !u!114 &4786018054025231093
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1515688381437741579}
+  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.2509804, g: 0.45098042, b: 0.57254905, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: btn_23
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
+--- !u!114 &746534647625004429
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1515688381437741579}
+  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: 4786018054025231093}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &1724651191095121306
 GameObject:
   m_ObjectHideFlags: 0
@@ -1210,6 +1550,7 @@ RectTransform:
   - {fileID: 5985873034990668332}
   - {fileID: 4047916813180227560}
   - {fileID: 111880961769183880}
+  - {fileID: 8355865228313168032}
   m_Father: {fileID: 6694772361877173011}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -1340,7 +1681,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0.0000038146973, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8774718514361989388
@@ -1454,7 +1795,7 @@ MonoBehaviour:
     m_Right: 0
     m_Top: 0
     m_Bottom: 0
-  m_ChildAlignment: 0
+  m_ChildAlignment: 4
   m_Spacing: -7.79
   m_ChildForceExpandWidth: 1
   m_ChildForceExpandHeight: 1
@@ -1477,6 +1818,86 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 2
   m_VerticalFit: 0
+--- !u!1 &2135059945273132741
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 87607927935484462}
+  - component: {fileID: 6314345131758368494}
+  - component: {fileID: 9175187348211492529}
+  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 &87607927935484462
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2135059945273132741}
+  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: 400790666199448005}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: -3.9500046}
+  m_SizeDelta: {x: 0, y: -7.8999}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6314345131758368494
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2135059945273132741}
+  m_CullTransparentMesh: 1
+--- !u!114 &9175187348211492529
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2135059945273132741}
+  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: 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_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 28
+    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: "\u4FE1\u606F"
 --- !u!1 &2308441241757036424
 GameObject:
   m_ObjectHideFlags: 0
@@ -1512,7 +1933,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0.0000038146973, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3350747234563056364
@@ -1597,6 +2018,8 @@ RectTransform:
   - {fileID: 6224527261346386714}
   - {fileID: 626305634221636739}
   - {fileID: 3727605509090450065}
+  - {fileID: 400790666199448005}
+  - {fileID: 2365237549990123137}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -1953,7 +2376,52 @@ MonoBehaviour:
     - gameObject: {fileID: 0}
     - gameObject: {fileID: 0}
     - gameObject: {fileID: 0}
-  isAssetBundle: 1
+  - key: Btn_Info
+    gameObject: {fileID: 8239318831176044666}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 953277807175961835}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+  - key: Btn_OneKyChange
+    gameObject: {fileID: 746534647625004429}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 953277807175961835}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+  - key: Icon_Select
+    gameObject: {fileID: 9060697012125411653}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 953277807175961835}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+  isAssetBundle: 0
 --- !u!1 &3415559647474066940
 GameObject:
   m_ObjectHideFlags: 0
@@ -2253,7 +2721,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.2627451, g: 0.8117648, b: 0.48627454, a: 1}
+  m_Color: {r: 0.2509804, g: 0.45098042, b: 0.57254905, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -2357,7 +2825,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0.0000038146973, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &326365117143667270
@@ -3068,8 +3536,8 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 66.7051, y: 63.477}
-  m_Pivot: {x: 0, y: 0.5}
+  m_SizeDelta: {x: 66.70511, y: 63.477}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5668826745793188999
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -3447,8 +3915,8 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 66.7051, y: 63.477}
-  m_Pivot: {x: 0, y: 0.5}
+  m_SizeDelta: {x: 66.70511, y: 63.477}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7022963007068931577
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -3574,7 +4042,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0.0000038146973, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4667859169330485215
@@ -3982,8 +4450,8 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 66.7051, y: 63.477}
-  m_Pivot: {x: 0, y: 0.5}
+  m_SizeDelta: {x: 66.70511, y: 63.477}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &137162416073161416
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -4355,7 +4823,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0.0000038146973, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4947873227909897392
@@ -4591,6 +5059,90 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &8282051426038164161
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2365237549990123137}
+  - component: {fileID: 2629981881521530746}
+  - component: {fileID: 9060697012125411653}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_Select
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &2365237549990123137
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8282051426038164161}
+  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: 6694772361877173011}
+  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: 64.6809, y: 65.2337}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2629981881521530746
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8282051426038164161}
+  m_CullTransparentMesh: 1
+--- !u!114 &9060697012125411653
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8282051426038164161}
+  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: 0.88550174, b: 0, a: 1}
+  m_RaycastTarget: 0
+  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_Circle118
+  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: 8924b78c393d2a2d8f9dd44d02a397a9
 --- !u!1 &8374476484755925391
 GameObject:
   m_ObjectHideFlags: 0
@@ -4789,8 +5341,8 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 66.7051, y: 63.477}
-  m_Pivot: {x: 0, y: 0.5}
+  m_SizeDelta: {x: 66.70511, y: 63.477}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &255801767607311433
 CanvasRenderer:
   m_ObjectHideFlags: 0

Assets/Res/UI/SkillSelectPanel/SkillWidget.prefab

@@ -80,6 +80,51 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "1\u7EA7"
+--- !u!1 &740275112248685339
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 271321759498699397}
+  - component: {fileID: 4846741517815700259}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: InfoPos
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &271321759498699397
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 740275112248685339}
+  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: 8817738242950991828}
+  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.6391296, y: -74.3}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4846741517815700259
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 740275112248685339}
+  m_CullTransparentMesh: 1
 --- !u!1 &1157110654555507881
 GameObject:
   m_ObjectHideFlags: 0
@@ -117,6 +162,7 @@ RectTransform:
   - {fileID: 2140549312652121987}
   - {fileID: 4933297852123740916}
   - {fileID: 7716599432344587041}
+  - {fileID: 271321759498699397}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
@@ -171,6 +217,16 @@ MonoBehaviour:
     - gameObject: {fileID: 1541203404502475801}
     - gameObject: {fileID: 7344344513877532038}
     - gameObject: {fileID: 3002968146783622268}
+    - gameObject: {fileID: 784710312336784181}
+  - key: InfoPos
+    gameObject: {fileID: 271321759498699397}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 7739541666801086000}
+    - gameObject: {fileID: 1541203404502475801}
+    - gameObject: {fileID: 7344344513877532038}
+    - gameObject: {fileID: 3002968146783622268}
   isAssetBundle: 1
 --- !u!1 &1269921678863901166
 GameObject:
@@ -449,6 +505,7 @@ RectTransform:
   - {fileID: 295106506078024080}
   - {fileID: 8224044986558415334}
   - {fileID: 488998708127733385}
+  - {fileID: 1814687121676452637}
   m_Father: {fileID: 8817738242950991828}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
@@ -1350,6 +1407,90 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 99b40747f72180f8bdc5e972731dc65f
+--- !u!1 &7780583145739525372
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1814687121676452637}
+  - component: {fileID: 2898582578433882488}
+  - component: {fileID: 784710312336784181}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (5)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1814687121676452637
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7780583145739525372}
+  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: 4933297852123740916}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 22, y: 22}
+  m_Pivot: {x: 1, y: 0}
+--- !u!222 &2898582578433882488
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7780583145739525372}
+  m_CullTransparentMesh: 1
+--- !u!114 &784710312336784181
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7780583145739525372}
+  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_star_1
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
 --- !u!1 &8426038513191564165
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/WidgetItem.prefab

@@ -634,12 +634,12 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: dec_Border
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
-    packName: all
-    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
-    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: 7c5e93e3331cd67b15983d0d2161d334
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 8924b78c393d2a2d8f9dd44d02a397a9
 --- !u!1 &7948008364224510343
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/WidgetItem_空.prefab

@@ -383,12 +383,12 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: dec_Border
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
-    packName: all
-    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
-    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: 7c5e93e3331cd67b15983d0d2161d334
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 8924b78c393d2a2d8f9dd44d02a397a9
 --- !u!1 &2690853045440870870
 GameObject:
   m_ObjectHideFlags: 0
@@ -467,12 +467,12 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: dec_Border
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
-    packName: all
-    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
-    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: 8e0fed06f6e134745d1fa1d786d61cbc
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 8924b78c393d2a2d8f9dd44d02a397a9
 --- !u!1 &2845709020303858597
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/WidgetItem_紫装.prefab

@@ -78,12 +78,12 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: dec_Border
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
-    packName: all
-    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
-    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: 8e0fed06f6e134745d1fa1d786d61cbc
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 8924b78c393d2a2d8f9dd44d02a397a9
 --- !u!1 &3163732439973068919
 GameObject:
   m_ObjectHideFlags: 0
@@ -1021,12 +1021,12 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: dec_Border
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
-    packName: all
-    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
-    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: 7c5e93e3331cd67b15983d0d2161d334
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 8924b78c393d2a2d8f9dd44d02a397a9
 --- !u!1 &9111383392085214637
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/WidgetItem_红装.prefab

@@ -246,12 +246,12 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: dec_Border
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
-    packName: all
-    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
-    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: 8e0fed06f6e134745d1fa1d786d61cbc
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 8924b78c393d2a2d8f9dd44d02a397a9
 --- !u!1 &1367793669015536519
 GameObject:
   m_ObjectHideFlags: 0
@@ -414,12 +414,12 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: dec_Border
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
-    packName: all
-    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
-    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: 7c5e93e3331cd67b15983d0d2161d334
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 8924b78c393d2a2d8f9dd44d02a397a9
 --- !u!1 &4329955452405872013
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/WidgetItem_绿装.prefab

@@ -248,12 +248,12 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: dec_Border
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
-    packName: all
-    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
-    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: 8e0fed06f6e134745d1fa1d786d61cbc
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 8924b78c393d2a2d8f9dd44d02a397a9
 --- !u!1 &4543268321053037966
 GameObject:
   m_ObjectHideFlags: 0
@@ -1106,9 +1106,9 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: dec_Border
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
-    packName: all
-    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
-    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: 7c5e93e3331cd67b15983d0d2161d334
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 8924b78c393d2a2d8f9dd44d02a397a9

Assets/Res/UI/WidgetItem_黄装.prefab

@@ -297,12 +297,12 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: dec_Border
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
-    packName: all
-    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
-    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: 7c5e93e3331cd67b15983d0d2161d334
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 8924b78c393d2a2d8f9dd44d02a397a9
 --- !u!1 &2383726458849680665
 GameObject:
   m_ObjectHideFlags: 0
@@ -381,12 +381,12 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: dec_Border
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
-    packName: all
-    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
-    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: 8e0fed06f6e134745d1fa1d786d61cbc
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 8924b78c393d2a2d8f9dd44d02a397a9
 --- !u!1 &2516980686908524698
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UIAtlas/tongyong.spriteatlasv2

@@ -22,10 +22,12 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: a4d1d9b47ea645e44b322590986c395a, type: 3}
     - {fileID: 2800000, guid: be36d32279c7e2e47afadd96517fdbc6, type: 3}
     - {fileID: 2800000, guid: f1998451e894035448e0cbc27346f334, type: 3}
+    - {fileID: 2800000, guid: d24269604ae00a8439edfdebf45a3509, type: 3}
     - {fileID: 2800000, guid: 760b972dae738db4d8b5ccb1d57dc843, type: 3}
     - {fileID: 2800000, guid: eedabc15aae7104408edf7c471b5f6a7, type: 3}
     - {fileID: 2800000, guid: 0bcd03373dfdc234bb832ef5e8e3177b, type: 3}
     - {fileID: 2800000, guid: 2990c1d0f0e731548b201bcf744187da, type: 3}
+    - {fileID: 2800000, guid: 50db720a997df0f4bb76d75ca3128dc6, type: 3}
     - {fileID: 2800000, guid: 25ea5a471ccb19146804285a8e6916ed, type: 3}
     - {fileID: 2800000, guid: 698fbe20c6be9b249a528c72dbd4773f, type: 3}
     - {fileID: 2800000, guid: d88c4b592dee64c49887ac850328e96a, type: 3}
@@ -47,5 +49,6 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: 656e38c697e9792479fe634f5f8bea8d, type: 3}
     - {fileID: 2800000, guid: 6a4ae9d9bf667354a8611accc71f8d50, type: 3}
     - {fileID: 2800000, guid: 2b4c4eb9c47d81945a3315fb99ac6de1, type: 3}
+    - {fileID: 2800000, guid: f74c331c73e28164694465f627a72d0a, type: 3}
   m_IsVariant: 0
   m_IsPlaceholder: 0

Assets/Res/UIAtlas/tongyong.spriteatlasv2.meta

@@ -20,8 +20,8 @@ SpriteAtlasImporter:
     padding: 8
     blockOffset: 1
     allowAlphaSplitting: 0
-    enableRotation: 1
-    enableTightPacking: 1
+    enableRotation: 0
+    enableTightPacking: 0
     enableAlphaDilation: 0
   secondaryTextureSettings: {}
   variantMultiplier: 1

Assets/Scripts/GameLogic/Player/GongFaControl.cs

@@ -3,6 +3,7 @@ using System.Linq;
 using GameLogic.Combat.CombatTool;
 using GameLogic.Combat.Hero;
 using GameLogic.Hero;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Logical;
 
 namespace GameLogic.Player
 {
@@ -68,5 +69,31 @@ namespace GameLogic.Player
             combatHeroEntity.CombatHeroSkillControl.SetNewSkill(allUseSkill);
             AccountFileInfo.Instance.SavePlayerData();
         }
+
+
+        public void SaveUseSkill(SkillInfo[] allUseSkill)
+        {
+            for (var i = 0; i < allSkill.Count; i++)
+            {
+                allSkill[i].index = -1;
+                AccountFileInfo.SkillData skillData = AccountFileInfo.Instance.playerData.AllSkillDatas.First(s => s.id == allSkill[i].skillConfig.IDGroup);
+                skillData.useIndex = -1;
+            }
+
+            for (var i = 0; i < allUseSkill.Length; i++)
+            {
+                this.allUseSkill[i] = allUseSkill[i];
+                if (allUseSkill[i] != null)
+                {
+                    allUseSkill[i].index = i;
+                    AccountFileInfo.SkillData skillData = AccountFileInfo.Instance.playerData.AllSkillDatas.First(s => s.id == allSkill[i].skillConfig.IDGroup);
+                    skillData.useIndex = i;
+                }
+            }
+
+            CombatHeroEntity combatHeroEntity = CombatController.currActiveCombat.playerHeroEntity;
+            combatHeroEntity.CombatHeroSkillControl.SetNewSkill(allUseSkill);
+            AccountFileInfo.Instance.SavePlayerData();
+        }
     }
 }

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

@@ -1,7 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Core.Language;
+using Excel2Json;
 using Fort23.Core;
+using Fort23.UTool;
 using GameLogic.Combat;
 using GameLogic.Combat.CombatTool;
 using GameLogic.Hero;
@@ -21,11 +24,17 @@ namespace Fort23.Mono
         private int type1 = 0;
         private int type2 = 0;
 
+        public SkillInfo[] allUseSkill;
+
+        private int currenRoadSkilId = PlayerManager.Instance.myHero.TaoismSkillId;
+
         /// <summary>
         /// 1.执行升级逻辑 2.执行更换逻辑
         /// </summary>
         private int infoType = 1;
 
+        SkillWidget currentSelectedSkill;
+
         public static async CTask OpenSkillSelectPanel()
         {
             CombatDrive.Instance.CombatController.isUpdate = false;
@@ -44,17 +53,132 @@ namespace Fort23.Mono
         {
         }
 
+        public override CTask<bool> AsyncInit(object[] uiData)
+        {
+            allUseSkill = PlayerManager.Instance.GongFaControl.allUseSkill.ToArray();
+            UpdateSkillWidget();
+            UpdateRoad();
+            return base.AsyncInit(uiData);
+        }
+
         public override void AddButtonEvent()
         {
-            Btn_ChangeRoad.onClick.AddListener(() => { SkillRoadSelecPanel.OpenPanel(); });
+            Btn_OneKyChange.onClick.AddListener(() =>
+            {
+                for (var i = 0; i < allUseSkill.Length; i++)
+                {
+                    allUseSkill[i] = null;
+                }
+
+                SkillInfo[] skills = new SkillInfo[5];
+                List<SkillInfo> allSkill = PlayerManager.Instance.GongFaControl.allSkill.ToList();
+
+                for (var i = 0; i < allSkill.Count; i++)
+                {
+                    //金
+                    if (allSkill[i].skillConfig.attribute == 1)
+                    {
+                        if (skills[0] == null || skills[0].skillConfig.level > allSkill[i].skillConfig.level)
+                        {
+                            skills[0] = allSkill[i];
+                        }
+                    }
+
+                    //木
+                    if (allSkill[i].skillConfig.attribute == 2)
+                    {
+                        if (skills[1] == null || skills[1].skillConfig.level > allSkill[i].skillConfig.level)
+                        {
+                            skills[1] = allSkill[i];
+                        }
+                    }
+
+                    //水
+                    if (allSkill[i].skillConfig.attribute == 4)
+                    {
+                        if (skills[2] == null || skills[2].skillConfig.level > allSkill[i].skillConfig.level)
+                        {
+                            skills[2] = allSkill[i];
+                        }
+                    }
+
+                    //火
+                    if (allSkill[i].skillConfig.attribute == 8)
+                    {
+                        if (skills[3] == null || skills[3].skillConfig.level > allSkill[i].skillConfig.level)
+                        {
+                            skills[3] = allSkill[i];
+                        }
+                    }
+
+                    //土
+                    if (allSkill[i].skillConfig.attribute == 16)
+                    {
+                        if (skills[4] == null || skills[4].skillConfig.level > allSkill[i].skillConfig.level)
+                        {
+                            skills[4] = allSkill[i];
+                        }
+                    }
+                }
+
+                for (var i = 0; i < allKongSkill.Count; i++)
+                {
+                    allKongSkill[i].InitWidget(allKongSkill[i].index, this);
+                }
+
+                for (var i = 0; i < indexList.Count; i++)
+                {
+                    if (skills[i] == null)
+                        continue;
+                    allKongSkill[indexList[i]].SetSKill(skills[i]);
+                    allUseSkill[indexList[i]] = skills[i];
+                }
+
+                isAlter = true;
+
+                UpdateSkillWidget();
+            });
 
-            Btn_Setting.onClick.AddListener(() =>
+            Btn_ChangeOk.onClick.AddListener(() =>
             {
-                GongFaSettingRoot.SetActive(true);
-                infoType = 2;
-                Btn_Setting.gameObject.SetActive(false);
+                ChangeInfoType(1);
+                if (isAlter)
+                {
+                    PlayerManager.Instance.GongFaControl.SaveUseSkill(allUseSkill);
+
+                    PlayerManager.Instance.GongFaControl.SetTaoismSkillIndex(currenRoadSkilId);
+                    PlayerManager.Instance.myHero.heroData.TaoismSkillId = currenRoadSkilId;
+                    AccountFileInfo.Instance.SavePlayerData();
+                }
+
+                isAlter = false;
             });
 
+            Btn_Info.onClick.AddListener(async () =>
+            {
+                if (currentSelectedSkill != null)
+                {
+                    GongFaUpgradePanel gongFaUpgradePanel = await GongFaUpgradePanel.Open(currentSelectedSkill.skillConfigId);
+                    await gongFaUpgradePanel.UIClosed();
+                    Sort(type1, type2);
+                }
+            });
+
+            Btn_ChangeRoad.onClick.AddListener(() =>
+            {
+                SkillRoadSelecPanel.OpenPanel(currenRoadSkilId, (skillId) =>
+                {
+                    if (skillId != currenRoadSkilId && skillId != 0)
+                    {
+                        currenRoadSkilId = skillId;
+                        isAlter = true;
+                        UpdateRoad();
+                    }
+                });
+            });
+
+            Btn_Setting.onClick.AddListener(() => { ChangeInfoType(2); });
+
             Btn_Jin.onClick.AddListener(() =>
             {
                 if (type2 == 1)
@@ -147,10 +271,17 @@ namespace Fort23.Mono
             {
                 if (infoType == 2)
                 {
-                    GongFaSettingRoot.SetActive(false);
-                    infoType = 1;
-                    Btn_Setting.gameObject.SetActive(true);
-                    CloseSelect();
+                    ChangeInfoType(1);
+                    currenRoadSkilId = PlayerManager.Instance.myHero.TaoismSkillId;
+                    allUseSkill = PlayerManager.Instance.GongFaControl.allUseSkill.ToArray();
+                    for (var i = 0; i < allKongSkill.Count; i++)
+                    {
+                        allKongSkill[i].InitWidget(allKongSkill[i].index, this);
+                        allKongSkill[i].SetSKill(allUseSkill[allKongSkill[i].index]);
+                    }
+
+                    UpdateSkillWidget();
+                    UpdateRoad();
                 }
                 else
                 {
@@ -166,8 +297,42 @@ namespace Fort23.Mono
             });
         }
 
+        private void UpdateRoad()
+        {
+            if (currenRoadSkilId != 0)
+            {
+                SkillConfig skillConfig = ConfigComponent.Instance.Get<SkillConfig>(currenRoadSkilId);
+                Text_RoadName.text = LanguageManager.Instance.Text(skillConfig.name);
+            }
+            else
+            {
+                Text_RoadName.text = "未选择";
+            }
+            // 
+        }
+
+        private void ChangeInfoType(int type)
+        {
+            if (type == 1)
+            {
+                GongFaSettingRoot.SetActive(false);
+                infoType = 1;
+                Btn_Setting.gameObject.SetActive(true);
+                CloseSelect();
+            }
+            else if (type == 2)
+            {
+                GongFaSettingRoot.SetActive(true);
+                infoType = 2;
+                allUseSkill = PlayerManager.Instance.GongFaControl.allUseSkill.ToArray();
+                Btn_Setting.gameObject.SetActive(false);
+            }
+        }
+
         List<SkillInfo> showSkillInfo = new List<SkillInfo>();
 
+        List<int> indexList = new List<int>() { 0, 6, 8, 4, 2 };
+
         private void Sort(int type1, int type2)
         {
             //先排序类型在排属性
@@ -191,21 +356,32 @@ namespace Fort23.Mono
 
             if (type2 == 0)
             {
+                Icon_Select.gameObject.SetActive(false);
             }
             else if (type2 == 1)
             {
+                Icon_Select.transform.position = Btn_Jin.transform.position;
+                Icon_Select.gameObject.SetActive(true);
             }
             else if (type2 == 2)
             {
+                Icon_Select.transform.position = Btn_Mu.transform.position;
+                Icon_Select.gameObject.SetActive(true);
             }
             else if (type2 == 4)
             {
+                Icon_Select.transform.position = Btn_Shui.transform.position;
+                Icon_Select.gameObject.SetActive(true);
             }
             else if (type2 == 8)
             {
+                Icon_Select.transform.position = Btn_Huo.transform.position;
+                Icon_Select.gameObject.SetActive(true);
             }
             else if (type2 == 16)
             {
+                Icon_Select.transform.position = Btn_Tu.transform.position;
+                Icon_Select.gameObject.SetActive(true);
             }
 
 
@@ -227,6 +403,7 @@ namespace Fort23.Mono
                 showSkillInfo = showSkillInfo.Where(s => s.skillConfig.attribute == type2).ToList();
             }
 
+            CloseSelect();
             Content.Init(this, showSkillInfo.Count);
         }
 
@@ -273,7 +450,7 @@ namespace Fort23.Mono
                     null, SkillKongWeiRoot,
                     isInstance: true);
                 skillKongWidget.InitWidget(index, this);
-                skillKongWidget.SetSKill(PlayerManager.Instance.GongFaControl.GetSkillInfo(index));
+                skillKongWidget.SetSKill(allUseSkill[index]);
                 skillKongWidget.transform.anchoredPosition = pos;
                 skillKongWidget.onClick = OnClickSkillKongWidget;
                 allKongSkill.Add(skillKongWidget);
@@ -287,22 +464,45 @@ namespace Fort23.Mono
         {
             if (infoType == 1)
                 return;
+            Btn_Info.gameObject.SetActive(false);
+            currentSelectedSkill = null;
+
             SkillKongWidget skillKongWidget = obj as SkillKongWidget;
 
-            if (skillKongWidget.SkillInfo == null && dianjiSkillKongWidget == null)
+            if (skillKongWidget.SkillInfo == null && dianjiSkillKongWidget == null && selectSkillConfig == null)
             {
-                skillKongWidget.SetSKill(selectSkillConfig);
-                selectSkillConfig.index = skillKongWidget.index;
-                PlayerManager.Instance.GongFaControl.AddUseSkill(selectSkillConfig);
+                return;
+            }
 
-                CloseSelect();
+            int count = 0;
+            for (var i = 0; i < allUseSkill.Length; i++)
+            {
+                if (allUseSkill[i] != null)
+                {
+                    count++;
+                }
             }
+
+
+            //直接上功法
+            if (skillKongWidget.SkillInfo == null && dianjiSkillKongWidget == null && selectSkillConfig != null)
+            {
+                if (count >= 4)
+                {
+                    TipMessagePanel.OpenTipMessagePanel("功法已经上满");
+                    CloseSelect();
+                    return;
+                }
+
+                skillKongWidget.SetSKill(selectSkillConfig);
+                allUseSkill[skillKongWidget.index] = selectSkillConfig;
+            }
+            //替换功法
             else if (skillKongWidget.SkillInfo != null && dianjiSkillKongWidget == null && selectSkillConfig != null)
             {
-                PlayerManager.Instance.GongFaControl.RemoveSkillInfo(skillKongWidget.SkillInfo);
+                allUseSkill[skillKongWidget.SkillInfo.index] = null;
                 skillKongWidget.SetSKill(selectSkillConfig);
-                selectSkillConfig.index = skillKongWidget.index;
-                PlayerManager.Instance.GongFaControl.AddUseSkill(selectSkillConfig);
+                allUseSkill[skillKongWidget.index] = selectSkillConfig;
                 skillKongWidget.SetSKill(selectSkillConfig);
                 CloseSelect();
             }
@@ -314,6 +514,8 @@ namespace Fort23.Mono
                     return;
                 }
 
+                //交换功法
+
                 if (dianjiSkillKongWidget == null)
                 {
                     dianjiSkillKongWidget = skillKongWidget;
@@ -328,18 +530,16 @@ namespace Fort23.Mono
                     if (skillKongWidget.SkillInfo != null)
                     {
                         dianjiSkillKongWidget.SetSKill(skillKongWidget.SkillInfo);
-                        dianjiSkillKongWidget.SkillInfo.index = dianjiSkillKongWidget.index;
-                        PlayerManager.Instance.GongFaControl.AddUseSkill(dianjiSkillKongWidget.SkillInfo);
+                        allUseSkill[dianjiSkillKongWidget.index] = dianjiSkillKongWidget.SkillInfo;
                     }
                     else
                     {
-                        PlayerManager.Instance.GongFaControl.RemoveSkillInfo(dianjiSkillKongWidget.SkillInfo);
+                        allUseSkill[dianjiSkillKongWidget.SkillInfo.index] = null;
                         dianjiSkillKongWidget.Cleared();
                     }
 
                     skillKongWidget.SetSKill(selectSkillConfig);
-                    selectSkillConfig.index = skillKongWidget.index;
-                    PlayerManager.Instance.GongFaControl.AddUseSkill(selectSkillConfig);
+                    allUseSkill[skillKongWidget.index] = selectSkillConfig;
                     CloseSelect();
                 }
             }
@@ -364,6 +564,11 @@ namespace Fort23.Mono
             selectSkillConfig = null;
             dianjiSkillKongWidget = null;
             Btn_RemoveGongFa.gameObject.SetActive(false);
+
+
+            Btn_Info.gameObject.SetActive(false);
+            currentSelectedSkill = null;
+
             for (int i = 0; i < allKongSkill.Count; i++)
             {
                 allKongSkill[i].SelectState(false);
@@ -374,13 +579,7 @@ namespace Fort23.Mono
         public override void Hide()
         {
             base.Hide();
-            if (isAlter)
-            {
-                PlayerManager.Instance.GongFaControl.SaveUseSkill();
-            }
-
             CombatDrive.Instance.CombatController.isUpdate = true;
-            isAlter = false;
         }
 
         List<SkillWidget> _skillWidgets = new List<SkillWidget>();
@@ -393,7 +592,7 @@ namespace Fort23.Mono
             SkillWidget skillWidget = await UIManager.Instance.CreateGComponent<SkillWidget>(null, ContentRoot);
             skillWidget.InitSkillWidget(skillInfo, this);
             skillWidget.onClick = OnClick;
-            if (PlayerManager.Instance.GongFaControl.allUseSkill.Contains(skillWidget.skillConfigId))
+            if (allUseSkill.Contains(skillWidget.skillConfigId))
             {
                 skillWidget.Icon_Marsk.SetActive(true);
             }
@@ -411,7 +610,7 @@ namespace Fort23.Mono
             int count = 0;
             foreach (var skillWidget in _skillWidgets)
             {
-                if (PlayerManager.Instance.GongFaControl.allUseSkill.Contains(skillWidget.skillConfigId))
+                if (allUseSkill.Contains(skillWidget.skillConfigId))
                 {
                     skillWidget.Icon_Marsk.SetActive(true);
                 }
@@ -421,9 +620,9 @@ namespace Fort23.Mono
                 }
             }
 
-            for (var i = 0; i < PlayerManager.Instance.GongFaControl.allUseSkill.Length; i++)
+            for (var i = 0; i < allUseSkill.Length; i++)
             {
-                if (PlayerManager.Instance.GongFaControl.allUseSkill[i] != null)
+                if (allUseSkill[i] != null)
                 {
                     count++;
                 }
@@ -433,27 +632,22 @@ namespace Fort23.Mono
             Text_GongFaCount.text = $"功法数量{count}/4";
         }
 
-        private void OnClick(ItemWidgetBasic obj)
+        private async void OnClick(ItemWidgetBasic obj)
         {
             SkillWidget skillWidget = obj as SkillWidget;
             if (infoType == 1)
             {
-                GongFaUpgradePanel.Open(skillWidget.skillConfigId);
+                GongFaUpgradePanel gongFaUpgradePanel = await GongFaUpgradePanel.Open(skillWidget.skillConfigId);
+                await gongFaUpgradePanel.UIClosed();
+                Sort(type1, type2);
             }
             else if (infoType == 2)
             {
-                int count = 0;
-                for (var i = 0; i < PlayerManager.Instance.GongFaControl.allUseSkill.Length; i++)
-                {
-                    if (PlayerManager.Instance.GongFaControl.allUseSkill[i] != null)
-                    {
-                        count++;
-                    }
-                }
-
-                if (count >= 4)
-                    return;
-                if (PlayerManager.Instance.GongFaControl.allUseSkill.Contains(skillWidget.skillConfigId))
+                CloseSelect();
+                Btn_Info.transform.position = skillWidget.InfoPos.position;
+                Btn_Info.gameObject.SetActive(true);
+                currentSelectedSkill = skillWidget;
+                if (allUseSkill.Contains(skillWidget.skillConfigId))
                 {
                     return;
                 }
@@ -490,8 +684,10 @@ namespace Fort23.Mono
                 UIManager.Instance.DormancyGComponent(wuXingGongFaWidget);
             }
 
+            Icon_Select.gameObject.SetActive(false);
             _wuXingGongFaWidgets.Clear();
-
+            CloseSelect();
+            ChangeInfoType(1);
             base.Close();
         }
     }

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

@@ -261,6 +261,39 @@ namespace Fort23.Mono
 	      return _Text_RoadName;
 	     }
 	   }
+	  private Button _Btn_Info;
+	  public Button Btn_Info
+	   {
+	   get{
+	      if (_Btn_Info == null)
+	       {
+	         _Btn_Info  = GetUIUnit<Button>("Btn_Info"); 
+	       }
+	      return _Btn_Info;
+	     }
+	   }
+	  private Button _Btn_OneKyChange;
+	  public Button Btn_OneKyChange
+	   {
+	   get{
+	      if (_Btn_OneKyChange == null)
+	       {
+	         _Btn_OneKyChange  = GetUIUnit<Button>("Btn_OneKyChange"); 
+	       }
+	      return _Btn_OneKyChange;
+	     }
+	   }
+	  private MyImage _Icon_Select;
+	  public MyImage Icon_Select
+	   {
+	   get{
+	      if (_Icon_Select == null)
+	       {
+	         _Icon_Select  = GetUIUnit<MyImage>("Icon_Select"); 
+	       }
+	      return _Icon_Select;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

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

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

Assets/Scripts/GameUI/UI/GongFaUpgradePanel/GongFaUpgradeInfoWidget.cs

@@ -39,6 +39,15 @@ namespace Fort23.Mono
                 own.transform.Gray();
             }
 
+            if (_skillInfo.skillConfig.level == currentSkillInfo.skillConfig.level + 1)
+            {
+                Icon_Select.gameObject.SetActive(true);
+            }
+            else
+            {
+                Icon_Select.gameObject.SetActive(false);
+            }
+
             Text_Desc.text = UtilTools.GetString(LanguageManager.Instance.Text(skillInfo.skillConfig.PromoteLan), skillInfo.skillConfig.PromoteLanPara);
             for (var i = 0; i < StarRoot.Count; i++)
             {

Assets/Scripts/GameUI/UI/GongFaUpgradePanel/GongFaUpgradeInfoWidgetData.cs

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

Assets/Scripts/GameUI/UI/GongFaUpgradePanel/GongFaUpgradePanel.cs

@@ -2,9 +2,11 @@ using System.Collections.Generic;
 using System.Linq;
 using Core.Language;
 using Excel2Json;
+using Fort23.Core;
 using Fort23.UTool;
 using GameLogic.Hero;
 using UnityEngine;
+using UnityEngine.UI;
 using Utility;
 
 namespace Fort23.Mono
@@ -210,6 +212,41 @@ namespace Fort23.Mono
                     Text_Attribute.text = "土";
                     break;
             }
+            
+            for (var i = 0; i < StarRoot.Count; i++)
+            {
+                MyImage myImage = StarRoot[i] as MyImage;
+                myImage.gameObject.SetActive(false);
+            }
+
+            int yinstar = skillInfo.skillConfig.level - 5;
+            for (var i = 0; i < StarRoot.Count; i++)
+            {
+                MyImage icon = StarRoot[i] as MyImage;
+                if (skillInfo.skillConfig.level > 5)
+                {
+                  
+                    if (i < yinstar)
+                    {
+                        icon.icon_name = "dec_star_2";
+                        icon.gameObject.SetActive(true);
+                    }
+                    else
+                    {
+                        icon.icon_name = "dec_star_1";
+                        icon.gameObject.SetActive(true);
+                    }
+                }
+                else
+                {
+                    if (i < skillInfo.skillConfig.level)
+                    {
+                        icon.icon_name = "dec_star_1";
+                        icon.gameObject.SetActive(true);
+                    }
+                }
+            }
+            
 
             List<SkillConfig> allSkillConfigs = ConfigComponent.Instance.GetAll<SkillConfig>().ToList();
             configs = allSkillConfigs.Where(s => s.IDGroup == skillConfig.IDGroup).ToList();
@@ -223,10 +260,11 @@ namespace Fort23.Mono
             }
         }
 
-        public async static void Open(SkillInfo skillInfo)
+        public async static CTask<GongFaUpgradePanel> Open(SkillInfo skillInfo)
         {
             GongFaUpgradePanel gongFaUpgradePanel = await UIManager.Instance.LoadAndOpenPanel<GongFaUpgradePanel>(null);
             gongFaUpgradePanel.CustomInit(skillInfo);
+            return gongFaUpgradePanel;
         }
 
         public override void Close()

Assets/Scripts/GameUI/UI/GongFaUpgradePanel/SkillRoadSelecPanel.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Core.Language;
@@ -10,6 +11,7 @@ namespace Fort23.Mono
     public partial class SkillRoadSelecPanel : UIPanel
     {
         List<SkillRoadWidget> _skillRoadWidgets = new List<SkillRoadWidget>();
+        private Action<int> callBack;
 
         private void Init()
         {
@@ -27,12 +29,14 @@ namespace Fort23.Mono
         {
             Btn_Close.onClick.AddListener(() =>
             {
+                callBack?.Invoke(0);
                 UIManager.Instance.HideUIUIPanel(this );
             });
         }
 
-        public async void CustomInit()
+        public async void CustomInit(int currentSelectId,Action<int> callBack)
         {
+            this.callBack = callBack;
             List<SkillConfig> skillConfigs = ConfigComponent.Instance.GetAll<SkillConfig>().ToList();
 
             List<SkillConfig> configs = skillConfigs.Where(s => s.SkillType == 4).ToList();
@@ -44,13 +48,13 @@ namespace Fort23.Mono
                 _skillRoadWidgets.Add(skillRoadWidget);
             }
 
-            if (PlayerManager.Instance.myHero.TaoismSkillId == 0)
+            if (currentSelectId == 0)
             {
                 Text_SkillName.text = "未选择";
             }
             else
             {
-                SkillConfig skillConfig = ConfigComponent.Instance.Get<SkillConfig>(PlayerManager.Instance.myHero.TaoismSkillId);
+                SkillConfig skillConfig = ConfigComponent.Instance.Get<SkillConfig>(currentSelectId);
                 Text_SkillName.text = LanguageManager.Instance.Text(skillConfig.name);
                 Icon_SkillIcon.icon_name = skillConfig.icon;
             }
@@ -59,16 +63,17 @@ namespace Fort23.Mono
         private void OnClick(ItemWidgetBasic obj)
         {
             SkillRoadWidget skillRoadWidget = obj as SkillRoadWidget;
-            PlayerManager.Instance.GongFaControl.SetTaoismSkillIndex(skillRoadWidget.SkillConfig.ID);
-            PlayerManager.Instance.myHero.heroData.TaoismSkillId = skillRoadWidget.SkillConfig.ID;
-            AccountFileInfo.Instance.SavePlayerData();
+            // PlayerManager.Instance.GongFaControl.SetTaoismSkillIndex(skillRoadWidget.SkillConfig.ID);
+            // PlayerManager.Instance.myHero.heroData.TaoismSkillId = skillRoadWidget.SkillConfig.ID;
+            // AccountFileInfo.Instance.SavePlayerData();
+            callBack?.Invoke(skillRoadWidget.SkillConfig.ID);
             UIManager.Instance.HideUIUIPanel(this);
         }
 
-        public async static void OpenPanel()
+        public async static void OpenPanel(int currentSelectId,Action<int> callBack)
         {
             SkillRoadSelecPanel skillRoadSelecPanel = await UIManager.Instance.LoadAndOpenPanel<SkillRoadSelecPanel>(null);
-            skillRoadSelecPanel.CustomInit();
+            skillRoadSelecPanel.CustomInit(currentSelectId,callBack);
         }
 
         public override void Close()

XiuXianGame.sln.DotSettings.user

@@ -5,6 +5,7 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACompareFunction_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F84_003Ff4158f3a_003FCompareFunction_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ADictionary_00602_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F9c2967a135e648bdb993c5397a44991b573620_003Fad_003Fcb4b4f1f_003FDictionary_00602_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AEditor_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F1f63769030ae497a94b35af8517071579d5a00_003F3c_003F2c949974_003FEditor_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AEnumerable_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5004a53079e04c2991f89460a5186cf010fc00_003Fd5_003F42d076c8_003FEnumerable_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AEnumerable_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5004a53079e04c2991f89460a5186cf010fc00_003Fd5_003F42d076c8_003FEnumerable_002Ecs_002Fz_003A2_002D1/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AEnumerable_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Ff2b6204eed6b41348236173e8a2f539817a880_003F16_003Ff8f742c5_003FEnumerable_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AExceptionDispatchInfo_002Ecs_002Fl_003AC_0021_003FUsers_003Fadmin_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fe4df6db7850b4c40b72002ff5da8188846ac00_003Fd3_003F4533b7c3_003FExceptionDispatchInfo_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>