Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

Assets/Res/Config/HeroModelConfig.json

@@ -244,7 +244,7 @@
       "hp": 150,
       "def": 50,
       "shield": 0,
-      "speed_atk": 4.0,
+      "speed_atk": 10.0,
       "Linggen": [
         100,
         100,

Assets/Res/UI/XianTuLogPanel/34c70944b951cc80a1d3a5216b572b1.png.meta

@@ -1,203 +0,0 @@
-fileFormatVersion: 2
-guid: DXof4HuuB36dFdvE5qsWJ4VR14chnypABpxEGSu4bRc+U4zdltq1a1pMk7J9
-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/XianTuLogPanel/4f0fbfe5751de5c514595a3711285d4.png.meta

@@ -1,203 +0,0 @@
-fileFormatVersion: 2
-guid: DXpOtH6vAS4o3ZDj1xTktZsLx+G5HjTEk36YE+14cR5t0xBfV1yghFvApbki
-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/XianTuLogPanel/EventLogInfoWidget.prefab

@@ -36,7 +36,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 220.36674, y: -45}
+  m_AnchoredPosition: {x: 220.36674, y: -63.5}
   m_SizeDelta: {x: 334.7335, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8146511189872025584

Assets/Res/UI/XianTuLogPanel/XianTuLogInfoPanel.prefab

@@ -35,6 +35,7 @@ RectTransform:
   - {fileID: 9037408276187403176}
   - {fileID: 4984119799780491756}
   - {fileID: 86150896025242752}
+  - {fileID: 3017899439440448584}
   - {fileID: 1239183305622828816}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -76,6 +77,26 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: EventLogTitleWidget
+    gameObject: {fileID: 7388315226818435012}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Marsk1
+    gameObject: {fileID: 86150896025242752}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Marsk2
+    gameObject: {fileID: 3017899439440448584}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Sv
+    gameObject: {fileID: 3581464887972855309}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &1850343213030836377
 GameObject:
@@ -451,7 +472,7 @@ GameObject:
   - component: {fileID: 7883865494936010614}
   m_Layer: 5
   m_HasEditorInfo: 1
-  m_Name: Scroll View
+  m_Name: Sv
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -545,6 +566,51 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &6532941494030869132
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3017899439440448584}
+  - component: {fileID: 6976609981825819012}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Marsk2
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3017899439440448584
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6532941494030869132}
+  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: 8599819629026832582}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -0.27731323, y: -125.32001}
+  m_SizeDelta: {x: 0.5539923, y: -426.83887}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6976609981825819012
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6532941494030869132}
+  m_CullTransparentMesh: 1
 --- !u!1 &6833021426073465471
 GameObject:
   m_ObjectHideFlags: 0
@@ -692,7 +758,7 @@ GameObject:
   - component: {fileID: 6640372110663749329}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: myImage
+  m_Name: Marsk1
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -964,6 +1030,54 @@ PrefabInstance:
       propertyPath: m_Name
       value: EventLogTitleWidget
       objectReference: {fileID: 0}
+    - target: {fileID: 3113180148145525686, guid: 034392a467bb69a46b538612078936bc, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6003345465301013575, guid: 034392a467bb69a46b538612078936bc, type: 3}
+      propertyPath: data.Array.size
+      value: 6
+      objectReference: {fileID: 0}
+    - target: {fileID: 6003345465301013575, guid: 034392a467bb69a46b538612078936bc, type: 3}
+      propertyPath: data.Array.data[1].key
+      value: EventLogTitleWidgetGam
+      objectReference: {fileID: 0}
+    - target: {fileID: 6003345465301013575, guid: 034392a467bb69a46b538612078936bc, type: 3}
+      propertyPath: data.Array.data[2].key
+      value: Marsk1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6003345465301013575, guid: 034392a467bb69a46b538612078936bc, type: 3}
+      propertyPath: data.Array.data[3].key
+      value: Sv
+      objectReference: {fileID: 0}
+    - target: {fileID: 6003345465301013575, guid: 034392a467bb69a46b538612078936bc, type: 3}
+      propertyPath: data.Array.data[4].key
+      value: Marsk2
+      objectReference: {fileID: 0}
+    - target: {fileID: 6003345465301013575, guid: 034392a467bb69a46b538612078936bc, type: 3}
+      propertyPath: data.Array.data[5].key
+      value: EventLogTitleWidgetGam
+      objectReference: {fileID: 0}
+    - target: {fileID: 6003345465301013575, guid: 034392a467bb69a46b538612078936bc, type: 3}
+      propertyPath: data.Array.data[1].gameObject
+      value: 
+      objectReference: {fileID: 7388315226818435012}
+    - target: {fileID: 6003345465301013575, guid: 034392a467bb69a46b538612078936bc, type: 3}
+      propertyPath: data.Array.data[2].gameObject
+      value: 
+      objectReference: {fileID: 86150896025242752}
+    - target: {fileID: 6003345465301013575, guid: 034392a467bb69a46b538612078936bc, type: 3}
+      propertyPath: data.Array.data[3].gameObject
+      value: 
+      objectReference: {fileID: 3581464887972855309}
+    - target: {fileID: 6003345465301013575, guid: 034392a467bb69a46b538612078936bc, type: 3}
+      propertyPath: data.Array.data[4].gameObject
+      value: 
+      objectReference: {fileID: 3017899439440448584}
+    - target: {fileID: 6003345465301013575, guid: 034392a467bb69a46b538612078936bc, type: 3}
+      propertyPath: data.Array.data[5].gameObject
+      value: 
+      objectReference: {fileID: 7388315226818435012}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
@@ -985,3 +1099,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!1 &7388315226818435012 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 3113180148145525686, guid: 034392a467bb69a46b538612078936bc, type: 3}
+  m_PrefabInstance: {fileID: 5601542614762144882}
+  m_PrefabAsset: {fileID: 0}

Assets/Res/UI/XianTuLogPanel/XianTuSaiXuanWidget.prefab

@@ -0,0 +1,332 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &3010060112929588141
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2397912466611057526}
+  - component: {fileID: 43859780477946217}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Button
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2397912466611057526
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3010060112929588141}
+  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: 6593923505059071937}
+  - {fileID: 1884686712654273815}
+  m_Father: {fileID: 2255013146822197070}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &43859780477946217
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3010060112929588141}
+  m_CullTransparentMesh: 1
+--- !u!1 &4361283601685093543
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2255013146822197070}
+  - component: {fileID: 882304056947836370}
+  - component: {fileID: 4978844846321001597}
+  - component: {fileID: 5563659626202568180}
+  - component: {fileID: 4313453455728757518}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: XianTuSaiXuanWidget
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2255013146822197070
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4361283601685093543}
+  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: 2397912466611057526}
+  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: 78.144, y: 36.0626}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &882304056947836370
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4361283601685093543}
+  m_CullTransparentMesh: 1
+--- !u!114 &4978844846321001597
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4361283601685093543}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: Text_Name
+    gameObject: {fileID: 3321307045676531026}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 1
+--- !u!114 &5563659626202568180
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4361283601685093543}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ef7878ea2dacc454894d556c1d97bca0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - StateInfos:
+    - Target: {fileID: 5196016631604194328}
+      UIStateV4Types: 40000000
+      UIStateV4Datas:
+      - {x: 0.98823535, y: 0.96470594, z: 0.94117653, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+    - Target: {fileID: 8533574500684186698}
+      UIStateV4Types: 80000000
+      UIStateV4Datas:
+      - {x: 0.5019608, y: 0.5019608, z: 0.5019608, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+  - StateInfos:
+    - Target: {fileID: 5196016631604194328}
+      UIStateV4Types: 40000000
+      UIStateV4Datas:
+      - {x: 0.65882355, y: 0.5764706, z: 0.49411768, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+    - Target: {fileID: 8533574500684186698}
+      UIStateV4Types: 80000000
+      UIStateV4Datas:
+      - {x: 0.9294118, y: 0.9294118, z: 0.9294118, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+  AllComs:
+  - {fileID: 5196016631604194328}
+  - {fileID: 8533574500684186698}
+  AllComsStateTypes: 4000000080000000
+  CurrIndex: 0
+--- !u!114 &4313453455728757518
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4361283601685093543}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 09a9a136688f46fbb2a843418fc53144, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isScriptControl: 1
+  uiToggleList: {fileID: 0}
+  CustomStateController: {fileID: 0}
+--- !u!1 &5196016631604194328
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6593923505059071937}
+  - component: {fileID: 8360256546683998588}
+  - component: {fileID: 3018369136703272782}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6593923505059071937
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5196016631604194328}
+  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: 2397912466611057526}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8360256546683998588
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5196016631604194328}
+  m_CullTransparentMesh: 1
+--- !u!114 &3018369136703272782
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5196016631604194328}
+  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.98823535, g: 0.96470594, b: 0.94117653, 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
+--- !u!1 &8533574500684186698
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1884686712654273815}
+  - component: {fileID: 1704184540188715246}
+  - component: {fileID: 3321307045676531026}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text_Name
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1884686712654273815
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8533574500684186698}
+  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: 2397912466611057526}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1704184540188715246
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8533574500684186698}
+  m_CullTransparentMesh: 1
+--- !u!114 &3321307045676531026
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8533574500684186698}
+  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.5019608, g: 0.5019608, b: 0.5019608, 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: 18
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u7B2C\u4E00\u7AE0"

Assets/Res/UI/XianTuLogPanel/XianTuSaiXuanWidget.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: W3of4Sn4Air60QHEDG7VEHowuZTsZpFuX+ONAGV7z0BDBvB+3bZGxTg6m4LZ
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/UI/XianTuLogPanel/ff7dcce5f248df581ec959ddca57846.png.meta

@@ -1,203 +0,0 @@
-fileFormatVersion: 2
-guid: DX4Yty2oUi6l7m0/4+BGs1myWoLX8nvOLoj/upXTlL9ec3PMLY5v1mVzherq
-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/Scripts/Core/Event/Event/CustomEventType.cs

@@ -116,7 +116,7 @@ namespace Fort23.Core
       /// </summary>
       AddItem,
       DaoYouCounUpdate,
-      UpdateZuiZhongEvent
-      
+      UpdateZuiZhongEvent,
+      CancelEvent,      
     }
 }

Assets/Scripts/Core/UI/Core/UIManager.cs

@@ -412,6 +412,11 @@ namespace Fort23.Mono
                         destroyUI.Remove(uiBindingAttribute.prefab);
                     }
 
+                    if (uiPanel.isAddStack)
+                    {
+                        EventManager.Instance.Dispatch(CustomEventType.CancelEvent,null);
+                    }
+
                     uiPanel.isFullUI = isFullUI;
                     // 等待数据准备好才初始化UI
                     if (await uiPanel.AsyncInit(uiData))

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

