Explorar el Código

优化技能面板的显示细节

lcn hace 3 meses
padre
commit
f091b0868f

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
Assets/Art/UIAssets/TextrueJson/all.txt


BIN
Assets/Art/UIAssets/decorate/dec_BottomBtn_Bg.png


+ 147 - 0
Assets/Art/UIAssets/decorate/dec_BottomBtn_Bg.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: CilLtC6oWyk8yu/EulfF8w1lTq+c+VV+FaIZz6NEsXjwGS2GD0rEaH0=
+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: 2, y: 2, z: 2, w: 7}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 1537655665
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 2
Assets/Art/UIAssets/decorate/dec_dim_Black.png.meta

@@ -52,7 +52,7 @@ TextureImporter:
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteBorder: {x: 1, y: 1, z: 1, w: 1}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaIsTransparency: 1
@@ -133,7 +133,7 @@ TextureImporter:
     physicsShape: []
     bones: []
     spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
+    internalID: 1537655665
     vertices: []
     indices: 
     edges: []

+ 181 - 18
Assets/Res/UI/HeroDetailPanel.prefab

@@ -6150,8 +6150,6 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -6390,8 +6388,6 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -8166,8 +8162,6 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -9737,8 +9731,6 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -10647,8 +10639,6 @@ SkinnedMeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 3
   m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -12389,6 +12379,7 @@ RectTransform:
   - {fileID: 7705411688387883887}
   - {fileID: 7484599139481258495}
   - {fileID: 3289702276652194812}
+  - {fileID: 4779141614631576596}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -12751,6 +12742,15 @@ MonoBehaviour:
     - gameObject: {fileID: 386705721927191908}
     - gameObject: {fileID: 3414719560540881468}
     - gameObject: {fileID: 6905440077724744462}
+  - key: skillUI
+    gameObject: {fileID: 325436920799097949}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 2431497390631250942}
+    - gameObject: {fileID: 386705721927191908}
+    - gameObject: {fileID: 3414719560540881468}
+    - gameObject: {fileID: 6905440077724744462}
   isAssetBundle: 1
 --- !u!225 &4187952801782332659
 CanvasGroup:
@@ -14123,8 +14123,6 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -14589,8 +14587,6 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -15520,8 +15516,6 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -15732,8 +15726,6 @@ SkinnedMeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 3
   m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -19930,3 +19922,174 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 5135952974914396357, guid: e99c8a9f5f283486a8d13ff33a3f6134, type: 3}
   m_PrefabInstance: {fileID: 88573252790506352}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &3977876576809755803
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 8323024823130982353}
+    m_Modifications:
+    - target: {fileID: 3724598441491386566, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_Name
+      value: SkillUIComponent
+      objectReference: {fileID: 0}
+    - target: {fileID: 5231644514269099707, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5231644514269099707, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5231644514269099707, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 344
+      objectReference: {fileID: 0}
+    - target: {fileID: 5231644514269099707, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -55
+      objectReference: {fileID: 0}
+    - target: {fileID: 8233403908056166009, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8233403908056166009, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8233403908056166009, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 344
+      objectReference: {fileID: 0}
+    - target: {fileID: 8233403908056166009, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -82.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8439587507723242819, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8439587507723242819, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8439587507723242819, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 344
+      objectReference: {fileID: 0}
+    - target: {fileID: 8439587507723242819, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 750
+      objectReference: {fileID: 0}
+    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 500
+      objectReference: {fileID: 0}
+    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8870045557280260565, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8870045557280260565, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8870045557280260565, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 344
+      objectReference: {fileID: 0}
+    - target: {fileID: 8870045557280260565, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -27.5
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+--- !u!1 &325436920799097949 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 3724598441491386566, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+  m_PrefabInstance: {fileID: 3977876576809755803}
+  m_PrefabAsset: {fileID: 0}
+--- !u!224 &4779141614631576596 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 8459636219199963279, guid: 0e32f2c66c36945f1a6217839d31a7df, type: 3}
+  m_PrefabInstance: {fileID: 3977876576809755803}
+  m_PrefabAsset: {fileID: 0}

+ 44 - 36
Assets/Res/UI/RewardsPanel.prefab

@@ -618,8 +618,8 @@ GameObject:
   m_Component:
   - component: {fileID: 8150427964580176949}
   - component: {fileID: 4022983029914649038}
-  - component: {fileID: 6046230828290279203}
   - component: {fileID: 9010385271561948532}
+  - component: {fileID: 8517797206717286252}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Dimed
@@ -655,36 +655,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3724772720786795118}
   m_CullTransparentMesh: 1
---- !u!114 &6046230828290279203
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3724772720786795118}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 55efdebed769a4f2fb81998fb87a2df5, type: 3}
-  m_Type: 1
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
 --- !u!114 &9010385271561948532
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -725,10 +695,48 @@ MonoBehaviour:
     m_SelectedTrigger: Selected
     m_DisabledTrigger: Disabled
   m_Interactable: 1
-  m_TargetGraphic: {fileID: 6046230828290279203}
+  m_TargetGraphic: {fileID: 0}
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &8517797206717286252
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3724772720786795118}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_dim_Black
+  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: e8ac4a11df23a3327a9a6fed106efb0a
 --- !u!1 &4226868228391283850
 GameObject:
   m_ObjectHideFlags: 0
@@ -1619,10 +1627,10 @@ RectTransform:
   - {fileID: 3011679360858695175}
   m_Father: {fileID: 410575005933691755}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 330, y: -60}
-  m_SizeDelta: {x: 80, y: 80}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &8571562622299407104
 MonoBehaviour:

+ 492 - 546
Assets/Res/UI/SkillUIComponent.prefab

@@ -1,5 +1,180 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &473624110943845480
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5012133587235986117}
+  - component: {fileID: 2428755547011541359}
+  - component: {fileID: 8770810331096651526}
+  - component: {fileID: 4973554695561391867}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: di
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5012133587235986117
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 473624110943845480}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6985120552032159048}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -67}
+  m_SizeDelta: {x: 750, y: 500}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2428755547011541359
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 473624110943845480}
+  m_CullTransparentMesh: 1
+--- !u!114 &8770810331096651526
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 473624110943845480}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 4973554695561391867}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &4973554695561391867
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 473624110943845480}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.130874, g: 0.16037738, b: 0.15382107, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_BottomBtn_Bg
+  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: a6fab45fc6a5f0b09679bb4eedcdd188
+--- !u!1 &629358253661901542
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6985120552032159048}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Bottom
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6985120552032159048
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 629358253661901542}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 3716005545264761289}
+  - {fileID: 5012133587235986117}
+  - {fileID: 2386831869758086357}
+  - {fileID: 1061230050760813048}
+  - {fileID: 1011666818352242648}
+  - {fileID: 2589088228504847424}
+  - {fileID: 4388396417434440462}
+  - {fileID: 4397437230936891047}
+  - {fileID: 4105650447501009726}
+  - {fileID: 3627910858691465121}
+  m_Father: {fileID: 8459636219199963279}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: -250}
+  m_SizeDelta: {x: 715.7, y: 604.245}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &1028820458441546150
 GameObject:
   m_ObjectHideFlags: 0
@@ -31,15 +206,11 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7678038991277897505}
-  - {fileID: 1690804137536025959}
-  - {fileID: 5368683846553877953}
-  - {fileID: 7448757642809447720}
-  - {fileID: 4743646536950976607}
-  m_Father: {fileID: 8459636219199963279}
+  m_Father: {fileID: 6985120552032159048}
   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: -243, y: 320}
+  m_AnchoredPosition: {x: -241.15, y: 247.47754}
   m_SizeDelta: {x: 224.67001, y: 109.29004}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &3541113496881229149
@@ -68,7 +239,7 @@ MonoBehaviour:
   m_ChildScaleWidth: 0
   m_ChildScaleHeight: 0
   m_ReverseArrangement: 0
---- !u!1 &1335202512441972296
+--- !u!1 &1230225229054983255
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -76,72 +247,103 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 637797717169572563}
-  - component: {fileID: 3199744273824380900}
-  - component: {fileID: 772150921752026299}
-  - component: {fileID: 1027732467348844608}
+  - component: {fileID: 5496076525872188181}
+  - component: {fileID: 1366203269678552495}
+  - component: {fileID: 5147407071533386158}
+  - component: {fileID: 2489171200668761687}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: Bg
+  m_Name: btnDi
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!224 &637797717169572563
+  m_IsActive: 1
+--- !u!224 &5496076525872188181
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1335202512441972296}
+  m_GameObject: {fileID: 1230225229054983255}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 4105650447501009726}
+  m_Father: {fileID: 8459636219199963279}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: -4, y: -4}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 559}
+  m_SizeDelta: {x: 750, y: 1800}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &3199744273824380900
+--- !u!222 &1366203269678552495
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1335202512441972296}
+  m_GameObject: {fileID: 1230225229054983255}
   m_CullTransparentMesh: 1
