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

# Conflicts:
#	UserSettings/EditorUserSettings.asset   resolved by origin/master(远端) version

Assets/Art/UIAssets/TextrueJson/heroIcon.txt

@@ -0,0 +1 @@
+{"packName":"heroIcon","isTyPack":false,"newTextureJson":[{"textrueName":"icon_tx116","filePath":"/icon/icon_tx116.png"},{"textrueName":"icon_tx105","filePath":"/icon/icon_tx105.png"},{"textrueName":"icon_tx107","filePath":"/icon/icon_tx107.png"},{"textrueName":"icon_tx113","filePath":"/icon/icon_tx113.png"}],"keyToValue":{}}

Assets/Art/UIAssets/TextrueJson/heroIcon.txt.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: CykctHykWijTND3oe43UTd12RJln4bOoRL1lenb5c0ehoiG59ytGBXU=
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Assets/Res/Config/HeroModelConfig.json

@@ -16,6 +16,7 @@
       "crit": null,
       "attack": 10,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 2,
@@ -40,6 +41,7 @@
       "crit": null,
       "attack": 11,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 3,
@@ -64,6 +66,7 @@
       "crit": null,
       "attack": 12,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 4,
@@ -88,6 +91,7 @@
       "crit": null,
       "attack": 10,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 2,
@@ -109,6 +113,7 @@
       "crit": null,
       "attack": 11,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 3,
@@ -130,6 +135,7 @@
       "crit": null,
       "attack": 12,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 4,
@@ -151,6 +157,7 @@
       "crit": null,
       "attack": 10,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 2,
@@ -172,6 +179,7 @@
       "crit": null,
       "attack": 11,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 3,
@@ -193,6 +201,7 @@
       "crit": null,
       "attack": 12,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 4,
@@ -214,6 +223,7 @@
       "crit": null,
       "attack": 10,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 2,
@@ -235,6 +245,7 @@
       "crit": null,
       "attack": 11,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 3,
@@ -256,6 +267,7 @@
       "crit": null,
       "attack": 12,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 4,
@@ -277,6 +289,7 @@
       "crit": null,
       "attack": 10,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 2,
@@ -298,6 +311,7 @@
       "crit": null,
       "attack": 11,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 3,
@@ -319,6 +333,7 @@
       "crit": null,
       "attack": 12,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 4,
@@ -340,6 +355,7 @@
       "crit": null,
       "attack": 10,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 2,
@@ -361,6 +377,7 @@
       "crit": null,
       "attack": 11,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 3,
@@ -382,6 +399,7 @@
       "crit": null,
       "attack": 12,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 4,
@@ -403,6 +421,7 @@
       "crit": null,
       "attack": 11,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 3,
@@ -424,6 +443,7 @@
       "crit": null,
       "attack": 12,
       "shanbi": 10,
+      "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
       "range_atk": 4,
@@ -445,6 +465,7 @@
       "crit": null,
       "attack": 13,
       "shanbi": 0,
+      "expGain": null,
       "move_speed": 3,
       "speed_atk": 1.0,
       "range_atk": 3,
@@ -469,6 +490,7 @@
       "crit": null,
       "attack": 14,
       "shanbi": 0,
+      "expGain": null,
       "move_speed": 3,
       "speed_atk": 1.0,
       "range_atk": 3,
@@ -495,6 +517,7 @@
       "crit": null,
       "attack": 15,
       "shanbi": 0,
+      "expGain": null,
       "move_speed": 3,
       "speed_atk": 1.0,
       "range_atk": 3,

Assets/Res/Config/LanguageChineseConfig.json

@@ -115,6 +115,18 @@
     {
       "ID": 29,
       "txt": "吸血"
+    },
+    {
+      "ID": 30,
+      "txt": "传说"
+    },
+    {
+      "ID": 31,
+      "txt": "史诗"
+    },
+    {
+      "ID": 32,
+      "txt": "精英"
     }
   ]
 }

Assets/Res/UI/HeroDetailPanel.prefab

@@ -455,7 +455,7 @@ GameObject:
   - component: {fileID: 3287270408546687904}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: Text (TMP)
+  m_Name: txtBasicEquipLv
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1861,9 +1861,9 @@ RectTransform:
   - {fileID: 7381803730339431127}
   m_Father: {fileID: 7705411688387883887}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 336.49994, y: -28}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 227, y: 56}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5254878090505631399
@@ -3200,7 +3200,7 @@ GameObject:
   - component: {fileID: 19514213694833491}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: TextGrade
+  m_Name: TextRarity
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -3711,9 +3711,9 @@ RectTransform:
   - {fileID: 1714301204429487981}
   m_Father: {fileID: 7705411688387883887}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 549.99994, y: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 175.2, y: 56}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &8592391560479041805
@@ -3767,7 +3767,7 @@ GameObject:
   - component: {fileID: 5389224752589133892}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: TextUpGrade
+  m_Name: txt
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -5128,7 +5128,7 @@ GameObject:
   - component: {fileID: 5985745952537226085}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: Text (TMP)
+  m_Name: txtPromote
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -8925,7 +8925,7 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
-  - key: heroGrade
+  - key: heroRarity
     gameObject: {fileID: 19514213694833491}
     isAssetBundle: 0
     isList: 0
@@ -8955,6 +8955,136 @@ MonoBehaviour:
     - gameObject: {fileID: 2983232722897563720}
     - gameObject: {fileID: 7900421520403642917}
     - gameObject: {fileID: 1181932463234986561}
+  - key: txtHP
+    gameObject: {fileID: 598579539906994872}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9043530873077291103}
+    - gameObject: {fileID: 7786295750093721047}
+    - gameObject: {fileID: 2983232722897563720}
+    - gameObject: {fileID: 7900421520403642917}
+    - gameObject: {fileID: 1181932463234986561}
+  - key: txtATK
+    gameObject: {fileID: 8486385519936893500}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9043530873077291103}
+    - gameObject: {fileID: 7786295750093721047}
+    - gameObject: {fileID: 2983232722897563720}
+    - gameObject: {fileID: 7900421520403642917}
+    - gameObject: {fileID: 1181932463234986561}
+  - key: txtDEF
+    gameObject: {fileID: 7236757971243620307}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9043530873077291103}
+    - gameObject: {fileID: 7786295750093721047}
+    - gameObject: {fileID: 2983232722897563720}
+    - gameObject: {fileID: 7900421520403642917}
+    - gameObject: {fileID: 1181932463234986561}
+  - key: txtSHANBI
+    gameObject: {fileID: 1803937540883082637}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9043530873077291103}
+    - gameObject: {fileID: 7786295750093721047}
+    - gameObject: {fileID: 2983232722897563720}
+    - gameObject: {fileID: 7900421520403642917}
+    - gameObject: {fileID: 1181932463234986561}
+  - key: txtLv
+    gameObject: {fileID: 1188882091358369341}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9043530873077291103}
+    - gameObject: {fileID: 7786295750093721047}
+    - gameObject: {fileID: 2983232722897563720}
+    - gameObject: {fileID: 7900421520403642917}
+    - gameObject: {fileID: 1181932463234986561}
+  - key: txtExpGain
+    gameObject: {fileID: 4958296180853232177}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9043530873077291103}
+    - gameObject: {fileID: 7786295750093721047}
+    - gameObject: {fileID: 2983232722897563720}
+    - gameObject: {fileID: 7900421520403642917}
+    - gameObject: {fileID: 1181932463234986561}
+  - key: txtUpgrade
+    gameObject: {fileID: 6108899882536864750}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9043530873077291103}
+    - gameObject: {fileID: 7786295750093721047}
+    - gameObject: {fileID: 2983232722897563720}
+    - gameObject: {fileID: 7900421520403642917}
+    - gameObject: {fileID: 1181932463234986561}
+  - key: txtPromote
+    gameObject: {fileID: 5985745952537226085}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9043530873077291103}
+    - gameObject: {fileID: 7786295750093721047}
+    - gameObject: {fileID: 2983232722897563720}
+    - gameObject: {fileID: 7900421520403642917}
+    - gameObject: {fileID: 1181932463234986561}
+  - key: heroShards
+    gameObject: {fileID: 5495134090315458649}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9043530873077291103}
+    - gameObject: {fileID: 7786295750093721047}
+    - gameObject: {fileID: 2983232722897563720}
+    - gameObject: {fileID: 7900421520403642917}
+    - gameObject: {fileID: 1181932463234986561}
+  - key: txtBasicEquipLv
+    gameObject: {fileID: 3287270408546687904}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9043530873077291103}
+    - gameObject: {fileID: 7786295750093721047}
+    - gameObject: {fileID: 2983232722897563720}
+    - gameObject: {fileID: 7900421520403642917}
+    - gameObject: {fileID: 1181932463234986561}
+  - key: iconCommonEquip
+    gameObject: {fileID: 2875697944268458280}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9043530873077291103}
+    - gameObject: {fileID: 7786295750093721047}
+    - gameObject: {fileID: 2983232722897563720}
+    - gameObject: {fileID: 7900421520403642917}
+    - gameObject: {fileID: 1181932463234986561}
+  - key: iconSpecailEquip
+    gameObject: {fileID: 1302489430543971595}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9043530873077291103}
+    - gameObject: {fileID: 7786295750093721047}
+    - gameObject: {fileID: 2983232722897563720}
+    - gameObject: {fileID: 7900421520403642917}
+    - gameObject: {fileID: 1181932463234986561}
+  - key: lockObj
+    gameObject: {fileID: 3004711444938965894}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9043530873077291103}
+    - gameObject: {fileID: 7786295750093721047}
+    - gameObject: {fileID: 2983232722897563720}
+    - gameObject: {fileID: 7900421520403642917}
+    - gameObject: {fileID: 1181932463234986561}
   isAssetBundle: 1
 --- !u!1 &6353668298983276286
 GameObject:
@@ -8969,7 +9099,7 @@ GameObject:
   - component: {fileID: 3838246812056708320}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: TextLv
+  m_Name: Text
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -9333,7 +9463,7 @@ GameObject:
   - component: {fileID: 2298052617001389203}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: TextLv
+  m_Name: Text
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -9477,7 +9607,7 @@ GameObject:
   - component: {fileID: 6108899882536864750}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: Text (TMP)
+  m_Name: txtUpgrade
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -12345,7 +12475,7 @@ GameObject:
   - component: {fileID: 5100336500503189401}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: TextPromote
+  m_Name: txt
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

Assets/Res/UI/MainUIPanel.prefab

@@ -145,7 +145,7 @@ GameObject:
   m_Component:
   - component: {fileID: 7295285484143575252}
   - component: {fileID: 5110367857571788923}
-  - component: {fileID: 284659430331877172}
+  - component: {fileID: 3173585067917471387}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Icon_Gem
@@ -181,7 +181,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 276298489757744287}
   m_CullTransparentMesh: 1
---- !u!114 &284659430331877172
+--- !u!114 &3173585067917471387
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -190,7 +190,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 276298489757744287}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
@@ -201,7 +201,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 047acbbc02e094090ab6852579e7e7b7, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -211,6 +211,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+  _icon_name: icon_res_Gem
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  packInfo:
+    packName: all
+    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
+    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
+    lasetJsonGUID: e90cdb0036b7598e8196c482eccd4329
 --- !u!1 &501653731502256918
 GameObject:
   m_ObjectHideFlags: 0
@@ -569,7 +577,7 @@ GameObject:
   m_Component:
   - component: {fileID: 5433286787357854352}
   - component: {fileID: 5309631651483224709}
-  - component: {fileID: 433065630854994431}
+  - component: {fileID: 6524193313608138032}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Icon_Coin
@@ -605,7 +613,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1211543753200599720}
   m_CullTransparentMesh: 1
---- !u!114 &433065630854994431
+--- !u!114 &6524193313608138032
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -614,7 +622,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 1211543753200599720}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
@@ -625,7 +633,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: e3a3f6e5da08f46c895f632eccceb676, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -635,6 +643,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+  _icon_name: icon_Coin
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  packInfo:
+    packName: all
+    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
+    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
+    lasetJsonGUID: e90cdb0036b7598e8196c482eccd4329
 --- !u!1 &1222237385420729871
 GameObject:
   m_ObjectHideFlags: 0
@@ -2193,7 +2209,6 @@ RectTransform:
   - {fileID: 8106735504455601440}
   - {fileID: 8968252359368126328}
   - {fileID: 874346651065516408}
-  - {fileID: 8879947183720841500}
   m_Father: {fileID: 6466028004710776003}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -4210,8 +4225,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -75.2, y: -4}
-  m_SizeDelta: {x: 51.5, y: 71.7}
+  m_AnchoredPosition: {x: -60.5, y: 1.0374}
+  m_SizeDelta: {x: 42.7, y: 55.953}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2473317446412967829
 CanvasRenderer:
@@ -4251,7 +4266,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: btn_l_Green
+  _icon_name: icon_res_upgrade_1
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
   packInfo:
@@ -4859,185 +4874,3 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!1001 &4460092474410663005
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 9073062006211861286}
-    m_Modifications:
-    - target: {fileID: 2192921615180975605, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2192921615180975605, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2192921615180975605, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2192921615180975605, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2248459876073487429, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2248459876073487429, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2248459876073487429, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2248459876073487429, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5106666997551906113, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 5106666997551906113, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 5106666997551906113, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 5106666997551906113, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 5106666997551906113, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 5106666997551906113, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 5106666997551906113, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 150
-      objectReference: {fileID: 0}
-    - target: {fileID: 5106666997551906113, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 200
-      objectReference: {fileID: 0}
-    - target: {fileID: 5106666997551906113, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5106666997551906113, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5106666997551906113, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5106666997551906113, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 5106666997551906113, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5106666997551906113, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5106666997551906113, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5106666997551906113, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5106666997551906113, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5106666997551906113, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5106666997551906113, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5106666997551906113, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5424729500125663363, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_Name
-      value: WidgetHero
-      objectReference: {fileID: 0}
-    - target: {fileID: 7229761929894092049, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7229761929894092049, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7229761929894092049, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7229761929894092049, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7878371381901126332, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7878371381901126332, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7878371381901126332, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7878371381901126332, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8498367243636987744, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8498367243636987744, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8498367243636987744, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8498367243636987744, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
---- !u!224 &8879947183720841500 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 5106666997551906113, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
-  m_PrefabInstance: {fileID: 4460092474410663005}
-  m_PrefabAsset: {fileID: 0}

Assets/Res/UI/WidgetHero.prefab

@@ -36,7 +36,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 25.5, y: -27}
+  m_AnchoredPosition: {x: 28.5, y: -33}
   m_SizeDelta: {x: 35, y: 36}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7961417994247046798
@@ -164,7 +164,7 @@ GameObject:
   m_Component:
   - component: {fileID: 7878371381901126332}
   - component: {fileID: 8144389359825814294}
-  - component: {fileID: 1242894183903934781}
+  - component: {fileID: 2160483089439526009}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Grade_Star (4)
@@ -200,7 +200,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1235474140743937961}
   m_CullTransparentMesh: 1
---- !u!114 &1242894183903934781
+--- !u!114 &2160483089439526009
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -209,7 +209,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 1235474140743937961}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
@@ -220,7 +220,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 39afaf3c0b490422ea5f07aac1dcfbe1, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -230,6 +230,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_star
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  packInfo:
+    packName: all
+    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
+    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
+    lasetJsonGUID: 03b3872585b24d54f63b884a410da2bc
 --- !u!1 &1362261821966092627
 GameObject:
   m_ObjectHideFlags: 0
@@ -451,7 +459,7 @@ GameObject:
   m_Component:
   - component: {fileID: 2248459876073487429}
   - component: {fileID: 2739737631316204749}
-  - component: {fileID: 1893654776998886885}
+  - component: {fileID: 3810554628740734183}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Grade_Star
@@ -487,7 +495,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2054454074167662785}
   m_CullTransparentMesh: 1
---- !u!114 &1893654776998886885
+--- !u!114 &3810554628740734183
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -496,7 +504,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 2054454074167662785}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
@@ -507,7 +515,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 39afaf3c0b490422ea5f07aac1dcfbe1, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -517,6 +525,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_star
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  packInfo:
+    packName: all
+    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
+    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
+    lasetJsonGUID: 03b3872585b24d54f63b884a410da2bc
 --- !u!1 &2068292004882907889
 GameObject:
   m_ObjectHideFlags: 0
@@ -527,7 +543,7 @@ GameObject:
   m_Component:
   - component: {fileID: 7229761929894092049}
   - component: {fileID: 2708601044019718149}
-  - component: {fileID: 3829851137653808305}
+  - component: {fileID: 6873922282167129999}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Grade_Star (1)
@@ -563,7 +579,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2068292004882907889}
   m_CullTransparentMesh: 1
---- !u!114 &3829851137653808305
+--- !u!114 &6873922282167129999
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -572,7 +588,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 2068292004882907889}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
@@ -583,7 +599,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 39afaf3c0b490422ea5f07aac1dcfbe1, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -593,6 +609,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_star
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  packInfo:
+    packName: all
+    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
+    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
+    lasetJsonGUID: 03b3872585b24d54f63b884a410da2bc
 --- !u!1 &3035075031006461083
 GameObject:
   m_ObjectHideFlags: 0
@@ -603,7 +627,7 @@ GameObject:
   m_Component:
   - component: {fileID: 2192921615180975605}
   - component: {fileID: 8783385350428690739}
-  - component: {fileID: 8196141183824375260}
+  - component: {fileID: 3615513861017489878}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Grade_Star (3)
@@ -639,7 +663,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3035075031006461083}
   m_CullTransparentMesh: 1
---- !u!114 &8196141183824375260
+--- !u!114 &3615513861017489878
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -648,7 +672,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 3035075031006461083}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
@@ -659,7 +683,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 39afaf3c0b490422ea5f07aac1dcfbe1, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -669,6 +693,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_star
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  packInfo:
+    packName: all
+    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
+    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
+    lasetJsonGUID: 03b3872585b24d54f63b884a410da2bc
 --- !u!1 &3216529491418307855
 GameObject:
   m_ObjectHideFlags: 0
@@ -823,7 +855,7 @@ GameObject:
   m_Component:
   - component: {fileID: 143105881846625558}
   - component: {fileID: 7686669919121143803}
-  - component: {fileID: 3507173361900776593}
+  - component: {fileID: 5183410127581163152}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Icon
@@ -859,7 +891,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4370823504067617340}
   m_CullTransparentMesh: 1
---- !u!114 &3507173361900776593
+--- !u!114 &5183410127581163152
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -868,7 +900,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 4370823504067617340}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
@@ -879,7 +911,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: cbd10e67e1e8343aebe8498f30c54e2a, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -889,6 +921,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+  _icon_name: icon_zy_Hat
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  packInfo:
+    packName: all
+    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
+    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
+    lasetJsonGUID: 03b3872585b24d54f63b884a410da2bc
 --- !u!1 &5424729500125663363
 GameObject:
   m_ObjectHideFlags: 0
@@ -900,7 +940,6 @@ GameObject:
   - component: {fileID: 5106666997551906113}
   - component: {fileID: 8653829958343529847}
   - component: {fileID: 8641256824108606021}
-  - component: {fileID: 1237577693768947228}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: WidgetHero
@@ -951,8 +990,8 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
-  - key: headIcon
-    gameObject: {fileID: 4520237584939250927}
+  - key: iconHero
+    gameObject: {fileID: 2063880575880762248}
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
@@ -971,31 +1010,31 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas:
-    - gameObject: {fileID: 1893654776998886885}
-    - gameObject: {fileID: 3829851137653808305}
-    - gameObject: {fileID: 586281481670808277}
-    - gameObject: {fileID: 8196141183824375260}
-    - gameObject: {fileID: 1242894183903934781}
-  - key: zhiyeIcon
-    gameObject: {fileID: 3507173361900776593}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+  - key: iconZhiYe
+    gameObject: {fileID: 5183410127581163152}
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas:
-    - gameObject: {fileID: 1893654776998886885}
-    - gameObject: {fileID: 3829851137653808305}
-    - gameObject: {fileID: 586281481670808277}
-    - gameObject: {fileID: 8196141183824375260}
-    - gameObject: {fileID: 1242894183903934781}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
   - key: btnHero
     gameObject: {fileID: 8641256824108606021}
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas:
-    - gameObject: {fileID: 1893654776998886885}
-    - gameObject: {fileID: 3829851137653808305}
-    - gameObject: {fileID: 586281481670808277}
-    - gameObject: {fileID: 8196141183824375260}
-    - gameObject: {fileID: 1242894183903934781}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
   isAssetBundle: 1
 --- !u!114 &8641256824108606021
 MonoBehaviour:
@@ -1041,51 +1080,6 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
---- !u!61 &1237577693768947228
-BoxCollider2D:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5424729500125663363}
-  m_Enabled: 0
-  m_Density: 1
-  m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
-  m_ForceSendLayers:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_ForceReceiveLayers:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_ContactCaptureLayers:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_CallbackLayers:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_IsTrigger: 0
-  m_UsedByEffector: 0
-  m_UsedByComposite: 0
-  m_Offset: {x: 0, y: 0}
-  m_SpriteTilingProperty:
-    border: {x: 0, y: 0, z: 0, w: 0}
-    pivot: {x: 0, y: 0}
-    oldSize: {x: 0, y: 0}
-    newSize: {x: 0, y: 0}
-    adaptiveTilingThreshold: 0
-    drawMode: 0
-    adaptiveTiling: 0
-  m_AutoTiling: 0
-  serializedVersion: 2
-  m_Size: {x: 150, y: 200}
-  m_EdgeRadius: 0
 --- !u!1 &5677483184485922613
 GameObject:
   m_ObjectHideFlags: 0
@@ -1248,7 +1242,7 @@ GameObject:
   m_Component:
   - component: {fileID: 7602731387458885778}
   - component: {fileID: 8224281712761051760}
-  - component: {fileID: 4520237584939250927}
+  - component: {fileID: 2063880575880762248}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Icon
@@ -1266,15 +1260,15 @@ RectTransform:
   m_GameObject: {fileID: 6690880340389431512}
   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_LocalScale: {x: 0.4, y: 0.4, z: 0.4}
+  m_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 5106666997551906113}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 1.6, y: 8.7}
-  m_SizeDelta: {x: 124.61, y: 112.15}
+  m_SizeDelta: {x: 410, y: 262}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8224281712761051760
 CanvasRenderer:
@@ -1284,7 +1278,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6690880340389431512}
   m_CullTransparentMesh: 1
---- !u!114 &4520237584939250927
+--- !u!114 &2063880575880762248
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1293,7 +1287,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 6690880340389431512}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
@@ -1304,7 +1298,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 55423cb896009490a8dd8fe1a31aa5b1, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1314,6 +1308,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+  _icon_name: icon_tx105
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 1a259ebae9e024f1d8fb10d831b49c24, type: 3}
+  packInfo:
+    packName: heroIcon
+    packgJsonPath: /Art/UIAssets/TextrueJson/heroIcon.txt
+    packgSpritePath: Assets/Res/UIAtlas/heroIcon.spriteatlasv2
+    lasetJsonGUID: a59a676e2ab5c4925ab687adc8940d7b
 --- !u!1 &7524693852372550712
 GameObject:
   m_ObjectHideFlags: 0
@@ -1324,7 +1326,7 @@ GameObject:
   m_Component:
   - component: {fileID: 8498367243636987744}
   - component: {fileID: 6307304734260365425}
-  - component: {fileID: 586281481670808277}
+  - component: {fileID: 6382863773641817049}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Grade_Star (2)
@@ -1360,7 +1362,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7524693852372550712}
   m_CullTransparentMesh: 1
---- !u!114 &586281481670808277
+--- !u!114 &6382863773641817049
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1369,7 +1371,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 7524693852372550712}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
@@ -1380,7 +1382,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 39afaf3c0b490422ea5f07aac1dcfbe1, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1390,6 +1392,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_star
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  packInfo:
+    packName: all
+    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
+    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
+    lasetJsonGUID: 03b3872585b24d54f63b884a410da2bc
 --- !u!1 &7597079903001610012
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UIAtlas/all.spriteatlasv2

@@ -198,6 +198,53 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: d320d0b7f786e44768dbf452a215d9f4, type: 3}
     - {fileID: 2800000, guid: c5d88737534914e22a2b08bf691052c3, type: 3}
     - {fileID: 2800000, guid: 9e984408ac7ba4153bace3927806efeb, type: 3}
+    - {fileID: 2800000, guid: f135276cb2d8f43339f0cbe999537c48, type: 3}
+    - {fileID: 2800000, guid: 4f5b4c2303ae14f8aa8d2daf5803f417, type: 3}
+    - {fileID: 2800000, guid: 0b7cc907f403f4a67ad658df2c8b8bd6, type: 3}
+    - {fileID: 2800000, guid: fac2f1f21015b4387ba948c68d69b20a, type: 3}
+    - {fileID: 2800000, guid: 6db8a26aaf376472cb3da4b0174c3640, type: 3}
+    - {fileID: 2800000, guid: 1944ddda93ef84249abc2c330ccc1671, type: 3}
+    - {fileID: 2800000, guid: a30bf5a5fe0484028b110056f3f4bfb7, type: 3}
+    - {fileID: 2800000, guid: 7a8716b2f7dea49e2a0a4b04902a7b29, type: 3}
+    - {fileID: 2800000, guid: 137d66878d81240e08b1f9e634dd03e5, type: 3}
+    - {fileID: 2800000, guid: c9076402f3d8e4f14b590c121f9c99d0, type: 3}
+    - {fileID: 2800000, guid: 620836cccebfa47d69f3604400cda9d1, type: 3}
+    - {fileID: 2800000, guid: 036dc8ba1666442588bd4900d7967f74, type: 3}
+    - {fileID: 2800000, guid: 82fb7f520a3d042f68f126f07425081c, type: 3}
+    - {fileID: 2800000, guid: 4e7efc4278c98434aa518be230a9a6e2, type: 3}
+    - {fileID: 2800000, guid: 458074caa850a4ebe9902dadcebd5519, type: 3}
+    - {fileID: 2800000, guid: 92753e7463d6c4451bcfaa1be32e5834, type: 3}
+    - {fileID: 2800000, guid: 084d642e01f7849d0a49230ab9cc18b9, type: 3}
+    - {fileID: 2800000, guid: ce1ea5fcdbd674590ac8eae01e003bad, type: 3}
+    - {fileID: 2800000, guid: 7298f85c9be3e480ca29a540b881acc7, type: 3}
+    - {fileID: 2800000, guid: acf622f4b8b10451f864e6bbe0f2d18c, type: 3}
+    - {fileID: 2800000, guid: 69c249842084043e0b2152a611527273, type: 3}
+    - {fileID: 2800000, guid: 9369285ebc9f1452cb96bdd4c71dc580, type: 3}
+    - {fileID: 2800000, guid: 18bdd168063b3419c93ff0ad3d928768, type: 3}
+    - {fileID: 2800000, guid: a909a2534241641bfa4fd6d3aa0997fa, type: 3}
+    - {fileID: 2800000, guid: 1cedae3cd8e1c4e8b8351163cb83d3c3, type: 3}
+    - {fileID: 2800000, guid: 40b46970b24114095ae4592b09cd788b, type: 3}
+    - {fileID: 2800000, guid: 12f59c252111d4ddaa1efdbe970c9338, type: 3}
+    - {fileID: 2800000, guid: 88f8d005a66c74c8e8516498671a5363, type: 3}
+    - {fileID: 2800000, guid: 644d6a9935ab8468f91bccdf0e81217e, type: 3}
+    - {fileID: 2800000, guid: 0107877e5f4474feeb6c3a48ddbd0181, type: 3}
+    - {fileID: 2800000, guid: e6614d7880f624bebb9eb042438465e7, type: 3}
+    - {fileID: 2800000, guid: 11f8939ed19d74afd9f1ec5c2cd1ed40, type: 3}
+    - {fileID: 2800000, guid: 58233a1daedbb4a24b2ddca6bcb864fd, type: 3}
+    - {fileID: 2800000, guid: 03108c847a5054b63971245729018c27, type: 3}
+    - {fileID: 2800000, guid: e4a00da9d5759447c948b8fa241afc3e, type: 3}
+    - {fileID: 2800000, guid: dd87b4353a45646fbbeaafe8c13a4632, type: 3}
+    - {fileID: 2800000, guid: 7c661cddbbc49467d8441a35766809e1, type: 3}
+    - {fileID: 2800000, guid: 0e2733676e1be451a8519a89c49798c1, type: 3}
+    - {fileID: 2800000, guid: 7529bbf4240db4e31a7b6f4df456a36a, type: 3}
+    - {fileID: 2800000, guid: 082c2d0dec6374c548992e3de4c3cc17, type: 3}
+    - {fileID: 2800000, guid: ab7ed8048d1084deca39266a82de2fbc, type: 3}
+    - {fileID: 2800000, guid: 044267119b30c460785747c947493225, type: 3}
+    - {fileID: 2800000, guid: ebc537e5817db4407935a71d199232e9, type: 3}
+    - {fileID: 2800000, guid: 687226eea50e240aeb387bc0204de028, type: 3}
+    - {fileID: 2800000, guid: d320d0b7f786e44768dbf452a215d9f4, type: 3}
+    - {fileID: 2800000, guid: c5d88737534914e22a2b08bf691052c3, type: 3}
+    - {fileID: 2800000, guid: 9e984408ac7ba4153bace3927806efeb, type: 3}
     - {fileID: 2800000, guid: 92753e7463d6c4451bcfaa1be32e5834, type: 3}
     - {fileID: 2800000, guid: 69c249842084043e0b2152a611527273, type: 3}
     - {fileID: 2800000, guid: 620836cccebfa47d69f3604400cda9d1, type: 3}
@@ -248,5 +295,58 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: 7c661cddbbc49467d8441a35766809e1, type: 3}
     - {fileID: 2800000, guid: 7a8716b2f7dea49e2a0a4b04902a7b29, type: 3}
     - {fileID: 2800000, guid: 7529bbf4240db4e31a7b6f4df456a36a, type: 3}
+    - {fileID: 2800000, guid: f135276cb2d8f43339f0cbe999537c48, type: 3}
+    - {fileID: 2800000, guid: 4f5b4c2303ae14f8aa8d2daf5803f417, type: 3}
+    - {fileID: 2800000, guid: a87149123ae00504d802648411192f19, type: 3}
+    - {fileID: 2800000, guid: 9c4fd4838fb139248bd31b4595d3d3e0, type: 3}
+    - {fileID: 2800000, guid: 0b7cc907f403f4a67ad658df2c8b8bd6, type: 3}
+    - {fileID: 2800000, guid: 104a340bfa7bdc842a914e4855a3f023, type: 3}
+    - {fileID: 2800000, guid: fac2f1f21015b4387ba948c68d69b20a, type: 3}
+    - {fileID: 2800000, guid: 6db8a26aaf376472cb3da4b0174c3640, type: 3}
+    - {fileID: 2800000, guid: 1944ddda93ef84249abc2c330ccc1671, type: 3}
+    - {fileID: 2800000, guid: a30bf5a5fe0484028b110056f3f4bfb7, type: 3}
+    - {fileID: 2800000, guid: 7a8716b2f7dea49e2a0a4b04902a7b29, type: 3}
+    - {fileID: 2800000, guid: fb9317113944240948cfe4a213422ff8, type: 3}
+    - {fileID: 2800000, guid: 137d66878d81240e08b1f9e634dd03e5, type: 3}
+    - {fileID: 2800000, guid: c9076402f3d8e4f14b590c121f9c99d0, type: 3}
+    - {fileID: 2800000, guid: 620836cccebfa47d69f3604400cda9d1, type: 3}
+    - {fileID: 2800000, guid: 036dc8ba1666442588bd4900d7967f74, type: 3}
+    - {fileID: 2800000, guid: df1cd931072aa4a118088d9e27a0a603, type: 3}
+    - {fileID: 2800000, guid: 82fb7f520a3d042f68f126f07425081c, type: 3}
+    - {fileID: 2800000, guid: 4e7efc4278c98434aa518be230a9a6e2, type: 3}
+    - {fileID: 2800000, guid: e701ef601bf944f31a3d97f606f78430, type: 3}
+    - {fileID: 2800000, guid: 458074caa850a4ebe9902dadcebd5519, type: 3}
+    - {fileID: 2800000, guid: 92753e7463d6c4451bcfaa1be32e5834, type: 3}
+    - {fileID: 2800000, guid: 084d642e01f7849d0a49230ab9cc18b9, type: 3}
+    - {fileID: 2800000, guid: ce1ea5fcdbd674590ac8eae01e003bad, type: 3}
+    - {fileID: 2800000, guid: 7298f85c9be3e480ca29a540b881acc7, type: 3}
+    - {fileID: 2800000, guid: acf622f4b8b10451f864e6bbe0f2d18c, type: 3}
+    - {fileID: 2800000, guid: 69c249842084043e0b2152a611527273, type: 3}
+    - {fileID: 2800000, guid: 9369285ebc9f1452cb96bdd4c71dc580, type: 3}
+    - {fileID: 2800000, guid: 18bdd168063b3419c93ff0ad3d928768, type: 3}
+    - {fileID: 2800000, guid: a909a2534241641bfa4fd6d3aa0997fa, type: 3}
+    - {fileID: 2800000, guid: 1cedae3cd8e1c4e8b8351163cb83d3c3, type: 3}
+    - {fileID: 2800000, guid: 40b46970b24114095ae4592b09cd788b, type: 3}
+    - {fileID: 2800000, guid: 12f59c252111d4ddaa1efdbe970c9338, type: 3}
+    - {fileID: 2800000, guid: 88f8d005a66c74c8e8516498671a5363, type: 3}
+    - {fileID: 2800000, guid: 644d6a9935ab8468f91bccdf0e81217e, type: 3}
+    - {fileID: 2800000, guid: 0107877e5f4474feeb6c3a48ddbd0181, type: 3}
+    - {fileID: 2800000, guid: e6614d7880f624bebb9eb042438465e7, type: 3}
+    - {fileID: 2800000, guid: 11f8939ed19d74afd9f1ec5c2cd1ed40, type: 3}
+    - {fileID: 2800000, guid: 58233a1daedbb4a24b2ddca6bcb864fd, type: 3}
+    - {fileID: 2800000, guid: 03108c847a5054b63971245729018c27, type: 3}
+    - {fileID: 2800000, guid: e4a00da9d5759447c948b8fa241afc3e, type: 3}
+    - {fileID: 2800000, guid: dd87b4353a45646fbbeaafe8c13a4632, type: 3}
+    - {fileID: 2800000, guid: 7c661cddbbc49467d8441a35766809e1, type: 3}
+    - {fileID: 2800000, guid: 0e2733676e1be451a8519a89c49798c1, type: 3}
+    - {fileID: 2800000, guid: 7529bbf4240db4e31a7b6f4df456a36a, type: 3}
+    - {fileID: 2800000, guid: 082c2d0dec6374c548992e3de4c3cc17, type: 3}
+    - {fileID: 2800000, guid: ab7ed8048d1084deca39266a82de2fbc, type: 3}
+    - {fileID: 2800000, guid: 044267119b30c460785747c947493225, type: 3}
+    - {fileID: 2800000, guid: ebc537e5817db4407935a71d199232e9, type: 3}
+    - {fileID: 2800000, guid: 687226eea50e240aeb387bc0204de028, type: 3}
+    - {fileID: 2800000, guid: d320d0b7f786e44768dbf452a215d9f4, type: 3}
+    - {fileID: 2800000, guid: c5d88737534914e22a2b08bf691052c3, type: 3}
+    - {fileID: 2800000, guid: 9e984408ac7ba4153bace3927806efeb, type: 3}
   m_IsVariant: 0
   m_IsPlaceholder: 0

Assets/Res/UIAtlas/heroIcon.spriteatlasv2

@@ -0,0 +1,19 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!612988286 &1
+SpriteAtlasAsset:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  serializedVersion: 3
+  m_MasterAtlas: {fileID: 0}
+  m_ImporterData:
+    packables:
+    - {fileID: 2800000, guid: 686bc6c27b77549b0a4309b808e6620b, type: 3}
+    - {fileID: 2800000, guid: ff7f553a76e6f4322a64fbb61d20f9ba, type: 3}
+    - {fileID: 2800000, guid: 40bc652a2f80c4500b10133dd8ca5e43, type: 3}
+    - {fileID: 2800000, guid: 3077f31e475de4831b14989f053d238f, type: 3}
+  m_IsVariant: 0
+  m_IsPlaceholder: 0

Assets/Res/UIAtlas/heroIcon.spriteatlasv2.meta

@@ -0,0 +1,31 @@
+fileFormatVersion: 2
+guid: DisdsCP4ASpJWW+yv3WvThwzL8/T0WZJOugmuodBPeyqpmMFuc7HiE0=
+SpriteAtlasImporter:
+  externalObjects: {}
+  textureSettings:
+    serializedVersion: 3
+    anisoLevel: 1
+    compressionQuality: 50
+    maxTextureSize: 2048
+    textureCompression: 0
+    filterMode: 1
+    generateMipMaps: 0
+    readable: 0
+    crunchedCompression: 0
+    webStreaming: 0
+    sRGB: 1
+  platformSettings: []
+  packingSettings:
+    serializedVersion: 2
+    padding: 4
+    blockOffset: 1
+    allowAlphaSplitting: 0
+    enableRotation: 0
+    enableTightPacking: 0
+    enableAlphaDilation: 0
+  secondaryTextureSettings: {}
+  variantMultiplier: 1
+  bindAsDefault: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/GameData/ExcelConfig/HeroModelConfig.cs

@@ -104,6 +104,12 @@ public int attack;
 public int shanbi;
 
 
+		/// <summary>
+		///经验产出
+		/// </summary>
+public long expGain;
+
+
 		/// <summary>
 		///移动速度
 		/// </summary>

Assets/Scripts/GameData/ExcelConfig/HeroPowerUpConfig.cs

@@ -50,6 +50,12 @@ public float DEFFactor;
 public float SHANBIFactor;
 
 
+		/// <summary>
+		///经验产出倍率
+		/// </summary>
+public float EXPFactor;
+
+
 		/// <summary>
 		///升级所需经验值 （0代表最大等级)
 		/// </summary>

Assets/Scripts/GameLogic/Combat/Hero/CombatHeroInfo.cs

@@ -18,13 +18,18 @@ public class CombatHeroInfo
     /// </summary>
     public EncryptionInt shanbi = new EncryptionInt(); 
     
+    /// <summary>
+    /// 经验产出
+    /// </summary>
+    public EncryptionLong expGain = new EncryptionLong();
+    
     public EncryptionFloat attSpeed = new EncryptionFloat();
     public EncryptionFloat crit =new EncryptionFloat();
     public EncryptionFloat critDamage =new EncryptionFloat();
-    public EncryptionFloat dodge = new EncryptionFloat();
+    // public EncryptionFloat dodge = new EncryptionFloat();
 
-    public int level;
-    public int star;
+    public EncryptionInt level;
+    public EncryptionInt star;
     
     public HeroModelConfig modelConfig;
 
@@ -76,13 +81,19 @@ public class CombatHeroInfo
         factor = rarityFactor * starFactor;
     }
 
-    protected void CalAttribute()
+
+    protected void CalBasicAttribute()
     {
         hp = (EncryptionLong)(modelConfig.hp * powerUpConfig.HPFactor * factor);
         defense = (EncryptionLong)(modelConfig.def * powerUpConfig.DEFFactor * factor);
         attack = (EncryptionLong)(modelConfig.attack * powerUpConfig.ATKFactor * factor);
-        
-        shanbi = (EncryptionInt)(modelConfig.shanbi * powerUpConfig.SHANBIFactor);
+        shanbi = (EncryptionInt)(modelConfig.shanbi * powerUpConfig.SHANBIFactor * factor);
+        expGain = (EncryptionLong)(modelConfig.expGain * powerUpConfig.EXPFactor * factor);
+    }
+    
+    protected void CalAttribute()
+    {
+        CalBasicAttribute();
 
         attSpeed = (EncryptionFloat)modelConfig.speed_atk;
         crit = (EncryptionFloat)modelConfig.crit;
@@ -94,11 +105,13 @@ public class CombatHeroInfo
         heroType = modelConfig.heroType;
     }
 
-    protected void SetDataConfig(int id,int level, int star)
+    protected void SetDataConfig(int modelID,int level, int star)
     {
-        modelConfig = ConfigComponent.Instance.Get<HeroModelConfig>(id);
+        modelConfig = ConfigComponent.Instance.Get<HeroModelConfig>(modelID);
         powerUpConfig = ConfigComponent.Instance.Get<HeroPowerUpConfig>(level);
         promoteConfig = ConfigComponent.Instance.Get<HeroPromoteConfig>(star);
+        this.level = (EncryptionInt)level;
+        this.star = (EncryptionInt)star;
     }
     
     public void InitMonster(int modelID,int level, int star = 1)

Assets/Scripts/GameLogic/CombatScenesTool/TestCombatHeroConfig.cs

@@ -24,7 +24,7 @@ namespace GameLogic.CombatScenesTool
                 combatHeroInfo.attack.Value = (att);
                 combatHeroInfo.crit.Value = (0);
                 combatHeroInfo.critDamage.Value = (0);
-                combatHeroInfo.dodge.Value = (0);
+                combatHeroInfo.shanbi.Value = (0);
                 combatHeroInfo.maxDis = attDis;
                 combatHeroInfo.maxDisTo = attDis * attDis;
                 combatHeroInfo.skillId = skillId;

Assets/Scripts/GameLogic/Hero/HeroInfo.cs

@@ -32,31 +32,51 @@ namespace GameLogic.Hero
                 return _iconZhiYe;
             }
         }
-        
-        //
-        // public int level;
-        // public int star;
-        
-        
+
+        public int modelID;
+
+        /// <summary>
+        /// 是否为上阵英雄
+        /// </summary>
+        public bool isLead;
+
         public void InitHero(AccountFileInfo.HeroData heroData)
         {
+            modelID = heroData.heroModelId;
             SetDataConfig(heroData.heroModelId, 
                 heroData.heroPowerId, 
                 heroData.heroPromoteId);
             CalFactor();
             CalAttribute();
         }
-        
-        // public HeroInfo(AccountFileInfo.HeroData heroData)
-        // {
-        //     modelConfig = ConfigComponent.Instance.Get<HeroModelConfig>(heroData.heroModelId);
-        //     promoteConfig = ConfigComponent.Instance.Get<HeroPromoteConfig>(heroData.heroPromoteId);
-        //     powerConfig = ConfigComponent.Instance.Get<HeroPowerConfig>(heroData.heroPowerId);
-        //     
-        //     lv = powerConfig.heroLevel;
-        //     star = promoteConfig.starGrade;
-        // }
 
-        
+        public void Upgrade()
+        {
+            level.Value++;
+            powerUpConfig = ConfigComponent.Instance.Get<HeroPowerUpConfig>(level.Value);
+            CalFactor();
+            CalBasicAttribute();
+            PlayerManager.Instance.SaveHeroData(this);
+        }
+
+        public void Promote()
+        {
+            star.Value++;
+            promoteConfig = ConfigComponent.Instance.Get<HeroPromoteConfig>(star.Value);
+            CalFactor();
+            CalBasicAttribute();
+            PlayerManager.Instance.SaveHeroData(this);
+        }
+
+        public AccountFileInfo.HeroData ToHeroData()
+        {
+            AccountFileInfo.HeroData heroData = new AccountFileInfo.HeroData
+            {
+                heroModelId = modelConfig.ID,
+                heroPowerId = powerUpConfig.ID,
+                heroPromoteId = promoteConfig.ID
+            };
+            return heroData;
+        }
     }
 }

Assets/Scripts/GameLogic/Player/PlayerManager.cs

@@ -1,6 +1,5 @@
 using System.Collections;
 using System.Collections.Generic;
-using Common.Utility.CombatEvent;
 using Excel2Json;
 using Fort23.UTool;
 using GameLogic.Hero;
@@ -10,7 +9,6 @@ using Utility;
 public class PlayerManager : Singleton<PlayerManager>
 {
     public List<HeroInfo> heroList = new List<HeroInfo>();
-
     /// <summary>
     /// 上阵的英雄，也可以叫主力，替补英雄等级=主力英雄的最低等级（和afk一样的）
     /// </summary>
@@ -18,8 +16,6 @@ public class PlayerManager : Singleton<PlayerManager>
 
     public GameConstantConfig gameConstantConfig;
 
-    
-
     public void Init()
     {
         gameConstantConfig = ConfigComponent.Instance.Get<GameConstantConfig>(1);
@@ -37,4 +33,48 @@ public class PlayerManager : Singleton<PlayerManager>
             heroListInLead.Add(heroInfo);
         }
     }
-}
+
+    private int leadHeroIdx = 0;
+
+    /// <summary>
+    /// 快速保存英雄数据
+    /// 反复升级统一英雄时，就不用反复遍历列表了
+    /// </summary>
+    /// <param name="heroInfo"></param>
+    /// <returns>ture=升级的是同一个英雄</returns>
+    private bool QuickSaveHeroData(HeroInfo heroInfo)
+    {
+        var lastHeroData= AccountFileInfo.Instance.playerData.HeroListInLeadDatas[leadHeroIdx];
+        
+        if (heroInfo.modelID == lastHeroData.heroModelId)
+        {
+            AccountFileInfo.Instance.playerData.HeroListInLeadDatas[leadHeroIdx] = heroInfo.ToHeroData();
+            AccountFileInfo.Instance.SavePlayerData();
+            return true;
+        }
+
+        return false;
+    }
+    
+    /// <summary>
+    /// 保存英雄数据
+    /// </summary>
+    /// <param name="heroInfo"></param>
+    public void SaveHeroData(HeroInfo heroInfo)
+    {
+        if (!QuickSaveHeroData(heroInfo))
+        {
+            for (int i = 0; i < AccountFileInfo.Instance.playerData.HeroListInLeadDatas.Count; i++)
+            {
+                AccountFileInfo.HeroData heroData = AccountFileInfo.Instance.playerData.HeroListInLeadDatas[i];
+                if (heroData.heroModelId == heroInfo.modelID)
+                {
+                    AccountFileInfo.Instance.playerData.HeroListInLeadDatas[i] = heroInfo.ToHeroData();
+                    //存下来，用于快速查找
+                    leadHeroIdx = i;
+                    return;
+                }
+            }
+        }
+    }
+}

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

@@ -1,3 +1,4 @@
+using Core.Language;
 using Excel2Json;
 using Fort23.UTool;
 using GameLogic.Hero;
@@ -31,8 +32,32 @@ namespace Fort23.Mono
         public void InitHeroDetailPanel(HeroInfo heroInfo)
         {
             iconZhiYe.icon_name = heroInfo.iconZhiYe;
-            
-            LogTool.Log(heroInfo);
+            heroName.text = LanguageManager.Instance.Text(heroInfo.modelConfig.name);
+            HeroUITools.SetStarShow(stars, heroInfo.star.Value);
+
+            switch (heroInfo.modelConfig.rarity)
+            {
+                case 1:
+                    heroRarity.text = LanguageManager.Instance.Text(32);
+                    break;
+                case 2:
+                    heroRarity.text = LanguageManager.Instance.Text(31);
+                    break;
+                case 3:
+                    heroRarity.text = LanguageManager.Instance.Text(30);
+                    break;
+                default:
+                    LogTool.Error("找不到hero的稀有度:" + heroInfo.modelConfig.ID);
+                    break;
+            }
+
+            txtHP.text = heroInfo.hp.Value.ToString();
+            txtATK.text = heroInfo.attack.Value.ToString();
+            txtDEF.text = heroInfo.defense.Value.ToString();
+            txtSHANBI.text = heroInfo.shanbi.Value.ToString();
+
+            txtLv.text = heroInfo.level.Value.ToString();
+            txtExpGain.text = heroInfo.expGain.Value.ToString();
         }
 
     }

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

@@ -3,6 +3,8 @@ using Fort23.UTool;
 using UnityEngine.UI;
 using UnityEngine;
 using System.Collections.Generic;
+using TMPro;
+
 namespace Fort23.Mono
 {
 	public partial class HeroDetailPanel 
@@ -19,15 +21,15 @@ namespace Fort23.Mono
 	      return _btnBack;
 	     }
 	   }
-	  private Text _heroGrade;
-	  public Text heroGrade
+	  private Text _heroRarity;
+	  public Text heroRarity
 	   {
 	   get{
-	      if (_heroGrade == null)
+	      if (_heroRarity == null)
 	       {
-	         _heroGrade  = GetUIUnit<Text>("heroGrade"); 
+	         _heroRarity  = GetUIUnit<Text>("heroRarity"); 
 	       }
-	      return _heroGrade;
+	      return _heroRarity;
 	     }
 	   }
 	  private Text _heroName;
@@ -63,6 +65,149 @@ namespace Fort23.Mono
 	      return _iconZhiYe;
 	     }
 	   }
+	  private TextMeshProUGUI _txtHP;
+	  public TextMeshProUGUI txtHP
+	   {
+	   get{
+	      if (_txtHP == null)
+	       {
+	         _txtHP  = GetUIUnit<TextMeshProUGUI>("txtHP"); 
+	       }
+	      return _txtHP;
+	     }
+	   }
+	  private TextMeshProUGUI _txtATK;
+	  public TextMeshProUGUI txtATK
+	   {
+	   get{
+	      if (_txtATK == null)
+	       {
+	         _txtATK  = GetUIUnit<TextMeshProUGUI>("txtATK"); 
+	       }
+	      return _txtATK;
+	     }
+	   }
+	  private TextMeshProUGUI _txtDEF;
+	  public TextMeshProUGUI txtDEF
+	   {
+	   get{
+	      if (_txtDEF == null)
+	       {
+	         _txtDEF  = GetUIUnit<TextMeshProUGUI>("txtDEF"); 
+	       }
+	      return _txtDEF;
+	     }
+	   }
+	  private TextMeshProUGUI _txtSHANBI;
+	  public TextMeshProUGUI txtSHANBI
+	   {
+	   get{
+	      if (_txtSHANBI == null)
+	       {
+	         _txtSHANBI  = GetUIUnit<TextMeshProUGUI>("txtSHANBI"); 
+	       }
+	      return _txtSHANBI;
+	     }
+	   }
+	  private TextMeshProUGUI _txtLv;
+	  public TextMeshProUGUI txtLv
+	   {
+	   get{
+	      if (_txtLv == null)
+	       {
+	         _txtLv  = GetUIUnit<TextMeshProUGUI>("txtLv"); 
+	       }
+	      return _txtLv;
+	     }
+	   }
+	  private TextMeshProUGUI _txtExpGain;
+	  public TextMeshProUGUI txtExpGain
+	   {
+	   get{
+	      if (_txtExpGain == null)
+	       {
+	         _txtExpGain  = GetUIUnit<TextMeshProUGUI>("txtExpGain"); 
+	       }
+	      return _txtExpGain;
+	     }
+	   }
+	  private TextMeshProUGUI _txtUpgrade;
+	  public TextMeshProUGUI txtUpgrade
+	   {
+	   get{
+	      if (_txtUpgrade == null)
+	       {
+	         _txtUpgrade  = GetUIUnit<TextMeshProUGUI>("txtUpgrade"); 
+	       }
+	      return _txtUpgrade;
+	     }
+	   }
+	  private TextMeshProUGUI _txtPromote;
+	  public TextMeshProUGUI txtPromote
+	   {
+	   get{
+	      if (_txtPromote == null)
+	       {
+	         _txtPromote  = GetUIUnit<TextMeshProUGUI>("txtPromote"); 
+	       }
+	      return _txtPromote;
+	     }
+	   }
+	  private MyImage _heroShards;
+	  public MyImage heroShards
+	   {
+	   get{
+	      if (_heroShards == null)
+	       {
+	         _heroShards  = GetUIUnit<MyImage>("heroShards"); 
+	       }
+	      return _heroShards;
+	     }
+	   }
+	  private TextMeshProUGUI _txtBasicEquipLv;
+	  public TextMeshProUGUI txtBasicEquipLv
+	   {
+	   get{
+	      if (_txtBasicEquipLv == null)
+	       {
+	         _txtBasicEquipLv  = GetUIUnit<TextMeshProUGUI>("txtBasicEquipLv"); 
+	       }
+	      return _txtBasicEquipLv;
+	     }
+	   }
+	  private MyImage _iconCommonEquip;
+	  public MyImage iconCommonEquip
+	   {
+	   get{
+	      if (_iconCommonEquip == null)
+	       {
+	         _iconCommonEquip  = GetUIUnit<MyImage>("iconCommonEquip"); 
+	       }
+	      return _iconCommonEquip;
+	     }
+	   }
+	  private MyImage _iconSpecailEquip;
+	  public MyImage iconSpecailEquip
+	   {
+	   get{
+	      if (_iconSpecailEquip == null)
+	       {
+	         _iconSpecailEquip  = GetUIUnit<MyImage>("iconSpecailEquip"); 
+	       }
+	      return _iconSpecailEquip;
+	     }
+	   }
+	  private GameObject _lockObj;
+	  public GameObject lockObj
+	   {
+	   get{
+	      if (_lockObj == null)
+	       {
+	         _lockObj  = GetUIUnit<GameObject>("lockObj"); 
+	       }
+	      return _lockObj;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

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

@@ -0,0 +1,58 @@
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace Fort23.Mono
+{
+    public static class HeroUITools
+    {
+        /// <summary>
+        /// 根据星级，显示不同的数量的星星和样子
+        /// </summary>
+        /// <param name="stars"></param>
+        /// <param name="starGrade"></param>
+        public static void SetStarShow(List<object> stars, int starGrade)
+        {
+            // 最大星级展示个数（6星，只显示一颗星星，换颜色）
+            int maxShowStar = 5;
+
+            // 计算 当前星级 应该用什么星星的表现
+            int group = (starGrade - 1) / maxShowStar;
+            
+            int i = 1;
+            foreach (GameObject star in stars)
+            {
+                SetStarImg(group, star);
+                // 根据星级显示星星
+                if (starGrade >= i)
+                {
+                    star.SetActive(true);
+                }
+                else
+                {
+                    star.SetActive(false);
+                }
+                i++;
+            }
+        }
+        
+        private static void SetStarImg(int group, GameObject starObj)
+        {
+            MyImage image = starObj.GetComponent<MyImage>();
+            // 执行对应的逻辑  （0）GradeIcon_Star_s_Yellow  （1）GradeIcon_Star_s_Premium
+            switch (group)
+            {
+                case 0: // n = 1~5
+                    image.icon_name = "dec_star";
+                    break;
+                case 1: // n = 6~10
+                    image.icon_name = "dec_star";    
+                    break;
+                default: // 其他情况
+                    image.icon_name = "dec_star";
+                    break;
+            }
+        }
+        
+    }
+}

Assets/Scripts/GameUI/UI/Hero/HeroUITools.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 5540bab530cf4f1cbd86c91d8c0c2d02
+timeCreated: 1732690520

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

@@ -55,55 +55,56 @@ namespace Fort23.Mono
         /// <param name="heroInfo"></param>
         public void InitHero(HeroInfo heroInfo)
         {
-            // GetComponent<RectTransform>().anchorMin = new Vector2(0.5f, 0.5f);
-            // GetComponent<RectTransform>().anchorMax = new Vector2(0.5f, 0.5f);
             this.heroInfo = heroInfo;
-            lv.text = heroInfo.level.ToString();
+            lv.text = heroInfo.level.Value.ToString();
+            iconHero.icon_name = heroInfo.modelConfig.headicon;
+            iconHero.SetNativeSize();
+            iconZhiYe.icon_name = heroInfo.iconZhiYe;
+            
+            HeroUITools.SetStarShow(stars, heroInfo.star.Value);
             
             // 最大星级展示个数（6星，只显示一颗星星，换颜色）
-            int maxShowStar = 5;
-
-            // 计算 当前星级 应该用什么星星的表现
-            int group = (heroInfo.star - 1) / maxShowStar;
-
-
-
-            int i = 1;
-            foreach (GameObject star in stars)
-            {
-                // Image image = star.GetComponent<Image>();
-
-                SetStarImg(group, star);
-                
-                if (heroInfo.star >= i)
-                {
-                    star.SetActive(true);
-                }
-                else
-                {
-                    star.SetActive(false);
-                }
-                i++;
-            }
+            // int maxShowStar = 5;
+            //
+            // // 计算 当前星级 应该用什么星星的表现
+            // int group = (heroInfo.star - 1) / maxShowStar;
+            //
+            // int i = 1;
+            // foreach (GameObject star in stars)
+            // {
+            //     // Image image = star.GetComponent<Image>();
+            //
+            //     SetStarImg(group, star);
+            //     
+            //     if (heroInfo.star >= i)
+            //     {
+            //         star.SetActive(true);
+            //     }
+            //     else
+            //     {
+            //         star.SetActive(false);
+            //     }
+            //     i++;
+            // }
         }
 
-        private void SetStarImg(int group, GameObject starObj)
-        {
-            Image image = starObj.GetComponent<Image>();
-            // 执行对应的逻辑  （0）GradeIcon_Star_s_Yellow  （1）GradeIcon_Star_s_Premium
-            switch (group)
-            {
-                case 0: // n = 1~5
-                    image.name = "GradeIcon_Star_s_Yellow";
-                    break;
-                case 1: // n = 6~10
-                    image.name = "GradeIcon_Star_s_Premium";    
-                    break;
-                default: // 其他情况
-                    image.name = "GradeIcon_Star_s_Yellow";
-                    break;
-            }
-        }
+        // private void SetStarImg(int group, GameObject starObj)
+        // {
+        //     Image image = starObj.GetComponent<Image>();
+        //     // 执行对应的逻辑  （0）GradeIcon_Star_s_Yellow  （1）GradeIcon_Star_s_Premium
+        //     switch (group)
+        //     {
+        //         case 0: // n = 1~5
+        //             image.name = "GradeIcon_Star_s_Yellow";
+        //             break;
+        //         case 1: // n = 6~10
+        //             image.name = "GradeIcon_Star_s_Premium";    
+        //             break;
+        //         default: // 其他情况
+        //             image.name = "GradeIcon_Star_s_Yellow";
+        //             break;
+        //     }
+        // }
 
     }
 }

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

@@ -21,15 +21,15 @@ namespace Fort23.Mono
 	      return _bgImg;
 	     }
 	   }
-	  private Image _headIcon;
-	  public Image headIcon
+	  private MyImage _iconHero;
+	  public MyImage iconHero
 	   {
 	   get{
-	      if (_headIcon == null)
+	      if (_iconHero == null)
 	       {
-	         _headIcon  = GetUIUnit<Image>("headIcon"); 
+	         _iconHero  = GetUIUnit<MyImage>("iconHero"); 
 	       }
-	      return _headIcon;
+	      return _iconHero;
 	     }
 	   }
 	  private List<object> _stars;
@@ -54,15 +54,15 @@ namespace Fort23.Mono
 	      return _lv;
 	     }
 	   }
-	  private Image _zhiyeIcon;
-	  public Image zhiyeIcon
+	  private MyImage _iconZhiYe;
+	  public MyImage iconZhiYe
 	   {
 	   get{
-	      if (_zhiyeIcon == null)
+	      if (_iconZhiYe == null)
 	       {
-	         _zhiyeIcon  = GetUIUnit<Image>("zhiyeIcon"); 
+	         _iconZhiYe  = GetUIUnit<MyImage>("iconZhiYe"); 
 	       }
-	      return _zhiyeIcon;
+	      return _iconZhiYe;
 	     }
 	   }
 	  private Button _btnHero;

UGUIPack/uguiconfig.db

@@ -1 +1 @@
-{"allPackgInfos":[{"packName":"all","packgJsonPath":"/Art/UIAssets/TextrueJson/all.txt","packgSpritePath":"Assets/Res/UIAtlas/all.spriteatlasv2","lasetJsonGUID":"03b3872585b24d54f63b884a410da2bc"}],"isJiaoYan":true}
+{"allPackgInfos":[{"packName":"all","packgJsonPath":"/Art/UIAssets/TextrueJson/all.txt","packgSpritePath":"Assets/Res/UIAtlas/all.spriteatlasv2","lasetJsonGUID":"e90cdb0036b7598e8196c482eccd4329"},{"packName":"heroIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/heroIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/heroIcon.spriteatlasv2","lasetJsonGUID":"e21daa5d31e00b95876c58a9ce604a30"}],"isJiaoYan":true}

UserSettings/EditorUserSettings.asset

@@ -21,46 +21,34 @@ EditorUserSettings:
       value: 184c
       flags: 0
     RecentlyUsedSceneGuid-0:
-      value: 5007050006035d0254085b7647700e44174e197c7c2c7668752f4436e1b3676c
+      value: 0255025200575009595a087740735d44464f1b792e7a2761792b1e37e3b93769
       flags: 0
     RecentlyUsedSceneGuid-1:
-      value: 5452000707020a0a0c0f092143220844144e402c2f2c71662e711836e0b2306a
+      value: 520706035554580a0c590e204220064443161c7e7c2b71602f784a64bbb8636f
       flags: 0
     RecentlyUsedSceneGuid-2:
-      value: 5a05505551515d03555a0d2316745d44444e412e2f712235292d1960b6b3663c
+      value: 5b0255535d0c510e5e565e7249250f4413154d2b787e76317f2c1e63b1e26568
       flags: 0
     RecentlyUsedSceneGuid-3:
-      value: 5701025003000c090c0c0d2643225b444015407c7d7074627b7c1c66e3b4613a
-      flags: 0
-    RecentlyUsedSceneGuid-4:
-      value: 530404525401510d5f0b097b45200f4444154f297b2b7134787c4432b5b16d60
-      flags: 0
-    RecentlyUsedSceneGuid-5:
       value: 5a50500553530b595d0f597343770941474e4c722e2a20367e794861e1b86c68
       flags: 0
-    RecentlyUsedSceneGuid-6:
+    RecentlyUsedSceneGuid-4:
       value: 5a500c0357030b0f0858097a44770f40154f4f2e2a2c743229794b64e0b56c6a
       flags: 0
-    RecentlyUsedSceneGuid-7:
-      value: 5b520d0503545b0d0c0c0a2715770748154f4d2c7d7d7e627a7d4a35b4e1646a
-      flags: 0
-    RecentlyUsedSceneGuid-8:
-      value: 055303045d535e5d54080e721672094412154e7b757c71342e794b65b2e4616f
-      flags: 0
-    RecentlyUsedSceneGuid-9:
+    RecentlyUsedSceneGuid-5:
       value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
       flags: 0
     Systems Window:
       value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615
       flags: 0
     UnityEditor.ShaderGraph.Blackboard:
-      value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4ba75e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1bf968e93e2ffcbc3e7e2f0b3ffe0e8b0be9af8ffaeffff8e85dd8390e3949c8899daa7
+      value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4ba75e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1b2968e93e2ffcbc3e7e2f0b3ffe0e8b0be9af9f9aaffff8e85dd8390e3949c8899daa7
       flags: 0
     UnityEditor.ShaderGraph.FloatingWindowsLayout2:
-      value: 181344140043005e1a220d3b1f364b524c0c5a27130c293326201334cee5322ca0bd30e8eb293a707b0fd0180b3d0a36fc0d3d04e649500d1002ee0b5dbd1d2c27c00ad113cb1e10e41f1addc80993b982988db381b2b4808789f4aaa0a3b9adb9b3a8c482a7eec9b0a0f0a5aecee8c2c7d9b2d08e9c9189ea9e93de81e0dbc9dc94dfcd9b9f9a8188dff4c3fac0f7f4c2f9f7c7c5f0cdfdc5c6d0f079f1f531343226ecece8e6d3ebef3fd22229d7df276a9b64
+      value: 181344140043005e1a220d3b1f364b524c0c5a27130c293326201334cee5322ca0bd30e8eb293a707b0fd0180b3d0a36fc0d3d04e649500d1002ee0b5dbd1d2c27c00ad113cb1e10e41f1addc80993b98d9884a69ae6d8f0d1cda9e8fbfefaf9f9dea3fdb9ade882f0f7b0e1e380cafbf2c3adc18e9cd285a2908b82ec869c8395949c9483d68a8e97ddbd90bf
       flags: 0
     UnityEditor.ShaderGraph.InspectorWindow:
-      value: 18135939215a0a5004000b0e15254b524c1119263f2d6a722016393ce1eb3d36e5d339f9a5602b2e2c07a37e0901373ae01e0008f707250d171df81a53a5485d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd80908ff0a2a4a1bbaaa0a9f2a3f3f8aa93e6edf38e9ccbddc18390ac86d4849394ea829f83f291cb918384d28397d5888b89dcf2dff2c7f7f7c2f3f38b88
+      value: 18135939215a0a5004000b0e15254b524c1119263f2d6a722016393ce1eb3d36e5d339f9a5602b2e2c07a37e0901373ae01e0008f707250d171df81a53a5495d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd80908fecb0f9cfddf1eff4e7a1b1eae482f0fcaee1e1928b86d888ed9198978797a7cf
       flags: 0
     vcSharedLogLevel:
       value: 0d5e400f0650

UserSettings/Layouts/default-2022.dwlt

@@ -1,6 +1,54 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
 --- !u!114 &1
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_PixelRect:
+    serializedVersion: 2
+    x: -284
+    y: -1312
+    width: 478
+    height: 1032
+  m_ShowMode: 0
+  m_Title: Simulator
+  m_RootView: {fileID: 5}
+  m_MinSize: {x: 200, y: 221}
+  m_MaxSize: {x: 4000, y: 4021}
+  m_Maximized: 0
+--- !u!114 &2
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_PixelRect:
+    serializedVersion: 2
+    x: 578
+    y: 298
+    width: 641
+    height: 603
+  m_ShowMode: 0
+  m_Title: Build Settings
+  m_RootView: {fileID: 7}
+  m_MinSize: {x: 640, y: 601}
+  m_MaxSize: {x: 4000, y: 4021}
+  m_Maximized: 0
+--- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -14,17 +62,17 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_PixelRect:
     serializedVersion: 2
-    x: 9
-    y: 51
-    width: 2543
-    height: 1333
+    x: 112
+    y: 66
+    width: 1546
+    height: 971
   m_ShowMode: 4
   m_Title: Hierarchy
-  m_RootView: {fileID: 4}
-  m_MinSize: {x: 875, y: 321}
+  m_RootView: {fileID: 8}
+  m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_Maximized: 0
---- !u!114 &2
+--- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -39,18 +87,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 630
+    x: 0
     y: 0
-    width: 315
-    height: 646
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 14}
+    width: 478
+    height: 1032
+  m_MinSize: {x: 200, y: 221}
+  m_MaxSize: {x: 4000, y: 4021}
+  m_ActualView: {fileID: 24}
   m_Panes:
-  - {fileID: 14}
+  - {fileID: 24}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &3
+--- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -63,20 +111,70 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 9}
-  - {fileID: 2}
+  - {fileID: 4}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 945
-    height: 646
-  m_MinSize: {x: 200, y: 50}
-  m_MaxSize: {x: 16192, y: 8096}
+    width: 478
+    height: 1032
+  m_MinSize: {x: 200, y: 221}
+  m_MaxSize: {x: 4000, y: 4021}
   vertical: 0
-  controlID: 33
+  controlID: 218186
   draggingID: 0
---- !u!114 &4
+--- !u!114 &6
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: BuildPlayerWindow
+  m_EditorClassIdentifier: 
+  m_Children: []
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 641
+    height: 603
+  m_MinSize: {x: 640, y: 601}
+  m_MaxSize: {x: 4000, y: 4021}
+  m_ActualView: {fileID: 18}
+  m_Panes:
+  - {fileID: 18}
+  m_Selected: 0
+  m_LastSelected: 0
+--- !u!114 &7
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Children:
+  - {fileID: 6}
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 641
+    height: 603
+  m_MinSize: {x: 640, y: 601}
+  m_MaxSize: {x: 4000, y: 4021}
+  vertical: 0
+  controlID: 215509
+  draggingID: 0
+--- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -89,22 +187,22 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 5}
-  - {fileID: 7}
-  - {fileID: 6}
+  - {fileID: 9}
+  - {fileID: 11}
+  - {fileID: 10}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 2543
-    height: 1333
+    width: 1546
+    height: 971
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_UseTopView: 1
   m_TopViewHeight: 30
   m_UseBottomView: 1
   m_BottomViewHeight: 20
---- !u!114 &5
+--- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -121,12 +219,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 2543
+    width: 1546
     height: 30
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
   m_LastLoadedLayoutName: 
---- !u!114 &6
+--- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -142,12 +240,12 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 1313
-    width: 2543
+    y: 951
+    width: 1546
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
---- !u!114 &7
+--- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -160,22 +258,22 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 8}
-  - {fileID: 11}
   - {fileID: 12}
-  - {fileID: 13}
+  - {fileID: 15}
+  - {fileID: 16}
+  - {fileID: 17}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 30
-    width: 2543
-    height: 1283
-  m_MinSize: {x: 500, y: 100}
-  m_MaxSize: {x: 40480, y: 16192}
+    width: 1546
+    height: 921
+  m_MinSize: {x: 400, y: 100}
+  m_MaxSize: {x: 32384, y: 16192}
   vertical: 0
-  controlID: 560
+  controlID: 198560
   draggingID: 0
---- !u!114 &8
+--- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -188,20 +286,20 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 3}
-  - {fileID: 10}
+  - {fileID: 13}
+  - {fileID: 14}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 945
-    height: 1283
-  m_MinSize: {x: 200, y: 100}
-  m_MaxSize: {x: 16192, y: 16192}
+    width: 466.5
+    height: 921
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
-  controlID: 32
+  controlID: 198561
   draggingID: 0
---- !u!114 &9
+--- !u!114 &13
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -218,16 +316,16 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 630
-    height: 646
+    width: 466.5
+    height: 366
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 15}
+  m_ActualView: {fileID: 19}
   m_Panes:
-  - {fileID: 15}
+  - {fileID: 19}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &10
+--- !u!114 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -243,17 +341,17 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 646
-    width: 945
-    height: 637
+    y: 366
+    width: 466.5
+    height: 555
   m_MinSize: {x: 101, y: 121}
   m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 16}
+  m_ActualView: {fileID: 20}
   m_Panes:
-  - {fileID: 16}
+  - {fileID: 20}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &11
+--- !u!114 &15
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -268,18 +366,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 945
+    x: 466.5
     y: 0
-    width: 506
-    height: 1283
+    width: 266
+    height: 921
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 17}
+  m_ActualView: {fileID: 21}
   m_Panes:
-  - {fileID: 17}
+  - {fileID: 21}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &12
+--- !u!114 &16
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -294,18 +392,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1451
+    x: 732.5
     y: 0
     width: 379
-    height: 1283
+    height: 921
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
-  m_ActualView: {fileID: 18}
+  m_ActualView: {fileID: 22}
   m_Panes:
-  - {fileID: 18}
+  - {fileID: 22}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &13
+--- !u!114 &17
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -320,18 +418,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1830
+    x: 1111.5
     y: 0
-    width: 713
-    height: 1283
+    width: 434.5
+    height: 921
   m_MinSize: {x: 276, y: 71}
   m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 19}
+  m_ActualView: {fileID: 23}
   m_Panes:
-  - {fileID: 19}
+  - {fileID: 23}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &14
+--- !u!114 &18
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -340,21 +438,21 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 13974, guid: 0000000000000000e000000000000000, type: 0}
+  m_Script: {fileID: 12043, guid: 0000000000000000e000000000000000, type: 0}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_MinSize: {x: 200, y: 200}
+  m_MinSize: {x: 640, y: 580}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
-    m_Text: Simulator
-    m_Image: {fileID: 8720083202187608617, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: Build Settings
+    m_Image: {fileID: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 639
-    y: 81
-    width: 313
-    height: 625
+    x: 578
+    y: 298
+    width: 641
+    height: 582
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -365,39 +463,29 @@ MonoBehaviour:
     m_LastAppliedPresetName: Default
     m_SaveData: []
     m_OverlaysVisible: 1
-  m_SerializedViewNames:
-  - UnityEditor.GameView
-  m_SerializedViewValues:
-  - /Users/lcn/0Fort23Projects/XY001/Library/PlayModeViewStates/d60d5cdcd558546949e78131da8dbfc9
-  m_PlayModeViewName: Device Simulator
-  m_ShowGizmos: 0
-  m_TargetDisplay: 0
-  m_ClearColor: {r: 0, g: 0, b: 0, a: 1}
-  m_TargetSize: {x: 1125, y: 2436}
-  m_TextureFilterMode: 0
-  m_TextureHideFlags: 61
-  m_RenderIMGUI: 1
-  m_EnterPlayModeBehavior: 2
-  m_UseMipMap: 0
-  m_SimulatorState:
-    controlPanelVisible: 0
-    controlPanelWidth: 0
-    controlPanelFoldoutKeys:
-    - UnityEditor.DeviceSimulation.ApplicationSettingsPlugin
-    controlPanelFoldoutValues: 00
-    pluginNames:
-    - UnityEditor.DeviceSimulation.ApplicationSettingsPlugin
-    pluginStates:
-    - '{}'
-    scale: 23
-    fitToScreenEnabled: 1
-    rotationDegree: 0
-    highlightSafeAreaEnabled: 0
-    friendlyName: Apple iPhone XS
-    screenIndex: 0
-    networkReachability: 1
-    systemLanguage: 10
---- !u!114 &15
+  m_TreeViewState:
+    scrollPos: {x: 0, y: 0}
+    m_SelectedIDs: 
+    m_LastClickedID: 0
+    m_ExpandedIDs: 
+    m_RenameOverlay:
+      m_UserAcceptedRename: 0
+      m_Name: 
+      m_OriginalName: 
+      m_EditFieldRect:
+        serializedVersion: 2
+        x: 0
+        y: 0
+        width: 0
+        height: 0
+      m_UserData: 0
+      m_IsWaitingForDelay: 0
+      m_IsRenaming: 0
+      m_OriginalEventType: 11
+      m_IsRenamingFilename: 0
+      m_ClientGUIView: {fileID: 0}
+    m_SearchString: 
+--- !u!114 &19
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -413,14 +501,14 @@ MonoBehaviour:
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
     m_Text: Scene
-    m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 9
-    y: 81
-    width: 629
-    height: 625
+    x: 112
+    y: 96
+    width: 465.5
+    height: 345
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -792,9 +880,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: -0.08415088, y: 3.1853874, z: 0.002926414}
+    m_Target: {x: -0.3829853, y: -0.030267246, z: -0.022057882}
     speed: 2
-    m_Value: {x: -0.08415088, y: 3.1853874, z: 0.002926414}
+    m_Value: {x: -0.3829853, y: -0.030267246, z: -0.022057882}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -830,13 +918,13 @@ MonoBehaviour:
       m_Size: {x: 1, y: 1}
     zGrid:
       m_Fade:
-        m_Target: 1
+        m_Target: 0
         speed: 2
-        m_Value: 1
+        m_Value: 0
       m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
       m_Pivot: {x: 0, y: 0, z: 0}
       m_Size: {x: 1, y: 1}
-    m_ShowGrid: 1
+    m_ShowGrid: 0
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
@@ -844,9 +932,9 @@ MonoBehaviour:
     speed: 2
     m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
-    m_Target: 1.4470903
+    m_Target: 2.9594293
     speed: 2
-    m_Value: 1.4470903
+    m_Value: 2.9594293
   m_Ortho:
     m_Target: 1
     speed: 2
@@ -866,14 +954,14 @@ MonoBehaviour:
     m_OcclusionCulling: 0
     m_EnableGDRP: 1
     m_BackfaceCulling: 0
-  m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
+  m_LastSceneViewRotation: {x: -0.15547842, y: 0.59475, z: -0.11858795, w: -0.77976775}
   m_LastSceneViewOrtho: 0
   m_ReplacementShader: {fileID: 0}
   m_ReplacementString: 
   m_SceneVisActive: 1
   m_LastLockedObject: {fileID: 0}
   m_ViewIsLockedToObject: 0
---- !u!114 &16
+--- !u!114 &20
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -889,14 +977,14 @@ MonoBehaviour:
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
     m_Text: Console
-    m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 9
-    y: 727
-    width: 944
-    height: 616
+    x: 112
+    y: 462
+    width: 465.5
+    height: 534
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -907,7 +995,7 @@ MonoBehaviour:
     m_LastAppliedPresetName: Default
     m_SaveData: []
     m_OverlaysVisible: 1
---- !u!114 &17
+--- !u!114 &21
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -923,14 +1011,14 @@ MonoBehaviour:
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
     m_Text: Hierarchy
-    m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 954
-    y: 81
-    width: 504
-    height: 1262
+    x: 578.5
+    y: 96
+    width: 264
+    height: 900
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -944,9 +1032,9 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: cea70000
-      m_LastClickedID: 42958
-      m_ExpandedIDs: eaf5ffff
+      m_SelectedIDs: 
+      m_LastClickedID: 0
+      m_ExpandedIDs: f619f1ff9838f1ffa638f1ff344af1ff304bf1ff9a74f3ffa874f3ffa87cf3ff787ef3ffa27ef3ffcc7ef3fff67ef3fffc7ef3ffaa7ff3ffac7ff3ff7480f3ffdab2f3ff4cb3f3ff64b3f3ff68b3f3ff84b3f3ffb8b6f3ffc6b6f3ff24bef3fff4bef3ffb8dbf3ffc6dbf3ffdee6f3ff30e7f3ff32eaf3ff34eaf3ff3e19f5ff9c23f5ffee23f5ff7024f5ff8424f5ff9425f5ff4626f5fff026f5ff6e2af5ff7c2af5ffea2ff5ff98c3f5ffeac3f5ffeec6f5ff90f8f5ff94f8f5ffa2f8f5ffd613f7ffdc13f7ffe013f7ff5214f7ff6a14f7ff6e14f7ff8c14f7ff8439f7ff8839f7ff9639f7ff2887f7ff4087f7ff4487f7ff6287f7ff08d3f7ff0cd3f7ff1ad3f7fffad5f7ff94e4f7fface4f7ffb0e4f7ff3cecf7ff4aecf7ff4cecf7ffdc35f8fff435f8fff835f8ff1636f8ff025df8ff065df8ff145df8fff45ff8ff1464f8ff2264f8ff6473f8ff5423f9ff463ff9ff2040f9ff2840f9ffea40f9ff0841f9ff0c41f9ff1a41f9ffb0f8f9ffb60bfaff9c30fbff6a43fbfffc9ffbff0aa0fbff84aafbff78aefbff20bdfbff0e32feff9694feffbc94feffc094feffc894fefff894feff7c95feff8495feff6296feff6c96feff8896feffa496feffbe96fefff696feff2a97feff3297feff5097feff6097feff3499feff5e99feff8899feffb299feffbc99feff2a9afeff409afeff449afeff749afeff769afeff829afefff29cfeff749efeff96a1feff4ad9feff7ad9feff82d9feffdee5feffcce6feffd0e6feff54e7feff58e7feff5ee7feff62e7feff66e7feff78e7feff84e7feffa8e8feffc0e8feffc4e8feffe0e8fefff4e8fefff6e8feff02e9feff04e9feff40c3ffff46f7ffffa0f7ffffb4faffffc2faffffc4faffff0ee20100baee01004ef40100
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -962,7 +1050,7 @@ MonoBehaviour:
         m_IsRenaming: 0
         m_OriginalEventType: 11
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 11}
+        m_ClientGUIView: {fileID: 15}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
@@ -970,7 +1058,7 @@ MonoBehaviour:
       m_IsLocked: 0
     m_CurrentSortingName: TransformSorting
   m_WindowGUID: d52fa66f7ca074a00968d8c52b6fc68f
---- !u!114 &18
+--- !u!114 &22
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -986,14 +1074,14 @@ MonoBehaviour:
   m_MaxSize: {x: 10000, y: 10000}
   m_TitleContent:
     m_Text: Project
-    m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1460
-    y: 81
+    x: 844.5
+    y: 96
     width: 377
-    height: 1262
+    height: 900
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1015,7 +1103,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Scripts/GameUI
+    - Assets/Res/UIAtlas
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
@@ -1023,32 +1111,32 @@ MonoBehaviour:
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Scripts/GameUI
+  - Assets/Res/UIAtlas
   m_LastFoldersGridSize: 16
-  m_LastProjectPath: D:\unityProject\XY001
+  m_LastProjectPath: /Users/lcn/0Fort23Projects/XY001
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 406}
-    m_SelectedIDs: d2a80000
-    m_LastClickedID: 43218
-    m_ExpandedIDs: 00000000b4a80000b6a80000b8a80000baa80000bca80000bea80000c0a80000c2a80000c4a80000c6a80000c8a80000caa80000cca80000cea80000d0a80000d2a80000d4a8000000ca9a3bffffff7f
+    scrollPos: {x: 0, y: 48}
+    m_SelectedIDs: e2ea0000
+    m_LastClickedID: 60130
+    m_ExpandedIDs: 0000000000b3000002b3000004b3000006b3000008b300000cb300000eb3000010b3000012b3000014b3000016b300002cb3000034b3000056b3000060b3000066e8000068e800006ae800004ce9000086ed000088fb00009a820100b0820100b682010000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: 
-      m_OriginalName: 
+      m_Name: icon
+      m_OriginalName: icon
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 0
+      m_UserData: 64390
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 11
+      m_OriginalEventType: 0
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 12}
+      m_ClientGUIView: {fileID: 16}
     m_SearchString: 
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
@@ -1060,7 +1148,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000b4a80000b6a80000b8a80000baa80000bca80000bea80000c0a80000c2a80000c4a80000c6a80000c8a80000caa80000cca80000cea80000d0a80000d2a80000d4a80000
+    m_ExpandedIDs: 0000000000b3000002b3000004b3000006b3000008b300000cb300000eb3000010b3000012b3000014b3000016b300004cb3000060b3000066e8000068e800006ae8000086ed000000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1088,23 +1176,23 @@ MonoBehaviour:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
     m_HadKeyboardFocusLastEvent: 1
-    m_ExpandedInstanceIDs: 929701000000000096ba0200f41802008618020048180200ae180200d4180200e01702003ac30a004c1a02000c1a02007e17020058190200c4890000641b0200e4180200caa1000066d50000
+    m_ExpandedInstanceIDs: 929701000000000096ba0200f41802008618020048180200ae180200d4180200e01702003ac30a004c1a02000c1a02007e17020058190200c4890000641b0200e4180200caa1000066d5000052fb00003aa1000086a000006ca1000076a100000807010028a100007ca1000062a1000078a1000068a100003ca100006ea100002aa100002ea1000090a000006c1001008aa000003ea1000038a1000092a000008ea0000082a1000086a1000074a100004407010026070100
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: 
-      m_OriginalName: 
+      m_Name: all
+      m_OriginalName: all
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 0
+      m_UserData: 120760
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 11
+      m_OriginalEventType: 0
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 12}
+      m_ClientGUIView: {fileID: 16}
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
@@ -1115,8 +1203,8 @@ MonoBehaviour:
     m_ScrollPosition: {x: 0, y: 0}
     m_GridSize: 16
   m_SkipHiddenPackages: 0
-  m_DirectoriesAreaWidth: 184
---- !u!114 &19
+  m_DirectoriesAreaWidth: 207
+--- !u!114 &23
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1132,14 +1220,14 @@ MonoBehaviour:
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
     m_Text: Inspector
-    m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1839
-    y: 81
-    width: 712
-    height: 1262
+    x: 1223.5
+    y: 96
+    width: 433.5
+    height: 900
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1153,7 +1241,7 @@ MonoBehaviour:
   m_ObjectsLockedBeforeSerialization: []
   m_InstanceIDsLockedBeforeSerialization: 
   m_PreviewResizer:
-    m_CachedPref: 484
+    m_CachedPref: 225
     m_ControlHash: -371814159
     m_PrefName: Preview_InspectorPreview
   m_LastInspectedObjectInstanceID: -1
@@ -1163,3 +1251,69 @@ MonoBehaviour:
   m_LockTracker:
     m_IsLocked: 0
   m_PreviewWindow: {fileID: 0}
+--- !u!114 &24
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 13974, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: Simulator
+    m_Image: {fileID: 3038311277492192215, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: -284
+    y: -1312
+    width: 478
+    height: 1011
+  m_SerializedDataModeController:
+    m_DataMode: 0
+    m_PreferredDataMode: 0
+    m_SupportedDataModes: 
+    isAutomatic: 1
+  m_ViewDataDictionary: {fileID: 0}
+  m_OverlayCanvas:
+    m_LastAppliedPresetName: Default
+    m_SaveData: []
+    m_OverlaysVisible: 1
+  m_SerializedViewNames:
+  - UnityEditor.GameView
+  m_SerializedViewValues:
+  - /Users/lcn/0Fort23Projects/XY001/Library/PlayModeViewStates/fcb172f76445941df86237e2028b0cb2
+  m_PlayModeViewName: Device Simulator
+  m_ShowGizmos: 0
+  m_TargetDisplay: 0
+  m_ClearColor: {r: 0, g: 0, b: 0, a: 1}
+  m_TargetSize: {x: 1284, y: 2778}
+  m_TextureFilterMode: 0
+  m_TextureHideFlags: 61
+  m_RenderIMGUI: 1
+  m_EnterPlayModeBehavior: 2
+  m_UseMipMap: 0
+  m_SimulatorState:
+    controlPanelVisible: 0
+    controlPanelWidth: 0
+    controlPanelFoldoutKeys:
+    - UnityEditor.DeviceSimulation.ApplicationSettingsPlugin
+    controlPanelFoldoutValues: 00
+    pluginNames:
+    - UnityEditor.DeviceSimulation.ApplicationSettingsPlugin
+    pluginStates:
+    - '{}'
+    scale: 32
+    fitToScreenEnabled: 0
+    rotationDegree: 0
+    highlightSafeAreaEnabled: 0
+    friendlyName: Apple iPhone 13 Pro Max
+    screenIndex: 0
+    networkReachability: 1
+    systemLanguage: 10

美术/unity_use_ui/TextrueJson/heroIcon.txt

@@ -0,0 +1 @@
+{"packName":"heroIcon","isTyPack":false,"newTextureJson":[{"textrueName":"icon_tx116","filePath":"/icon/icon_tx116.png"},{"textrueName":"icon_tx105","filePath":"/icon/icon_tx105.png"},{"textrueName":"icon_tx107","filePath":"/icon/icon_tx107.png"},{"textrueName":"icon_tx113","filePath":"/icon/icon_tx113.png"}],"keyToValue":{}}

美术/工具/imgui.ini

@@ -10,27 +10,27 @@ Collapsed=0
 
 [Window][Tool]
 Pos=400,0
-Size=666,100
+Size=900,100
 Collapsed=0
 
 [Window][unity_art]
-Pos=1066,0
+Pos=1300,0
 Size=400,720
 Collapsed=0
 
 [Window][console]
 Pos=400,520
-Size=666,70
+Size=900,70
 Collapsed=0
 
 [Window][控制台]
 Pos=400,590
-Size=666,130
+Size=900,130
 Collapsed=0
 
 [Window][scence]
 Pos=400,100
-Size=666,420
+Size=900,420
 Collapsed=0
 
 [Docking][Data]