@@ -53,7 +53,7 @@ namespace GameLogic.Combat.Hero
 
         public SkillTurntable SkillTurntable;
 
-            
+
         protected override async CTask ProInit()
         {
             SkillTurntable = new SkillTurntable();
@@ -64,8 +64,6 @@ namespace GameLogic.Combat.Hero
             }
             else
             {
-                
-
                 await SetNewSkill(PlayerManager.Instance.GongFaControl.allUseSkill);
             }
 
@@ -93,14 +91,22 @@ namespace GameLogic.Combat.Hero
                 SkillInfo skillInfo = new SkillInfo(id, 1);
                 skillBasic.InitSkillConfig(_combatHeroEntity, skillInfo);
                 taoismSkillBasic = skillBasic;
-                _combatHeroEntity.CurrCombatHeroInfo.SetSkillAttSpeed(skillConfig.addcd+SkillTurntable.skillAddSkillCd);
+                // _combatHeroEntity.CurrCombatHeroInfo.SetSkillAttSpeed(skillConfig.addcd+SkillTurntable.skillAddSkillCd);
                 TaoismSkillAlterEventData taoismSkillAlterEventData = TaoismSkillAlterEventData.Create();
                 taoismSkillAlterEventData.CombatHeroEntity = _combatHeroEntity;
                 CombatEventManager.Instance.Dispatch(CombatEventType.TaoismSkillAlter, taoismSkillAlterEventData);
             }
+
+            if (!_combatHeroEntity.IsEnemy)
+            {
+                float cd = _combatHeroEntity.CurrCombatHeroInfo.powerUpConfig.MaxActiveGongfaNum * 3;
+                _combatHeroEntity.CurrCombatHeroInfo.SetSkillAttSpeed(
+                    cd + SkillTurntable.skillAddSkillCd);
+            }
             else
             {
-                _combatHeroEntity.CurrCombatHeroInfo.SetSkillAttSpeed(_combatHeroEntity.CurrCombatHeroInfo.modelConfig.speed_atk+SkillTurntable.skillAddSkillCd);
+                _combatHeroEntity.CurrCombatHeroInfo.SetSkillAttSpeed(
+                    _combatHeroEntity.CurrCombatHeroInfo.modelConfig.speed_atk + SkillTurntable.skillAddSkillCd);
             }
         }
 
@@ -164,6 +170,7 @@ namespace GameLogic.Combat.Hero
             {
                 return null;
             }
+
             if (!_combatHeroEntity.IsEnemy && _combatHeroEntity.CombatAIBasic.currFocusTarget is BannerHero)
             {
                 return null;
@@ -186,7 +193,7 @@ namespace GameLogic.Combat.Hero
             {
                 float speed = _combatHeroEntity.CurrCombatHeroInfo.GetAttSpeed;
                 float angle = 360 / (1.0f / speed);
-                SkillTurntable.Update(t, angle*t);
+                SkillTurntable.Update(t, angle * t);
             }
 
             if (taoismSkillBasic != null)

Assets/Scripts/GameUI/EventManager/DialogueManager.cs

@@ -56,7 +56,7 @@ public class DialogueManager : Singleton<DialogueManager>
         if (CurrentEventList != null)
         {
             var eventLinkDatas = CurrentEventList.eventLinks.FirstOrDefault(el => el.eventLinkId == dialogueID);
-            if (!EventSystemManager.Instance.CeekEventGroupComplete(eventLinkDatas.eventConditions))
+            if (eventLinkDatas != null && !EventSystemManager.Instance.CeekEventGroupComplete(eventLinkDatas.eventConditions))
             {
                 onCancel?.Invoke();
                 return;
@@ -82,7 +82,7 @@ public class DialogueManager : Singleton<DialogueManager>
             {
                 EventSystemManager.Instance.CurrentEventList.curStep = currentDialogueID;
                 //记录步骤 日志使用
-                if(!EventSystemManager.Instance.CurrentEventList.selectEventLinkIds.Contains(currentDialogueID)) 
+                if (!EventSystemManager.Instance.CurrentEventList.selectEventLinkIds.Contains(currentDialogueID))
                     EventSystemManager.Instance.CurrentEventList.selectEventLinkIds.Add(currentDialogueID);
             }
         }
@@ -167,6 +167,8 @@ public class DialogueManager : Singleton<DialogueManager>
     /// </summary>
     private async void EndDialogue1()
     {
+        if (CurrentEventList == null)
+            return;
         EventLinkConfig dialogueConfig = ConfigComponent.Instance.Get<EventLinkConfig>(currentDialogueID);
         bool isCombatWin = false;
 
@@ -261,8 +263,6 @@ public class DialogueManager : Singleton<DialogueManager>
                     }
                 }
             }
-
-       
         }
 
 
@@ -338,4 +338,14 @@ public class DialogueManager : Singleton<DialogueManager>
             await rewardsPanel.UIClosed();
         }
     }
+
+    public void ChancleEvent()
+    {
+        CurrentEventList = null;
+        onDialogueComplete = null;
+        onCancel = null;
+        currentDialogueID = 0;
+        eventConfig = default;
+        UIManager.Instance.HideUIUIPanel<DialogueBubblePanel>();
+    }
 }

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -30,8 +30,8 @@ public class EventSystemManager : Singleton<EventSystemManager>
     public bool isOpenUi;
 
     Action onCompleteCallback;
-    
-    public Map<int,List<EventConfig>> eventConfigsMap = new Map<int,List<EventConfig>>();
+
+    public Map<int, List<EventConfig>> eventConfigsMap = new Map<int, List<EventConfig>>();
 
     // public Map<int, AccountFileInfo.EventConditionData> EventConditionDataMap = new Map<int, AccountFileInfo.EventConditionData>();
 
@@ -39,7 +39,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
     {
         eventConfigs = ConfigComponent.Instance.GetAll<EventConfig>().ToList();
         divineSenseConfigs = ConfigComponent.Instance.GetAll<DivineSenseConfig>().ToList();
-        
+
         foreach (var eventConfig in eventConfigs)
         {
             if (eventConfig.XiantuID != 0)
@@ -64,6 +64,12 @@ public class EventSystemManager : Singleton<EventSystemManager>
         EventManager.Instance.AddEventListener(CustomEventType.DetectRandomEvent, RenfenceRandomEvent);
         EventManager.Instance.AddEventListener(CustomEventType.AddItem, ItemUpdate);
         EventManager.Instance.AddEventListener(CustomEventType.JingJieUpgrade, JingJieUpgrade);
+        EventManager.Instance.AddEventListener(CustomEventType.CancelEvent,Cancel);
+    }
+
+    private void Cancel(IEventData e)
+    {
+        CancelEvent();
     }
 
     private void JingJieUpgrade(IEventData e)
@@ -196,6 +202,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
                 count++;
             }
         }
+
         return count;
     }
 
@@ -390,7 +397,6 @@ public class EventSystemManager : Singleton<EventSystemManager>
                 {
                     return null;
                 }
-                
             }
             else
             {
@@ -400,6 +406,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
             eventList.guid = IdGenerater.GenerateIdInt();
             eventList.curStep = eventConfig.EventLinksId[0];
+            eventList.selectEventLinkIds.Add(eventConfig.EventLinksId[0]);
         }
 
         //初始化神识链条，用于监听条件是否完成
@@ -473,7 +480,9 @@ public class EventSystemManager : Singleton<EventSystemManager>
         LogTool.Log($"触发事件: {evt.EventName} (ID: {evt.ID}, 品质: {evt.EventQuality})");
         CombatDrive.Instance.CombatController.ChangeState(CombatController.idle);
 
-        DialogueManager.Instance.StartDialogue(null, evt.EventLinksId[0], evt.ID, () => { CompleteEvent(evt.ID); });
+        AccountFileInfo.EventList eventList = AddEvent(evt.ID);
+        CurrentEventList = eventList;
+        DialogueManager.Instance.StartDialogue(eventList, evt.EventLinksId[0], evt.ID, () => { CompleteEvent(evt.ID); });
     }
 
     /// <summary>
@@ -481,6 +490,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
     /// </summary>
     public async CTask TriggerEvent(AccountFileInfo.EventList evt, Action oncompleteCallBack = null)
     {
+        // ChancleEvent();
         if (isTriggerEvent)
             return;
         CTask cTask = CTask.Create();
@@ -748,14 +758,18 @@ public class EventSystemManager : Singleton<EventSystemManager>
             }
         }
 
-        //先不移除 下次探索神识移除
-        eventList.isCompleted = true;
 
-        // AccountFileInfo.Instance.playerData.completeEvents.Add(eventList);
-        //
-        //
-        //
-        // AccountFileInfo.Instance.playerData.eventList.Remove(eventList);
+        if (eventConfig.EventTriggerType == 4)
+        {
+            AccountFileInfo.Instance.playerData.completeEvents.Add(eventList);
+            AccountFileInfo.Instance.playerData.eventList.Remove(eventList);
+            TaskInfoPanel.OpenPanel(eventList);
+        }
+        else
+        {
+            //先不移除 下次探索神识移除
+            eventList.isCompleted = true;
+        }
 
         if (AccountFileInfo.Instance.playerData.CurrentZuiZhongEventList.guid == eventList.guid)
         {
@@ -765,11 +779,6 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
         AccountFileInfo.Instance.SavePlayerData();
 
-        if (eventConfig.EventTriggerType == 4)
-        {
-            TaskInfoPanel.OpenPanel(eventList);
-        }
-
 
         CombatDrive.Instance.CombatController.ChangeState(CombatController.update);
         EventManager.Instance.Dispatch(CustomEventType.CompleteEvent, null);
@@ -823,4 +832,13 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
         return null;
     }
+
+
+    public void CancelEvent()
+    {
+        CombatDrive.Instance.CombatController.ChangeState(CombatController.update);
+        DialogueManager.Instance.ChancleEvent();
+        CurrentEventList = null;
+        isTriggerEvent = false;
+    }
 }

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