---- !u!114 &772150921752026299
+--- !u!114 &5147407071533386158
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1335202512441972296}
+  m_GameObject: {fileID: 1230225229054983255}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_ShowMaskGraphic: 1
---- !u!114 &1027732467348844608
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 2489171200668761687}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &2489171200668761687
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1335202512441972296}
+  m_GameObject: {fileID: 1230225229054983255}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.17254902, g: 0.1764706, b: 0.26666668, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -158,15 +360,15 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_00_04_06_Bg
+  _icon_name: dec_dim_Black
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
   packInfo:
     packName: all
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: 8fbc3902b8b4a448719eb520746784cf
---- !u!1 &1416342346878455576
+    lasetJsonGUID: e8ac4a11df23a3327a9a6fed106efb0a
+--- !u!1 &1335202512441972296
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -174,64 +376,162 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 4388396417434440462}
-  - component: {fileID: 6310280512319826708}
-  - component: {fileID: 6354889710214839342}
+  - component: {fileID: 637797717169572563}
+  - component: {fileID: 3199744273824380900}
+  - component: {fileID: 772150921752026299}
+  - component: {fileID: 1027732467348844608}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: dec_eft
+  m_Name: Bg
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &4388396417434440462
+  m_IsActive: 0
+--- !u!224 &637797717169572563
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1416342346878455576}
+  m_GameObject: {fileID: 1335202512441972296}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 8357257302712234465}
-  m_Father: {fileID: 8459636219199963279}
+  m_Children: []
+  m_Father: {fileID: 4105650447501009726}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -298, y: 158}
-  m_SizeDelta: {x: 120, y: 30}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: -4, y: -4}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &6310280512319826708
+--- !u!222 &3199744273824380900
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1416342346878455576}
+  m_GameObject: {fileID: 1335202512441972296}
   m_CullTransparentMesh: 1
---- !u!114 &6354889710214839342
+--- !u!114 &772150921752026299
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1416342346878455576}
+  m_GameObject: {fileID: 1335202512441972296}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.6509434, g: 0.6509434, b: 0.6509434, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
+  m_ShowMaskGraphic: 1
+--- !u!114 &1027732467348844608
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1335202512441972296}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.17254902, g: 0.1764706, b: 0.26666668, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_00_04_06_Bg
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  packInfo:
+    packName: all
+    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
+    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
+    lasetJsonGUID: 8fbc3902b8b4a448719eb520746784cf
+--- !u!1 &1416342346878455576
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4388396417434440462}
+  - component: {fileID: 6310280512319826708}
+  - component: {fileID: 6354889710214839342}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: dec_eft
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4388396417434440462
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1416342346878455576}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 8357257302712234465}
+  m_Father: {fileID: 6985120552032159048}
+  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: -296.15, y: 85.47754}
+  m_SizeDelta: {x: 120, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6310280512319826708
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1416342346878455576}
+  m_CullTransparentMesh: 1
+--- !u!114 &6354889710214839342
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1416342346878455576}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.6509434, g: 0.6509434, b: 0.6509434, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
       m_Calls: []
   m_Sprite: {fileID: 0}
   m_Type: 1
@@ -287,7 +587,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 344, y: -55}
+  m_AnchoredPosition: {x: 344, y: -82}
   m_SizeDelta: {x: 688, y: 0}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &4396069779853996381
@@ -382,7 +682,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 344, y: -27.5}
+  m_AnchoredPosition: {x: 344, y: -41}
   m_SizeDelta: {x: 688, y: 0}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &7568156432243018947
@@ -661,7 +961,7 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2456279290738976765}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -670,11 +970,11 @@ RectTransform:
   - {fileID: 8870045557280260565}
   - {fileID: 5231644514269099707}
   - {fileID: 8233403908056166009}
-  m_Father: {fileID: 8459636219199963279}
+  m_Father: {fileID: 6985120552032159048}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -304, y: 75}
+  m_AnchoredPosition: {x: -302.15, y: 2.477539}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &8772388447304254165
@@ -735,11 +1035,11 @@ RectTransform:
   - {fileID: 637797717169572563}
   - {fileID: 8089296172921106170}
   - {fileID: 8803200532895793815}
-  m_Father: {fileID: 8459636219199963279}
+  m_Father: {fileID: 6985120552032159048}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: -170}
+  m_AnchoredPosition: {x: 1.8500061, y: -242.52252}
   m_SizeDelta: {x: 606.1, y: 119.2}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &3468534719193380031
@@ -768,16 +1068,16 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3468534719193380031}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 8459636219199963279}
+  m_Father: {fileID: 6985120552032159048}
   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: -104.4, y: 205}
+  m_AnchoredPosition: {x: -102.549995, y: 132.47754}
   m_SizeDelta: {x: 52, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2127374248778295320
@@ -832,7 +1132,6 @@ GameObject:
   m_Component:
   - component: {fileID: 8459636219199963279}
   - component: {fileID: 5658093172566555573}
-  - component: {fileID: 8687561165943941247}
   - component: {fileID: 7951263076483495950}
   m_Layer: 0
   m_HasEditorInfo: 1
@@ -854,19 +1153,13 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 2386831869758086357}
-  - {fileID: 1061230050760813048}
-  - {fileID: 1011666818352242648}
-  - {fileID: 2589088228504847424}
-  - {fileID: 4388396417434440462}
-  - {fileID: 4397437230936891047}
-  - {fileID: 4105650447501009726}
-  - {fileID: 3627910858691465121}
+  - {fileID: 5496076525872188181}
+  - {fileID: 6985120552032159048}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: -1.4569092}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 750, y: 500}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &5658093172566555573
@@ -877,36 +1170,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3724598441491386566}
   m_CullTransparentMesh: 1
---- !u!114 &8687561165943941247
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3724598441491386566}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.130874, g: 0.16037738, b: 0.15382107, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 03cc62a06f5fc44639b0a7ec241ee65f, type: 3}
-  m_Type: 1
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
 --- !u!114 &7951263076483495950
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -992,6 +1255,24 @@ MonoBehaviour:
     - gameObject: {fileID: 1829847571812348693}
     - gameObject: {fileID: 1806108059677379203}
     - gameObject: {fileID: 7033063365279083689}
+  - key: widgetSkill
+    gameObject: {fileID: 1088164473376649017}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 1903911127976497113}
+    - gameObject: {fileID: 1829847571812348693}
+    - gameObject: {fileID: 1806108059677379203}
+    - gameObject: {fileID: 7033063365279083689}
+  - key: btnDi
+    gameObject: {fileID: 5147407071533386158}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 1903911127976497113}
+    - gameObject: {fileID: 1829847571812348693}
+    - gameObject: {fileID: 1806108059677379203}
+    - gameObject: {fileID: 7033063365279083689}
   isAssetBundle: 1
 --- !u!1 &3883852036818116843
 GameObject:
@@ -1073,6 +1354,90 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u6280\u80FD\u5DF2\u8FBE\u6700\u9AD8\u7B49\u7EA7"
+--- !u!1 &4199935220685144262
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3716005545264761289}
+  - component: {fileID: 2238219793278329628}
+  - component: {fileID: 2814182431208657963}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: skillDi
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3716005545264761289
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4199935220685144262}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6985120552032159048}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 248}
+  m_SizeDelta: {x: 815.4, y: 120}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2238219793278329628
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4199935220685144262}
+  m_CullTransparentMesh: 1
+--- !u!114 &2814182431208657963
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4199935220685144262}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.4433962, g: 0.4433962, b: 0.4433962, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_00_04_06_Bg
+  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: a6fab45fc6a5f0b09679bb4eedcdd188
 --- !u!1 &4356462366393647132
 GameObject:
   m_ObjectHideFlags: 0
@@ -1099,16 +1464,16 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4356462366393647132}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 8459636219199963279}
+  m_Father: {fileID: 6985120552032159048}
   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: -158, y: 205}
+  m_AnchoredPosition: {x: -156.15, y: 132.47754}
   m_SizeDelta: {x: 52, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7788972489946103816
@@ -1453,7 +1818,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 344, y: -82.5}
+  m_AnchoredPosition: {x: 344, y: -123}
   m_SizeDelta: {x: 688, y: 0}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &5946602135712632191
@@ -1543,11 +1908,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 8459636219199963279}
+  m_Father: {fileID: 6985120552032159048}
   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: -273, y: 205}
+  m_AnchoredPosition: {x: -271.15, y: 132.47754}
   m_SizeDelta: {x: 173.4, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8720316360143550269
@@ -1626,11 +1991,11 @@ RectTransform:
   m_Children:
   - {fileID: 1363224240556191930}
   - {fileID: 2937261174254495495}
-  m_Father: {fileID: 8459636219199963279}
+  m_Father: {fileID: 6985120552032159048}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 316, y: 200}
+  m_AnchoredPosition: {x: 317.84998, y: 127.47754}
   m_SizeDelta: {x: 80, y: 80}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3044300648206569428
@@ -1723,7 +2088,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
     lasetJsonGUID: ace5466faa841bb7b9046587aae54d38
---- !u!1001 &1361594306138628991
+--- !u!1001 &2249487104835043702
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
@@ -1733,7 +2098,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 1165912544772320847, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_Name
-      value: WidgetIconSkill (3)
+      value: WidgetIconSkill
       objectReference: {fileID: 0}
     - target: {fileID: 1165912544772320847, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_IsActive
@@ -1801,7 +2166,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 498.89496
+      value: 52.884995
       objectReference: {fileID: 0}
     - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_AnchoredPosition.y
@@ -1824,432 +2189,13 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
---- !u!224 &7448757642809447720 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-  m_PrefabInstance: {fileID: 1361594306138628991}
-  m_PrefabAsset: {fileID: 0}
---- !u!1001 &2249487104835043702
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 2386831869758086357}
-    m_Modifications:
-    - target: {fileID: 1165912544772320847, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_Name
-      value: WidgetIconSkill
-      objectReference: {fileID: 0}
-    - target: {fileID: 1165912544772320847, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 105.76999
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 104.85
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 52.884995
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -52.425
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
---- !u!224 &7678038991277897505 stripped
+--- !u!1 &1088164473376649017 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 1165912544772320847, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
+  m_PrefabInstance: {fileID: 2249487104835043702}
+  m_PrefabAsset: {fileID: 0}
+--- !u!224 &7678038991277897505 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
   m_PrefabInstance: {fileID: 2249487104835043702}
   m_PrefabAsset: {fileID: 0}
---- !u!1001 &3778175075372361224
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 2386831869758086357}
-    m_Modifications:
-    - target: {fileID: 1165912544772320847, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_Name
-      value: WidgetIconSkill (4)
-      objectReference: {fileID: 0}
-    - target: {fileID: 1165912544772320847, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 105.76999
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 104.85
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 647.56494
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -52.425
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
---- !u!224 &4743646536950976607 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-  m_PrefabInstance: {fileID: 3778175075372361224}
-  m_PrefabAsset: {fileID: 0}
---- !u!1001 &4556361691147586454
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 2386831869758086357}
-    m_Modifications:
-    - target: {fileID: 1165912544772320847, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_Name
-      value: WidgetIconSkill (2)
-      objectReference: {fileID: 0}
-    - target: {fileID: 1165912544772320847, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 105.76999
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 104.85
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 350.22498
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -52.425
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
---- !u!224 &5368683846553877953 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-  m_PrefabInstance: {fileID: 4556361691147586454}
-  m_PrefabAsset: {fileID: 0}
---- !u!1001 &7119318228264551216
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 2386831869758086357}
-    m_Modifications:
-    - target: {fileID: 1165912544772320847, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_Name
-      value: WidgetIconSkill (1)
-      objectReference: {fileID: 0}
-    - target: {fileID: 1165912544772320847, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 105.76999
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 104.85
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 201.55498
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -52.425
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
---- !u!224 &1690804137536025959 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
-  m_PrefabInstance: {fileID: 7119318228264551216}
-  m_PrefabAsset: {fileID: 0}

+ 78 - 77
Assets/Res/UIAtlas/all.spriteatlasv2

@@ -11,96 +11,97 @@ SpriteAtlasAsset:
   m_MasterAtlas: {fileID: 0}
   m_ImporterData:
     packables:
-    - {fileID: 2800000, guid: 7f40c4693834f4b79813864b3b216f22, type: 3}
-    - {fileID: 2800000, guid: 92753e7463d6c4451bcfaa1be32e5834, type: 3}
-    - {fileID: 2800000, guid: 69c249842084043e0b2152a611527273, type: 3}
-    - {fileID: 2800000, guid: 620836cccebfa47d69f3604400cda9d1, type: 3}
-    - {fileID: 2800000, guid: c9076402f3d8e4f14b590c121f9c99d0, type: 3}
-    - {fileID: 2800000, guid: e4a00da9d5759447c948b8fa241afc3e, type: 3}
-    - {fileID: 2800000, guid: 11b26917032164d598602af49f7fe468, type: 3}
-    - {fileID: 2800000, guid: 2b82d333ed81d430a84d2124a819c288, type: 3}
-    - {fileID: 2800000, guid: ce1ea5fcdbd674590ac8eae01e003bad, type: 3}
-    - {fileID: 2800000, guid: 5c287376e64d24bc1a85b53628621857, type: 3}
-    - {fileID: 2800000, guid: 265dc7048cc994225bb9669326ab9ed6, type: 3}
-    - {fileID: 2800000, guid: 8beb887d62a704827986ead27b5a4935, type: 3}
-    - {fileID: 2800000, guid: 92cd22df52f4e473a89701d0395c71ac, type: 3}
-    - {fileID: 2800000, guid: 513aeb74bd03e47a89e20193a6ed1b19, type: 3}
-    - {fileID: 2800000, guid: e1b6b9fd78e034d5da9c741d07ed1146, type: 3}
-    - {fileID: 2800000, guid: 7802bfdd398ef4cf8a545b3d8362f081, type: 3}
-    - {fileID: 2800000, guid: dd5f2c8c6196c4f2da80fb80e8d302c1, type: 3}
-    - {fileID: 2800000, guid: 7a1aa398466652b4aae1bf35dd9f03e8, type: 3}
-    - {fileID: 2800000, guid: c5d88737534914e22a2b08bf691052c3, type: 3}
-    - {fileID: 2800000, guid: 03108c847a5054b63971245729018c27, type: 3}
-    - {fileID: 2800000, guid: 036dc8ba1666442588bd4900d7967f74, type: 3}
-    - {fileID: 2800000, guid: cb6357c4501c7f940be9613426020ba9, type: 3}
-    - {fileID: 2800000, guid: 5c40ba2427908a24d9352a4296d00504, type: 3}
+    - {fileID: 2800000, guid: 1d87a1a810baddc4d82d37c6d78eb3c4, type: 3}
+    - {fileID: 2800000, guid: 81855acce71634bc8aa205d1313e2dd8, type: 3}
+    - {fileID: 2800000, guid: f135276cb2d8f43339f0cbe999537c48, type: 3}
     - {fileID: 2800000, guid: 1e57f4f2deb7646f38356896a394b27c, type: 3}
-    - {fileID: 2800000, guid: 50db720a997df0f4bb76d75ca3128dc6, type: 3}
-    - {fileID: 2800000, guid: e939c98a051bd9340aa91d8314666dab, type: 3}
+    - {fileID: 2800000, guid: d05f208cad7f39c488a07bc21a1938e9, type: 3}
+    - {fileID: 2800000, guid: 4f5b4c2303ae14f8aa8d2daf5803f417, type: 3}
+    - {fileID: 2800000, guid: 05f27d75986d94b2a876e7c5984f42b6, type: 3}
+    - {fileID: 2800000, guid: a87149123ae00504d802648411192f19, type: 3}
+    - {fileID: 2800000, guid: 9c4fd4838fb139248bd31b4595d3d3e0, type: 3}
+    - {fileID: 2800000, guid: 0b7cc907f403f4a67ad658df2c8b8bd6, type: 3}
+    - {fileID: 2800000, guid: 5fc69a4cdcb513349b62aadcb6ea64ae, type: 3}
+    - {fileID: 2800000, guid: 104a340bfa7bdc842a914e4855a3f023, type: 3}
+    - {fileID: 2800000, guid: 99451d3c99bda4547aea27878c0936fa, type: 3}
+    - {fileID: 2800000, guid: 8beb887d62a704827986ead27b5a4935, type: 3}
+    - {fileID: 2800000, guid: 6db8a26aaf376472cb3da4b0174c3640, type: 3}
+    - {fileID: 2800000, guid: 1944ddda93ef84249abc2c330ccc1671, type: 3}
     - {fileID: 2800000, guid: a30bf5a5fe0484028b110056f3f4bfb7, type: 3}
-    - {fileID: 2800000, guid: 18bdd168063b3419c93ff0ad3d928768, type: 3}
-    - {fileID: 2800000, guid: b2e467ec8826146c494188b3c7fbdef7, type: 3}
-    - {fileID: 2800000, guid: 7c8926e9485cb44518cbd710f654f4c3, type: 3}
-    - {fileID: 2800000, guid: eb5a004d027914b13abea711a54675e5, type: 3}
+    - {fileID: 2800000, guid: 7a8716b2f7dea49e2a0a4b04902a7b29, type: 3}
+    - {fileID: 2800000, guid: 5cd1458b0dea24e43baf2431893ace5c, type: 3}
+    - {fileID: 2800000, guid: 9cc56dbf2574943bfac47268b7bbc584, type: 3}
+    - {fileID: 2800000, guid: fb9317113944240948cfe4a213422ff8, type: 3}
+    - {fileID: 2800000, guid: e66ca3a4c42e3764c9dd960f3e696fea, type: 3}
+    - {fileID: 2800000, guid: b585079c6bd658f4e937b4f0468e8091, type: 3}
     - {fileID: 2800000, guid: 066cdce1ecfa6a14dbec09075860d79a, type: 3}
+    - {fileID: 2800000, guid: c9076402f3d8e4f14b590c121f9c99d0, type: 3}
+    - {fileID: 2800000, guid: 620836cccebfa47d69f3604400cda9d1, type: 3}
+    - {fileID: 2800000, guid: 7c8926e9485cb44518cbd710f654f4c3, type: 3}
+    - {fileID: 2800000, guid: dd5f2c8c6196c4f2da80fb80e8d302c1, type: 3}
+    - {fileID: 2800000, guid: 5c40ba2427908a24d9352a4296d00504, 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: ce32dcb975473404e93ec07abe82cf10, type: 3}
+    - {fileID: 2800000, guid: 458074caa850a4ebe9902dadcebd5519, type: 3}
+    - {fileID: 2800000, guid: 7dcf2d1065fa80640890e6fc7a8b1d8e, type: 3}
+    - {fileID: 2800000, guid: 92753e7463d6c4451bcfaa1be32e5834, type: 3}
+    - {fileID: 2800000, guid: 084d642e01f7849d0a49230ab9cc18b9, type: 3}
+    - {fileID: 2800000, guid: ce1ea5fcdbd674590ac8eae01e003bad, type: 3}
+    - {fileID: 2800000, guid: 014bfa77b5b6abb468599df19cab8b08, type: 3}
     - {fileID: 2800000, guid: 7298f85c9be3e480ca29a540b881acc7, type: 3}
-    - {fileID: 2800000, guid: 05f27d75986d94b2a876e7c5984f42b6, type: 3}
+    - {fileID: 2800000, guid: e939c98a051bd9340aa91d8314666dab, type: 3}
+    - {fileID: 2800000, guid: acf622f4b8b10451f864e6bbe0f2d18c, type: 3}
+    - {fileID: 2800000, guid: 92cd22df52f4e473a89701d0395c71ac, type: 3}
+    - {fileID: 2800000, guid: 69c249842084043e0b2152a611527273, type: 3}
     - {fileID: 2800000, guid: c4a220291754e4cdcb56015d594b6049, type: 3}
-    - {fileID: 2800000, guid: 54f226abc196547a9b4749d64512ffcb, type: 3}
-    - {fileID: 2800000, guid: d05f208cad7f39c488a07bc21a1938e9, type: 3}
-    - {fileID: 2800000, guid: 99451d3c99bda4547aea27878c0936fa, type: 3}
-    - {fileID: 2800000, guid: 1d87a1a810baddc4d82d37c6d78eb3c4, type: 3}
-    - {fileID: 2800000, guid: f135276cb2d8f43339f0cbe999537c48, type: 3}
-    - {fileID: 2800000, guid: 0107877e5f4474feeb6c3a48ddbd0181, type: 3}
-    - {fileID: 2800000, guid: 9cc56dbf2574943bfac47268b7bbc584, type: 3}
-    - {fileID: 2800000, guid: c9543603422a7467da7d308507e9b575, type: 3}
-    - {fileID: 2800000, guid: 5fc69a4cdcb513349b62aadcb6ea64ae, type: 3}
+    - {fileID: 2800000, guid: 9369285ebc9f1452cb96bdd4c71dc580, type: 3}
+    - {fileID: 2800000, guid: 18bdd168063b3419c93ff0ad3d928768, type: 3}
     - {fileID: 2800000, guid: 8433511397436d04bb18893929b38c14, type: 3}
+    - {fileID: 2800000, guid: 2b82d333ed81d430a84d2124a819c288, type: 3}
+    - {fileID: 2800000, guid: a909a2534241641bfa4fd6d3aa0997fa, type: 3}
+    - {fileID: 2800000, guid: 1cedae3cd8e1c4e8b8351163cb83d3c3, type: 3}
+    - {fileID: 2800000, guid: 54f226abc196547a9b4749d64512ffcb, type: 3}
     - {fileID: 2800000, guid: 40b46970b24114095ae4592b09cd788b, type: 3}
+    - {fileID: 2800000, guid: 5d0910d5da5bc9a43a3cdad4e94e053d, type: 3}
+    - {fileID: 2800000, guid: 88f8d005a66c74c8e8516498671a5363, type: 3}
+    - {fileID: 2800000, guid: e1b6b9fd78e034d5da9c741d07ed1146, type: 3}
+    - {fileID: 2800000, guid: 7802bfdd398ef4cf8a545b3d8362f081, type: 3}
     - {fileID: 2800000, guid: 644d6a9935ab8468f91bccdf0e81217e, type: 3}
+    - {fileID: 2800000, guid: 0107877e5f4474feeb6c3a48ddbd0181, type: 3}
+    - {fileID: 2800000, guid: 513aeb74bd03e47a89e20193a6ed1b19, type: 3}
     - {fileID: 2800000, guid: 694e03b969504324081225f1921465de, type: 3}
-    - {fileID: 2800000, guid: ce32dcb975473404e93ec07abe82cf10, type: 3}
-    - {fileID: 2800000, guid: 014bfa77b5b6abb468599df19cab8b08, type: 3}
-    - {fileID: 2800000, guid: 1cedae3cd8e1c4e8b8351163cb83d3c3, type: 3}
-    - {fileID: 2800000, guid: f4492d7c6449e4ea7bcfb41d86964417, type: 3}
-    - {fileID: 2800000, guid: 143cd712a8bc04e1c9218c3c504b7abf, type: 3}
-    - {fileID: 2800000, guid: 5555f9ec76d49734ea1437158ef8e663, type: 3}
-    - {fileID: 2800000, guid: 81855acce71634bc8aa205d1313e2dd8, type: 3}
-    - {fileID: 2800000, guid: 7dcf2d1065fa80640890e6fc7a8b1d8e, type: 3}
-    - {fileID: 2800000, guid: 88f8d005a66c74c8e8516498671a5363, type: 3}
-    - {fileID: 2800000, guid: 82fb7f520a3d042f68f126f07425081c, type: 3}
-    - {fileID: 2800000, guid: 458074caa850a4ebe9902dadcebd5519, type: 3}
-    - {fileID: 2800000, guid: 0b7cc907f403f4a67ad658df2c8b8bd6, type: 3}
+    - {fileID: 2800000, guid: 58233a1daedbb4a24b2ddca6bcb864fd, type: 3}
+    - {fileID: 2800000, guid: 03108c847a5054b63971245729018c27, type: 3}
+    - {fileID: 2800000, guid: eb5a004d027914b13abea711a54675e5, type: 3}
+    - {fileID: 2800000, guid: e4a00da9d5759447c948b8fa241afc3e, type: 3}
     - {fileID: 2800000, guid: 793dd477683f1b743acb6e68d204d465, type: 3}
-    - {fileID: 2800000, guid: 104a340bfa7bdc842a914e4855a3f023, type: 3}
-    - {fileID: 2800000, guid: 9c4fd4838fb139248bd31b4595d3d3e0, type: 3}
-    - {fileID: 2800000, guid: 687226eea50e240aeb387bc0204de028, type: 3}
-    - {fileID: 2800000, guid: a909a2534241641bfa4fd6d3aa0997fa, type: 3}
-    - {fileID: 2800000, guid: 084d642e01f7849d0a49230ab9cc18b9, type: 3}
+    - {fileID: 2800000, guid: dd87b4353a45646fbbeaafe8c13a4632, type: 3}
+    - {fileID: 2800000, guid: 7c661cddbbc49467d8441a35766809e1, type: 3}
     - {fileID: 2800000, guid: 0e2733676e1be451a8519a89c49798c1, type: 3}
-    - {fileID: 2800000, guid: 044267119b30c460785747c947493225, type: 3}
-    - {fileID: 2800000, guid: 4f5b4c2303ae14f8aa8d2daf5803f417, type: 3}
-    - {fileID: 2800000, guid: acf622f4b8b10451f864e6bbe0f2d18c, type: 3}
-    - {fileID: 2800000, guid: a87149123ae00504d802648411192f19, type: 3}
+    - {fileID: 2800000, guid: b2e467ec8826146c494188b3c7fbdef7, type: 3}
+    - {fileID: 2800000, guid: 7529bbf4240db4e31a7b6f4df456a36a, type: 3}
+    - {fileID: 2800000, guid: 5555f9ec76d49734ea1437158ef8e663, type: 3}
+    - {fileID: 2800000, guid: ab7ed8048d1084deca39266a82de2fbc, type: 3}
+    - {fileID: 2800000, guid: c9543603422a7467da7d308507e9b575, type: 3}
+    - {fileID: 2800000, guid: 7a1aa398466652b4aae1bf35dd9f03e8, type: 3}
     - {fileID: 2800000, guid: 20a0259ff08564d3193d072c03463665, type: 3}
-    - {fileID: 2800000, guid: 5d0910d5da5bc9a43a3cdad4e94e053d, type: 3}
-    - {fileID: 2800000, guid: d320d0b7f786e44768dbf452a215d9f4, type: 3}
-    - {fileID: 2800000, guid: b585079c6bd658f4e937b4f0468e8091, type: 3}
-    - {fileID: 2800000, guid: 9369285ebc9f1452cb96bdd4c71dc580, type: 3}
-    - {fileID: 2800000, guid: e701ef601bf944f31a3d97f606f78430, type: 3}
-    - {fileID: 2800000, guid: df1cd931072aa4a118088d9e27a0a603, type: 3}
-    - {fileID: 2800000, guid: fb9317113944240948cfe4a213422ff8, type: 3}
-    - {fileID: 2800000, guid: e66ca3a4c42e3764c9dd960f3e696fea, type: 3}
-    - {fileID: 2800000, guid: 6db8a26aaf376472cb3da4b0174c3640, type: 3}
-    - {fileID: 2800000, guid: 4e7efc4278c98434aa518be230a9a6e2, type: 3}
+    - {fileID: 2800000, guid: 044267119b30c460785747c947493225, type: 3}
     - {fileID: 2800000, guid: ebc537e5817db4407935a71d199232e9, type: 3}
+    - {fileID: 2800000, guid: 50db720a997df0f4bb76d75ca3128dc6, type: 3}
+    - {fileID: 2800000, guid: cb6357c4501c7f940be9613426020ba9, type: 3}
+    - {fileID: 2800000, guid: 687226eea50e240aeb387bc0204de028, type: 3}
+    - {fileID: 2800000, guid: 143cd712a8bc04e1c9218c3c504b7abf, type: 3}
+    - {fileID: 2800000, guid: d320d0b7f786e44768dbf452a215d9f4, type: 3}
+    - {fileID: 2800000, guid: 265dc7048cc994225bb9669326ab9ed6, type: 3}
+    - {fileID: 2800000, guid: 11b26917032164d598602af49f7fe468, type: 3}
+    - {fileID: 2800000, guid: 5c287376e64d24bc1a85b53628621857, type: 3}
+    - {fileID: 2800000, guid: f4492d7c6449e4ea7bcfb41d86964417, type: 3}
+    - {fileID: 2800000, guid: c5d88737534914e22a2b08bf691052c3, type: 3}
+    - {fileID: 2800000, guid: 7f40c4693834f4b79813864b3b216f22, type: 3}
     - {fileID: 2800000, guid: 9e984408ac7ba4153bace3927806efeb, type: 3}
-    - {fileID: 2800000, guid: ab7ed8048d1084deca39266a82de2fbc, type: 3}
-    - {fileID: 2800000, guid: 58233a1daedbb4a24b2ddca6bcb864fd, type: 3}
-    - {fileID: 2800000, guid: dd87b4353a45646fbbeaafe8c13a4632, type: 3}
-    - {fileID: 2800000, guid: 1944ddda93ef84249abc2c330ccc1671, type: 3}
-    - {fileID: 2800000, guid: 7c661cddbbc49467d8441a35766809e1, type: 3}
-    - {fileID: 2800000, guid: 7a8716b2f7dea49e2a0a4b04902a7b29, type: 3}
-    - {fileID: 2800000, guid: 7529bbf4240db4e31a7b6f4df456a36a, type: 3}
   m_IsVariant: 0
   m_IsPlaceholder: 0

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 239 - 456
Assets/Scenes/UIBuild.scene


+ 9 - 2
Assets/Scripts/GameUI/UI/Hero/HeroDetailPanel.cs

@@ -116,8 +116,13 @@ namespace Fort23.Mono
         public SkillUIComponent skillUIComponent;
         private async void OnClickSkill()
         {
-            skillUIComponent = await UIManager.Instance.CreateGComponent<SkillUIComponent>(null, poolName:"SkillUIComponent",
-                root:transform);
+            // skillUIComponent = await UIManager.Instance.CreateGComponent<SkillUIComponent>(null, poolName:"SkillUIComponent",
+            //     root:transform);
+            
+            
+            skillUIComponent = await UIManager.Instance.
+                CreateGComponentForObject<SkillUIComponent>(skillUI, null, isInstance : false, root:transform);
+            
             skillUIComponent.InitUI(heroInfo);
         }
 
@@ -356,6 +361,8 @@ namespace Fort23.Mono
             this.heroWidget = heroWidget;
             this.sourcePanel = sourcePanel;
             
+            skillUI.SetActive(false);
+            
             btns1.SetActive(true);
             objHeroPowerUpPre.SetActive(false);
             

+ 11 - 0
Assets/Scripts/GameUI/UI/Hero/HeroDetailPanelData.cs

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

+ 22 - 5
Assets/Scripts/GameUI/UI/Hero/SkillUIComponent.cs

@@ -24,15 +24,19 @@ namespace Fort23.Mono
         public override void AddButtonEvent()
         {
             btnBack.onClick.AddListener(OnClickBack);
+            btnDi.onClick.AddListener(OnClickBack);
         }
 
         private void OnClickBack()
         {
-            UIManager.Instance.DormancyGComponent(this);
-            UIManager.Instance.DormancyAllGComponent<WidgetIconSkill>("WidgetIconSkill");
+            // UIManager.Instance.DormancyGComponent(this);
+            own.SetActive(false);
+            UIManager.Instance.DormancyAllGComponent<WidgetIconSkill>(poolName);
         }
 
         private HeroInfo heroInfo;
+
+        private string poolName = "widgetSkillIconPool";
         
         public List<WidgetIconSkill> allSkillIcon = new List<WidgetIconSkill>();
 
@@ -51,8 +55,16 @@ namespace Fort23.Mono
 
                 SkillInfo skillInfo = heroInfo.SkillData.GetHighestLevelOr1(keyValuePair.Key);
                 
-                WidgetIconSkill widgetIconSkill = await UIManager.Instance.CreateGComponent<WidgetIconSkill>(null,
-                    poolName: "WidgetIconSkill", root: skillRoot);
+                // WidgetIconSkill widgetIconSkill = await UIManager.Instance.CreateGComponent<WidgetIconSkill>(null,
+                //     poolName: "WidgetIconSkill", root: skillRoot);
+                
+                
+                WidgetIconSkill widgetIconSkill = await UIManager.Instance.
+                    CreateGComponentForObject<WidgetIconSkill>(widgetSkill, null, isInstance : true, 
+                        poolName:poolName, root:skillRoot);
+                
+                //WidgetIconSkill widgetIconSkill = await UIManager.Instance.CreateGComponentForObject()<WidgetIconSkill>(null,  widgetIkill, root: skillRoot);
+                
                 widgetIconSkill.InitWidget(skillInfo);
                 
                 allSkillIcon.Add(widgetIconSkill);
@@ -61,6 +73,11 @@ namespace Fort23.Mono
                 if (idx == 0)
                 {
                     ShowSkillDetail(keyValuePair.Key);
+                    widgetIconSkill.Highlight();
+                }
+                else
+                {
+                    widgetIconSkill.UnHighlight();
                 }
                 idx++;
             }
@@ -72,7 +89,7 @@ namespace Fort23.Mono
             {
                 if (widgetIconSkill != iconSkill)
                 {
-                    widgetIconSkill.imgBorder.color = Color.black;
+                    widgetIconSkill.UnHighlight();
                 }            
             }
         }

+ 22 - 0
Assets/Scripts/GameUI/UI/Hero/SkillUIComponentData.cs

@@ -140,6 +140,28 @@ namespace Fort23.Mono
 	      return _btnBack;
 	     }
 	   }
+	  private GameObject _widgetSkill;
+	  public GameObject widgetSkill
+	   {
+	   get{
+	      if (_widgetSkill == null)
+	       {
+	         _widgetSkill  = GetUIUnit<GameObject>("widgetSkill"); 
+	       }
+	      return _widgetSkill;
+	     }
+	   }
+	  private Button _btnDi;
+	  public Button btnDi
+	   {
+	   get{
+	      if (_btnDi == null)
+	       {
+	         _btnDi  = GetUIUnit<Button>("btnDi"); 
+	       }
+	      return _btnDi;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

+ 11 - 1
Assets/Scripts/GameUI/UI/Hero/WidgetIconSkill.cs

@@ -30,9 +30,19 @@ namespace Fort23.Mono
             
             // SkillUIComponent skillUIComponent = await UIManager.Instance.CreateGComponent<SkillUIComponent>(Callback);
             heroDetailPanel.skillUIComponent.SetOtherBorder(this);
-            imgBorder.color = new Color(0, 1, 0.65f);
+            Highlight();
             heroDetailPanel.skillUIComponent.ShowSkillDetail(skillInfo.skillConfig.IDGroup);
         }
+
+        public void Highlight()
+        {
+            imgBorder.color = new Color(0, 1, 0.65f);
+        }
+
+        public void UnHighlight()
+        {
+            imgBorder.color = Color.black;
+        }
         
         private void Callback(SkillUIComponent obj)
         {

+ 1 - 1
UGUIPack/uguiconfig.db

@@ -1 +1 @@
-{"allPackgInfos":[{"packName":"all","packgJsonPath":"/Art/UIAssets/TextrueJson/all.txt","packgSpritePath":"Assets/Res/UIAtlas/all.spriteatlasv2","lasetJsonGUID":"e8ac4a11df23a3327a9a6fed106efb0a"},{"packName":"heroIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/heroIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/heroIcon.spriteatlasv2","lasetJsonGUID":"a54d3984b6522f413325daf005732f7d"},{"packName":"skillIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/skillIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/skillIcon.spriteatlasv2","lasetJsonGUID":"151dde130cdc5228de9614f608886409"},{"packName":"itemIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/itemIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/itemIcon.spriteatlasv2","lasetJsonGUID":"dc3cb1520cfd8b3b6ac7d02c7fccd2df"},{"packName":"EquipmentIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/EquipmentIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/EquipmentIcon.spriteatlasv2","lasetJsonGUID":""},{"packName":"bg","packgJsonPath":"/Art/UIAssets/TextrueJson/bg.txt","packgSpritePath":"Assets/Res/UIAtlas/bg.spriteatlasv2","lasetJsonGUID":""},{"packName":"box","packgJsonPath":"/Art/UIAssets/TextrueJson/box.txt","packgSpritePath":"Assets/Res/UIAtlas/box.spriteatlasv2","lasetJsonGUID":""}],"isJiaoYan":true}
+{"allPackgInfos":[{"packName":"all","packgJsonPath":"/Art/UIAssets/TextrueJson/all.txt","packgSpritePath":"Assets/Res/UIAtlas/all.spriteatlasv2","lasetJsonGUID":"a6fab45fc6a5f0b09679bb4eedcdd188"},{"packName":"heroIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/heroIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/heroIcon.spriteatlasv2","lasetJsonGUID":"a54d3984b6522f413325daf005732f7d"},{"packName":"skillIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/skillIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/skillIcon.spriteatlasv2","lasetJsonGUID":"151dde130cdc5228de9614f608886409"},{"packName":"itemIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/itemIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/itemIcon.spriteatlasv2","lasetJsonGUID":"dc3cb1520cfd8b3b6ac7d02c7fccd2df"},{"packName":"EquipmentIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/EquipmentIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/EquipmentIcon.spriteatlasv2","lasetJsonGUID":""},{"packName":"bg","packgJsonPath":"/Art/UIAssets/TextrueJson/bg.txt","packgSpritePath":"Assets/Res/UIAtlas/bg.spriteatlasv2","lasetJsonGUID":""},{"packName":"box","packgJsonPath":"/Art/UIAssets/TextrueJson/box.txt","packgSpritePath":"Assets/Res/UIAtlas/box.spriteatlasv2","lasetJsonGUID":""}],"isJiaoYan":true}

+ 10 - 10
UserSettings/EditorUserSettings.asset

@@ -21,28 +21,28 @@ EditorUserSettings:
       value: 184c
       flags: 0
     RecentlyUsedSceneGuid-0:
-      value: 5007050006035d0254085b7647700e44174e197c7c2c7668752f4436e1b3676c
+      value: 0509560200060a0c5908552040750b44444f1a7a2a7827327c2a1e63b3b4603c
       flags: 0
     RecentlyUsedSceneGuid-1:
-      value: 5452000707020a0a0c0f092143220844144e402c2f2c71662e711836e0b2306a
+      value: 020600005157590b5e595b7313215b44424e4b7f7b2b70337479486be6b46d39
       flags: 0
     RecentlyUsedSceneGuid-2:
-      value: 5a05505551515d03555a0d2316745d44444e412e2f712235292d1960b6b3663c
+      value: 5455050750515e025d5f5b2342770f4212164878792d2462282a4a62b1e5603d
       flags: 0
     RecentlyUsedSceneGuid-3:
-      value: 5701025003000c090c0c0d2643225b444015407c7d7074627b7c1c66e3b4613a
+      value: 0600055050050c595f0c097146200b44464f4c2f7c2c24627b2a4d35e6e4366c
       flags: 0
     RecentlyUsedSceneGuid-4:
-      value: 530404525401510d5f0b097b45200f4444154f297b2b7134787c4432b5b16d60
+      value: 0052555e0156080d0b0c097b4726594443154b287c7f76617b2b1830e1b5613b
       flags: 0
     RecentlyUsedSceneGuid-5:
-      value: 5b520d0503545b0d0c0c0a2715770748154f4d2c7d7d7e627a7d4a35b4e1646a
+      value: 055303045d535e5d54080e721672094412154e7b757c71342e794b65b2e4616f
       flags: 0
     RecentlyUsedSceneGuid-6:
-      value: 5a50500553530b595d0f597343770941474e4c722e2a20367e794861e1b86c68
+      value: 5b520d0503545b0d0c0c0a2715770748154f4d2c7d7d7e627a7d4a35b4e1646a
       flags: 0
     RecentlyUsedSceneGuid-7:
-      value: 055303045d535e5d54080e721672094412154e7b757c71342e794b65b2e4616f
+      value: 5a50500553530b595d0f597343770941474e4c722e2a20367e794861e1b86c68
       flags: 0
     RecentlyUsedSceneGuid-8:
       value: 5a500c0357030b0f0858097a44770f40154f4f2e2a2c743229794b64e0b56c6a
@@ -57,10 +57,10 @@ EditorUserSettings:
       value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4ba75e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1bf968e93e2ffcbc3e7e2f0b3ffe0e8b0be9af8ffaeffff8e85dd8390e3949c8899daa7
       flags: 0
     UnityEditor.ShaderGraph.FloatingWindowsLayout2:
-      value: 181344140043005e1a220d3b1f364b524c0c5a27130c293326201334cee5322ca0bd30e8eb293a707b0fd0180b3d0a36fc0d3d04e649500d1002ee0b5dbd1d2c27c00ad113cb1e10e41f1addc80993b982988db381b2b4808789f4aaa0a3b9adb9b3a8c482a7eec9b0a0f0a5aecee8c2c7d9b2d08e9c9189ea9e93de81e0dbc9dc94dfcd9b9f9a8188dff4c3fac0f7f4c2f9f7c7c5f0cdfdc5c6d0f079f1f531343226ecece8e6d3ebef3fd22229d7df276a9b64
+      value: 181344140043005e1a220d3b1f364b524c0c5a27130c293326201334cee5322ca0bd30e8eb293a707b0fd0180b3d0a36fc0d3d04e649500d1002ee0b5dbd1d2c27c00ad113cb1e10e41f1addc80993b98d9884a69ae6d8f0d1cda9e8fbfefaf9f9dea3fdb9ade882f0f7b0e1e380cafbf2c3adc18e9cd285a2908b82ec869c8395949c9483d68a8d97ddbd90bf
       flags: 0
     UnityEditor.ShaderGraph.InspectorWindow:
-      value: 18135939215a0a5004000b0e15254b524c1119263f2d6a722016393ce1eb3d36e5d339f9a5602b2e2c07a37e0901373ae01e0008f707250d171df81a53a5485d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd80908ff0a2a4a1bbaaa0a9f2a3f3f8aa93e6edf38e9ccbddc18390ac86d4849394ea829f83f291cb918384d28397d5888b89dcf2dff2c7f7f7c2f3f38b88
+      value: 18135939215a0a5004000b0e15254b524c1119263f2d6a722016393ce1eb3d36e5d339f9a5602b2e2c07a37e0901373ae01e0008f707250d171df81a53a5485d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd81908fecb0f9cfddf1eff4e7a1b1eae482f0fcaee1e1928b86d888ed9195908797a7cf
       flags: 0
     vcSharedLogLevel:
       value: 0d5e400f0650

+ 251 - 152
UserSettings/Layouts/CurrentMaximizeLayout.dwlt

@@ -14,21 +14,174 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Children:
   - {fileID: 3}
-  - {fileID: 9}
-  - {fileID: 11}
-  - {fileID: 13}
+  - {fileID: 10}
+  - {fileID: 12}
+  - {fileID: 14}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 30
-    width: 1503
+    width: 1557
     height: 929
   m_MinSize: {x: 400, y: 100}
   m_MaxSize: {x: 32384, y: 16192}
   vertical: 0
-  controlID: 19
+  controlID: 12605
   draggingID: 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: 1
+  m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: Game
+    m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: 129
+    y: 96
+    width: 454.5
+    height: 650.5
+  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: []
+  m_SerializedViewValues: []
+  m_PlayModeViewName: GameView
+  m_ShowGizmos: 0
+  m_TargetDisplay: 0
+  m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
+  m_TargetSize: {x: 750, y: 1624}
+  m_TextureFilterMode: 0
+  m_TextureHideFlags: 61
+  m_RenderIMGUI: 1
+  m_EnterPlayModeBehavior: 0
+  m_UseMipMap: 0
+  m_VSyncEnabled: 0
+  m_Gizmos: 0
+  m_Stats: 0
+  m_SelectedSizes: 08000000000000000000000000000000000000000000000000000000000000000000000000000000
+  m_ZoomArea:
+    m_HRangeLocked: 0
+    m_VRangeLocked: 0
+    hZoomLockedByDefault: 0
+    vZoomLockedByDefault: 0
+    m_HBaseRangeMin: -187.5
+    m_HBaseRangeMax: 187.5
+    m_VBaseRangeMin: -406
+    m_VBaseRangeMax: 406
+    m_HAllowExceedBaseRangeMin: 1
+    m_HAllowExceedBaseRangeMax: 1
+    m_VAllowExceedBaseRangeMin: 1
+    m_VAllowExceedBaseRangeMax: 1
+    m_ScaleWithWindow: 0
+    m_HSlider: 0
+    m_VSlider: 0
+    m_IgnoreScrollWheelUntilClicked: 0
+    m_EnableMouseInput: 0
+    m_EnableSliderZoomHorizontal: 0
+    m_EnableSliderZoomVertical: 0
+    m_UniformScale: 1
+    m_UpDirection: 1
+    m_DrawArea:
+      serializedVersion: 2
+      x: 0
+      y: 21
+      width: 454.5
+      height: 629.5
+    m_Scale: {x: 0.7752463, y: 0.7752463}
+    m_Translation: {x: 227.25, y: 314.75}
+    m_MarginLeft: 0
+    m_MarginRight: 0
+    m_MarginTop: 0
+    m_MarginBottom: 0
+    m_LastShownAreaInsideMargins:
+      serializedVersion: 2
+      x: -293.13263
+      y: -406
+      width: 586.26526
+      height: 812
+    m_MinimalGUI: 1
+  m_defaultScale: 0.7752463
+  m_LastWindowPixelSize: {x: 909, y: 1301}
+  m_ClearInEditMode: 1
+  m_NoCameraWarning: 1
+  m_LowResolutionForAspectRatios: 01000000000000000000
+  m_XRRenderMode: 0
+  m_RenderTexture: {fileID: 0}
+--- !u!114 &3
+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: 1
+  m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Children:
+  - {fileID: 4}
+  - {fileID: 8}
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 455.5
+    height: 929
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 8096, y: 16192}
+  vertical: 1
+  controlID: 12606
+  draggingID: 0
+--- !u!114 &4
+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: 1
+  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: GameView
+  m_EditorClassIdentifier: 
+  m_Children: []
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 455.5
+    height: 671.5
+  m_MinSize: {x: 201, y: 221}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 2}
+  m_Panes:
+  - {fileID: 5}
+  - {fileID: 2}
+  - {fileID: 6}
+  - {fileID: 7}
+  m_Selected: 1
+  m_LastSelected: 0
+--- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -48,10 +201,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 143
+    x: 129
     y: 96
-    width: 469
-    height: 361.5
+    width: 454.5
+    height: 650.5
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -66,7 +219,7 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: -171, y: -26}
+      snapOffset: {x: -161, y: -26}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 3
       id: Tool Settings
@@ -106,7 +259,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 25}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 1
       id: unity-search-toolbar
       index: 1
@@ -158,7 +311,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 25}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/Light Settings
       index: 2
@@ -184,7 +337,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 25}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/Cloth Constraints
       index: 3
@@ -197,7 +350,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 25}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/Cloth Collisions
       index: 4
@@ -249,7 +402,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 25}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/Occlusion Culling
       index: 5
@@ -262,7 +415,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 25}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/Physics Debugger
       index: 6
@@ -275,7 +428,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 25}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/Scene Visibility
       index: 7
@@ -415,17 +568,17 @@ MonoBehaviour:
     m_OverlaysVisible: 1
   m_WindowGUID: 6ec4b650245f86f4b853159290a53aa0
   m_Gizmos: 1
-  m_OverrideSceneCullingMask: 0
-  m_SceneIsLit: 0
+  m_OverrideSceneCullingMask: 6917529027641081856
+  m_SceneIsLit: 1
   m_SceneLighting: 1
   m_2DMode: 1
   m_isRotationLocked: 0
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 843.2695, y: 9.29941, z: -1.8970643}
+    m_Target: {x: 4.324243, y: 6.6835437, z: -0.027853256}
     speed: 2
-    m_Value: {x: 843.2695, y: 9.29941, z: -1.8970643}
+    m_Value: {x: 4.324243, y: 6.6835437, z: -0.027853256}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -436,7 +589,7 @@ MonoBehaviour:
   m_SceneViewState:
     m_AlwaysRefresh: 0
     showFog: 1
-    showSkybox: 0
+    showSkybox: 1
     showFlares: 1
     showImageEffects: 1
     showParticleSystems: 1
@@ -475,9 +628,9 @@ MonoBehaviour:
     speed: 2
     m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
-    m_Target: 954.8977
+    m_Target: 5.31923
     speed: 2
-    m_Value: 954.8977
+    m_Value: 5.31923
   m_Ortho:
     m_Target: 1
     speed: 2
@@ -504,61 +657,7 @@ MonoBehaviour:
   m_SceneVisActive: 1
   m_LastLockedObject: {fileID: 0}
   m_ViewIsLockedToObject: 0
---- !u!114 &3
-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: 1
-  m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Children:
-  - {fileID: 4}
-  - {fileID: 7}
-  m_Position:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 470
-    height: 929
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 8096, y: 16192}
-  vertical: 1
-  controlID: 20
-  draggingID: 0
---- !u!114 &4
-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: 1
-  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: SceneView
-  m_EditorClassIdentifier: 
-  m_Children: []
-  m_Position:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 470
-    height: 382.5
-  m_MinSize: {x: 201, y: 221}
-  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 2}
-  m_Panes:
-  - {fileID: 2}
-  - {fileID: 5}
-  - {fileID: 6}
-  m_Selected: 0
-  m_LastSelected: 1
---- !u!114 &5
+--- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -578,10 +677,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 144
-    y: 96
-    width: 469
-    height: 361.5
+    x: 0
+    y: 73
+    width: 1209
+    height: 436
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -696,7 +795,7 @@ MonoBehaviour:
   m_CurrentEditor: 0
   m_LayerEditor:
     m_SelectedLayerIndex: 0
---- !u!114 &6
+--- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -826,7 +925,7 @@ MonoBehaviour:
       type: {class: TransitionLibraryAliasesPage, ns: Animancer.Editor.TransitionLibraries, asm: Kybernetik.Animancer.Editor}
       data:
         _ScrollPosition: {x: 0, y: 0}
---- !u!114 &7
+--- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -842,17 +941,17 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 382.5
-    width: 470
-    height: 546.5
+    y: 671.5
+    width: 455.5
+    height: 257.5
   m_MinSize: {x: 101, y: 121}
   m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 8}
+  m_ActualView: {fileID: 9}
   m_Panes:
-  - {fileID: 8}
+  - {fileID: 9}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &8
+--- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -872,10 +971,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 143
-    y: 478.5
-    width: 469
-    height: 525.5
+    x: 129
+    y: 767.5
+    width: 454.5
+    height: 236.5
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -886,7 +985,7 @@ MonoBehaviour:
     m_LastAppliedPresetName: Default
     m_SaveData: []
     m_OverlaysVisible: 1
---- !u!114 &9
+--- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -901,18 +1000,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 470
+    x: 455.5
     y: 0
-    width: 255
+    width: 292
     height: 929
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 10}
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 11}
   m_Panes:
-  - {fileID: 10}
+  - {fileID: 11}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &10
+--- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -932,9 +1031,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 613
+    x: 584.5
     y: 96
-    width: 253
+    width: 290
     height: 908
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -949,25 +1048,25 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 52df0100
-      m_LastClickedID: 122706
-      m_ExpandedIDs: 12b4f8ff34b4f8ff62dd010084dd0100a0dd0100d4dd0100e0dd01000ede010022de01007ade010092de0100a6de0100c2de0100cede010020df010052df0100
+      m_SelectedIDs: 38aa0000
+      m_LastClickedID: 0
+      m_ExpandedIDs: c204f3ff803ef3ff4245f3ff464cf3ff544cf3ff3658f3ffe061f3ffa468f3ffb89bf3ffc69bf3ffba9ef3ff24ccf3ff38ccf3fffad2f3ff5ee4f3ff60e4f3ff6ce4f3fff2f4f3ff9001f4ffa401f4fffc01f4ff5c02f4ff9405f4ff6808f4ff523bf4ff603bf4ff2254f4ff3654f4ffba59f4ff4a5af4fffa5af4ff928df4ffa08df4ff8490f4ff04c0f4ffc8c6f4ff40faf4ff4efaf4ffba9df5ff949ef5ff4af3f5ff82f7f5ff46fef5ff9832f6ffa632f6ff9a35f6ff8c67f6ff9a67f6ffbc90f6ffdc94f6ff8c95f6ff5cacf6ff6aacf6ff48b4f6ff4ed8f6ff1408f7ffd80ef7ff8045f7ff8e45f7ff8248f7ff829ef7ff16baf7ff18baf7ff24baf7ff8ebdf7ff50c4f7ff02d1f7ffeea6fffff0a6fffff2a6fffffca6ffffa8adffff5aaeffff08afffffeabbffff9ebdffffa0bdffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
-        m_Name: 
-        m_OriginalName: 
+        m_Name: SkillUIComponent
+        m_OriginalName: SkillUIComponent
         m_EditFieldRect:
           serializedVersion: 2
           x: 0
           y: 0
           width: 0
           height: 0
-        m_UserData: 0
+        m_UserData: -826912
         m_IsWaitingForDelay: 0
         m_IsRenaming: 0
-        m_OriginalEventType: 11
+        m_OriginalEventType: 0
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 9}
+        m_ClientGUIView: {fileID: 10}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
@@ -975,7 +1074,7 @@ MonoBehaviour:
       m_IsLocked: 0
     m_CurrentSortingName: TransformSorting
   m_WindowGUID: 9cd1477dbcc46d642bdb31d35b82cd83
---- !u!114 &11
+--- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -990,18 +1089,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 725
+    x: 747.5
     y: 0
-    width: 338.5
+    width: 422
     height: 929
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
-  m_ActualView: {fileID: 12}
+  m_ActualView: {fileID: 13}
   m_Panes:
-  - {fileID: 12}
+  - {fileID: 13}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &12
+--- !u!114 &13
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1021,9 +1120,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 868
+    x: 876.5
     y: 96
-    width: 336.5
+    width: 420
     height: 908
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -1036,7 +1135,7 @@ MonoBehaviour:
     m_SaveData: []
     m_OverlaysVisible: 1
   m_SearchFilter:
-    m_NameFilter: PopupDim_RewardItems
+    m_NameFilter: 
     m_ClassNames: []
     m_AssetLabels: []
     m_AssetBundleNames: []
@@ -1046,24 +1145,24 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Editor
+    - Assets/Scenes
     m_Globs: []
-    m_OriginalText: PopupDim_RewardItems
+    m_OriginalText: 
     m_ImportLogFlags: 0
     m_FilterByTypeIntersection: 0
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Editor
+  - Assets/Res/UI
   m_LastFoldersGridSize: 16
   m_LastProjectPath: /Users/lcn/0Fort23Projects/XY001
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
     scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 74a80000
-    m_LastClickedID: 43124
-    m_ExpandedIDs: 000000005ca600005ea6000060a6000062a6000064a6000066a6000068a600006aa600006ca600006ea6000070a6000072a6000074a6000078a600007ca8000000ca9a3b
+    m_SelectedIDs: 03ca9a3b
+    m_LastClickedID: 1000000003
+    m_ExpandedIDs: 00000000caa60000cca60000cea60000d0a60000d2a60000d4a60000d6a60000d8a60000daa60000dca60000dea60000e0a60000e4a60000e6a600004aa900005aa90000d6b1010000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1079,7 +1178,7 @@ MonoBehaviour:
       m_IsRenaming: 0
       m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 11}
+      m_ClientGUIView: {fileID: 12}
     m_SearchString: 
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
@@ -1091,7 +1190,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 000000005ca600005ea6000060a6000062a6000064a6000066a6000068a600006aa600006ca600006ea6000070a6000072a6000074a6000076a6000078a60000
+    m_ExpandedIDs: 00000000caa60000cca60000cea60000d0a60000d2a60000d6a60000d8a60000daa60000dca60000dea60000e0a60000e4a60000e6a6000000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1116,26 +1215,26 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
   m_ListAreaState:
-    m_SelectedInstanceIDs: 52df0100
-    m_LastClickedInstanceID: 122706
+    m_SelectedInstanceIDs: 38aa0000
+    m_LastClickedInstanceID: 43576
     m_HadKeyboardFocusLastEvent: 1
-    m_ExpandedInstanceIDs: d02e01001ef900002afc000092f80000f0f70000d8fa000046fa0000f0f80000dc5b0100d05b0100c85b0100cc5b01004a0b0100de0b0100de0a01009e0b0100220b01002a4201007a490100aa4401008a4301006a4e010088960000069a00008c8b0000728b0000
+    m_ExpandedInstanceIDs: d02e01001ef900002afc000092f80000f0f70000d8fa000046fa0000f0f80000dc5b0100d05b0100c85b0100cc5b01004a0b0100de0b0100de0a01009e0b0100220b01002a4201007a490100aa4401008a4301006a4e0100a0e70000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: 
-      m_OriginalName: 
+      m_Name: testCombat
+      m_OriginalName: testCombat
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 0
+      m_UserData: 43576
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 11
+      m_OriginalEventType: 0
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 11}
+      m_ClientGUIView: {fileID: 12}
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
@@ -1146,8 +1245,8 @@ MonoBehaviour:
     m_ScrollPosition: {x: 0, y: 0}
     m_GridSize: 16
   m_SkipHiddenPackages: 0
-  m_DirectoriesAreaWidth: 180.5
---- !u!114 &13
+  m_DirectoriesAreaWidth: 227
+--- !u!114 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1162,18 +1261,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1063.5
+    x: 1169.5
     y: 0
-    width: 439.5
+    width: 387.5
     height: 929
-  m_MinSize: {x: 276, y: 71}
-  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 14}
+  m_MinSize: {x: 275, y: 50}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 15}
   m_Panes:
-  - {fileID: 14}
+  - {fileID: 15}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &14
+--- !u!114 &15
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1193,14 +1292,14 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1206.5
+    x: 1298.5
     y: 96
-    width: 438.5
+    width: 386.5
     height: 908
   m_SerializedDataModeController:
-    m_DataMode: 1
-    m_PreferredDataMode: 1
-    m_SupportedDataModes: 010000000200000003000000
+    m_DataMode: 0
+    m_PreferredDataMode: 0
+    m_SupportedDataModes: 
     isAutomatic: 1
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
@@ -1210,7 +1309,7 @@ MonoBehaviour:
   m_ObjectsLockedBeforeSerialization: []
   m_InstanceIDsLockedBeforeSerialization: 
   m_PreviewResizer:
-    m_CachedPref: 151
+    m_CachedPref: 315
     m_ControlHash: -371814159
     m_PrefName: Preview_InspectorPreview
   m_LastInspectedObjectInstanceID: -1

BIN
美术/art_use_ui/all/dec_BottomBtn_Bg.png


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
美术/unity_use_ui/TextrueJson/all.txt


BIN
美术/unity_use_ui/decorate/dec_BottomBtn_Bg.png


+ 5 - 5
美术/工具/imgui.ini

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

Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio