替换一些ui

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

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

Assets/Res/UI/AppBarPanel/TitlePanel.prefab

@@ -0,0 +1,697 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &170644211414419701
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 9177955560029039243}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Fill Area
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &9177955560029039243
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 170644211414419701}
+  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: 4485187506652535173}
+  m_Father: {fileID: 3006831369699495683}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.25}
+  m_AnchorMax: {x: 1, y: 0.75}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &1161096511545055734
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4264355029574138168}
+  - component: {fileID: 8974566408459148074}
+  - component: {fileID: 7467439324834291400}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text_JingJie
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4264355029574138168
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1161096511545055734}
+  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: 4251176618484867663}
+  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: -166, y: -7.6}
+  m_SizeDelta: {x: 220.1661, y: 50.1693}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8974566408459148074
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1161096511545055734}
+  m_CullTransparentMesh: 1
+--- !u!114 &7467439324834291400
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1161096511545055734}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.9803922, g: 0.9058824, b: 0.654902, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 24
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 6
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u91D1\u4E39\u524D\u671F.\u56DB\u51B2"
+--- !u!1 &1814268402840942092
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4251176618484867663}
+  - component: {fileID: 7108258747564116440}
+  - component: {fileID: 9137017659689659031}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4251176618484867663
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1814268402840942092}
+  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: 1315830646960664688}
+  - {fileID: 4264355029574138168}
+  - {fileID: 1054918091777185813}
+  - {fileID: 3006831369699495683}
+  m_Father: {fileID: 5226667430741191111}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 110.5612}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &7108258747564116440
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1814268402840942092}
+  m_CullTransparentMesh: 1
+--- !u!114 &9137017659689659031
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1814268402840942092}
+  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.16862746, g: 0.16862746, b: 0.16862746, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: 
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 129d2dfcaa346e2c98412e94b22ff390
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &1947865541254548843
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8023400312620770093}
+  - component: {fileID: 551551059454503283}
+  - component: {fileID: 5669358892037877841}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Background
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8023400312620770093
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1947865541254548843}
+  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: 3006831369699495683}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.25}
+  m_AnchorMax: {x: 1, y: 0.75}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &551551059454503283
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1947865541254548843}
+  m_CullTransparentMesh: 1
+--- !u!114 &5669358892037877841
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1947865541254548843}
+  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.5754717, g: 0.5754717, b: 0.5754717, 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: 10907, guid: 0000000000000000f000000000000000, type: 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
+--- !u!1 &2867086444048306635
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1054918091777185813}
+  - component: {fileID: 7928542766183595868}
+  - component: {fileID: 2677369192963784420}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Group_ResourceBar
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1054918091777185813
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2867086444048306635}
+  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: 4251176618484867663}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: -15.9, y: -10.6}
+  m_SizeDelta: {x: 0, y: 56}
+  m_Pivot: {x: 1, y: 0}
+--- !u!114 &7928542766183595868
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2867086444048306635}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 3
+  m_Spacing: 11.7
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!114 &2677369192963784420
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2867086444048306635}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
+--- !u!1 &5633683238185533987
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4485187506652535173}
+  - component: {fileID: 7219234678677038065}
+  - component: {fileID: 8044901943668159564}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Fill
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4485187506652535173
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5633683238185533987}
+  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: 9177955560029039243}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7219234678677038065
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5633683238185533987}
+  m_CullTransparentMesh: 1
+--- !u!114 &8044901943668159564
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5633683238185533987}
+  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.9568628, g: 0.7725491, b: 0.2627451, 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: 10905, guid: 0000000000000000f000000000000000, type: 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
+--- !u!1 &5704274849554977417
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1315830646960664688}
+  - component: {fileID: 3703894264624883511}
+  - component: {fileID: 7324808850767659230}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1315830646960664688
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5704274849554977417}
+  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: 4251176618484867663}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 26.2, y: -36.5}
+  m_SizeDelta: {x: 65.5257, y: 63.5984}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &3703894264624883511
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5704274849554977417}
+  m_CullTransparentMesh: 1
+--- !u!114 &7324808850767659230
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5704274849554977417}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_ty_ziyuan2
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 129d2dfcaa346e2c98412e94b22ff390
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &6398584325073933168
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5226667430741191111}
+  - component: {fileID: 7203008914783957009}
+  - component: {fileID: 6554467020433496479}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: TitlePanel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5226667430741191111
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6398584325073933168}
+  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: 4251176618484867663}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 750, y: 1624}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7203008914783957009
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6398584325073933168}
+  m_CullTransparentMesh: 1
+--- !u!114 &6554467020433496479
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6398584325073933168}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: Text_JingJie
+    gameObject: {fileID: 7467439324834291400}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Slider_Exp
+    gameObject: {fileID: 8105874991546617229}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Group_ResourceBar
+    gameObject: {fileID: 1054918091777185813}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 1
+--- !u!1 &7394536043274693495
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3006831369699495683}
+  - component: {fileID: 8105874991546617229}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Slider_Exp
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3006831369699495683
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7394536043274693495}
+  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: 8023400312620770093}
+  - {fileID: 9177955560029039243}
+  m_Father: {fileID: 4251176618484867663}
+  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: -141.1, y: -42}
+  m_SizeDelta: {x: 275.2626, y: 20}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &8105874991546617229
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7394536043274693495}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, 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: 0}
+  m_FillRect: {fileID: 4485187506652535173}
+  m_HandleRect: {fileID: 0}
+  m_Direction: 0
+  m_MinValue: 0
+  m_MaxValue: 1
+  m_WholeNumbers: 0
+  m_Value: 1
+  m_OnValueChanged:
+    m_PersistentCalls:
+      m_Calls: []

Assets/Res/UI/AppBarPanel/TitlePanel.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: BiwatiikVHOE9XB02/HQ9Dp+7VELR2OZyZKnjErfZbhyuQOsriqh9hUpbope
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/UI/AppBarPanel/心境.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: C3MXty75VHjJ4aSZeqc7CA1L07lrp3+fBe0hjwRUWYDaO6F1YARBIpm3RAy4
+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: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: HMIAndroid
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: OpenHarmony
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/UI/DaoYouPanel/DaoYouInfoPanel.prefab

@@ -61,7 +61,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -78,14 +78,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_daoyou_xingxiang_dengji_wenzi_di
+  _icon_name: dec_ty_jianbiandi2
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 0d383e80d99516a44a603bb1ccd73209, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
-    packName: daoyou
-    packgJsonPath: /Art/UIAssets/TextrueJson\daoyou.txt
-    packgSpritePath: Assets/Res/UIAtlas/daoyou.spriteatlasv2
-    lasetJsonGUID: edd8757281c361370f022860a59cdd97
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 129d2dfcaa346e2c98412e94b22ff390
   imageH: 100
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
@@ -1740,7 +1740,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1757,14 +1757,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_daoyou_xingxiang_dengji_wenzi_di
+  _icon_name: dec_ty_jianbiandi2
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 0d383e80d99516a44a603bb1ccd73209, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
-    packName: daoyou
-    packgJsonPath: /Art/UIAssets/TextrueJson\daoyou.txt
-    packgSpritePath: Assets/Res/UIAtlas/daoyou.spriteatlasv2
-    lasetJsonGUID: edd8757281c361370f022860a59cdd97
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 129d2dfcaa346e2c98412e94b22ff390
   imageH: 100
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
@@ -3495,7 +3495,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -3512,14 +3512,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_daoyou_xingxiang_dengji_wenzi_di
+  _icon_name: dec_ty_jianbiandi2
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 0d383e80d99516a44a603bb1ccd73209, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
-    packName: daoyou
-    packgJsonPath: /Art/UIAssets/TextrueJson\daoyou.txt
-    packgSpritePath: Assets/Res/UIAtlas/daoyou.spriteatlasv2
-    lasetJsonGUID: edd8757281c361370f022860a59cdd97
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 129d2dfcaa346e2c98412e94b22ff390
   imageH: 100
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
@@ -8729,7 +8729,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -8737,7 +8737,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_Sprite: {fileID: 0}
-  m_Type: 0
+  m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -8746,14 +8746,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_daoyou_xingxiang_dengji_wenzi_di
+  _icon_name: dec_ty_jianbiandi2
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 0d383e80d99516a44a603bb1ccd73209, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
-    packName: daoyou
-    packgJsonPath: /Art/UIAssets/TextrueJson\daoyou.txt
-    packgSpritePath: Assets/Res/UIAtlas/daoyou.spriteatlasv2
-    lasetJsonGUID: edd8757281c361370f022860a59cdd97
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 129d2dfcaa346e2c98412e94b22ff390
   imageH: 100
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}

Assets/Res/UI/DaoYouPanel/DaoYouWidget.prefab

@@ -514,6 +514,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Text_Level
+    gameObject: {fileID: 167346425644948474}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!114 &4309724099149842934
 MonoBehaviour:

Assets/Res/UI/DialoguePanel/DialogueBubblePanel.prefab

@@ -159,6 +159,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
     lasetJsonGUID: 9ac47f5fba5fc4d9c019e3c208c4513e
+  imageH: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -220,7 +221,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: 129, y: -20}
+  m_AnchoredPosition: {x: 129, y: -45}
   m_SizeDelta: {x: 230, y: 0}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &8563214976376415512
@@ -386,6 +387,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\event.txt
     packgSpritePath: Assets/Res/UIAtlas/event.spriteatlasv2
     lasetJsonGUID: df80f818a4f258d33b8038600af6f215
+  imageH: 55
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -553,6 +555,7 @@ MonoBehaviour:
     packgJsonPath: 
     packgSpritePath: 
     lasetJsonGUID: 
+  imageH: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}

Assets/Res/UI/DialoguePanel/DialogueOptionWidget.prefab

@@ -37,7 +37,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: 319.2129, y: -20.5}
+  m_AnchoredPosition: {x: 320.29395, y: -38}
   m_SizeDelta: {x: 628.4258, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5086374945530126731
@@ -69,19 +69,19 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 28
-    m_FontStyle: 0
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 35
+    m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 10
-    m_MaxSize: 40
+    m_MaxSize: 73
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 3121232131312123213131212
+  m_Text: 3121232131312123213131212312
 --- !u!114 &6116667400179102108
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -175,7 +175,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.7294118}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -192,7 +192,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: btn_01
+  _icon_name: dec_ty_juxing_dahu
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
@@ -304,7 +304,7 @@ MonoBehaviour:
     m_Right: 5
     m_Top: 5
     m_Bottom: 5
-  m_ChildAlignment: 0
+  m_ChildAlignment: 4
   m_Spacing: 0
   m_ChildForceExpandWidth: 1
   m_ChildForceExpandHeight: 1

Assets/Res/UI/DialoguePanel/DialoguePanel.prefab

@@ -504,7 +504,7 @@ RectTransform:
   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: 483}
+  m_AnchoredPosition: {x: 0, y: 429.3}
   m_SizeDelta: {x: 131, y: 14}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &1752607932964163169
@@ -546,7 +546,7 @@ MonoBehaviour:
     m_Right: 0
     m_Top: 14
     m_Bottom: 0
-  m_ChildAlignment: 7
+  m_ChildAlignment: 4
   m_Spacing: 21.66
   m_ChildForceExpandWidth: 1
   m_ChildForceExpandHeight: 1
@@ -590,8 +590,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -3.4999943, y: 14.6588}
-  m_SizeDelta: {x: 635.8, y: 242.2825}
+  m_AnchoredPosition: {x: 7.8427, y: -16.554604}
+  m_SizeDelta: {x: 652.723, y: 179.8556}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5302561503091161802
 CanvasRenderer:
@@ -614,7 +614,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_Color: {r: 0.5803922, g: 0.5803922, b: 0.5686275, a: 1}
   m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -622,9 +622,9 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: a61334e31cf014203a72ff5de1c54c27, type: 3}
-    m_FontSize: 24
-    m_FontStyle: 0
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 28
+    m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 40
@@ -804,8 +804,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 40.2, y: -145.58}
-  m_SizeDelta: {x: 204.8788, y: 54.4193}
+  m_AnchoredPosition: {x: 42.7, y: -1301.9}
+  m_SizeDelta: {x: 252.6799, y: 63.2714}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &3547886679702880668
 CanvasRenderer:
@@ -837,12 +837,12 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 29
+    m_FontSize: 37
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 10
-    m_MaxSize: 40
-    m_Alignment: 6
+    m_MaxSize: 44
+    m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
@@ -879,6 +879,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 1312387393509469673}
   - {fileID: 311482651042689352}
   - {fileID: 3275273584098972649}
   - {fileID: 5263293711959085783}
@@ -997,6 +998,82 @@ MonoBehaviour:
     isList: 0
     ListCollectorDatas: []
   isAssetBundle: 1
+--- !u!1 &5501269362975452296
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1312387393509469673}
+  - component: {fileID: 178105329784466801}
+  - component: {fileID: 3797594260735072966}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &1312387393509469673
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5501269362975452296}
+  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: 1803833552231621266}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 750, y: 1623}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &178105329784466801
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5501269362975452296}
+  m_CullTransparentMesh: 1
+--- !u!114 &3797594260735072966
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5501269362975452296}
+  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: 31bb4b0b944396d4a8e171dde3af154a, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &5657917399314919801
 GameObject:
   m_ObjectHideFlags: 0
@@ -1127,7 +1204,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
-  imageH: 0
+  imageH: 105.9872
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -1211,11 +1288,11 @@ RectTransform:
   - {fileID: 6614233195307115645}
   m_Father: {fileID: 3275273584098972649}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 357.7, y: -368.04102}
-  m_SizeDelta: {x: 685, y: 336.082}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 286.7114}
+  m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &6945069562181101411
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -1237,7 +1314,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.8980393, g: 0.8745099, b: 0.8196079, a: 1}
   m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1254,7 +1331,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_di_01
+  _icon_name: dec_juxing_fang
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
@@ -1303,7 +1380,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 299, y: -134}
+  m_AnchoredPosition: {x: 333.1, y: -120.48}
   m_SizeDelta: {x: 38, y: 28}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2729643428166531704
@@ -1798,10 +1875,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 3275273584098972649}
   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: 455.95898}
-  m_SizeDelta: {x: 34.599976, y: 1087.918}
+  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: 1358.2251, y: 2788.8887}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2437030225407380323
 CanvasRenderer:
@@ -1824,14 +1901,14 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 21300000, guid: 5e06f09e30985d44b816eb4ba5839a99, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1841,14 +1918,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: 
+  _icon_name: bg_xiulian
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 0}
   packInfo:
-    packName: 
-    packgJsonPath: 
-    packgSpritePath: 
-    lasetJsonGUID: 
+    packName: bg
+    packgJsonPath: /Art/UIAssets/TextrueJson/bg.txt
+    packgSpritePath: Assets/Res/UIAtlas/bg.spriteatlasv2
+    lasetJsonGUID: a8c60c0bafc6a50970ede1f51833bf09
   imageH: 1624
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
@@ -1940,7 +2017,7 @@ MonoBehaviour:
     packgJsonPath: 
     packgSpritePath: 
     lasetJsonGUID: 
-  imageH: 0
+  imageH: 1624
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -2187,14 +2264,15 @@ RectTransform:
   - {fileID: 5221273778027939417}
   - {fileID: 5617782115550842872}
   - {fileID: 3450449309247689875}
+  - {fileID: 6037835178821244997}
   - {fileID: 4876923545589450363}
   m_Father: {fileID: 1803833552231621266}
   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: 88}
-  m_SizeDelta: {x: 715.4, y: 536.08203}
-  m_Pivot: {x: 0.5, y: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &7792863436289110911
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2235,6 +2313,95 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 0
   m_VerticalFit: 2
+--- !u!1 &9062071681843881045
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6037835178821244997}
+  - component: {fileID: 2253655063094105127}
+  - component: {fileID: 8045742727328589985}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6037835178821244997
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9062071681843881045}
+  m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3275273584098972649}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -210.4, y: -521.7}
+  m_SizeDelta: {x: 76.8093, y: 272.673}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2253655063094105127
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9062071681843881045}
+  m_CullTransparentMesh: 1
+--- !u!114 &8045742727328589985
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9062071681843881045}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_xinjing_wenzi_di
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 129d2dfcaa346e2c98412e94b22ff390
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &9090904604107627365
 GameObject:
   m_ObjectHideFlags: 0
@@ -2253,7 +2420,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &5617782115550842872
 RectTransform:
   m_ObjectHideFlags: 0
@@ -2270,7 +2437,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: 375, y: 2.7180176}
+  m_AnchoredPosition: {x: 375, y: -1120}
   m_SizeDelta: {x: 304.0769, y: 405.4359}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7774198419232979247

Assets/Res/UI/DialoguePanel/剧情1.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: DHtN5y7/UymUBAwZQPlSyarZHqZC/mSvXkJHmdroN5466KToneTp0Q0WaCbC
+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: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: HMIAndroid
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: OpenHarmony
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/UI/DivineSence/DivineSenceInfoBtnWidget.prefab

@@ -293,13 +293,14 @@ RectTransform:
   m_Children:
   - {fileID: 1210481472512527899}
   - {fileID: 8115934941119590487}
+  - {fileID: 7829594341012787606}
   - {fileID: 1538816196695707703}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 48.4442, y: 48.4442}
+  m_SizeDelta: {x: 87, y: 87}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &5650926104719368414
 CanvasRenderer:
@@ -419,4 +420,98 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Icon_ShenIcon
+    gameObject: {fileID: 7829594341012787606}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
+--- !u!1 &7870696938869026474
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7829594341012787606}
+  - component: {fileID: 5212170371116405064}
+  - component: {fileID: 8775125306476010038}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_ShenIcon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7829594341012787606
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7870696938869026474}
+  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: 7812643512891689521}
+  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.0000076293945, y: 0}
+  m_SizeDelta: {x: 59.171, y: 59.1709}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5212170371116405064
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7870696938869026474}
+  m_CullTransparentMesh: 1
+--- !u!114 &8775125306476010038
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7870696938869026474}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_ty_ziyuan1
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 129d2dfcaa346e2c98412e94b22ff390
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0

Assets/Res/UI/DivineSence/DivineSenceItemPanel.prefab

@@ -1,5 +1,73 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &198148066550838196
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5061389632054125975}
+  - component: {fileID: 3249463790938390749}
+  - component: {fileID: 8311798467361151430}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: toogleList
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5061389632054125975
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 198148066550838196}
+  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: 7857197774275572282}
+  - {fileID: 6362304510319692790}
+  m_Father: {fileID: 5852862441037819201}
+  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: -72.68805, y: 236.08755}
+  m_SizeDelta: {x: 361.2239, y: 58.0248}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3249463790938390749
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 198148066550838196}
+  m_CullTransparentMesh: 1
+--- !u!114 &8311798467361151430
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 198148066550838196}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: eb5ebcd40411455c96935cb00dbfcf1e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  lastSelectObj: {fileID: 0}
+  isRepeatHind: 0
+  isRDefaultShow: 0
+  index: -1
+  childObj:
+  - {fileID: 3310038844506836782}
+  - {fileID: 1778556041660004066}
+  _allChildObj: []
 --- !u!1 &650584255987892480
 GameObject:
   m_ObjectHideFlags: 0
@@ -68,6 +136,21 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: toogleList
+    gameObject: {fileID: 8311798467361151430}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Btn_GaiLv
+    gameObject: {fileID: 1342822691304209320}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Btn_ZuiZhong
+    gameObject: {fileID: 2874290103563485796}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &1610468003939772099
 GameObject:
@@ -102,6 +185,7 @@ RectTransform:
   m_Children:
   - {fileID: 8842124393281780795}
   - {fileID: 2708046515207152597}
+  - {fileID: 5061389632054125975}
   - {fileID: 5866622043385976589}
   m_Father: {fileID: 8599819629026832582}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -367,8 +451,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: -15.9656}
-  m_SizeDelta: {x: 497.8617, y: 444.1218}
+  m_AnchoredPosition: {x: 0, y: -58.851562}
+  m_SizeDelta: {x: 497.8617, y: 529.825}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3793524203819905834
 CanvasRenderer:
@@ -830,3 +914,267 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 0
   m_VerticalFit: 2
+--- !u!1001 &6273587929810223113
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 5061389632054125975}
+    m_Modifications:
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 158.6238
+      objectReference: {fileID: 0}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 51.4315
+      objectReference: {fileID: 0}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 246
+      objectReference: {fileID: 0}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 30.124756
+      objectReference: {fileID: 0}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4360649484400356509, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_Text
+      value: "\u8FFD\u8E2A"
+      objectReference: {fileID: 0}
+    - target: {fileID: 5319170196061798649, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_Name
+      value: Btn_ZuiZhong
+      objectReference: {fileID: 0}
+    - target: {fileID: 5746295913924572907, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: isScriptControl
+      value: 1
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+--- !u!114 &1778556041660004066 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 5746295913924572907, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+  m_PrefabInstance: {fileID: 6273587929810223113}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 09a9a136688f46fbb2a843418fc53144, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &2874290103563485796 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 8139065990980223597, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+  m_PrefabInstance: {fileID: 6273587929810223113}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!224 &6362304510319692790 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+  m_PrefabInstance: {fileID: 6273587929810223113}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &7084566262572104133
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 5061389632054125975}
+    m_Modifications:
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 158.6238
+      objectReference: {fileID: 0}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 51.4315
+      objectReference: {fileID: 0}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 85.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 30.124756
+      objectReference: {fileID: 0}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4360649484400356509, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_Text
+      value: "\u6982\u7387"
+      objectReference: {fileID: 0}
+    - target: {fileID: 5319170196061798649, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_Name
+      value: Btn_GaiLv
+      objectReference: {fileID: 0}
+    - target: {fileID: 5746295913924572907, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: isScriptControl
+      value: 1
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+--- !u!114 &1342822691304209320 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 8139065990980223597, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+  m_PrefabInstance: {fileID: 7084566262572104133}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &3310038844506836782 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 5746295913924572907, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+  m_PrefabInstance: {fileID: 7084566262572104133}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 09a9a136688f46fbb2a843418fc53144, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!224 &7857197774275572282 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+  m_PrefabInstance: {fileID: 7084566262572104133}
+  m_PrefabAsset: {fileID: 0}

Assets/Res/UI/DivineSence/ShengShiEventWidgetType2.prefab

@@ -147,8 +147,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -7.5, y: 50.5}
-  m_SizeDelta: {x: 629.5898, y: 29.6509}
+  m_AnchoredPosition: {x: -40.26007, y: 50.5}
+  m_SizeDelta: {x: 564.0696, y: 29.6509}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2062974483703860703
 CanvasRenderer:
@@ -914,7 +914,6 @@ RectTransform:
   - {fileID: 6639653483637829207}
   - {fileID: 1007467258602941415}
   - {fileID: 2080350128756554473}
-  - {fileID: 1926551284965162357}
   m_Father: {fileID: 3370061335406075943}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -1346,7 +1345,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -9.799988, y: -5.4881973}
+  m_AnchoredPosition: {x: -11.700012, y: -10}
   m_SizeDelta: {x: 28, y: 29}
   m_Pivot: {x: 1, y: 1}
 --- !u!222 &8916865937304356244
@@ -1475,11 +1474,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3764721290890148754}
+  m_Father: {fileID: 7566769296908980725}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -165.7, y: -11.5}
+  m_AnchoredPosition: {x: -88.17052, y: -3.0117188}
   m_SizeDelta: {x: 25, y: 26}
   m_Pivot: {x: 1, y: 1}
 --- !u!222 &5844111507754799144
@@ -1952,7 +1951,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: -24.204}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 301.9, y: 105.8}
+  m_AnchoredPosition: {x: 307.4, y: 108.4}
   m_SizeDelta: {x: 104.2876, y: 38.2108}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3700033355154013030
@@ -2036,7 +2035,8 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 1926551284965162357}
   m_Father: {fileID: 3764721290890148754}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}

Assets/Res/UI/LevelChoosePanel/Places/PengLaiDaoPlacesPanel.prefab

@@ -603,9 +603,21 @@ PrefabInstance:
       propertyPath: imageH
       value: 149.7444
       objectReference: {fileID: 0}
+    - target: {fileID: 5226224395191220938, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: -175.6729
+      objectReference: {fileID: 0}
+    - target: {fileID: 5226224395191220938, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 181.1626
+      objectReference: {fileID: 0}
     - target: {fileID: 5226224395191220938, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: -139
+      value: 0.548996
+      objectReference: {fileID: 0}
+    - target: {fileID: 5226224395191220938, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 1.0979004
       objectReference: {fileID: 0}
     - target: {fileID: 6200425982828528602, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
       propertyPath: m_Name

Assets/Res/UI/MainPanel/MainPanel.prefab

@@ -473,7 +473,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &6989282849120352285
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1051,6 +1051,7 @@ GameObject:
   - component: {fileID: 8449163745382179136}
   - component: {fileID: 2298873888804225080}
   - component: {fileID: 5407159726911301663}
+  - component: {fileID: 4259804586481753930}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text_ExplorationProgress
@@ -1076,7 +1077,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 1.3578, y: -45.1}
-  m_SizeDelta: {x: 161.8208, y: 30.6732}
+  m_SizeDelta: {x: 0, y: 30.6732}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8449163745382179136
 CanvasRenderer:
@@ -1135,6 +1136,20 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!114 &4259804586481753930
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2612461740519665566}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
 --- !u!1 &2746795842072799363
 GameObject:
   m_ObjectHideFlags: 0
@@ -1575,7 +1590,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &5739472452241556578
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1727,7 +1742,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: -55, y: 344}
+  m_AnchoredPosition: {x: -49.7, y: 343.6}
   m_SizeDelta: {x: 56.486206, y: 56.4862}
   m_Pivot: {x: 1, y: 0}
 --- !u!222 &5437042110972805642
@@ -1760,7 +1775,7 @@ MonoBehaviour:
       m_Calls: []
   m_Sprite: {fileID: 0}
   m_Type: 0
-  m_PreserveAspect: 0
+  m_PreserveAspect: 1
   m_FillCenter: 1
   m_FillMethod: 4
   m_FillAmount: 1
@@ -1768,14 +1783,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_touxiang
+  _icon_name: icon_shenshifu
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: bec1e4479c1593746876da07861f4d67, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 77f77eea85838ad4b8734050364b4892, type: 3}
   packInfo:
-    packName: mainUI
-    packgJsonPath: /Art/UIAssets/TextrueJson\mainUI.txt
-    packgSpritePath: Assets/Res/UIAtlas/mainUI.spriteatlasv2
-    lasetJsonGUID: e1c5b270b3ca9ddf87be5864ad756cc0
+    packName: daoju
+    packgJsonPath: /Art/UIAssets/TextrueJson\daoju.txt
+    packgSpritePath: Assets/Res/UIAtlas/daoju.spriteatlasv2
+    lasetJsonGUID: 6e42cc1f96a3da679f0602631c62812a
   imageH: 56.4862
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}

Assets/Res/UI/ShopPanel/EnergyWidget.prefab

@@ -32,12 +32,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 1
   m_Children: []
-  m_Father: {fileID: 6527561963321663096}
+  m_Father: {fileID: 6618987967785114178}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: 15.8, y: 3.3}
-  m_SizeDelta: {x: 52, y: 52}
+  m_AnchoredPosition: {x: -15.3, y: 0.000024319}
+  m_SizeDelta: {x: 17.3661, y: 20.8393}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5365322635743840051
 CanvasRenderer:
@@ -104,7 +104,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.9960785, g: 0.7607844, b: 0.3529412, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -121,7 +121,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_ziyuanjia
+  _icon_name: dec_fuhao_jia
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
@@ -169,8 +169,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 5.3, y: 0}
-  m_SizeDelta: {x: 85, y: 44.694}
+  m_AnchoredPosition: {x: 1.9105, y: 0}
+  m_SizeDelta: {x: 104.9, y: 44.694}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4830072340555722385
 CanvasRenderer:
@@ -246,7 +246,6 @@ RectTransform:
   m_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 6618987967785114178}
-  - {fileID: 3010089067676543759}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -328,8 +327,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -71.7, y: 3}
-  m_SizeDelta: {x: 79.4773, y: 84.2935}
+  m_AnchoredPosition: {x: -66.7, y: 1.2}
+  m_SizeDelta: {x: 34.4441, y: 36.5312}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4099161695515857595
 CanvasRenderer:
@@ -476,12 +475,13 @@ RectTransform:
   m_Children:
   - {fileID: 8519055793353954361}
   - {fileID: 6554596081216309278}
+  - {fileID: 3010089067676543759}
   m_Father: {fileID: 6527561963321663096}
   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: 16.5, y: 4.1}
-  m_SizeDelta: {x: 176, y: 50}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 147.9615, y: 25}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5984184458604740083
 CanvasRenderer:
@@ -548,7 +548,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.1137255, g: 0.10980393, b: 0.10588236, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -556,7 +556,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_Sprite: {fileID: 0}
-  m_Type: 0
+  m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -565,14 +565,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_ziyuandi
+  _icon_name: dec_xiulianTiaoDi
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 192194a01f8a35742b246abac6b340ca, type: 3}
   packInfo:
-    packName: tongyong
-    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
-    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
-    lasetJsonGUID: 8de890b954c861b7d182629dcafc0d3a
+    packName: jingjie
+    packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
+    packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
+    lasetJsonGUID: a5790df98a45a640721da3160fc31d51
   imageH: 50
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}

Assets/Res/UI/ShopPanel/ShopBtnWidget.prefab

@@ -366,10 +366,10 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 40
+    m_FontSize: 30
     m_FontStyle: 1
     m_BestFit: 0
-    m_MinSize: 10
+    m_MinSize: 3
     m_MaxSize: 40
     m_Alignment: 4
     m_AlignByGeometry: 0
@@ -377,4 +377,4 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u795E\u7AE5"
+  m_Text: "\u795E\u7AE5\u795E\u7AE5"

Assets/Res/UI/SkillInfopanel.prefab

@@ -32,7 +32,6 @@ RectTransform:
   m_Children:
   - {fileID: 3960169911326494192}
   - {fileID: 1490485299211484798}
-  - {fileID: 1957297708681738173}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -147,9 +146,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 1957297708681738173}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 190, y: -36}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 38, y: 36}
   m_Pivot: {x: 1, y: 0}
 --- !u!222 &4838683765843384993
@@ -238,8 +237,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 7.600006, y: -135.6}
-  m_SizeDelta: {x: 157.3905, y: 30.1278}
+  m_AnchoredPosition: {x: 43.3, y: -181.7}
+  m_SizeDelta: {x: 268.5818, y: 34.9178}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &986468789992764445
 CanvasRenderer:
@@ -262,7 +261,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.62352943, g: 0.6156863, b: 0.58431375, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -270,9 +269,9 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 22
-    m_FontStyle: 0
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 26
+    m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
@@ -316,9 +315,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 1957297708681738173}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 152, y: -36}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 38, y: 36}
   m_Pivot: {x: 1, y: 0}
 --- !u!222 &1116566506475113699
@@ -408,6 +407,7 @@ RectTransform:
   - {fileID: 6122583032657971884}
   - {fileID: 8822711238517633434}
   - {fileID: 8697082098443950979}
+  - {fileID: 1957297708681738173}
   - {fileID: 1830281469280455044}
   - {fileID: 4669283478158613189}
   m_Father: {fileID: 4480049515833029494}
@@ -415,7 +415,7 @@ RectTransform:
   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: 418.1019, y: 467.3293}
+  m_SizeDelta: {x: 478.2334, y: 561.0347}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3771240254086539797
 CanvasRenderer:
@@ -438,7 +438,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.04705883, g: 0.07058824, b: 0.09411766, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.8862745}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -455,14 +455,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: btn_Round09
+  _icon_name: dec_juxing_fang_hujiao
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 23f1ff3af41427347a63b9cc35608247, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
-    packName: all
-    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
-    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: 9ac47f5fba5fc4d9c019e3c208c4513e
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 129d2dfcaa346e2c98412e94b22ff390
   imageH: 244.2
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
@@ -504,8 +504,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -4.100006, y: -5.800003}
-  m_SizeDelta: {x: 68.4427, y: 30.4571}
+  m_AnchoredPosition: {x: -6.3009033, y: -6.2206116}
+  m_SizeDelta: {x: 130.7942, y: 38.715}
   m_Pivot: {x: 1, y: 1}
 --- !u!222 &4320320176099817450
 CanvasRenderer:
@@ -528,7 +528,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.85098046, g: 0.7058824, b: 0.36078432, a: 1}
+  m_Color: {r: 0.20784315, g: 0.34117648, b: 0.3803922, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -536,7 +536,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_Sprite: {fileID: 0}
-  m_Type: 0
+  m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -545,14 +545,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: 
+  _icon_name: dec_juxing_fang_hujiao
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 0}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
-    packName: 
-    packgJsonPath: 
-    packgSpritePath: 
-    lasetJsonGUID: 
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 129d2dfcaa346e2c98412e94b22ff390
   imageH: 100
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
@@ -593,7 +593,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0.0000076293945, y: 0}
+  m_AnchoredPosition: {x: 0.000015258789, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6658018418359927563
@@ -625,9 +625,9 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 16
-    m_FontStyle: 0
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 34
+    m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
@@ -673,8 +673,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -21.5, y: 194.2}
-  m_SizeDelta: {x: 141.4118, y: 44.8777}
+  m_AnchoredPosition: {x: -19.7, y: 214.9}
+  m_SizeDelta: {x: 169.9389, y: 44.8777}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3878207609747309761
 CanvasRenderer:
@@ -697,7 +697,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.7843138, g: 0.8352942, b: 0.53333336, a: 1}
+  m_Color: {r: 0.5058824, g: 0.4784314, b: 0.34901962, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -706,8 +706,8 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 28
-    m_FontStyle: 0
+    m_FontSize: 34
+    m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 40
@@ -737,7 +737,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &1957297708681738173
 RectTransform:
   m_ObjectHideFlags: 0
@@ -755,12 +755,12 @@ RectTransform:
   - {fileID: 4331291220573204548}
   - {fileID: 2726941946761920848}
   - {fileID: 6224201304652063395}
-  m_Father: {fileID: 4480049515833029494}
+  m_Father: {fileID: 1490485299211484798}
   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: -184.7, y: 923.7}
-  m_SizeDelta: {x: 190, y: 30.610802}
+  m_AnchoredPosition: {x: -157.7, y: 413.4}
+  m_SizeDelta: {x: 0, y: 30.610802}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &2150958618498772244
 CanvasRenderer:
@@ -869,7 +869,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.62352943, g: 0.6156863, b: 0.58431375, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -877,9 +877,9 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 16
-    m_FontStyle: 0
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 26
+    m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
@@ -925,7 +925,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -13.400002, y: 144.9}
+  m_AnchoredPosition: {x: -28.5, y: 171.7}
   m_SizeDelta: {x: 141.4118, y: 44.8777}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7641072684813566097
@@ -949,7 +949,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.6, g: 0.6509804, b: 0.68235296, a: 1}
+  m_Color: {r: 0.62352943, g: 0.6156863, b: 0.58431375, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -958,8 +958,8 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 24
-    m_FontStyle: 0
+    m_FontSize: 28
+    m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 40
@@ -1124,11 +1124,11 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 1490485299211484798}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 418.1, y: 127.9363}
-  m_Pivot: {x: 0, y: 1}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 117.120834}
+  m_SizeDelta: {x: 414.7504, y: 2.7925}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7681446096203755470
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -1150,7 +1150,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.09411766, g: 0.14509805, b: 0.18039216, a: 1}
+  m_Color: {r: 0.3529412, g: 0.2901961, b: 0.27450982, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1167,14 +1167,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: btn_Round09
+  _icon_name: dec_juxing_fang
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 23f1ff3af41427347a63b9cc35608247, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
-    packName: all
-    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
-    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: 9ac47f5fba5fc4d9c019e3c208c4513e
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 129d2dfcaa346e2c98412e94b22ff390
   imageH: 66.495
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
@@ -1213,9 +1213,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 1957297708681738173}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 76, y: -36}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 38, y: 36}
   m_Pivot: {x: 1, y: 0}
 --- !u!222 &3441310019887674539
@@ -1302,9 +1302,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 1957297708681738173}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 38, y: -36}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 38, y: 36}
   m_Pivot: {x: 1, y: 0}
 --- !u!222 &4272992708527523052
@@ -1417,7 +1417,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.62352943, g: 0.6156863, b: 0.58431375, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1425,11 +1425,11 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 20
-    m_FontStyle: 0
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 26
+    m_FontStyle: 1
     m_BestFit: 0
-    m_MinSize: 2
+    m_MinSize: 1
     m_MaxSize: 40
     m_Alignment: 0
     m_AlignByGeometry: 0
@@ -1437,7 +1437,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: New TextNew TextNew TextNew TextNew TextNew TextNew Text
+  m_Text: "\u4EBA\u9020\u6210"
 --- !u!1 &6257049415626519749
 GameObject:
   m_ObjectHideFlags: 0
@@ -1476,8 +1476,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 14.9, y: -176.2}
-  m_SizeDelta: {x: 387.8113, y: 0}
+  m_AnchoredPosition: {x: 30.289, y: -226.8}
+  m_SizeDelta: {x: 427.6196, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &8454407626879801666
 CanvasRenderer:
@@ -1560,9 +1560,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 1957297708681738173}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 114, y: -36}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 38, y: 36}
   m_Pivot: {x: 1, y: 0}
 --- !u!222 &6672657082940570505
@@ -1651,7 +1651,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: 14.6, y: -19.4}
+  m_AnchoredPosition: {x: 38.1, y: -43.179}
   m_SizeDelta: {x: 83, y: 83}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &117020735489117837

Assets/Res/UI/SkillSelectPanel/Btn_UpStar.prefab

@@ -176,6 +176,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: d4e5a262b3976e33870ab7190f3a5bdb
+  imageH: 80
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -323,7 +324,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 126.5, y: -40}
-  m_SizeDelta: {x: 132, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &125408759325352028
 CanvasRenderer:

Assets/Res/UI/SkillSelectPanel/SkillSelectPanel.prefab

@@ -130,7 +130,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
     packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
     lasetJsonGUID: 6f6d3dad490d22d3028cfa941e8122a5
-  imageH: 0
+  imageH: 64.1194
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -264,7 +264,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
-  imageH: 0
+  imageH: 84
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -1509,7 +1509,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
     packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
     lasetJsonGUID: 6f6d3dad490d22d3028cfa941e8122a5
-  imageH: 0
+  imageH: 47
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -2034,7 +2034,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\mainUI.txt
     packgSpritePath: Assets/Res/UIAtlas/mainUI.spriteatlasv2
     lasetJsonGUID: bb67f442413bd755b03774cb7d5a173d
-  imageH: 0
+  imageH: 109.1089
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -5671,7 +5671,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
-  imageH: 0
+  imageH: 74
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}

Assets/Res/UI/TipMessagePanel/TipMessagePanel.prefab

@@ -103,13 +103,14 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 8617602873264636042}
   m_Father: {fileID: 6582327781870859720}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 378, y: 144.5}
+  m_SizeDelta: {x: 378, y: 83.3183}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &607144206561970494
 CanvasRenderer:
@@ -132,7 +133,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.30588236, g: 0.42352945, b: 0.37254903, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -149,7 +150,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_dadi_02
+  _icon_name: dec_juxing_fang_hujiao
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
@@ -157,6 +158,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
+  imageH: 144.5
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -282,6 +284,95 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &5318766287457603745
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8617602873264636042}
+  - component: {fileID: 8441070473825213442}
+  - component: {fileID: 4953259690303593532}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: bg_icon (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8617602873264636042
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5318766287457603745}
+  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: 6908189256873560321}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0.020126343, y: -0.05529785}
+  m_SizeDelta: {x: -8.092957, y: -6.725498}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8441070473825213442
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5318766287457603745}
+  m_CullTransparentMesh: 1
+--- !u!114 &4953259690303593532
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5318766287457603745}
+  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.9058824, g: 0.882353, b: 0.82745105, 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_juxing_fang_hujiao
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
+  imageH: 144.5
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &5357924637379588896
 GameObject:
   m_ObjectHideFlags: 0
@@ -356,7 +447,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -1.1, y: 3.3}
+  m_AnchoredPosition: {x: -1.1, y: 0}
   m_SizeDelta: {x: 342.3, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1634987077912709362
@@ -380,7 +471,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_Color: {r: 0.49411768, g: 0.5137255, b: 0.48235297, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -388,9 +479,9 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: bb5b55cc5861a4951990bcc1caccc50e, type: 3}
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 18
-    m_FontStyle: 0
+    m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40

Assets/Res/UI/战斗详情-技能效果.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: Wy4dtH/4UC95iB24STD5AQqVaRNjiZTSuk9VQz28RLr737t+5R6btWqRS4OQ
+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: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: HMIAndroid
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: OpenHarmony
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/UIAtlas/tongyong.spriteatlasv2

@@ -83,6 +83,7 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: b8390464696c712499e852112d209bce, type: 3}
     - {fileID: 2800000, guid: a9ae15faa104add4ca6c307cbf92705e, type: 3}
     - {fileID: 2800000, guid: 4e62c976efb31884db06b06e96f003b1, type: 3}
+    - {fileID: 2800000, guid: bf26621577f885940b01f88716447a8b, type: 3}
     - {fileID: 2800000, guid: f596587448fca754b958dee86ccbcaf7, type: 3}
     - {fileID: 2800000, guid: abb710a638b53dd46a643139c8216358, type: 3}
     - {fileID: 2800000, guid: 99b0a1fe472cb4343b017d299afc6171, type: 3}

Assets/Scenes/testCombat.scene

@@ -2337,7 +2337,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 9214784224709271120, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []

Assets/Scripts/GameLogic/Player/PlayerManager.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
@@ -14,6 +15,7 @@ using GameLogic.Hero;
 using GameLogic.Player;
 using UnityEngine;
 using Utility;
+using Random = UnityEngine.Random;
 
 public class PlayerManager : Singleton<PlayerManager>
 {
@@ -41,7 +43,7 @@ public class PlayerManager : Singleton<PlayerManager>
         set { currentPlaces = value; }
     }
 
-    public float PlacesBl => GetMapBl(CurrentPlaces.id);
+    public float PlacesBl =>  GetMapBl(CurrentPlaces.id);
 
     private TimerEntity _timerEntity;
 
@@ -282,7 +284,7 @@ public class PlayerManager : Singleton<PlayerManager>
             return 0;
         }
 
-        return ((float)placesData.progress / placesConfig.TotalScore) * 100;
+        return (float)Math.Round(((float)placesData.progress / placesConfig.TotalScore) * 100, 1);
         // AccountFileInfo.Instance.playerData.completeEvents.Where(ce =>placesConfig.MainTaskID.Contains(ce.eventID) || placesConfig.ZhixianID.Contains(ce.eventID) || placesConfig.ZhixianID.Contains(ce.1001
         // ))
     }

Assets/Scripts/GameUI/UI/AppBarPanel/AppBarPanel.cs

@@ -50,6 +50,26 @@ namespace Fort23.Mono
                 UIManager.Instance.HideUIUIPanel(currentOpenUIPanel);
                 // currentOpenUIPanel = null;
             });
+            Btn_Menu.onClick.AddListener(() =>
+            {
+                MenuRoot.SetActive(true);
+            });
+            Btn_Back1.onClick.AddListener(() =>
+            {
+                MenuRoot.SetActive(false);
+            });
+            
+            Btn_DaoYou.onClick.AddListener(() =>
+            {
+                DaoYouPanel.OpenPanel();
+                MenuRoot.SetActive(false);
+            });
+
+            Btn_Tower.onClick.AddListener(() =>
+            {
+                TowerPanel.OpenPanel(1);
+                MenuRoot.SetActive(false);
+            });
         }
 
         public async void Btn_Shop_Click()

Assets/Scripts/GameUI/UI/AppBarPanel/AppBarPanelData.cs

@@ -107,6 +107,61 @@ namespace Fort23.Mono
 	      return _Toggle_BtnRoot;
 	     }
 	   }
+	  private GameObject _MenuRoot;
+	  public GameObject MenuRoot
+	   {
+	   get{
+	      if (_MenuRoot == null)
+	       {
+	         _MenuRoot  = GetUIUnit<GameObject>("MenuRoot"); 
+	       }
+	      return _MenuRoot;
+	     }
+	   }
+	  private Button _Btn_Back1;
+	  public Button Btn_Back1
+	   {
+	   get{
+	      if (_Btn_Back1 == null)
+	       {
+	         _Btn_Back1  = GetUIUnit<Button>("Btn_Back1"); 
+	       }
+	      return _Btn_Back1;
+	     }
+	   }
+	  private Button _Btn_Menu;
+	  public Button Btn_Menu
+	   {
+	   get{
+	      if (_Btn_Menu == null)
+	       {
+	         _Btn_Menu  = GetUIUnit<Button>("Btn_Menu"); 
+	       }
+	      return _Btn_Menu;
+	     }
+	   }
+	  private Button _Btn_Tower;
+	  public Button Btn_Tower
+	   {
+	   get{
+	      if (_Btn_Tower == null)
+	       {
+	         _Btn_Tower  = GetUIUnit<Button>("Btn_Tower"); 
+	       }
+	      return _Btn_Tower;
+	     }
+	   }
+	  private Button _Btn_DaoYou;
+	  public Button Btn_DaoYou
+	   {
+	   get{
+	      if (_Btn_DaoYou == null)
+	       {
+	         _Btn_DaoYou  = GetUIUnit<Button>("Btn_DaoYou"); 
+	       }
+	      return _Btn_DaoYou;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/AppBarPanel/TitlePanel.cs

@@ -0,0 +1,97 @@
+using System.Collections.Generic;
+using Core.Language;
+using Fort23.Core;
+
+namespace Fort23.Mono
+{
+    [UIBinding(prefab = "TitlePanel")]
+    public partial class TitlePanel : UIPanel
+    {
+        List<EnergyWidget> widgets = new List<EnergyWidget>();
+
+        private void Init()
+        {
+        }
+
+        protected override void AddEvent()
+        {
+        }
+
+        protected override void DelEvent()
+        {
+        }
+
+        public override void AddButtonEvent()
+        {
+        }
+
+        public async static CTask<TitlePanel> OpenPanel(List<int> items)
+        {
+            TitlePanel appBarPanel = null;
+            if (UIManager.Instance.GetComponent<TitlePanel>() == null)
+            {
+                appBarPanel = await UIManager.Instance.LoadAndOpenPanel<TitlePanel>(null, UILayer.Top, isFocus: false);
+            }
+            else
+            {
+                appBarPanel = UIManager.Instance.GetComponent<TitlePanel>();
+                await appBarPanel.Show();
+            }
+
+            await appBarPanel.CustomInit(items);
+            return appBarPanel;
+        }
+
+        public async CTask CustomInit(List<int> items)
+        {
+            foreach (var energyWidget in widgets)
+            {
+                UIManager.Instance.DormancyGComponent(energyWidget);
+            }
+
+            widgets.Clear();
+            Text_JingJie.text =
+                LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[0]) +
+                LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[1]) +
+                LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[2]);
+
+            Slider_Exp.maxValue = PlayerManager.Instance.myHero.powerUpConfig.levelUpExp;
+
+            foreach (var item in items)
+            {
+                EnergyWidget energyWidget =
+                    await UIManager.Instance.CreateGComponent<EnergyWidget>(null, Group_ResourceBar);
+                energyWidget.CustomInit(item);
+                widgets.Add(energyWidget);
+            }
+        }
+
+
+        [CustomMethod(CustomMethodType.Update)]
+        public void Update()
+        {
+            int currentMiao = (int)((TimeHelper.ClientNow() - PlayerManager.Instance.myHero.heroData.upTime) / 1000);
+
+            float allexp = currentMiao * PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei;
+
+            Slider_Exp.value = PlayerManager.Instance.myHero.heroData.exp + allexp;
+        }
+
+        public async static CTask ClosePanel()
+        {
+            UIManager.Instance.GetComponent<TitlePanel>()?.Hide();
+        }
+
+        public override void Hide()
+        {
+            foreach (var energyWidget in widgets)
+            {
+                UIManager.Instance.DormancyGComponent(energyWidget);
+            }
+
+            widgets.Clear();
+
+            base.Hide();
+        }
+    }
+}

Assets/Scripts/GameUI/UI/AppBarPanel/TitlePanel.cs.meta

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

Assets/Scripts/GameUI/UI/AppBarPanel/TitlePanelData.cs

@@ -0,0 +1,51 @@
+using Fort23.Core;
+using Fort23.UTool;
+using UnityEngine.UI;
+using UnityEngine;
+using System.Collections.Generic;
+namespace Fort23.Mono
+{
+	public partial class TitlePanel 
+	{
+	  #region 自定义数据 
+	  private Text _Text_JingJie;
+	  public Text Text_JingJie
+	   {
+	   get{
+	      if (_Text_JingJie == null)
+	       {
+	         _Text_JingJie  = GetUIUnit<Text>("Text_JingJie"); 
+	       }
+	      return _Text_JingJie;
+	     }
+	   }
+	  private Slider _Slider_Exp;
+	  public Slider Slider_Exp
+	   {
+	   get{
+	      if (_Slider_Exp == null)
+	       {
+	         _Slider_Exp  = GetUIUnit<Slider>("Slider_Exp"); 
+	       }
+	      return _Slider_Exp;
+	     }
+	   }
+	  private RectTransform _Group_ResourceBar;
+	  public RectTransform Group_ResourceBar
+	   {
+	   get{
+	      if (_Group_ResourceBar == null)
+	       {
+	         _Group_ResourceBar  = GetUIUnit<RectTransform>("Group_ResourceBar"); 
+	       }
+	      return _Group_ResourceBar;
+	     }
+	   }
+	  #endregion 自定义数据结束 
+	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
+	{
+	 await base.SetUIGameObject(gObjectPoolInterface);
+	 Init();
+	}
+	}
+}

Assets/Scripts/GameUI/UI/AppBarPanel/TitlePanelData.cs.meta

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

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouPanel.cs

@@ -29,6 +29,7 @@ namespace Fort23.Mono
         
         public override CTask GetFocus()
         {
+            TitlePanel.ClosePanel();
             AppBarPanel.OpenPanel(this);
             return base.GetFocus();
         }

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouWidget.cs

@@ -37,6 +37,8 @@ namespace Fort23.Mono
 
             Text_Name.text = LanguageManager.Instance.Text(_daoyouModelConfig.name);
 
+            Text_Level.text = _daoYouData.favorabilityLv.ToString();
+
 
             if (_daoYouData == null)
             {

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouWidgetData.cs

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

Assets/Scripts/GameUI/UI/DivineSence/DivineSenceEventPreviewPanel.cs

@@ -26,7 +26,6 @@ namespace Fort23.Mono
             isAddStack = true;
         }
 
-   
 
         public override CTask GetFocus()
         {
@@ -35,7 +34,7 @@ namespace Fort23.Mono
             AppBarPanel.OpenPanel(this);
             return base.GetFocus();
         }
-        
+
         protected override void AddEvent()
         {
             EventManager.Instance.AddEventListener(CustomEventType.RemoveEvent, RemoveEvent);
@@ -63,7 +62,7 @@ namespace Fort23.Mono
                 if (saixuanType == 1)
                     return;
                 saixuanType = 1;
-                toggleList.ShowTargetIndex(0);
+
                 UpdateContent();
             });
 
@@ -72,7 +71,7 @@ namespace Fort23.Mono
                 if (saixuanType == 2)
                     return;
                 saixuanType = 2;
-                toggleList.ShowTargetIndex(1);
+
                 UpdateContent();
             });
         }
@@ -103,6 +102,7 @@ namespace Fort23.Mono
             //神识
             if (saixuanType == 1)
             {
+                toggleList.ShowTargetIndex(0);
                 TitleRoot.SetActive(true);
                 Rect_Sv.sizeDelta = new Vector2(718.82f, 865.36f);
                 Rect_Sv.anchoredPosition = new Vector2(2.61f, -126.23f);
@@ -119,6 +119,7 @@ namespace Fort23.Mono
             //道友
             else
             {
+                toggleList.ShowTargetIndex(1);
                 UIManager.Instance.DormancyGComponent(mainShengShiEventWidgetType2);
                 mainShengShiEventWidgetType2 = null;
                 TitleRoot.SetActive(false);
@@ -142,7 +143,7 @@ namespace Fort23.Mono
             if (a.isCompleted && !b.isCompleted)
                 return 1;
             if (!a.isCompleted && b.isCompleted)
-                return -11;
+                return -1;
             return 0;
         }
 

Assets/Scripts/GameUI/UI/DivineSence/DivineSenceInfoBtnWidget.cs

@@ -31,7 +31,8 @@ namespace Fort23.Mono
 
             if (type == 1)
             {
-                Icon_ItemIcon.gameObject.SetActive(transform);
+                Icon_ItemIcon.gameObject.SetActive(false);
+                Icon_ShenIcon.gameObject.SetActive(true);
                 // Icon_ItemIcon.icon_name = ItemInfo.config.icon;
                 Text_ItemCount.text = $"{100 * 1}/{AccountFileInfo.Instance.playerData.divineSensePoint}";
             }
@@ -41,12 +42,14 @@ namespace Fort23.Mono
                 {
                     ItemInfo = null;
                     Icon_ItemIcon.gameObject.SetActive(false);
+                    Icon_ShenIcon.gameObject.SetActive(false);
                     Text_ItemCount.text = "";
                 }
                 else
                 {
                     ItemInfo = PlayerManager.Instance.BagController.GetItemInfo(id);
                     Icon_ItemIcon.gameObject.SetActive(transform);
+                    Icon_ShenIcon.gameObject.SetActive(false);
                     Icon_ItemIcon.icon_name = ItemInfo.config.icon;
                     Text_ItemCount.text = $"{1}/{ItemInfo.count.Value.ToString()}";
                 }

Assets/Scripts/GameUI/UI/DivineSence/DivineSenceInfoBtnWidgetData.cs

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

Assets/Scripts/GameUI/UI/DivineSence/DivineSenceInfoPanel.cs

@@ -125,7 +125,15 @@ namespace Fort23.Mono
             DivineSenceInfoBtnWidget divineSenceInfoBtnWidget = obj as DivineSenceInfoBtnWidget;
             if (divineSenceInfoBtnWidget.type == 1)
                 return;
-            DivineSenceItemPanel.OpenPanel(divineSenceInfoBtnWidget.ItemInfo, (id) =>
+            List<int> selectType = new List<int>();
+            foreach (var senceInfoBtnWidget in _divineSenceInfoBtnWidgets)
+            {
+                if (senceInfoBtnWidget != divineSenceInfoBtnWidget && senceInfoBtnWidget.type != 1 && senceInfoBtnWidget.ItemInfo != null)
+                {
+                    selectType.Add(senceInfoBtnWidget.ItemInfo.config.associateID);
+                }
+            }
+            DivineSenceItemPanel.OpenPanel(divineSenceInfoBtnWidget.ItemInfo,selectType, (id) =>
                 {
                     divineSenceInfoBtnWidget.CustomInit(id, divineSenceInfoBtnWidget.type);
                     UpdateBl();

Assets/Scripts/GameUI/UI/DivineSence/DivineSenceItemPanel.cs

@@ -11,6 +11,13 @@ namespace Fort23.Mono
         List<DivineSenceItemWidget> _divineSenceItemWidgets = new List<DivineSenceItemWidget>();
         private Action<int> callBack;
         private Action cancelCallBack;
+        private List<int> selectType;
+
+        private List<ItemInfo> itemInfos1 = new List<ItemInfo>();
+        private List<ItemInfo> itemInfos2 = new List<ItemInfo>();
+        private ItemInfo selectItemInit;
+
+        private int type = 1;
 
         private void Init()
         {
@@ -27,49 +34,127 @@ namespace Fort23.Mono
         public override void AddButtonEvent()
         {
             Btn_Close.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
-            
+            Btn_GaiLv.onClick.AddListener(() =>
+            {
+                if (selectType.Contains(6))
+                {
+                    TipMessagePanel.OpenTipMessagePanel("此类型不能重复选择！");
+                    return;
+                }
+
+                if (type == 1)
+                {
+                    return;
+                }
+
+                type = 1;
+                CreatWidget(1);
+            });
+
+            Btn_ZuiZhong.onClick.AddListener(() =>
+            {
+                if (selectType.Contains(7))
+                {
+                    TipMessagePanel.OpenTipMessagePanel("此类型不能重复选择！");
+                    return;
+                }
+
+                if (type == 2)
+                {
+                    return;
+                }
+
+                type = 2;
+                CreatWidget(type);
+            });
         }
 
         public async override CTask<bool> AsyncInit(object[] uiData)
         {
-            ItemInfo selectItemInit = uiData[0] as ItemInfo;
-            callBack = uiData[1] as Action<int>;
-            cancelCallBack = uiData[2] as Action;
-            List<ItemInfo> itemInfos = new List<ItemInfo>();
+            selectItemInit = uiData[0] as ItemInfo;
+            selectType = uiData[1] as List<int>;
+            callBack = uiData[2] as Action<int>;
+            cancelCallBack = uiData[3] as Action;
+
             foreach (var keyValuePair in PlayerManager.Instance.BagController.allBagDic)
             {
-                if (keyValuePair.Value.config.associateID == 6 || keyValuePair.Value.config.associateID == 7)
+                if (keyValuePair.Value.config.associateID == 6)
                 {
-                    itemInfos.Add(keyValuePair.Value);
+                    itemInfos1.Add(keyValuePair.Value);
+                }
+
+                if (keyValuePair.Value.config.associateID == 7)
+                {
+                    itemInfos2.Add(keyValuePair.Value);
                 }
             }
 
-            foreach (var itemInfo in itemInfos)
+            if (selectType.Count == 0)
+            {
+                type = 1;
+            }
+            else if (selectType.Contains(7))
+            {
+                type = 1;
+            }
+            else
             {
-                DivineSenceItemWidget divineSenceItemWidget = await UIManager.Instance.CreateGComponent<DivineSenceItemWidget>(null, Content);
-                divineSenceItemWidget.CustomInit(itemInfo,CancelClick, selectItemInit);
-                divineSenceItemWidget.OnClick = OnClick;
-                _divineSenceItemWidgets.Add(divineSenceItemWidget);
+                type = 2;
             }
 
+            CreatWidget(type);
+
             return await base.AsyncInit(uiData);
         }
 
+        public async CTask CreatWidget(int type)
+        {
+            foreach (var divineSenceItemWidget in _divineSenceItemWidgets)
+            {
+                UIManager.Instance.DormancyGComponent(divineSenceItemWidget);
+            }
+
+            _divineSenceItemWidgets.Clear();
+            if (type == 1)
+            {
+                toogleList.ShowTargetIndex(0);
+                foreach (var itemInfo in itemInfos1)
+                {
+                    DivineSenceItemWidget divineSenceItemWidget = await UIManager.Instance.CreateGComponent<DivineSenceItemWidget>(null, Content);
+                    divineSenceItemWidget.CustomInit(itemInfo, CancelClick, selectItemInit);
+                    divineSenceItemWidget.OnClick = OnClick;
+                    _divineSenceItemWidgets.Add(divineSenceItemWidget);
+                }
+            }
+            else
+            {
+                toogleList.ShowTargetIndex(1);
+                foreach (var itemInfo in itemInfos2)
+                {
+                    DivineSenceItemWidget divineSenceItemWidget = await UIManager.Instance.CreateGComponent<DivineSenceItemWidget>(null, Content);
+                    divineSenceItemWidget.CustomInit(itemInfo, CancelClick, selectItemInit);
+                    divineSenceItemWidget.OnClick = OnClick;
+                    _divineSenceItemWidgets.Add(divineSenceItemWidget);
+                }
+            }
+        }
+
         private void OnClick(ItemWidgetBasic obj)
         {
             DivineSenceItemWidget divineSenceItemWidget = obj as DivineSenceItemWidget;
             callBack?.Invoke(divineSenceItemWidget.ItemInfo.itemID);
             UIManager.Instance.HideUIUIPanel(this);
         }
+
         private void CancelClick()
         {
             cancelCallBack?.Invoke();
             UIManager.Instance.HideUIUIPanel(this);
         }
 
-        public static async CTask OpenPanel(ItemInfo selectItemInit, Action<int> itemId,Action cancelCallBack)
+        public static async CTask OpenPanel(ItemInfo selectItemInit, List<int> selectType, Action<int> itemId, Action cancelCallBack)
         {
-            await UIManager.Instance.LoadAndOpenPanel<DivineSenceItemPanel>(null, UILayer.Top, uiData: new object[] { selectItemInit, itemId,cancelCallBack });
+            await UIManager.Instance.LoadAndOpenPanel<DivineSenceItemPanel>(null, UILayer.Top, uiData: new object[] { selectItemInit, selectType,itemId, cancelCallBack });
         }
 
         public override void Close()
@@ -80,6 +165,9 @@ namespace Fort23.Mono
             }
 
             _divineSenceItemWidgets.Clear();
+            itemInfos1.Clear();
+            itemInfos2.Clear();
+            selectItemInit = null;
 
             base.Close();
         }

Assets/Scripts/GameUI/UI/DivineSence/DivineSenceItemPanelData.cs

@@ -8,13 +8,13 @@ namespace Fort23.Mono
 	public partial class DivineSenceItemPanel 
 	{
 	  #region 自定义数据 
-	  private MyImage _bg;
-	  public MyImage bg
+	  private Object _bg;
+	  public Object bg
 	   {
 	   get{
 	      if (_bg == null)
 	       {
-	         _bg  = GetUIUnit<MyImage>("bg"); 
+	         _bg  = GetUIUnit<Object>("bg"); 
 	       }
 	      return _bg;
 	     }
@@ -41,6 +41,39 @@ namespace Fort23.Mono
 	      return _Content;
 	     }
 	   }
+	  private UIToggleList _toogleList;
+	  public UIToggleList toogleList
+	   {
+	   get{
+	      if (_toogleList == null)
+	       {
+	         _toogleList  = GetUIUnit<UIToggleList>("toogleList"); 
+	       }
+	      return _toogleList;
+	     }
+	   }
+	  private Button _Btn_GaiLv;
+	  public Button Btn_GaiLv
+	   {
+	   get{
+	      if (_Btn_GaiLv == null)
+	       {
+	         _Btn_GaiLv  = GetUIUnit<Button>("Btn_GaiLv"); 
+	       }
+	      return _Btn_GaiLv;
+	     }
+	   }
+	  private Button _Btn_ZuiZhong;
+	  public Button Btn_ZuiZhong
+	   {
+	   get{
+	      if (_Btn_ZuiZhong == null)
+	       {
+	         _Btn_ZuiZhong  = GetUIUnit<Button>("Btn_ZuiZhong"); 
+	       }
+	      return _Btn_ZuiZhong;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

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

@@ -33,11 +33,11 @@ namespace Fort23.Mono
         private void Init()
         {
             isAddStack = true;
-            // IsShowAppBar = false;
+            IsShowAppBar = false;
         }
         public async override CTask GetFocus()
         {
-            await AppBarPanel.OpenPanel(this);
+            // await AppBarPanel.OpenPanel(this);
             base.GetFocus();
         }
 

Assets/Scripts/GameUI/UI/LevelChoosePanel/LevelChoosePanel.cs

@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using System.Linq;
 using Core.Language;
 using Excel2Json;
@@ -48,10 +49,17 @@ namespace Fort23.Mono
         }
         public async override CTask GetFocus()
         {
+            TitlePanel.OpenPanel(new List<int>() { 1001, 1002 });
             await AppBarPanel.OpenPanel(this);
             base.GetFocus();
         }
 
+        public override CTask LoseFocus()
+        {
+            TitlePanel.ClosePanel();
+            return base.LoseFocus();
+        }
+
         // public async CTask ChangeMap(int bigMapId)
         // {
         //     Sv2.gameObject.SetActive(false);

Assets/Scripts/GameUI/UI/MainHeroPnael/MainHeroPanel.cs

@@ -32,12 +32,14 @@ namespace Fort23.Mono
 
         public override CTask GetFocus()
         {
+            TitlePanel.OpenPanel(new List<int>() { 1001, 1002 });
             AppBarPanel.OpenPanel(this);
             return base.GetFocus();
         }
 
         public override CTask LoseFocus()
         {
+            TitlePanel.ClosePanel();
             // AppBarPanel.ClosePanel();
             return base.LoseFocus();
         }
@@ -51,6 +53,7 @@ namespace Fort23.Mono
             Btn_Close.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
             Btn_Sentiment.onClick.AddListener(() => { SentimentPanel.OpenPanel(); });
         }
+
         private async CTask CreatHero()
         {
             modelObj = await GObjectPool.Instance.FetchAsync<GameObjectPool>(PlayerManager.Instance.myHero.modelConfig.model + ".prefab", null);
@@ -77,7 +80,7 @@ namespace Fort23.Mono
                 }
             }
         }
-        
+
         public void ChangeLayerRecursively(GameObject obj, int newLayer)
         {
             if (obj == null || obj.layer == newLayer) return;

Assets/Scripts/GameUI/UI/MainHeroPnael/SelectFaBaoPanel.cs

@@ -32,10 +32,13 @@ namespace Fort23.Mono
         private void Init()
         {
             isAddStack = true;
+            IsShowAppBar = false;
         }
+
         public async override CTask GetFocus()
         {
-            await AppBarPanel.OpenPanel(this);
+            TitlePanel.ClosePanel();
+            // await AppBarPanel.OpenPanel(this);
             base.GetFocus();
         }
 
@@ -46,7 +49,7 @@ namespace Fort23.Mono
         protected override void DelEvent()
         {
         }
-        
+
 
         public override void AddButtonEvent()
         {

Assets/Scripts/GameUI/UI/MainPanel/MainPanel.cs

@@ -44,6 +44,7 @@ namespace Fort23.Mono
         public async override CTask GetFocus()
         {
             await AppBarPanel.OpenPanel(this);
+            TitlePanel.ClosePanel();
             base.GetFocus();
         }
 

Assets/Scripts/GameUI/UI/SentimentPanel/SentimentInfoPanel.cs

@@ -13,7 +13,8 @@ namespace Fort23.Mono
     public partial class SentimentInfoPanel : UIPanel
     {
         AccountFileInfo.SentimentProperty curretnSentimentProperty;
-        private EnergyWidget energyWidget;
+
+        // private EnergyWidget energyWidget;
         private AccountFileInfo.SentimentData sentimentData;
 
         List<SentimentEffectWidget> sentimentEffectWidgets = new List<SentimentEffectWidget>();
@@ -29,15 +30,17 @@ namespace Fort23.Mono
 
         private ItemWidgetType1 _itemWidgetType1;
 
+        TitlePanel _titlePanel;
+
         private void Init()
         {
             isAddStack = true;
         }
 
-        public override CTask GetFocus()
+        public async override CTask GetFocus()
         {
             AppBarPanel.OpenPanel(this);
-            return base.GetFocus();
+            await base.GetFocus();
         }
 
         protected override void AddEvent()
@@ -55,15 +58,17 @@ namespace Fort23.Mono
                 foreach (var sentimentDataSentimentProperty in sentimentData.sentimentProperties)
                 {
                     int count = 0;
+                    int itemid = 0;
                     for (int i = 0; i < sentimentDataSentimentProperty.level; i++)
                     {
                         int level1 = sentimentData.sentimentProperties[0].level <= 0 ? 1 : sentimentData.sentimentProperties[0].level;
                         int conFigId1 = sentimentData.sentimentProperties[0].groupId * 10 + level1;
                         var sentimentEffectConfig1 = ConfigComponent.Instance.Get<SentimentEffectConfig>(conFigId1);
+                        itemid = sentimentEffectConfig1.upConstItemId;
                         count += sentimentEffectConfig1.upConstCount;
                     }
 
-                    PlayerManager.Instance.BagController.AddItem(energyWidget._itemConfig.ID, count);
+                    PlayerManager.Instance.BagController.AddItem(itemid, count);
 
 
                     sentimentDataSentimentProperty.level = 0;
@@ -155,9 +160,19 @@ namespace Fort23.Mono
             int level1 = sentimentData.sentimentProperties[0].level <= 0 ? 1 : sentimentData.sentimentProperties[0].level;
             int conFigId1 = sentimentData.sentimentProperties[0].groupId * 10 + level1;
             var sentimentEffectConfig1 = ConfigComponent.Instance.Get<SentimentEffectConfig>(conFigId1);
-            energyWidget =
-                await UIManager.Instance.CreateGComponent<EnergyWidget>(null, Group_ResourceBar);
-            energyWidget.CustomInit(sentimentEffectConfig1.upConstItemId);
+            if (_titlePanel == null)
+            {
+                _titlePanel = await TitlePanel.OpenPanel(new List<int>() { sentimentEffectConfig1.upConstItemId });
+            }
+            else
+            {
+                _titlePanel.CustomInit(new List<int>() { sentimentEffectConfig1.upConstItemId });
+            }
+
+
+            // energyWidget =
+            //     await UIManager.Instance.CreateGComponent<EnergyWidget>(null, Group_ResourceBar);
+            // energyWidget.CustomInit(sentimentEffectConfig1.upConstItemId);
 
             foreach (var sentimentDataSentimentProperty in sentimentData.sentimentProperties)
             {
@@ -262,8 +277,8 @@ namespace Fort23.Mono
 
             currentSentimentEffectWidget = null;
             curretnSentimentProperty = null;
-            UIManager.Instance.DormancyGComponent(energyWidget);
-            energyWidget = null;
+            // UIManager.Instance.DormancyGComponent(energyWidget);
+            // energyWidget = null;
 
             base.Close();
         }

Assets/Scripts/GameUI/UI/SentimentPanel/SentimentPanel.cs

@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using Fort23.Core;
 
 namespace Fort23.Mono
@@ -12,6 +13,7 @@ namespace Fort23.Mono
 		}
 		public async override CTask GetFocus()
 		{
+			TitlePanel.OpenPanel(new List<int>(){1001,1002});
 			await AppBarPanel.OpenPanel(this);
 			base.GetFocus();
 		}

Assets/Scripts/GameUI/UI/ShopPanel/ShopPanel.cs

@@ -15,7 +15,7 @@ namespace Fort23.Mono
 
         private List<ShopGroupWidgetType1> _shopGroupWidgetType1s = new List<ShopGroupWidgetType1>();
 
-        List<EnergyWidget> _energyWidgets = new List<EnergyWidget>();
+        // List<EnergyWidget> _energyWidgets = new List<EnergyWidget>();
         ShopBtnWidget currentSelectedShopBtnWidget;
 
         List<ShopBtnWidget> _shopBtnWidgets = new List<ShopBtnWidget>();
@@ -40,10 +40,17 @@ namespace Fort23.Mono
 
         public override CTask GetFocus()
         {
+            TitlePanel.OpenPanel(new List<int>() { 1001, 1002 });
             AppBarPanel.OpenPanel(this);
             return base.GetFocus();
         }
 
+        public override CTask LoseFocus()
+        {
+            TitlePanel.ClosePanel();
+            return base.LoseFocus();
+        }
+
         public async override CTask<bool> AsyncInit(object[] uiData)
         {
             ShopGroupConfig[] shopGroupConfigs = ConfigComponent.Instance.GetAll<ShopGroupConfig>();
@@ -112,19 +119,19 @@ namespace Fort23.Mono
             await base.Show();
 
 
-            foreach (var widget in _energyWidgets)
-            {
-                UIManager.Instance.DormancyGComponent(widget);
-            }
-
-            _energyWidgets.Clear();
-            EnergyWidget energyWidget =
-                await UIManager.Instance.CreateGComponent<EnergyWidget>(null, Group_ResourceBar);
-            energyWidget.CustomInit(GlobalParam.Item_Coin_ID);
-            _energyWidgets.Add(energyWidget);
-            energyWidget = await UIManager.Instance.CreateGComponent<EnergyWidget>(null, Group_ResourceBar);
-            energyWidget.CustomInit(GlobalParam.Item_Diamond_ID);
-            _energyWidgets.Add(energyWidget);
+            // foreach (var widget in _energyWidgets)
+            // {
+            //     UIManager.Instance.DormancyGComponent(widget);
+            // }
+            //
+            // _energyWidgets.Clear();
+            // EnergyWidget energyWidget =
+            //     await UIManager.Instance.CreateGComponent<EnergyWidget>(null, Group_ResourceBar);
+            // energyWidget.CustomInit(GlobalParam.Item_Coin_ID);
+            // _energyWidgets.Add(energyWidget);
+            // energyWidget = await UIManager.Instance.CreateGComponent<EnergyWidget>(null, Group_ResourceBar);
+            // energyWidget.CustomInit(GlobalParam.Item_Diamond_ID);
+            // _energyWidgets.Add(energyWidget);
         }
 
         private void ShopRefence(IEventData e)
@@ -146,12 +153,12 @@ namespace Fort23.Mono
             }
 
             _shopGroupWidgetType1s.Clear();
-            foreach (var widget in _energyWidgets)
-            {
-                UIManager.Instance.DormancyGComponent(widget);
-            }
-
-            _energyWidgets.Clear();
+            // foreach (var widget in _energyWidgets)
+            // {
+            //     UIManager.Instance.DormancyGComponent(widget);
+            // }
+            //
+            // _energyWidgets.Clear();
 
             foreach (var shopBtnWidget in _shopBtnWidgets)
             {

Assets/Scripts/GameUI/UI/SkillInfopanel.cs

@@ -30,7 +30,7 @@ namespace Fort23.Mono
             Text_Name.text = LanguageManager.Instance.Text(faBaoInfo.FabaoConfig.name);
             Text_Level.text = "等级：" + faBaoInfo.FaBaoData.level.ToString();
             Text_Tag.text = "法宝";
-            Text_tip.text = "法宝详情";
+            Text_tip.text = "法宝详情：";
             Text_Power.text = $"强度：{faBaoInfo.qiangDu}";
             Text_massge.text = UtilTools.GetString(LanguageManager.Instance.Text(faBaoInfo.SkillConfig.dec), faBaoInfo.effectValue);
             Text_Power.gameObject.SetActive(true);
@@ -43,7 +43,7 @@ namespace Fort23.Mono
             Text_Name.text = LanguageManager.Instance.Text(skillInfo.skillConfig.name);
             Text_Level.text = "等级：" + skillInfo.SkillPowerupConfig.ID.ToString();
             Text_Tag.text = "功法";
-            Text_tip.text = "功法详情";
+            Text_tip.text = "功法详情：";
             Text_massge.text = UtilTools.GetString(LanguageManager.Instance.Text(skillInfo.skillConfig.dec), skillInfo.effectValue);
             Text_Power.gameObject.SetActive(false);
             Icon_SkillIcon.icon_name = skillInfo.skillConfig.icon;

Assets/Scripts/GameUI/UI/TowerPanel/TowerPanel.cs

@@ -29,6 +29,7 @@ namespace Fort23.Mono
         }
         public override CTask GetFocus()
         {
+            TitlePanel.ClosePanel();
             AppBarPanel.OpenPanel(this);
             return base.GetFocus();
         }

UserSettings/Layouts/default-2022.dwlt

@@ -100,7 +100,7 @@ MonoBehaviour:
   m_MinSize: {x: 400, y: 50}
   m_MaxSize: {x: 32384, y: 8096}
   vertical: 0
-  controlID: 55
+  controlID: 18
   draggingID: 0
 --- !u!114 &5
 MonoBehaviour:
@@ -140,7 +140,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 1209
     y: 0
-    width: 411
+    width: 284
     height: 1299
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
@@ -164,9 +164,9 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1620
+    x: 1493
     y: 0
-    width: 367
+    width: 494
     height: 1299
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
@@ -194,8 +194,8 @@ MonoBehaviour:
     y: 0
     width: 573
     height: 1299
-  m_MinSize: {x: 276, y: 71}
-  m_MaxSize: {x: 4001, y: 4021}
+  m_MinSize: {x: 275, y: 50}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 11}
   m_Panes:
   - {fileID: 11}
@@ -250,7 +250,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 1209
     y: 73
-    width: 409
+    width: 282
     height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -267,21 +267,21 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: d2f0dbffdaf0dbffeaf0dbff40f1dbff4af1dbff52f1dbffdaf1dbff2cfadbff32fadbff32fbdbff4afbdbff4efbdbff52fbdbff60fbdbff789bdeff829bdeff46a1deff50a1deff56a1deff86a1deff96b2deffaeb2deffb6b2deffc4b2deffae8fdfff7290dfffb690dfff1c92dfff2692dfff2c92dfff9492dfff1e9bdfff249bdfff249cdfff3c9cdfff409cdfff449cdfff529cdfffd61fe5ffde1fe5ff1620e5ff782fe5ff902fe5ff942fe5ff982fe5ffa62fe5ff9470eeff9c70eeffa670eeffb070eeffba70eeffc270eeffe070eeff4881eeff4e81eeff4e82eeff6682eeff6a82eeff6e82eeff7c82eeffc669f5ffce69f5ff306af5ff4083f5ff5883f5ff5c83f5ff6083f5ff6e83f5ff7c94f5ffcc9cf5ffd29cf5ffc89df5ffe09df5ffe49df5ffe89df5fff69df5ff1cc8f5ff22c8f5ff1205f6ff2a05f6ff2e05f6ff3205f6ff4005f6ff2a03f9ff3a03f9ff5403f9ff5c03f9ff6c03f9ff8403f9ff562df9ff6e2df9ff722df9ff842df9ff6c43f9ff7643f9ff8643f9ff1444f9ff2e44f9ff3644f9ff4644f9ff5e44f9ff9451f9ff9a51f9ff9a52f9ffb252f9ffb652f9ffc852f9ff184bfeffc065feffd865feffdc65feffee65feff2281feff3481feff9289feff3e8afeff948afeffac8afeffbc94feffc294feffc295feffda95feffde95feffe295feffe695fefff095feff76dcfeff80dcfeff98ddfeffb0ddfeff4ee6feff54e6feff54e7feff6ce7feff70e7feff74e7feff82e7feff0080ffff0880ffff3e80ffff6480ffff6c80ffff7c80ffffb092ffffb692ffffb693ffffce93ffffd293ffffe493ffffee99ffff069affff7ed6ffff96d6ffff9ad6ffffacd6ffff78faffff
+      m_ExpandedIDs: 54e6b8ff5a3bbdff823bbdffc03bbdff684dbdff6e4dbdff6e4ebdff864ebdff8a4ebdff8e4ebdff9c4ebdff0673bdff2673bdff2e73bdff6c73bdff5085bdff5685bdff5686bdff6e86bdff7286bdff7686bdff8486bdff7a47bfff8047bfff4248bfff7248bfff3e50bfff4450bfff4451bfff5c51bfff6051bfff6451bfff7251bfff902bc8ff9a2bc8ff282ec8ffc02ec8ff023dc8ff1a3dc8ff1e3dc8ff223dc8ff303dc8ff7400cdff0c01cdff0c91cdff2491cdff2891cdff2c91cdff3a91cdff4afcd4ff52fcd4ffdafed4ffe4fed4ffeefed4ff16ffd4ff1effd4ffa6ffd4ff3e54d5ff4454d5ff4455d5ff5c55d5ff6055d5ff6455d5ff7255d5ff8a28d7ff942ad7ff9e2ad7ffa82ad7ffb62ad7ff8644d7ff9e44d7ffa244d7ffa644d7ffb444d7ff5c60dcff6460dcff8461dcffc661dcffd061dcffda61dcffe261dcff1862dcffdc6edcffe46edcff426fdcffc6c0dcffdec0dcffe2c0dcffe6c0dcfff4c0dcff78faffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
-        m_Name: 
-        m_OriginalName: 
+        m_Name: Text_SkillName
+        m_OriginalName: Text_SkillName
         m_EditFieldRect:
           serializedVersion: 2
           x: 0
           y: 0
           width: 0
           height: 0
-        m_UserData: 0
+        m_UserData: 1311170
         m_IsWaitingForDelay: 0
         m_IsRenaming: 0
-        m_OriginalEventType: 11
+        m_OriginalEventType: 0
         m_IsRenamingFilename: 0
         m_ClientGUIView: {fileID: 6}
       m_SearchString: 
@@ -328,7 +328,7 @@ MonoBehaviour:
   m_ObjectsLockedBeforeSerialization: []
   m_InstanceIDsLockedBeforeSerialization: 
   m_PreviewResizer:
-    m_CachedPref: 378
+    m_CachedPref: 597
     m_ControlHash: -371814159
     m_PrefName: Preview_InspectorPreview
   m_LastInspectedObjectInstanceID: -1
@@ -358,9 +358,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1620
+    x: 1493
     y: 73
-    width: 365
+    width: 492
     height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -373,7 +373,7 @@ MonoBehaviour:
     m_SaveData: []
     m_OverlaysVisible: 1
   m_SearchFilter:
-    m_NameFilter: 
+    m_NameFilter: skillwidget
     m_ClassNames: []
     m_AssetLabels: []
     m_AssetBundleNames: []
@@ -383,24 +383,24 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Res/UI/LevelChoosePanel
+    - Assets/Res/UI/HeroInformainPanel
     m_Globs: []
-    m_OriginalText: 
+    m_OriginalText: skillwidget
     m_ImportLogFlags: 0
     m_FilterByTypeIntersection: 0
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Res/UI/LevelChoosePanel
+  - Assets/Res/UI/HeroInformainPanel
   m_LastFoldersGridSize: -1
   m_LastProjectPath: D:\FB\XiuXianGame
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 454}
-    m_SelectedIDs: 9cf00000
-    m_LastClickedID: 61596
-    m_ExpandedIDs: 0000000034ed000036ed000038ed00003aed00003ced00003eed000040ed000042ed000044ed000046ed000048ed00004aed00004ced00004eed000050ed000052ed000054ed000056ed000022f000009cf00000d4f00000a05a010000ca9a3bffffff7f
+    scrollPos: {x: 0, y: 982}
+    m_SelectedIDs: aef00000
+    m_LastClickedID: 61614
+    m_ExpandedIDs: 00000000c6ef0000c8ef0000caef0000ccef0000ceef0000d0ef0000d2ef0000d4ef0000d6ef0000d8ef0000daef0000dcef0000deef0000e0ef0000e2ef0000e4ef0000e6ef0000e8ef000038f00000eaf000004c00140000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -428,7 +428,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 0000000034ed000036ed000038ed00003aed00003ced00003eed000040ed000042ed000044ed000046ed000048ed00004aed00004ced00004eed000050ed000052ed000054ed000056ed0000
+    m_ExpandedIDs: 00000000c6ef0000c8ef0000caef0000ccef0000ceef0000d0ef0000d2ef0000d4ef0000d6ef0000d8ef0000daef0000dcef0000deef0000e0ef0000e2ef0000e4ef0000e6ef0000e8ef0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -455,19 +455,19 @@ MonoBehaviour:
   m_ListAreaState:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
-    m_HadKeyboardFocusLastEvent: 0
+    m_HadKeyboardFocusLastEvent: 1
     m_ExpandedInstanceIDs: 00000000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: WuLiangJiePlacesPanel
-      m_OriginalName: WuLiangJiePlacesPanel
+      m_Name: HeroInformationPanel
+      m_OriginalName: HeroInformationPanel
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 451224
+      m_UserData: 78276
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
       m_OriginalEventType: 0
@@ -990,9 +990,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 0.82425827, y: -0.7104751, z: -4.8697553}
+    m_Target: {x: 0.7252979, y: 1.1180861, z: 0.06206698}
     speed: 2
-    m_Value: {x: 0.82425827, y: -0.7104751, z: -4.8697553}
+    m_Value: {x: 0.7252979, y: 1.1180861, z: 0.06206698}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -1042,9 +1042,9 @@ MonoBehaviour:
     speed: 2
     m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
-    m_Target: 2.495135
+    m_Target: 3.7932963
     speed: 2
-    m_Value: 2.495135
+    m_Value: 3.7932963
   m_Ortho:
     m_Target: 1
     speed: 2

XiuXianGame.sln.DotSettings.user

@@ -63,4 +63,5 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AVector3_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003Fe4_003F8efb9845_003FVector3_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AVector3_002Ecs_002Fl_003AC_0021_003FUsers_003Fck_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F2008d2d6093f4149aaeafd5f414aa7a517c400_003Fd3_003F23d17a83_003FVector3_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AVisualElement_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F56d039fe633a4adf8fb266a0b1797e6c17a000_003Ffe_003Fe2beea8c_003FVisualElement_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AVisualTreeAsset_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F56d039fe633a4adf8fb266a0b1797e6c17a000_003F42_003F6fa4298f_003FVisualTreeAsset_002Ecs/@EntryIndexedValue">ForceIncluded</s:String></wpf:ResourceDictionary>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AVisualTreeAsset_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F56d039fe633a4adf8fb266a0b1797e6c17a000_003F42_003F6fa4298f_003FVisualTreeAsset_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003A_005F_005FDynamicallyInvokableAttribute_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F3789ee403a53437cbb6b5d9ab6311f51573620_003F83_003Fcaa5e168_003F_005F_005FDynamicallyInvokableAttribute_002Ecs/@EntryIndexedValue">ForceIncluded</s:String></wpf:ResourceDictionary>