@@ -144,7 +144,7 @@ namespace Fort23.Mono
         {
             ShengShiEventWidgetType2 shengShiEventWidgetType2 = obj as ShengShiEventWidgetType2;
 
-
+            EventSystemManager.Instance.CancelEvent();
             if (EventSystemManager.Instance.isTriggerEvent)
                 return;
             this.GObjectPoolInterface.SetActive(false);

Assets/Scripts/GameUI/UI/XianTuLogPanel/EventLogWidget.cs

@@ -29,24 +29,27 @@ namespace Fort23.Mono
         public override void AddButtonEvent()
         {
             base.AddButtonEvent();
-            Btn_HuiGu.onClick.AddListener(() => { XianTuLogInfoPanel.OpenPanel(_xianTuLogConfig.ID); });
+            Btn_HuiGu.onClick.AddListener(() => { XianTuLogInfoPanel.OpenPanel(2,_xianTuLogConfig.ID); });
         }
 
-        public async CTask CustomInit(XianTuLogConfig xianTuLogConfig)
+        public async CTask CustomInit(XianTuLogConfig xianTuLogConfig, List<int> places)
         {
             _xianTuLogConfig = xianTuLogConfig;
-            Text_Title.text = LanguageManager.Instance.Text(xianTuLogConfig.Ttile);
+            Text_Title.text = LanguageManager.Instance.Text(xianTuLogConfig.Title);
             Text_Desc.text = LanguageManager.Instance.Text(xianTuLogConfig.Desc);
 
-            var configs = EventSystemManager.Instance.eventConfigsMap[_xianTuLogConfig.ID];
-            foreach (var eventConfig in configs)
+            if (EventSystemManager.Instance.eventConfigsMap.ContainsKey(_xianTuLogConfig.ID))
             {
-                AccountFileInfo.EventList eventList = AccountFileInfo.Instance.playerData.completeEvents.FirstOrDefault(cl => cl.eventID == eventConfig.ID);
-                EventMinLogWidget eventMinLogWidget = await UIManager.Instance.CreateGComponent<EventMinLogWidget>(null, Connect);
-                eventMinLogWidget.CustomInit(eventConfig.ID,eventList);
-                eventMinLogWidgets.Add(eventMinLogWidget);
+                var configs = EventSystemManager.Instance.eventConfigsMap[_xianTuLogConfig.ID];
+                foreach (var eventConfig in configs)
+                {
+                    AccountFileInfo.EventList eventList = AccountFileInfo.Instance.playerData.completeEvents.FirstOrDefault(cl => cl.eventID == eventConfig.ID);
+                    EventMinLogWidget eventMinLogWidget = await UIManager.Instance.CreateGComponent<EventMinLogWidget>(null, Connect);
+                    eventMinLogWidget.CustomInit(eventConfig.ID, eventList,places);
+                    eventMinLogWidgets.Add(eventMinLogWidget);
+                }
             }
-            
+
             LayoutRebuilder.ForceRebuildLayoutImmediate(Connect);
             LayoutRebuilder.ForceRebuildLayoutImmediate(Connect.transform.parent.GetComponent<RectTransform>());
         }

Assets/Scripts/GameUI/UI/XianTuLogPanel/EventMinLogWidget.cs

@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using Core.Language;
 using Excel2Json;
 using Fort23.UTool;
@@ -25,9 +26,11 @@ namespace Fort23.Mono
         {
         }
 
-        public void CustomInit(int id, AccountFileInfo.EventList eventList)
+        public void CustomInit(int id, AccountFileInfo.EventList eventList, List<int> places)
         {
             eventConfig = ConfigComponent.Instance.Get<EventConfig>(id);
+            PlacesConfig placesConfig = ConfigComponent.Instance.Get<PlacesConfig>(eventConfig.placeID);
+            Text_MapName.text = LanguageManager.Instance.Text(placesConfig.placeName);
             if (eventList == null)
             {
                 Text_Name.text = "???";
@@ -36,6 +39,22 @@ namespace Fort23.Mono
             {
                 Text_Name.text = LanguageManager.Instance.Text(eventConfig.EventName);
             }
+
+            if (places.Count > 0)
+            {
+                if (places.Contains(eventConfig.placeID))
+                {
+                    transform.RecoverColor();
+                }
+                else
+                {
+                    transform.Gray();
+                }
+            }
+            else
+            {
+                transform.RecoverColor();
+            }
         }
     }
 }

Assets/Scripts/GameUI/UI/XianTuLogPanel/MainEventLogWidget.cs

@@ -24,14 +24,14 @@ namespace Fort23.Mono
 			base.AddButtonEvent();
 			Btn_HuiGu.onClick.AddListener(() =>
 			{
-				XianTuLogInfoPanel.OpenPanel(_xianTuLogConfig.ID);
+				XianTuLogInfoPanel.OpenPanel(1,_xianTuLogConfig.ID);
 			});
 		}
 
 		public void CustomInit(XianTuLogConfig xianTuLogConfig)
 		{
 			_xianTuLogConfig = xianTuLogConfig;
-			Text_Title.text = LanguageManager.Instance.Text(xianTuLogConfig.Ttile);
+			Text_Title.text = LanguageManager.Instance.Text(xianTuLogConfig.Title);
 			Text_Desc.text = LanguageManager.Instance.Text(xianTuLogConfig.Desc);
 		}
 

Assets/Scripts/GameUI/UI/XianTuLogPanel/XianTuLogInfoPanel.cs

@@ -5,6 +5,7 @@ using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
 using UnityEngine;
+using Utility;
 
 namespace Fort23.Mono
 {
@@ -22,12 +23,18 @@ namespace Fort23.Mono
     [UIBinding(prefab = "XianTuLogInfoPanel")]
     public partial class XianTuLogInfoPanel : UIPanel, IScrollListContent
     {
+        private EventLogTitleWidget eventLogTitleWidget;
+
         private XianTuLogConfig _xianTuLogConfig;
 
         List<XianTuLogInfoData> showXianTuLogInfoData = new List<XianTuLogInfoData>();
 
         List<UIComponent> components = new List<UIComponent>();
 
+        List<EventLogTitleWidget> titleWidgets = new List<EventLogTitleWidget>();
+
+        private int type;
+
         private void Init()
         {
         }
@@ -45,60 +52,94 @@ namespace Fort23.Mono
             Btn_Close.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
         }
 
-        public void CustomInit(int id)
+        public async void CustomInit(int type, int id)
         {
+            this.type = type;
+            eventLogTitleWidget = await UIManager.Instance.CreateGComponentForObject<EventLogTitleWidget>(EventLogTitleWidget, null);
+            Map<int, List<EventConfig>> eventConfigMap = new Map<int, List<EventConfig>>();
+
+
             showXianTuLogInfoData.Clear();
             _xianTuLogConfig = ConfigComponent.Instance.Get<XianTuLogConfig>(id);
-            XianTuLogInfoData xianTuLogInfoData3 = new XianTuLogInfoData();
-            xianTuLogInfoData3.type = 1;
-            xianTuLogInfoData3.message = "北海";
-            showXianTuLogInfoData.Add(xianTuLogInfoData3);
+
             var configs = EventSystemManager.Instance.eventConfigsMap[_xianTuLogConfig.ID];
+
             foreach (var @c in configs)
             {
                 EventConfig eventConfig = c;
-                AccountFileInfo.EventList eventList = AccountFileInfo.Instance.playerData.completeEvents.FirstOrDefault(cl => cl.eventID == c.ID);
-                if (eventList == null)
+                if (!eventConfigMap.ContainsKey(eventConfig.placeID))
+                {
+                    eventConfigMap.Add(eventConfig.placeID, new List<EventConfig>());
+                }
+
+                eventConfigMap[eventConfig.placeID].Add(eventConfig);
+            }
+
+            foreach (var keyValuePair in eventConfigMap)
+            {
+                if (type == 1)
                 {
-                    //主线没有做不显示问好
-                    if (_xianTuLogConfig.EventType == 2)
+                    PlacesConfig placesConfig = ConfigComponent.Instance.Get<PlacesConfig>(keyValuePair.Key);
+                    XianTuLogInfoData xianTuLogInfoData3 = new XianTuLogInfoData();
+                    xianTuLogInfoData3.type = 1;
+                    xianTuLogInfoData3.message = LanguageManager.Instance.Text(placesConfig.placeName);
+                    showXianTuLogInfoData.Add(xianTuLogInfoData3);
+                }
+
+                foreach (var eventConfig in keyValuePair.Value)
+                {
+                    AccountFileInfo.EventList eventList = AccountFileInfo.Instance.playerData.completeEvents.FirstOrDefault(cl => cl.eventID == eventConfig.ID);
+                    if (eventList == null)
+                    {
+                        //主线没有做不显示问好
+                        if (_xianTuLogConfig.EventType == 2)
+                        {
+                            XianTuLogInfoData xianTuLogInfoData = new XianTuLogInfoData();
+                            xianTuLogInfoData.type = 2;
+                            xianTuLogInfoData.message = "????????";
+
+                            XianTuLogInfoData xianTuLogInfoData1 = new XianTuLogInfoData();
+                            xianTuLogInfoData1.type = 3;
+                            xianTuLogInfoData1.message = "?????????????????????????????????";
+
+                            showXianTuLogInfoData.Add(xianTuLogInfoData);
+                            showXianTuLogInfoData.Add(xianTuLogInfoData1);
+                        }
+                    }
+                    else
                     {
                         XianTuLogInfoData xianTuLogInfoData = new XianTuLogInfoData();
                         xianTuLogInfoData.type = 2;
-                        xianTuLogInfoData.message = "????????";
-                    
-                        XianTuLogInfoData xianTuLogInfoData1 = new XianTuLogInfoData();
-                        xianTuLogInfoData1.type = 3;
-                        xianTuLogInfoData1.message = "?????????????????????????????????";
-                    
+                        xianTuLogInfoData.message = LanguageManager.Instance.Text(eventConfig.EventName);
                         showXianTuLogInfoData.Add(xianTuLogInfoData);
-                        showXianTuLogInfoData.Add(xianTuLogInfoData1);
-                    }
-                    
-                }
-                else
-                {
-                    XianTuLogInfoData xianTuLogInfoData = new XianTuLogInfoData();
-                    xianTuLogInfoData.type = 2;
-                    xianTuLogInfoData.message = LanguageManager.Instance.Text(eventConfig.EventName);
-                    showXianTuLogInfoData.Add(xianTuLogInfoData);
-                    foreach (var eventListSelectEventLinkId in eventList.selectEventLinkIds)
-                    {
-                        EventLinkConfig eventLinkConfig = ConfigComponent.Instance.Get<EventLinkConfig>(eventListSelectEventLinkId);
-                        if (eventLinkConfig.LanID != null)
+                        foreach (var eventListSelectEventLinkId in eventList.selectEventLinkIds)
                         {
-                            foreach (var i in eventLinkConfig.LanID)
+                            EventLinkConfig eventLinkConfig = ConfigComponent.Instance.Get<EventLinkConfig>(eventListSelectEventLinkId);
+                            if (eventLinkConfig.LanID != null)
                             {
-                                XianTuLogInfoData xianTuLogInfoData1 = new XianTuLogInfoData();
-                                xianTuLogInfoData1.type = 3;
-                                xianTuLogInfoData1.message = LanguageManager.Instance.Text(i);
-                                showXianTuLogInfoData.Add(xianTuLogInfoData1);
+                                foreach (var i in eventLinkConfig.LanID)
+                                {
+                                    XianTuLogInfoData xianTuLogInfoData1 = new XianTuLogInfoData();
+                                    xianTuLogInfoData1.type = 3;
+                                    xianTuLogInfoData1.message = LanguageManager.Instance.Text(i);
+                                    showXianTuLogInfoData.Add(xianTuLogInfoData1);
+                                }
                             }
                         }
                     }
                 }
             }
 
+            if (type == 1)
+            {
+                // eventLogTitleWidget.SetActive(true);
+                eventLogTitleWidget.CustomInit(showXianTuLogInfoData[0].message);
+                eventLogTitleWidget.own.SetActive(true);
+            }
+            else if (type == 2)
+            {
+                eventLogTitleWidget.own.SetActive(false);
+            }
 
             Content.Init(this, showXianTuLogInfoData.Count);
         }
@@ -116,6 +157,7 @@ namespace Fort23.Mono
             {
                 EventLogTitleWidget eventLogTitleWidget = await UIManager.Instance.CreateGComponent<EventLogTitleWidget>(null, ContentRoot);
                 eventLogTitleWidget.CustomInit(xianTuLogInfoData.message);
+                titleWidgets.Add(eventLogTitleWidget);
                 components.Add(eventLogTitleWidget);
                 return eventLogTitleWidget;
             }
@@ -140,6 +182,15 @@ namespace Fort23.Mono
         public void HindIScorllListWidget(IScorllListWidget widget)
         {
             UIManager.Instance.DormancyGComponent(widget as UIComponent);
+            if (components.Contains(widget as UIComponent))
+            {
+                components.Remove(widget as UIComponent);
+            }
+
+            if (titleWidgets.Contains(widget as EventLogTitleWidget))
+            {
+                titleWidgets.Remove(widget as EventLogTitleWidget);
+            }
         }
 
         public override void Close()
@@ -151,14 +202,44 @@ namespace Fort23.Mono
             }
 
             components.Clear();
+            titleWidgets.Clear();
 
             base.Close();
         }
 
-        public async static CTask OpenPanel(int id)
+        [CustomMethod(CustomMethodType.Update)]
+        public void Update()
+        {
+            if (type != 2)
+                return;
+            EventLogTitleWidget highestItem = null;
+            float maxY = float.MinValue;
+
+
+            foreach (var xianTuTitleWidget in titleWidgets)
+            {
+                float itemY = xianTuTitleWidget.own.transform.position.y; // 使用世界坐标的 Y 值
+                if (itemY > maxY)
+                {
+                    maxY = itemY;
+                    highestItem = xianTuTitleWidget;
+                }
+            }
+
+            if (highestItem != null)
+            {
+                float outsideY = eventLogTitleWidget.own.transform.position.y;
+                if (maxY > outsideY - 5)
+                {
+                    eventLogTitleWidget.CustomInit(highestItem.Text_Name.text);
+                }
+            }
+        }
+
+        public async static CTask OpenPanel(int type, int id)
         {
             XianTuLogInfoPanel xianTuLogInfoPanel = await UIManager.Instance.LoadAndOpenPanel<XianTuLogInfoPanel>(null);
-            xianTuLogInfoPanel.CustomInit(id);
+            xianTuLogInfoPanel.CustomInit(type, id);
         }
     }
 }

Assets/Scripts/GameUI/UI/XianTuLogPanel/XianTuLogInfoPanelData.cs

@@ -52,6 +52,50 @@ namespace Fort23.Mono
 	      return _Text_Title;
 	     }
 	   }
+	  private GameObject _EventLogTitleWidget;
+	  public GameObject EventLogTitleWidget
+	   {
+	   get{
+	      if (_EventLogTitleWidget == null)
+	       {
+	         _EventLogTitleWidget  = GetUIUnit<GameObject>("EventLogTitleWidget"); 
+	       }
+	      return _EventLogTitleWidget;
+	     }
+	   }
+	  private RectTransform _Marsk1;
+	  public RectTransform Marsk1
+	   {
+	   get{
+	      if (_Marsk1 == null)
+	       {
+	         _Marsk1  = GetUIUnit<RectTransform>("Marsk1"); 
+	       }
+	      return _Marsk1;
+	     }
+	   }
+	  private RectTransform _Marsk2;
+	  public RectTransform Marsk2
+	   {
+	   get{
+	      if (_Marsk2 == null)
+	       {
+	         _Marsk2  = GetUIUnit<RectTransform>("Marsk2"); 
+	       }
+	      return _Marsk2;
+	     }
+	   }
+	  private RectTransform _Sv;
+	  public RectTransform Sv
+	   {
+	   get{
+	      if (_Sv == null)
+	       {
+	         _Sv  = GetUIUnit<RectTransform>("Sv"); 
+	       }
+	      return _Sv;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/XianTuLogPanel/XianTuLogPanel.cs

@@ -1,21 +1,44 @@
 using System.Collections.Generic;
 using System.Linq;
+using Core.Language;
 using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
 using OfficeOpenXml.FormulaParsing.Excel.Functions.Logical;
 using UnityEngine;
+using Utility;
 
 namespace Fort23.Mono
 {
+    public class XianTuData
+    {
+        public int type;
+        public string name;
+        public XianTuLogConfig xianTuLogConfig;
+    }
+
     [UIBinding(prefab = "XianTuLogPanel")]
     public partial class XianTuLogPanel : UIPanel, IScrollListContent
     {
-        private int type = 1;
+        private int type = 0;
+
+        private int bigMaoXaiXuan = 0;
+        private int placesXaiXuan = 0;
 
         List<XianTuLogConfig> xianTuLogConfigs = new List<XianTuLogConfig>();
         List<XianTuLogConfig> shoeXianTuLogConfigs = new List<XianTuLogConfig>();
 
+        List<XianTuSaiXuanWidget> bigMapXianTuSaiWidgets = new List<XianTuSaiXuanWidget>();
+        List<XianTuSaiXuanWidget> placesXianTuSaiWidgets = new List<XianTuSaiXuanWidget>();
+
+        List<XianTuData> xianTuDatas = new List<XianTuData>();
+
+        List<EventLogTitleWidget> xianTuTitleWidgets = new List<EventLogTitleWidget>();
+
+        List<int> places = new List<int>();
+
+        private EventLogTitleWidget eventLogTitleWidget;
+
         private void Init()
         {
             isAddStack = true;
@@ -34,35 +57,252 @@ namespace Fort23.Mono
         {
             Btn_Close.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
 
-            Btn_Main.onClick.AddListener(() =>
-            {
-                if(this.type == 1)
-                    return;
-                UIManager.Instance.DormancyAllGComponent<MainEventLogWidget>();
-                UIManager.Instance.DormancyAllGComponent<EventLogWidget>();
-                type = 1;
-                shoeXianTuLogConfigs = GetTypeXiantuLogConfigs(type);
-                Content.Init(this, shoeXianTuLogConfigs.Count);
-            });
-
-            Btn_Event.onClick.AddListener(() =>
-            {
-                if(this.type == 2)
-                    return;
-                UIManager.Instance.DormancyAllGComponent<MainEventLogWidget>();
-                UIManager.Instance.DormancyAllGComponent<EventLogWidget>();
-                type = 2;
-                shoeXianTuLogConfigs = GetTypeXiantuLogConfigs(type);
-                Content.Init(this, shoeXianTuLogConfigs.Count);
-            });
+            Btn_Main.onClick.AddListener(() => { Btn_Main_OnClick(); });
+
+            Btn_Event.onClick.AddListener(() => { Btn_Event_OnClick(); });
+
+            Btn_XaiXuan.onClick.AddListener(() => { Btn_XaiXuanClose.gameObject.SetActive(true); });
+            Btn_XaiXuanClose.onClick.AddListener(() => { Btn_XaiXuanClose.gameObject.SetActive(false); });
+        }
+
+        private void Btn_Main_OnClick()
+        {
+            if (this.type == 1)
+                return;
+            Sv.transform.SetParent(MarskRoot1);
+            eventLogTitleWidget.own.gameObject.SetActive(false);
+            ChangeList.ShowTargetIndex(0);
+            Btn_XaiXuanClose.gameObject.SetActive(false);
+            Btn_XaiXuan.gameObject.SetActive(false);
+            bigMaoXaiXuan = 0;
+            placesXaiXuan = 0;
+            places.Clear();
+            UIManager.Instance.DormancyAllGComponent<MainEventLogWidget>();
+            UIManager.Instance.DormancyAllGComponent<EventLogWidget>();
+            UIManager.Instance.DormancyAllGComponent<EventLogTitleWidget>();
+            xianTuTitleWidgets.Clear();
+            type = 1;
+            shoeXianTuLogConfigs = GetTypeXiantuLogConfigs(type);
+            XaiXuanMap(shoeXianTuLogConfigs);
+            Content.Init(this, xianTuDatas.Count);
+        }
+
+        private void Btn_Event_OnClick()
+        {
+            if (this.type == 2)
+                return;
+            Sv.transform.SetParent(MarskRoot);
+            eventLogTitleWidget.own.gameObject.SetActive(true);
+            ChangeList.ShowTargetIndex(1);
+            Btn_XaiXuanClose.gameObject.SetActive(false);
+            Btn_XaiXuan.gameObject.SetActive(false);
+            bigMaoXaiXuan = 0;
+            placesXaiXuan = 0;
+            places.Clear();
+            UIManager.Instance.DormancyAllGComponent<MainEventLogWidget>();
+            UIManager.Instance.DormancyAllGComponent<EventLogWidget>();
+            UIManager.Instance.DormancyAllGComponent<EventLogTitleWidget>();
+            xianTuTitleWidgets.Clear();
+            type = 2;
+            shoeXianTuLogConfigs = GetTypeXiantuLogConfigs(type);
+            XaiXuanMap(shoeXianTuLogConfigs);
+            eventLogTitleWidget.CustomInit(xianTuDatas[0].name);
+            Content.Init(this, xianTuDatas.Count);
+        }
+
+        private void XaiXuanMap(List<XianTuLogConfig> configs)
+        {
+            xianTuDatas.Clear();
+            // List<XianTuLogConfig> showConfigs = new List<XianTuLogConfig>();
+            Map<int, List<XianTuLogConfig>> xiantuMap = new Map<int, List<XianTuLogConfig>>();
+            //全部 不筛选
+            if (bigMaoXaiXuan == 0)
+            {
+                if (type == 1)
+                {
+                    foreach (var xianTuLogConfig in configs)
+                    {
+                        XianTuData xianTuData2 = new XianTuData();
+                        xianTuData2.type = 2;
+                        xianTuData2.xianTuLogConfig = xianTuLogConfig;
+                        xianTuDatas.Add(xianTuData2);
+                    }
+                }
+                else
+                {
+                    foreach (var xianTuLogConfig in configs)
+                    {
+                        if (!xiantuMap.ContainsKey(xianTuLogConfig.BigMapID))
+                        {
+                            xiantuMap.Add(xianTuLogConfig.BigMapID, new List<XianTuLogConfig>());
+                        }
+
+                        xiantuMap[xianTuLogConfig.BigMapID].Add(xianTuLogConfig);
+                    }
+
+                    foreach (var keyValuePair in xiantuMap)
+                    {
+                        XianTuData xianTuData = new XianTuData();
+                        xianTuData.type = 1;
+                        BigMapConfig bigMapConfig = ConfigComponent.Instance.Get<BigMapConfig>(keyValuePair.Key);
+                        xianTuData.name = LanguageManager.Instance.Text(bigMapConfig.mapName);
+                        xianTuDatas.Add(xianTuData);
+                        foreach (var xianTuLogConfig in keyValuePair.Value)
+                        {
+                            XianTuData xianTuData2 = new XianTuData();
+                            xianTuData2.type = 2;
+                            xianTuData2.xianTuLogConfig = xianTuLogConfig;
+                            xianTuDatas.Add(xianTuData2);
+                        }
+                    }
+                }
+
+
+                return;
+            }
+
+
+            List<EventConfig> eventConfigs;
+            foreach (var xianTuLogConfig in configs)
+            {
+                if (EventSystemManager.Instance.eventConfigsMap.ContainsKey(xianTuLogConfig.ID))
+                {
+                    eventConfigs = EventSystemManager.Instance.eventConfigsMap[xianTuLogConfig.ID];
+                    foreach (var eventConfig in eventConfigs)
+                    {
+                        if (places.Contains(eventConfig.placeID))
+                        {
+                            PlacesConfig placesConfig = ConfigComponent.Instance.Get<PlacesConfig>(eventConfig.placeID);
+                            if (!xiantuMap.ContainsKey(placesConfig.bigMapID))
+                            {
+                                xiantuMap.Add(placesConfig.bigMapID, new List<XianTuLogConfig>());
+                            }
+
+                            xiantuMap[placesConfig.bigMapID].Add(xianTuLogConfig);
+                            // showConfigs.Add(xianTuLogConfig);
+                            break;
+                        }
+                    }
+                }
+            }
+
+            foreach (var keyValuePair in xiantuMap)
+            {
+                XianTuData xianTuData = new XianTuData();
+                xianTuData.type = 1;
+                BigMapConfig bigMapConfig = ConfigComponent.Instance.Get<BigMapConfig>(keyValuePair.Key);
+                xianTuData.name = LanguageManager.Instance.Text(bigMapConfig.mapName);
+                xianTuDatas.Add(xianTuData);
+                foreach (var xianTuLogConfig in keyValuePair.Value)
+                {
+                    XianTuData xianTuData2 = new XianTuData();
+                    xianTuData2.type = 2;
+                    xianTuData2.xianTuLogConfig = xianTuLogConfig;
+                    xianTuDatas.Add(xianTuData2);
+                }
+            }
         }
 
-        public override CTask<bool> AsyncInit(object[] uiData)
+        public async override CTask<bool> AsyncInit(object[] uiData)
         {
             xianTuLogConfigs = ConfigComponent.Instance.GetAll<XianTuLogConfig>().ToList();
+
+            XianTuSaiXuanWidget xianTuSaiXuanWidget1 = await UIManager.Instance.CreateGComponentForObject<XianTuSaiXuanWidget>(XianTuSaiXuanWidget1, null);
+            xianTuSaiXuanWidget1.CustomInit(1, 0);
+            xianTuSaiXuanWidget1.OnClick = OnClick;
+
+            xianTuSaiXuanWidget1 = await UIManager.Instance.CreateGComponentForObject<XianTuSaiXuanWidget>(XianTuSaiXuanWidget2, null);
+            xianTuSaiXuanWidget1.CustomInit(2, 0);
+            xianTuSaiXuanWidget1.OnClick = OnClick;
+
+            BigMapConfig[] bigMapConfigs = ConfigComponent.Instance.GetAll<BigMapConfig>();
+            foreach (var bigMapConfig in bigMapConfigs)
+            {
+                XianTuSaiXuanWidget xianTuSaiXuanWidget = await UIManager.Instance.CreateGComponent<XianTuSaiXuanWidget>(null, BigMapConnect);
+                xianTuSaiXuanWidget.CustomInit(1, bigMapConfig.ID);
+                xianTuSaiXuanWidget.OnClick = OnClick;
+                bigMapXianTuSaiWidgets.Add(xianTuSaiXuanWidget);
+            }
+
+            eventLogTitleWidget = await UIManager.Instance.CreateGComponentForObject<EventLogTitleWidget>(EventLogTitleWidgetGam, null);
+
+
+            BigMapList.GetChildObj();
+            BigMapList.ShowTargetIndex(0);
+
+            Btn_Main_OnClick();
+            return await base.AsyncInit(uiData);
+        }
+
+        private async void OnClick(ItemWidgetBasic obj)
+        {
+            XianTuSaiXuanWidget xianTuSaiXuanWidge = obj as XianTuSaiXuanWidget;
+            if (xianTuSaiXuanWidge.type == 1)
+            {
+                bigMaoXaiXuan = xianTuSaiXuanWidge._bigMapConfig.ID;
+                placesXaiXuan = 0;
+                foreach (var placesXianTuSaiWidget in placesXianTuSaiWidgets)
+                {
+                    UIManager.Instance.DormancyGComponent(placesXianTuSaiWidget);
+                }
+
+                placesXianTuSaiWidgets.Clear();
+                if (bigMaoXaiXuan == 0)
+                {
+                    PlacesRoot.gameObject.SetActive(false);
+                    BigMapList.ShowTargetIndex(0);
+                }
+                else
+                {
+                    PlacesRoot.gameObject.SetActive(true);
+                    foreach (var place in xianTuSaiXuanWidge._bigMapConfig.places)
+                    {
+                        XianTuSaiXuanWidget xianTuSaiXuanWidget = await UIManager.Instance.CreateGComponent<XianTuSaiXuanWidget>(null, PlacesConnect);
+                        xianTuSaiXuanWidget.CustomInit(2, place);
+                        xianTuSaiXuanWidget.OnClick = OnClick;
+                        placesXianTuSaiWidgets.Add(xianTuSaiXuanWidget);
+                    }
+
+                    BigMapList.ClickWidget(xianTuSaiXuanWidge.own.GetComponent<UIToggleWidgetBasic>());
+
+                    PlacesRootList.GetChildObj();
+                    PlacesRootList.ShowTargetIndex(0);
+                }
+            }
+            else if (xianTuSaiXuanWidge.type == 2)
+            {
+                placesXaiXuan = xianTuSaiXuanWidge._placesConfig.ID;
+                if (placesXaiXuan == 0)
+                {
+                    PlacesRootList.ShowTargetIndex(0);
+                }
+                else
+                {
+                    PlacesRootList.ClickWidget(xianTuSaiXuanWidge.own.GetComponent<UIToggleWidgetBasic>());
+                }
+            }
+
+            BigMapConfig bigMapConfig = ConfigComponent.Instance.Get<BigMapConfig>(bigMaoXaiXuan);
+            PlacesConfig placesConfig = ConfigComponent.Instance.Get<PlacesConfig>(placesXaiXuan);
+
+            places.Clear();
+            if (bigMaoXaiXuan == 0)
+            {
+            }
+            else if (bigMaoXaiXuan != 0 && placesXaiXuan == 0)
+            {
+                places.AddRange(bigMapConfig.places);
+            }
+            else if (bigMaoXaiXuan != 0 && placesXaiXuan != 0)
+            {
+                places.Add(placesConfig.ID);
+            }
+
+            UIManager.Instance.DormancyAllGComponent<MainEventLogWidget>();
+            UIManager.Instance.DormancyAllGComponent<EventLogWidget>();
             shoeXianTuLogConfigs = GetTypeXiantuLogConfigs(type);
-            Content.Init(this, shoeXianTuLogConfigs.Count);
-            return base.AsyncInit(uiData);
+            XaiXuanMap(shoeXianTuLogConfigs);
+            Content.Init(this, xianTuDatas.Count);
         }
 
 
@@ -82,7 +322,7 @@ namespace Fort23.Mono
 
         public async CTask<IScorllListWidget> GetIScorllListWidget(int index, RectTransform root)
         {
-            if (index < 0 || index >= shoeXianTuLogConfigs.Count)
+            if (index < 0 || index >= xianTuDatas.Count)
             {
                 return null;
             }
@@ -90,22 +330,37 @@ namespace Fort23.Mono
             if (type == 1)
             {
                 MainEventLogWidget mainEventLogWidget = await UIManager.Instance.CreateGComponent<MainEventLogWidget>(null, Content.GetComponent<RectTransform>());
-                mainEventLogWidget.CustomInit(shoeXianTuLogConfigs[index]);
+                mainEventLogWidget.CustomInit(xianTuDatas[index].xianTuLogConfig);
 
                 return mainEventLogWidget;
             }
             else
             {
-                EventLogWidget EventLogWidget = await UIManager.Instance.CreateGComponent<EventLogWidget>(null, Content.GetComponent<RectTransform>());
-                await EventLogWidget.CustomInit(shoeXianTuLogConfigs[index]);
+                XianTuData xianTuData = xianTuDatas[index];
+                if (xianTuData.type == 1)
+                {
+                    EventLogTitleWidget eventLogTitleWidget = await UIManager.Instance.CreateGComponent<EventLogTitleWidget>(null, Content.GetComponent<RectTransform>());
+                    eventLogTitleWidget.CustomInit(xianTuData.name);
+                    xianTuTitleWidgets.Add(eventLogTitleWidget);
+                    return eventLogTitleWidget;
+                }
+                else
+                {
+                    EventLogWidget EventLogWidget = await UIManager.Instance.CreateGComponent<EventLogWidget>(null, Content.GetComponent<RectTransform>());
+                    await EventLogWidget.CustomInit(xianTuData.xianTuLogConfig, places);
 
-                return EventLogWidget;
+                    return EventLogWidget;
+                }
             }
         }
 
         public void HindIScorllListWidget(IScorllListWidget widget)
         {
             UIManager.Instance.DormancyGComponent(widget as UIComponent);
+            if (xianTuTitleWidgets.Contains(widget as EventLogTitleWidget))
+            {
+                xianTuTitleWidgets.Remove(widget as EventLogTitleWidget);
+            }
         }
 
         public async static CTask OpenPanel()
@@ -113,11 +368,63 @@ namespace Fort23.Mono
             XianTuLogPanel xianTuLogPanel = await UIManager.Instance.LoadAndOpenPanel<XianTuLogPanel>(null);
         }
 
+        [CustomMethod(CustomMethodType.Update)]
+        public void Update()
+        {
+            if (type != 2)
+                return;
+            EventLogTitleWidget highestItem = null;
+            float maxY = float.MinValue;
+
+
+            foreach (var xianTuTitleWidget in xianTuTitleWidgets)
+            {
+                float itemY = xianTuTitleWidget.own.transform.position.y; // 使用世界坐标的 Y 值
+                if (itemY > maxY)
+                {
+                    maxY = itemY;
+                    highestItem = xianTuTitleWidget;
+                }
+            }
+
+            if (highestItem != null)
+            {
+                float outsideY = eventLogTitleWidget.own.transform.position.y;
+                if (maxY > outsideY-5)
+                {
+                    eventLogTitleWidget.CustomInit(highestItem.Text_Name.text);
+                }
+            }
+        }
+
         public override void Close()
         {
             UIManager.Instance.DormancyAllGComponent<MainEventLogWidget>();
             UIManager.Instance.DormancyAllGComponent<EventLogWidget>();
-            type = 2;
+            UIManager.Instance.DormancyAllGComponent<EventLogTitleWidget>();
+            xianTuTitleWidgets.Clear();
+            type = 0;
+            foreach (var bigMapXianTuSaiWidget in bigMapXianTuSaiWidgets)
+            {
+                UIManager.Instance.DormancyGComponent(bigMapXianTuSaiWidget);
+            }
+
+            bigMapXianTuSaiWidgets.Clear();
+
+            foreach (var placesXianTuSaiWidget in placesXianTuSaiWidgets)
+            {
+                UIManager.Instance.DormancyGComponent(placesXianTuSaiWidget);
+            }
+
+            placesXianTuSaiWidgets.Clear();
+
+            Btn_XaiXuanClose.gameObject.SetActive(false);
+            Btn_XaiXuan.gameObject.SetActive(false);
+
+            bigMaoXaiXuan = 0;
+            placesXaiXuan = 0;
+            places.Clear();
+
             base.Close();
         }
     }

Assets/Scripts/GameUI/UI/XianTuLogPanel/XianTuLogPanelData.cs

@@ -52,6 +52,171 @@ namespace Fort23.Mono
 	      return _Btn_Event;
 	     }
 	   }
+	  private RectTransform _BigMapConnect;
+	  public RectTransform BigMapConnect
+	   {
+	   get{
+	      if (_BigMapConnect == null)
+	       {
+	         _BigMapConnect  = GetUIUnit<RectTransform>("BigMapConnect"); 
+	       }
+	      return _BigMapConnect;
+	     }
+	   }
+	  private RectTransform _PlacesConnect;
+	  public RectTransform PlacesConnect
+	   {
+	   get{
+	      if (_PlacesConnect == null)
+	       {
+	         _PlacesConnect  = GetUIUnit<RectTransform>("PlacesConnect"); 
+	       }
+	      return _PlacesConnect;
+	     }
+	   }
+	  private GameObject _PlacesRoot;
+	  public GameObject PlacesRoot
+	   {
+	   get{
+	      if (_PlacesRoot == null)
+	       {
+	         _PlacesRoot  = GetUIUnit<GameObject>("PlacesRoot"); 
+	       }
+	      return _PlacesRoot;
+	     }
+	   }
+	  private GameObject _XianTuSaiXuanWidget1;
+	  public GameObject XianTuSaiXuanWidget1
+	   {
+	   get{
+	      if (_XianTuSaiXuanWidget1 == null)
+	       {
+	         _XianTuSaiXuanWidget1  = GetUIUnit<GameObject>("XianTuSaiXuanWidget1"); 
+	       }
+	      return _XianTuSaiXuanWidget1;
+	     }
+	   }
+	  private GameObject _XianTuSaiXuanWidget2;
+	  public GameObject XianTuSaiXuanWidget2
+	   {
+	   get{
+	      if (_XianTuSaiXuanWidget2 == null)
+	       {
+	         _XianTuSaiXuanWidget2  = GetUIUnit<GameObject>("XianTuSaiXuanWidget2"); 
+	       }
+	      return _XianTuSaiXuanWidget2;
+	     }
+	   }
+	  private Button _Btn_XaiXuan;
+	  public Button Btn_XaiXuan
+	   {
+	   get{
+	      if (_Btn_XaiXuan == null)
+	       {
+	         _Btn_XaiXuan  = GetUIUnit<Button>("Btn_XaiXuan"); 
+	       }
+	      return _Btn_XaiXuan;
+	     }
+	   }
+	  private GameObject _XaiXuanRoot;
+	  public GameObject XaiXuanRoot
+	   {
+	   get{
+	      if (_XaiXuanRoot == null)
+	       {
+	         _XaiXuanRoot  = GetUIUnit<GameObject>("XaiXuanRoot"); 
+	       }
+	      return _XaiXuanRoot;
+	     }
+	   }
+	  private Button _Btn_XaiXuanClose;
+	  public Button Btn_XaiXuanClose
+	   {
+	   get{
+	      if (_Btn_XaiXuanClose == null)
+	       {
+	         _Btn_XaiXuanClose  = GetUIUnit<Button>("Btn_XaiXuanClose"); 
+	       }
+	      return _Btn_XaiXuanClose;
+	     }
+	   }
+	  private UIToggleList _ChangeList;
+	  public UIToggleList ChangeList
+	   {
+	   get{
+	      if (_ChangeList == null)
+	       {
+	         _ChangeList  = GetUIUnit<UIToggleList>("ChangeList"); 
+	       }
+	      return _ChangeList;
+	     }
+	   }
+	  private UIToggleList _BigMapList;
+	  public UIToggleList BigMapList
+	   {
+	   get{
+	      if (_BigMapList == null)
+	       {
+	         _BigMapList  = GetUIUnit<UIToggleList>("BigMapList"); 
+	       }
+	      return _BigMapList;
+	     }
+	   }
+	  private UIToggleList _PlacesRootList;
+	  public UIToggleList PlacesRootList
+	   {
+	   get{
+	      if (_PlacesRootList == null)
+	       {
+	         _PlacesRootList  = GetUIUnit<UIToggleList>("PlacesRootList"); 
+	       }
+	      return _PlacesRootList;
+	     }
+	   }
+	  private GameObject _EventLogTitleWidgetGam;
+	  public GameObject EventLogTitleWidgetGam
+	   {
+	   get{
+	      if (_EventLogTitleWidgetGam == null)
+	       {
+	         _EventLogTitleWidgetGam  = GetUIUnit<GameObject>("EventLogTitleWidgetGam"); 
+	       }
+	      return _EventLogTitleWidgetGam;
+	     }
+	   }
+	  private RectTransform _MarskRoot;
+	  public RectTransform MarskRoot
+	   {
+	   get{
+	      if (_MarskRoot == null)
+	       {
+	         _MarskRoot  = GetUIUnit<RectTransform>("MarskRoot"); 
+	       }
+	      return _MarskRoot;
+	     }
+	   }
+	  private RectTransform _Sv;
+	  public RectTransform Sv
+	   {
+	   get{
+	      if (_Sv == null)
+	       {
+	         _Sv  = GetUIUnit<RectTransform>("Sv"); 
+	       }
+	      return _Sv;
+	     }
+	   }
+	  private RectTransform _MarskRoot1 ;
+	  public RectTransform MarskRoot1 
+	   {
+	   get{
+	      if (_MarskRoot  == null)
+	       {
+	         _MarskRoot   = GetUIUnit<RectTransform>("MarskRoot "); 
+	       }
+	      return _MarskRoot ;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/XianTuLogPanel/XianTuSaiXuanWidget.cs

@@ -0,0 +1,62 @@
+using Core.Language;
+using Excel2Json;
+using Fort23.UTool;
+
+namespace Fort23.Mono
+{
+    [UIBinding(prefab = "XianTuSaiXuanWidget")]
+    public partial class XianTuSaiXuanWidget : ItemWidgetBasic
+    {
+        public int type;
+        public BigMapConfig _bigMapConfig;
+        public PlacesConfig _placesConfig;
+
+
+        private void Init()
+        {
+        }
+
+        public override void AddEvent()
+        {
+        }
+
+        public override void DelEvent()
+        {
+        }
+
+        public override void AddButtonEvent()
+        {
+            base.AddButtonEvent();
+        }
+
+        public void CustomInit(int type, int id)
+        {
+            this.type = type;
+            if (type == 1)
+            {
+                _bigMapConfig = ConfigComponent.Instance.Get<BigMapConfig>(id);
+                if (_bigMapConfig.ID == 0)
+                {
+                    Text_Name.text = "全部";
+                }
+                else
+                {
+                    Text_Name.text = LanguageManager.Instance.Text(_bigMapConfig.mapName);
+                }
+            }
+            else if (type == 2)
+            {
+                _placesConfig = ConfigComponent.Instance.Get<PlacesConfig>(id);
+
+                if (_placesConfig.ID == 0)
+                {
+                    Text_Name.text = "全部";
+                }
+                else
+                {
+                    Text_Name.text = LanguageManager.Instance.Text(_placesConfig.placeName);
+                }
+            }
+        }
+    }
+}

Assets/Scripts/GameUI/UI/XianTuLogPanel/XianTuSaiXuanWidget.cs.meta

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

Assets/Scripts/GameUI/UI/XianTuLogPanel/XianTuSaiXuanWidgetData.cs

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

Assets/Scripts/GameUI/UI/XianTuLogPanel/XianTuSaiXuanWidgetData.cs.meta

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

UserSettings/Layouts/default-2022.dwlt

@@ -15,146 +15,16 @@ MonoBehaviour:
   m_PixelRect:
     serializedVersion: 2
     x: 0
-    y: 32.000004
-    width: 1920.0002
-    height: 1012.0001
+    y: 43
+    width: 2560
+    height: 1349
   m_ShowMode: 4
-  m_Title: "\u5C42\u7EA7"
-  m_RootView: {fileID: 7}
+  m_Title: Hierarchy
+  m_RootView: {fileID: 2}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_Maximized: 1
 --- !u!114 &2
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: TimelineWindow
-  m_EditorClassIdentifier: 
-  m_Children: []
-  m_Position:
-    serializedVersion: 2
-    x: 0
-    y: 558.50006
-    width: 672.5001
-    height: 403.5
-  m_MinSize: {x: 102, y: 121}
-  m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 15}
-  m_Panes:
-  - {fileID: 15}
-  m_Selected: 0
-  m_LastSelected: 0
---- !u!114 &3
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Children:
-  - {fileID: 13}
-  - {fileID: 2}
-  m_Position:
-    serializedVersion: 2
-    x: 465.50003
-    y: 0
-    width: 672.5001
-    height: 962.00006
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 8096, y: 16192}
-  vertical: 1
-  controlID: 43
-  draggingID: 0
---- !u!114 &4
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: ProjectBrowser
-  m_EditorClassIdentifier: 
-  m_Children: []
-  m_Position:
-    serializedVersion: 2
-    x: 0
-    y: 498.00003
-    width: 439
-    height: 464.00003
-  m_MinSize: {x: 232, y: 271}
-  m_MaxSize: {x: 10002, y: 10021}
-  m_ActualView: {fileID: 18}
-  m_Panes:
-  - {fileID: 18}
-  m_Selected: 0
-  m_LastSelected: 0
---- !u!114 &5
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Children:
-  - {fileID: 11}
-  - {fileID: 4}
-  m_Position:
-    serializedVersion: 2
-    x: 1138.0001
-    y: 0
-    width: 439
-    height: 962.00006
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 8096, y: 16192}
-  vertical: 1
-  controlID: 71
-  draggingID: 0
---- !u!114 &6
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: GameView
-  m_EditorClassIdentifier: 
-  m_Children: []
-  m_Position:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 465.50003
-    height: 962.00006
-  m_MinSize: {x: 201, y: 221}
-  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 19}
-  m_Panes:
-  - {fileID: 19}
-  m_Selected: 0
-  m_LastSelected: 0
---- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -167,22 +37,22 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 8}
-  - {fileID: 9}
-  - {fileID: 10}
+  - {fileID: 3}
+  - {fileID: 4}
+  - {fileID: 5}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1920.0001
-    height: 1012.00006
+    width: 2560
+    height: 1349
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_UseTopView: 1
   m_TopViewHeight: 30
   m_UseBottomView: 1
   m_BottomViewHeight: 20
---- !u!114 &8
+--- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -199,12 +69,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1920.0001
+    width: 2560
     height: 30
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
-  m_LastLoadedLayoutName: 
---- !u!114 &9
+  m_LastLoadedLayoutName: 1
+--- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -217,22 +87,22 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
+  - {fileID: 9}
   - {fileID: 6}
-  - {fileID: 3}
-  - {fileID: 5}
-  - {fileID: 12}
+  - {fileID: 7}
+  - {fileID: 8}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 30
-    width: 1920.0001
-    height: 962.00006
-  m_MinSize: {x: 400, y: 100}
-  m_MaxSize: {x: 32384, y: 16192}
+    width: 2560
+    height: 1299
+  m_MinSize: {x: 400, y: 50}
+  m_MaxSize: {x: 32384, y: 8096}
   vertical: 0
-  controlID: 42
+  controlID: 456
   draggingID: 0
---- !u!114 &10
+--- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -248,12 +118,12 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 992.00006
-    width: 1920.0001
+    y: 1329
+    width: 2560
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
---- !u!114 &11
+--- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -268,18 +138,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 0
+    x: 1209
     y: 0
-    width: 439
-    height: 498.00003
+    width: 411
+    height: 1299
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 16}
+  m_ActualView: {fileID: 10}
   m_Panes:
-  - {fileID: 16}
+  - {fileID: 10}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &12
+--- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -294,18 +164,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1577.0001
+    x: 1620
     y: 0
-    width: 343
-    height: 962.00006
-  m_MinSize: {x: 276, y: 71}
-  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 17}
+    width: 367
+    height: 1299
+  m_MinSize: {x: 232, y: 271}
+  m_MaxSize: {x: 10002, y: 10021}
+  m_ActualView: {fileID: 12}
   m_Panes:
-  - {fileID: 17}
+  - {fileID: 12}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &13
+--- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -315,145 +185,23 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: SceneView
+  m_Name: 
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 0
+    x: 1987
     y: 0
-    width: 672.5001
-    height: 558.50006
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 20}
+    width: 573
+    height: 1299
+  m_MinSize: {x: 276, y: 71}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 11}
   m_Panes:
-  - {fileID: 20}
-  - {fileID: 14}
+  - {fileID: 11}
   m_Selected: 0
-  m_LastSelected: 1
---- !u!114 &14
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 12914, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_TitleContent:
-    m_Text: "\u52A8\u753B\u5668"
-    m_Image: {fileID: 1711060831702674872, guid: 0000000000000000d000000000000000, type: 0}
-    m_Tooltip: 
-  m_Pos:
-    serializedVersion: 2
-    x: 465.50006
-    y: 62.000008
-    width: 670.5001
-    height: 537.50006
-  m_SerializedDataModeController:
-    m_DataMode: 0
-    m_PreferredDataMode: 0
-    m_SupportedDataModes: 
-    isAutomatic: 1
-  m_ViewDataDictionary: {fileID: 0}
-  m_OverlayCanvas:
-    m_LastAppliedPresetName: Default
-    m_SaveData: []
-    m_OverlaysVisible: 1
-  m_ViewTransforms:
-    m_KeySerializationHelper:
-    - {fileID: -2482649398091839639, guid: 139d91e0dc707e24aafcff9a6c063703, type: 2}
-    - {fileID: -1657180535831846619, guid: 29ee6adcbcb9bf542a58fae3982213f5, type: 2}
-    - {fileID: -6746310318487003152, guid: bec3e919fc7fc974a964515148bef6ea, type: 2}
-    - {fileID: -3858470786119003265, guid: c59579014307e4f459b17a81ef04e671, type: 2}
-    m_ValueSerializationHelper:
-    - e00: 0.37947372
-      e01: 0
-      e02: 0
-      e03: -3.9736786
-      e10: 0
-      e11: 0.37947372
-      e12: 0
-      e13: 152.24475
-      e20: 0
-      e21: 0
-      e22: 1
-      e23: 0
-      e30: 0
-      e31: 0
-      e32: 0
-      e33: 1
-    - e00: 0.37947372
-      e01: 0
-      e02: 0
-      e03: -3.9736786
-      e10: 0
-      e11: 0.37947372
-      e12: 0
-      e13: 152.24475
-      e20: 0
-      e21: 0
-      e22: 1
-      e23: 0
-      e30: 0
-      e31: 0
-      e32: 0
-      e33: 1
-    - e00: 0.37947372
-      e01: 0
-      e02: 0
-      e03: -3.9736786
-      e10: 0
-      e11: 0.37947372
-      e12: 0
-      e13: 152.24475
-      e20: 0
-      e21: 0
-      e22: 1
-      e23: 0
-      e30: 0
-      e31: 0
-      e32: 0
-      e33: 1
-    - e00: 0.66370183
-      e01: 0
-      e02: 0
-      e03: -111.43112
-      e10: 0
-      e11: 0.66370183
-      e12: 0
-      e13: 56.73352
-      e20: 0
-      e21: 0
-      e22: 1
-      e23: 0
-      e30: 0
-      e31: 0
-      e32: 0
-      e33: 1
-  m_PreviewAnimator: {fileID: 0}
-  m_AnimatorController: {fileID: 9100000, guid: c59579014307e4f459b17a81ef04e671, type: 2}
-  m_BreadCrumbs:
-  - m_Target: {fileID: -3858470786119003265, guid: c59579014307e4f459b17a81ef04e671, type: 2}
-    m_ScrollPosition: {x: 0, y: 0}
-  stateMachineGraph: {fileID: 0}
-  stateMachineGraphGUI: {fileID: 0}
-  blendTreeGraph: {fileID: 0}
-  blendTreeGraphGUI: {fileID: 0}
-  m_AutoLiveLink: 1
-  m_MiniTool: 0
-  m_LockTracker:
-    m_IsLocked: 0
-  m_CurrentEditor: 0
-  m_LayerEditor:
-    m_SelectedLayerIndex: 0
---- !u!114 &15
+  m_LastSelected: 0
+--- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -461,42 +209,26 @@ MonoBehaviour:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 0}
   m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f817a38900380be47942905e17e7d39b, type: 3}
-  m_Name: 
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: SceneView
   m_EditorClassIdentifier: 
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_TitleContent:
-    m_Text: "\u65F6\u95F4\u8F74"
-    m_Image: {fileID: -5401195905404635996, guid: 0000000000000000d000000000000000, type: 0}
-    m_Tooltip: 
-  m_Pos:
+  m_Children: []
+  m_Position:
     serializedVersion: 2
-    x: 465.50006
-    y: 620.50006
-    width: 670.5001
-    height: 382.5
-  m_SerializedDataModeController:
-    m_DataMode: 0
-    m_PreferredDataMode: 0
-    m_SupportedDataModes: 
-    isAutomatic: 1
-  m_ViewDataDictionary: {fileID: 0}
-  m_OverlayCanvas:
-    m_LastAppliedPresetName: Default
-    m_SaveData: []
-    m_OverlaysVisible: 1
-  m_Preferences:
-    editType: 0
-    timeReferenceMode: 0
-  m_LockTracker:
-    m_IsLocked: 0
-  m_SequenceHierarchy: {fileID: 0}
-  m_SequencePath:
-    m_SelectionRoot: 0
-    m_SubElements: []
---- !u!114 &16
+    x: 0
+    y: 0
+    width: 1209
+    height: 1299
+  m_MinSize: {x: 201, y: 221}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 14}
+  m_Panes:
+  - {fileID: 14}
+  - {fileID: 13}
+  m_Selected: 0
+  m_LastSelected: 1
+--- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -511,15 +243,15 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
-    m_Text: "\u5C42\u7EA7"
-    m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: Hierarchy
+    m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1138.0001
-    y: 62.000008
-    width: 437
-    height: 477.00003
+    x: 1209
+    y: 73
+    width: 409
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -532,10 +264,10 @@ MonoBehaviour:
     m_OverlaysVisible: 1
   m_SceneHierarchy:
     m_TreeViewState:
-      scrollPos: {x: 0, y: 60}
-      m_SelectedIDs: 86e6feff
-      m_LastClickedID: -72058
-      m_ExpandedIDs: 504cffff1485ffffd28bffff7efaffff445a0100845a0100aa5b0100e860010032650100ca650100
+      scrollPos: {x: 0, y: 0}
+      m_SelectedIDs: 
+      m_LastClickedID: 0
+      m_ExpandedIDs: 7659fcff7c59fcff5abafeff64bafeff6ebafeff78bafeffb6bafeffdac8feffdec8feffecc8feffe8f8feff78fdfeff82fdfeff8cfdfeffcafdfeff000fffff1c0fffff2a0fffffe672fffff072fffffa72ffff3873fffffca4ffff0aa5ffff78faffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -551,7 +283,7 @@ MonoBehaviour:
         m_IsRenaming: 0
         m_OriginalEventType: 11
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 11}
+        m_ClientGUIView: {fileID: 6}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
@@ -559,7 +291,7 @@ MonoBehaviour:
       m_IsLocked: 0
     m_CurrentSortingName: TransformSorting
   m_WindowGUID: 468457e0d3add1041b6fec0b00b6a014
---- !u!114 &17
+--- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -574,15 +306,15 @@ MonoBehaviour:
   m_MinSize: {x: 275, y: 50}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
-    m_Text: "\u68C0\u67E5\u5668"
-    m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: Inspector
+    m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1577.0002
-    y: 62.000008
-    width: 342
-    height: 941.00006
+    x: 1987
+    y: 73
+    width: 572
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -596,7 +328,7 @@ MonoBehaviour:
   m_ObjectsLockedBeforeSerialization: []
   m_InstanceIDsLockedBeforeSerialization: 
   m_PreviewResizer:
-    m_CachedPref: 266.50006
+    m_CachedPref: -160
     m_ControlHash: -371814159
     m_PrefName: Preview_InspectorPreview
   m_LastInspectedObjectInstanceID: -1
@@ -606,7 +338,7 @@ MonoBehaviour:
   m_LockTracker:
     m_IsLocked: 0
   m_PreviewWindow: {fileID: 0}
---- !u!114 &18
+--- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -621,15 +353,15 @@ MonoBehaviour:
   m_MinSize: {x: 230, y: 250}
   m_MaxSize: {x: 10000, y: 10000}
   m_TitleContent:
-    m_Text: "\u9879\u76EE"
-    m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: Project
+    m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1138.0001
-    y: 560.00006
-    width: 437
-    height: 443.00003
+    x: 1620
+    y: 73
+    width: 365
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -651,7 +383,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Art/VFX/FXMeshs
+    - Assets/Res/UI/XianTuLogPanel
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
@@ -659,16 +391,16 @@ MonoBehaviour:
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Art/VFX/FXMeshs
+  - Assets/Res/UI/XianTuLogPanel
   m_LastFoldersGridSize: 16
-  m_LastProjectPath: E:\XY002\XiuXianGame
+  m_LastProjectPath: D:\FB\XiuXianGame
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 424.99997}
-    m_SelectedIDs: 083e0100
-    m_LastClickedID: 81416
-    m_ExpandedIDs: 00000000f83c0100fa3c0100fc3c0100fe3c0100003d0100023d0100043d0100063d0100083d01000a3d0100083e010000ca9a3b
+    scrollPos: {x: 0, y: 342}
+    m_SelectedIDs: da3c0100
+    m_LastClickedID: 81114
+    m_ExpandedIDs: 0000000086e3000088e300008ae300008ce300008ee3000090e3000092e3000094e3000096e3000098e300009ae300009ce300009ee30000fae600000ce7000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -696,7 +428,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000f83c0100fa3c0100fc3c0100fe3c0100003d0100023d0100043d0100063d0100083d01000a3d0100
+    m_ExpandedIDs: 0000000086e3000088e300008ae300008ce300008ee3000090e3000092e3000094e3000096e3000098e300009ae300009ce300009ee3000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -723,24 +455,24 @@ MonoBehaviour:
   m_ListAreaState:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
-    m_HadKeyboardFocusLastEvent: 0
-    m_ExpandedInstanceIDs: ccd40000ec17010052190100ae400100
+    m_HadKeyboardFocusLastEvent: 1
+    m_ExpandedInstanceIDs: 
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: 
-      m_OriginalName: 
+      m_Name: EventMinLogWidget
+      m_OriginalName: EventMinLogWidget
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 0
+      m_UserData: 133758
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 11
+      m_OriginalEventType: 0
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 4}
+      m_ClientGUIView: {fileID: 7}
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
@@ -748,11 +480,11 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
     m_NewAssetIndexInList: -1
-    m_ScrollPosition: {x: 0, y: 60}
+    m_ScrollPosition: {x: 0, y: 0}
     m_GridSize: 16
   m_SkipHiddenPackages: 0
-  m_DirectoriesAreaWidth: 171.5
---- !u!114 &19
+  m_DirectoriesAreaWidth: 115
+--- !u!114 &13
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -767,15 +499,15 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
-    m_Text: "\u6E38\u620F"
-    m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: Game
+    m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 62.000008
-    width: 464.50003
-    height: 941.00006
+    y: 73
+    width: 1208
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -801,16 +533,16 @@ MonoBehaviour:
   m_VSyncEnabled: 0
   m_Gizmos: 0
   m_Stats: 0
-  m_SelectedSizes: 07000000000000000000000011000000000000000000000000000000000000000000000000000000
+  m_SelectedSizes: 08000000000000000000000012000000000000000000000000000000000000000000000000000000
   m_ZoomArea:
     m_HRangeLocked: 0
     m_VRangeLocked: 0
     hZoomLockedByDefault: 0
     vZoomLockedByDefault: 0
-    m_HBaseRangeMin: -187.50002
-    m_HBaseRangeMax: 187.50002
-    m_VBaseRangeMin: -406.00006
-    m_VBaseRangeMax: 406.00006
+    m_HBaseRangeMin: -375
+    m_HBaseRangeMax: 375
+    m_VBaseRangeMin: -812
+    m_VBaseRangeMax: 812
     m_HAllowExceedBaseRangeMin: 1
     m_HAllowExceedBaseRangeMax: 1
     m_VAllowExceedBaseRangeMin: 1
@@ -819,7 +551,7 @@ MonoBehaviour:
     m_HSlider: 0
     m_VSlider: 0
     m_IgnoreScrollWheelUntilClicked: 0
-    m_EnableMouseInput: 1
+    m_EnableMouseInput: 0
     m_EnableSliderZoomHorizontal: 0
     m_EnableSliderZoomVertical: 0
     m_UniformScale: 1
@@ -828,29 +560,29 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 464.50003
-      height: 920.00006
-    m_Scale: {x: 1, y: 1}
-    m_Translation: {x: 232.25002, y: 460.00003}
+      width: 1208
+      height: 1257
+    m_Scale: {x: 0.7740148, y: 0.7740148}
+    m_Translation: {x: 604, y: 628.5}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -232.25002
-      y: -460.00003
-      width: 464.50003
-      height: 920.00006
+      x: -780.34686
+      y: -812
+      width: 1560.6937
+      height: 1624
     m_MinimalGUI: 1
-  m_defaultScale: 1
-  m_LastWindowPixelSize: {x: 929, y: 1882}
+  m_defaultScale: 0.7740148
+  m_LastWindowPixelSize: {x: 1208, y: 1278}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000001000000000000
   m_XRRenderMode: 0
   m_RenderTexture: {fileID: 0}
---- !u!114 &20
+--- !u!114 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -865,15 +597,15 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
-    m_Text: "\u573A\u666F"
-    m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: Scene
+    m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 465.50006
-    y: 62.000008
-    width: 670.5001
-    height: 537.50006
+    x: 0
+    y: 73
+    width: 1208
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1104,16 +836,16 @@ MonoBehaviour:
       layout: 4
       size: {x: 0, y: 0}
       sizeOverriden: 0
-    - dockPosition: 0
-      containerId: Floating
-      floating: 1
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
       collapsed: 0
-      displayed: 1
-      snapOffset: {x: -252.5, y: -235.50003}
+      displayed: 0
+      snapOffset: {x: 0, y: 0}
       snapOffsetDelta: {x: 0, y: 0}
-      snapCorner: 3
+      snapCorner: 0
       id: Scene View/Particles
-      index: 0
+      index: 8
       layout: 4
       size: {x: 0, y: 0}
       sizeOverriden: 0
@@ -1191,7 +923,7 @@ MonoBehaviour:
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/Path
-      index: 8
+      index: 9
       layout: 4
       size: {x: 0, y: 0}
       sizeOverriden: 0
@@ -1204,7 +936,7 @@ MonoBehaviour:
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: APV Overlay
-      index: 9
+      index: 10
       layout: 4
       size: {x: 0, y: 0}
       sizeOverriden: 0
@@ -1217,19 +949,6 @@ MonoBehaviour:
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/TrailRenderer
-      index: 10
-      layout: 4
-      size: {x: 0, y: 0}
-      sizeOverriden: 0
-    - dockPosition: 1
-      containerId: overlay-container--right
-      floating: 0
-      collapsed: 0
-      displayed: 0
-      snapOffset: {x: -200.00003, y: -254}
-      snapOffsetDelta: {x: 0, y: 0}
-      snapCorner: 3
-      id: Hot Reload
       index: 11
       layout: 4
       size: {x: 0, y: 0}
@@ -1242,14 +961,14 @@ MonoBehaviour:
       snapOffset: {x: 48, y: 48}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
-      id: UnityEditor.SceneViewCameraOverlay
-      index: 13
+      id: Hot Reload
+      index: 12
       layout: 4
       size: {x: 0, y: 0}
       sizeOverriden: 0
     m_OverlaysVisible: 1
   m_WindowGUID: 3de2bc164a2229345aaffb3c6f51b287
-  m_Gizmos: 0
+  m_Gizmos: 1
   m_OverrideSceneCullingMask: 6917529027641081856
   m_SceneIsLit: 1
   m_SceneLighting: 1
@@ -1258,9 +977,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: -0.76604927, y: 21.77063, z: 1.3759272}
+    m_Target: {x: 0.12125179, y: 2.7011049, z: -1.0543195}
     speed: 2
-    m_Value: {x: -0.76604927, y: 21.77063, z: 1.3759272}
+    m_Value: {x: 0.12125179, y: 2.7011049, z: -1.0543195}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -1269,7 +988,7 @@ MonoBehaviour:
   m_ValidateTrueMetals: 0
   m_DoValidateTrueMetals: 0
   m_SceneViewState:
-    m_AlwaysRefresh: 1
+    m_AlwaysRefresh: 0
     showFog: 1
     showSkybox: 1
     showFlares: 1
@@ -1306,13 +1025,13 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: -0.14847493, y: 0.44139862, z: -0.07431757, w: -0.88180244}
+    m_Target: {x: 0.07805907, y: 0.89706963, z: -0.176071, w: 0.3977065}
     speed: 2
-    m_Value: {x: -0.14842092, y: 0.4420651, z: -0.07442978, w: -0.8814816}
+    m_Value: {x: 0.07805912, y: 0.8970703, z: -0.17607112, w: 0.3977068}
   m_Size:
-    m_Target: 4.9010477
+    m_Target: 3.8512323
     speed: 2
-    m_Value: 4.9010477
+    m_Value: 3.8512323
   m_Ortho:
     m_Target: 0
     speed: 2
@@ -1332,7 +1051,7 @@ MonoBehaviour:
     m_OcclusionCulling: 0
     m_EnableGDRP: 1
     m_BackfaceCulling: 0
-  m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
+  m_LastSceneViewRotation: {x: 0.07805907, y: 0.89706963, z: -0.176071, w: 0.3977065}
   m_LastSceneViewOrtho: 0
   m_ReplacementShader: {fileID: 0}
   m_ReplacementString: