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

# Conflicts:
#	Assets/StreamingAssets/assetConfig.txt   resolved by master version

Assets/Res/UI/DivineSence/DivineSenceEventPreviewPanel.prefab

@@ -34,6 +34,7 @@ RectTransform:
   - {fileID: 2896655462721008753}
   - {fileID: 2569128129379278262}
   - {fileID: 9037408276187403176}
+  - {fileID: 8060720440738292912}
   - {fileID: 3450703639607992522}
   - {fileID: 3581464887972855309}
   - {fileID: 1442258019244538206}
@@ -110,6 +111,16 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Rect_Sv
+    gameObject: {fileID: 3581464887972855309}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_Tips
+    gameObject: {fileID: 6327424440615269228}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!114 &5478100459915039784
 MonoBehaviour:
@@ -241,6 +252,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
+  imageH: 36.176
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -373,6 +385,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
     packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
     lasetJsonGUID: 3c03c9ef85decb2db50053e08067fb5c
+  imageH: 1624
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -641,6 +654,86 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u4ED9\u9014\u4E8B\u4EF6"
+--- !u!1 &4310031400641785489
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8060720440738292912}
+  - component: {fileID: 4500106972101745355}
+  - component: {fileID: 6327424440615269228}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_Tips
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &8060720440738292912
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4310031400641785489}
+  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.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -2.9302979, y: 0}
+  m_SizeDelta: {x: 450.1394, y: 78.9535}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4500106972101745355
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4310031400641785489}
+  m_CullTransparentMesh: 1
+--- !u!114 &6327424440615269228
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4310031400641785489}
+  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.7830189, g: 0.76455146, b: 0.76455146, 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: 44
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 44
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u6682\u65E0\u9053\u53CB\u4E8B\u4EF6"
 --- !u!1 &4665951811628086642
 GameObject:
   m_ObjectHideFlags: 0
@@ -655,7 +748,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
@@ -678,8 +771,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -1.5, y: -102.55858}
-  m_SizeDelta: {x: 663.9488, y: 925.5284}
+  m_AnchoredPosition: {x: -1.5, y: 43.839}
+  m_SizeDelta: {x: 663.9488, y: 1218.3}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5904849993517078433
 CanvasRenderer:
@@ -897,6 +990,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
+  imageH: 84
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -1101,8 +1195,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 61.7}
+  m_SizeDelta: {x: 0, y: -43.5784}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7790443248632903804
 CanvasRenderer:
@@ -1145,7 +1239,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u795E\u8BC6(2/10)"
+  m_Text: 2/10
 --- !u!1 &7244836889075663130
 GameObject:
   m_ObjectHideFlags: 0
@@ -1232,6 +1326,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
+  imageH: 80
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -1360,6 +1455,86 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u65E5\u5FD7"
+--- !u!1 &7587375694572286685
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7705849554225510677}
+  - component: {fileID: 3127181873672424435}
+  - component: {fileID: 1674366787068327515}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text_ShenShiCount (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7705849554225510677
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7587375694572286685}
+  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: 1442258019244538206}
+  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 &3127181873672424435
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7587375694572286685}
+  m_CullTransparentMesh: 1
+--- !u!114 &1674366787068327515
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7587375694572286685}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 33
+    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: "\u795E\u8BC6\u4E8B\u4EF6"
 --- !u!1 &7638606920926905235
 GameObject:
   m_ObjectHideFlags: 0
@@ -1393,6 +1568,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1549299383501015935}
+  - {fileID: 7705849554225510677}
   m_Father: {fileID: 8599819629026832582}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -1446,6 +1622,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
+  imageH: 80
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}

Assets/Res/UI/DivineSence/DivineSenceInfoPanel.prefab

@@ -224,7 +224,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
   m_AnchoredPosition: {x: 75.5, y: -24.899963}
-  m_SizeDelta: {x: 111.5581, y: 30}
+  m_SizeDelta: {x: 144.368, y: 30}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &2863420320959690301
 CanvasRenderer:

Assets/Res/UI/HeroInformainPanel/CaveMainPanel.prefab

@@ -0,0 +1,1033 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &904154690949135262
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4792204723085321954}
+  - component: {fileID: 6849183701650811517}
+  - component: {fileID: 731186082125369934}
+  - component: {fileID: 1689730871889590423}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Btn_DaoLv
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4792204723085321954
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 904154690949135262}
+  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: 6784987615536610523}
+  m_Father: {fileID: 3122246251225988632}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 298.85767, y: 40}
+  m_SizeDelta: {x: 97, y: 97}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6849183701650811517
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 904154690949135262}
+  m_CullTransparentMesh: 1
+--- !u!114 &731186082125369934
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 904154690949135262}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: btn_xiulianDujie
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 192194a01f8a35742b246abac6b340ca, type: 3}
+  packInfo:
+    packName: jingjie
+    packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
+    packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
+    lasetJsonGUID: a5790df98a45a640721da3160fc31d51
+  imageH: 97
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!114 &1689730871889590423
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 904154690949135262}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 731186082125369934}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &2179581233926790995
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8727043245965595146}
+  - component: {fileID: 4789227125964645736}
+  - component: {fileID: 5419414090562956040}
+  - component: {fileID: 1893575841581847031}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Viewport
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8727043245965595146
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2179581233926790995}
+  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: 3122246251225988632}
+  m_Father: {fileID: 4438962577033244578}
+  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: -17}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &4789227125964645736
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2179581233926790995}
+  m_CullTransparentMesh: 1
+--- !u!114 &5419414090562956040
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2179581233926790995}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &1893575841581847031
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2179581233926790995}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ShowMaskGraphic: 0
+--- !u!1 &2492214209734313084
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2154732167150009679}
+  - component: {fileID: 8317572491284338921}
+  - component: {fileID: 7816067844810844046}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Image (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2154732167150009679
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2492214209734313084}
+  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: 3122246251225988632}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 748, y: -8.5}
+  m_SizeDelta: {x: 750, y: 1625}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8317572491284338921
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2492214209734313084}
+  m_CullTransparentMesh: 1
+--- !u!114 &7816067844810844046
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2492214209734313084}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 5e06f09e30985d44b816eb4ba5839a99, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: bg_xiulian
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 0}
+  packInfo:
+    packName: bg
+    packgJsonPath: /Art/UIAssets/TextrueJson/bg.txt
+    packgSpritePath: Assets/Res/UIAtlas/bg.spriteatlasv2
+    lasetJsonGUID: a57bdfcd44569904ea8cd7897867d1b1
+  imageH: 1624
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &2713101091723102553
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2074141334421181977}
+  - component: {fileID: 9181716882316998638}
+  - component: {fileID: 6053108420661588814}
+  - component: {fileID: 3384885484753796925}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Btn_XiuLian
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2074141334421181977
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2713101091723102553}
+  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: 4847353937859667548}
+  m_Father: {fileID: 3122246251225988632}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 212.39774, y: -98.8}
+  m_SizeDelta: {x: 97, y: 97}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &9181716882316998638
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2713101091723102553}
+  m_CullTransparentMesh: 1
+--- !u!114 &6053108420661588814
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2713101091723102553}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: btn_xiulianDujie
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 192194a01f8a35742b246abac6b340ca, type: 3}
+  packInfo:
+    packName: jingjie
+    packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
+    packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
+    lasetJsonGUID: a5790df98a45a640721da3160fc31d51
+  imageH: 97
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!114 &3384885484753796925
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2713101091723102553}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 6053108420661588814}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &2878224673519074309
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6784987615536610523}
+  - component: {fileID: 2175574356500699342}
+  - component: {fileID: 3162022149235310311}
+  - component: {fileID: 6213336244467756100}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6784987615536610523
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2878224673519074309}
+  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: 4792204723085321954}
+  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 &2175574356500699342
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2878224673519074309}
+  m_CullTransparentMesh: 1
+--- !u!114 &3162022149235310311
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2878224673519074309}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 30
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 0
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u9053\u4FA3"
+--- !u!114 &6213336244467756100
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2878224673519074309}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0.13725491, g: 0.38431376, b: 0.36862746, a: 1}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
+--- !u!1 &3427245093439295002
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4847353937859667548}
+  - component: {fileID: 8188347619997027446}
+  - component: {fileID: 4210667942956718264}
+  - component: {fileID: 5712423932741483040}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4847353937859667548
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3427245093439295002}
+  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: 2074141334421181977}
+  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 &8188347619997027446
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3427245093439295002}
+  m_CullTransparentMesh: 1
+--- !u!114 &4210667942956718264
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3427245093439295002}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 30
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 0
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u4FEE\u70BC"
+--- !u!114 &5712423932741483040
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3427245093439295002}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0.13725491, g: 0.38431376, b: 0.36862746, a: 1}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
+--- !u!1 &6015582386914595975
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8212670971040085124}
+  - component: {fileID: 4635955364539374710}
+  - component: {fileID: 4230831255636053839}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8212670971040085124
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6015582386914595975}
+  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: 3122246251225988632}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -8.5}
+  m_SizeDelta: {x: 750, y: 1625}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4635955364539374710
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6015582386914595975}
+  m_CullTransparentMesh: 1
+--- !u!114 &4230831255636053839
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6015582386914595975}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 5e06f09e30985d44b816eb4ba5839a99, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: bg_xiulian
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 0}
+  packInfo:
+    packName: bg
+    packgJsonPath: /Art/UIAssets/TextrueJson/bg.txt
+    packgSpritePath: Assets/Res/UIAtlas/bg.spriteatlasv2
+    lasetJsonGUID: a57bdfcd44569904ea8cd7897867d1b1
+  imageH: 1624
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &7417418787505981672
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3122246251225988632}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Content
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3122246251225988632
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7417418787505981672}
+  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: 8212670971040085124}
+  - {fileID: 2316571660537401340}
+  - {fileID: 2154732167150009679}
+  - {fileID: 2074141334421181977}
+  - {fileID: 4792204723085321954}
+  m_Father: {fileID: 8727043245965595146}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0.0022888184, y: 0}
+  m_SizeDelta: {x: 2250, y: 1608}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &7675339522409199110
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2316571660537401340}
+  - component: {fileID: 222954020009367132}
+  - component: {fileID: 7763273007402165071}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Image (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2316571660537401340
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7675339522409199110}
+  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: 3122246251225988632}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -753, y: -8.5}
+  m_SizeDelta: {x: 750, y: 1625}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &222954020009367132
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7675339522409199110}
+  m_CullTransparentMesh: 1
+--- !u!114 &7763273007402165071
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7675339522409199110}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 5e06f09e30985d44b816eb4ba5839a99, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: bg_xiulian
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 0}
+  packInfo:
+    packName: bg
+    packgJsonPath: /Art/UIAssets/TextrueJson/bg.txt
+    packgSpritePath: Assets/Res/UIAtlas/bg.spriteatlasv2
+    lasetJsonGUID: a57bdfcd44569904ea8cd7897867d1b1
+  imageH: 1624
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &8994874510214016950
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 9037135992368401232}
+  - component: {fileID: 4159330424245520485}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: CaveMainPanel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &9037135992368401232
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8994874510214016950}
+  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: 4438962577033244578}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 750, y: 1624}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &4159330424245520485
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8994874510214016950}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: Btn_DaoLv
+    gameObject: {fileID: 1689730871889590423}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Btn_XiuLian
+    gameObject: {fileID: 3384885484753796925}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 0
+--- !u!1 &9207797998736867900
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4438962577033244578}
+  - component: {fileID: 5618374046335389836}
+  - component: {fileID: 1192035853021247302}
+  - component: {fileID: 7269170856507537473}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Scroll View
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4438962577033244578
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9207797998736867900}
+  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: 8727043245965595146}
+  m_Father: {fileID: 9037135992368401232}
+  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 &5618374046335389836
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9207797998736867900}
+  m_CullTransparentMesh: 1
+--- !u!114 &1192035853021247302
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9207797998736867900}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.392}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &7269170856507537473
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9207797998736867900}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Content: {fileID: 3122246251225988632}
+  m_Horizontal: 1
+  m_Vertical: 1
+  m_MovementType: 2
+  m_Elasticity: 0.1
+  m_Inertia: 1
+  m_DecelerationRate: 0.135
+  m_ScrollSensitivity: 1
+  m_Viewport: {fileID: 8727043245965595146}
+  m_HorizontalScrollbar: {fileID: 0}
+  m_VerticalScrollbar: {fileID: 0}
+  m_HorizontalScrollbarVisibility: 2
+  m_VerticalScrollbarVisibility: 2
+  m_HorizontalScrollbarSpacing: -3
+  m_VerticalScrollbarSpacing: -3
+  m_OnValueChanged:
+    m_PersistentCalls:
+      m_Calls: []

Assets/Res/UI/HeroInformainPanel/CaveMainPanel.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: Cn0c5i35Wn4x6PbAt+NJxQa4/FERkMOzXK28fUQdewG3VSYwI4dW/EiDV00v
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/UI/HeroInformainPanel/HeroInformationPanel.prefab

@@ -86,6 +86,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
     packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
     lasetJsonGUID: a5790df98a45a640721da3160fc31d51
+  imageH: 112
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -218,6 +219,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
     packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
     lasetJsonGUID: a5790df98a45a640721da3160fc31d51
+  imageH: 37
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -241,7 +243,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &4792204723085321954
 RectTransform:
   m_ObjectHideFlags: 0
@@ -308,6 +310,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
     packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
     lasetJsonGUID: a5790df98a45a640721da3160fc31d51
+  imageH: 97
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -533,6 +536,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
     packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
     lasetJsonGUID: a5790df98a45a640721da3160fc31d51
+  imageH: 97
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -933,6 +937,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
     packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
     lasetJsonGUID: a5790df98a45a640721da3160fc31d51
+  imageH: 346
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -1021,6 +1026,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
     packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
     lasetJsonGUID: a5790df98a45a640721da3160fc31d51
+  imageH: 26
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -1337,6 +1343,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
+  imageH: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -1622,6 +1629,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
     packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
     lasetJsonGUID: a5790df98a45a640721da3160fc31d51
+  imageH: 26
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -1712,6 +1720,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
     packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
     lasetJsonGUID: a5790df98a45a640721da3160fc31d51
+  imageH: 97
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -1844,6 +1853,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
     packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
     lasetJsonGUID: a5790df98a45a640721da3160fc31d51
+  imageH: 34
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -1932,6 +1942,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/bg.txt
     packgSpritePath: Assets/Res/UIAtlas/bg.spriteatlasv2
     lasetJsonGUID: a57bdfcd44569904ea8cd7897867d1b1
+  imageH: 1624
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -2430,6 +2441,141 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
     packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
     lasetJsonGUID: a5790df98a45a640721da3160fc31d51
+  imageH: 69.468994
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &8728506421849655891
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 871529640652062368}
+  - component: {fileID: 4940213027956810051}
+  - component: {fileID: 6347213326569266808}
+  - component: {fileID: 483902916089829327}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Btn_Back
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &871529640652062368
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8728506421849655891}
+  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: 9037135992368401232}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 41, y: 25}
+  m_SizeDelta: {x: 79, y: 84}
+  m_Pivot: {x: 0, y: 0}
+--- !u!222 &4940213027956810051
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8728506421849655891}
+  m_CullTransparentMesh: 1
+--- !u!114 &6347213326569266808
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8728506421849655891}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 0
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 483902916089829327}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &483902916089829327
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8728506421849655891}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_fanhui2
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
+  imageH: 84
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -2570,6 +2716,7 @@ RectTransform:
   - {fileID: 6341706220095682999}
   - {fileID: 1177809280148261388}
   - {fileID: 1155106644705196333}
+  - {fileID: 871529640652062368}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -2660,4 +2807,9 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Btn_Back
+    gameObject: {fileID: 6347213326569266808}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 0

Assets/Res/UI/SkillSelectPanel/GongFaUpgradePanel.prefab

@@ -129,6 +129,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
+  imageH: 84
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -217,6 +218,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
     packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
     lasetJsonGUID: 6f6d3dad490d22d3028cfa941e8122a5
+  imageH: 36
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -305,6 +307,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
     packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
     lasetJsonGUID: 6f6d3dad490d22d3028cfa941e8122a5
+  imageH: 36
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -393,6 +396,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
     packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
     lasetJsonGUID: 6f6d3dad490d22d3028cfa941e8122a5
+  imageH: 36
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -502,6 +506,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 8de890b954c861b7d182629dcafc0d3a
+  imageH: 66
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -670,6 +675,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
     packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
     lasetJsonGUID: 6f6d3dad490d22d3028cfa941e8122a5
+  imageH: 36
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -1298,6 +1304,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/skillIcon.txt
     packgSpritePath: Assets/Res/UIAtlas/skillIcon.spriteatlasv2
     lasetJsonGUID: 151dde130cdc5228de9614f608886409
+  imageH: 150.4743
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -1485,6 +1492,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
     packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
     lasetJsonGUID: 6f6d3dad490d22d3028cfa941e8122a5
+  imageH: 542
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -1779,6 +1787,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
     packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
     lasetJsonGUID: 1fc57c8d04bebfe9417e3e2522efd20c
+  imageH: 1624
   useGradient: 0
   topOrLeftColor: {r: 0.09411766, g: 0.16862746, b: 0.18431373, a: 1}
   bottomOrRightColor: {r: 0.6117647, g: 0.80392164, b: 0.7843138, a: 1}
@@ -2231,6 +2240,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
     packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
     lasetJsonGUID: 6f6d3dad490d22d3028cfa941e8122a5
+  imageH: 36
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -2487,6 +2497,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: d4e5a262b3976e33870ab7190f3a5bdb
+  imageH: 37.4216
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -2576,6 +2587,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\battle.txt
     packgSpritePath: Assets/Res/UIAtlas/battle.spriteatlasv2
     lasetJsonGUID: b30151c7ca91f3adc1fcb725072e1a9f
+  imageH: 166.9464
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -2665,6 +2677,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
     packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
     lasetJsonGUID: 6f6d3dad490d22d3028cfa941e8122a5
+  imageH: 37
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -2848,6 +2861,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
     packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
     lasetJsonGUID: d888d6e73899265a3799225e04fd014b
+  imageH: 379
   useGradient: 0
   topOrLeftColor: {r: 0.14901961, g: 0.26666668, b: 0.27058825, a: 1}
   bottomOrRightColor: {r: 0.14509805, g: 0.25490198, b: 0.28235295, a: 1}
@@ -2937,6 +2951,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: d4e5a262b3976e33870ab7190f3a5bdb
+  imageH: 284.9714
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -2977,6 +2992,10 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 988966570303324014, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
+      propertyPath: imageH
+      value: 80
+      objectReference: {fileID: 0}
     - target: {fileID: 988966570303324014, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
       propertyPath: _icon_name
       value: btn_shengji
@@ -3474,6 +3493,10 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: -40
       objectReference: {fileID: 0}
+    - target: {fileID: 988966570303324014, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
+      propertyPath: imageH
+      value: 80
+      objectReference: {fileID: 0}
     - target: {fileID: 4167896752109910920, guid: 60b98673fc9b7d54eb62512cdcca58da, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5

Assets/Scripts/Core/UI/UTool/UtilTools.cs

@@ -586,7 +586,7 @@ namespace Utility
                 float n = number / 10000f;
                 string str = "";
                 str = GetTargetDecimalPlaceStr((int)n);
-                return str + "m";
+                return str + "万";
             }
 
             if (number > 100000)
@@ -594,7 +594,7 @@ namespace Utility
                 float n = number / 1000f;
                 string str = "";
                 str = GetTargetDecimalPlaceStr((int)n);
-                return str + "k";
+                return str + "千";
             }
 
             return number.ToString();
@@ -602,28 +602,12 @@ namespace Utility
 
         public static string ToStringEx(this int number)
         {
-            // if (number > 1000000000000)
-            // {
-            //     float n = number / 1000000000000f;
-            //     string str = "";
-            //     str = GetTargetDecimalPlaceStr((int)n);
-            //     return str + "t";
-            // }
-            //
-            // if (number > 1000000000)
-            // {
-            //     float n = number / 1000000000f;
-            //     string str = "";
-            //     str = GetTargetDecimalPlaceStr((int)n);
-            //     return str + "b";
-            // }
-
             if (number > 1000000)
             {
                 float n = number / 10000f;
                 string str = "";
                 str = GetTargetDecimalPlaceStr((int)n);
-                return str + "m";
+                return str + "万";
             }
 
             if (number > 100000)
@@ -631,21 +615,10 @@ namespace Utility
                 float n = number / 1000f;
                 string str = "";
                 str = GetTargetDecimalPlaceStr((int)n);
-                return str + "k";
+                return str + "千";
             }
 
             return number.ToString();
-            // // if (isShowLongEx)
-            // {
-            //     if (i >= 10000000000)
-            //         return (i / 1000000000) + "B";
-            //     else if (i >= 10000000)
-            //         return (i / 1000000) + "M";
-            //     else if (i >= 10000)
-            //         return (i / 1000) + "K";
-            // }
-            //
-            // return i.ToString();
         }
 #endif
         /// <summary>
@@ -862,7 +835,7 @@ namespace Utility
                 return (T)formatter.Deserialize(memoryStream);
             }
         }
-        
+
         public static T GetRandomByWeight<T>(List<T> items, int[] weights)
         {
             if (items.Count != weights.Length)
@@ -886,10 +859,9 @@ namespace Utility
             // 理论上不会到达这里，但为了安全返回最后一个元素
             return items[items.Count - 1];
         }
-        
+
         public static T GetRandomByWeight<T>(List<T> items, float[] weights)
         {
-            
             if (items.Count != weights.Length)
             {
                 LogTool.Error("权重和数组长度不一致");
@@ -910,7 +882,7 @@ namespace Utility
             // 理论上不会到达这里，但为了安全返回最后一个元素
             return items[items.Count - 1];
         }
-        
+
         // 计算每个权重的概率
         public static List<float> CalculateProbabilities(List<float> weights)
         {
@@ -939,7 +911,7 @@ namespace Utility
 
             return probabilities;
         }
-        
+
         // 计算每个权重的概率
         public static List<float> CalculateProbabilities(List<int> weights)
         {
@@ -968,7 +940,7 @@ namespace Utility
 
             return probabilities;
         }
-        
+
         public static string GetString(string a, float[] b)
         {
             if (a == null || a == "" || b == null)
@@ -1017,7 +989,6 @@ namespace Utility
 
             return a;
         }
-        
     }
 
 

Assets/Scripts/GameLogic/Player/AccountFileInfo.cs

@@ -40,7 +40,12 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         /// <summary>
         /// 神识点
         /// </summary>
-        public int divineSensePoint = 0;
+        public float divineSensePoint = 0;
+        
+        /// <summary>
+        /// 今天回复的神识值
+        /// </summary>
+        public float todayDivineSensePoint = 0;
 
         /// <summary>
         /// 神识经验

Assets/Scripts/GameLogic/Player/PlayerManager.cs

@@ -360,6 +360,7 @@ public class PlayerManager : Singleton<PlayerManager>
             AccountFileInfo.Instance.playerData.nextRefence =
                 TimeHelper.GetBaseRefreshTime(TimeHelper.ClientNow());
             AccountFileInfo.Instance.playerData.todayUseExpElixrPanelCount = 0;
+            AccountFileInfo.Instance.playerData.todayDivineSensePoint = 0;
             AccountFileInfo.Instance.SavePlayerData();
         }
 

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -57,10 +57,6 @@ public class EventSystemManager : Singleton<EventSystemManager>
             }
         }
 
-        // foreach (var playerDataEventConditionData in AccountFileInfo.Instance.playerData.eventConditionDatas)
-        // {
-        //     EventConditionDataMap.Add(playerDataEventConditionData.guid, playerDataEventConditionData);
-        // }
 
         StaticUpdater.Instance.AddRenderUpdateCallBack(Update);
         EventManager.Instance.AddEventListener(CustomEventType.DetectRandomEvent, RenfenceRandomEvent);
@@ -102,7 +98,16 @@ public class EventSystemManager : Singleton<EventSystemManager>
             HeroPowerUpConfig heroPowerUpConfig = PlayerManager.Instance.myHero.powerUpConfig;
             if (AccountFileInfo.Instance.playerData.divineSensePoint < heroPowerUpConfig.ShenshiMax)
             {
-                AccountFileInfo.Instance.playerData.divineSensePoint += 3;
+                if (AccountFileInfo.Instance.playerData.todayDivineSensePoint < PlayerManager.Instance.gameConstantConfig.shenshiPointRecSPD[0])
+                {
+                    AccountFileInfo.Instance.playerData.todayDivineSensePoint += PlayerManager.Instance.gameConstantConfig.shenshiPointRecSPD[1];
+                    AccountFileInfo.Instance.playerData.divineSensePoint += PlayerManager.Instance.gameConstantConfig.shenshiPointRecSPD[1];
+                }
+                else
+                {
+                    AccountFileInfo.Instance.playerData.divineSensePoint += PlayerManager.Instance.gameConstantConfig.shenshiPointRecSPD[2];
+                }
+
                 EventManager.Instance.Dispatch(CustomEventType.DivineSensePointChange, null);
                 AccountFileInfo.Instance.SavePlayerData();
             }
@@ -131,7 +136,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
 
         HeroPowerUpConfig heroPowerUpConfig = PlayerManager.Instance.myHero.powerUpConfig;
-        int count = AccountFileInfo.Instance.playerData.divineSensePoint / PlayerManager.Instance.gameConstantConfig.DetectEventCount;
+        int count = (int)(AccountFileInfo.Instance.playerData.divineSensePoint / PlayerManager.Instance.gameConstantConfig.DetectEventCount);
         if (count <= 0)
         {
             //神识值不够
@@ -914,7 +919,8 @@ public class EventSystemManager : Singleton<EventSystemManager>
                 else
                 {
                     List<ItemInfo> items = DropManager.Instance.DropItem(eventConfig.PrizeIDs[i]);
-                    itemInfos.AddRange(items);
+                    if(items != null)
+                        itemInfos.AddRange(items);
                 }
                 // itemInfos.Add(new ItemInfo(eventConfig.PrizeIDs[i], eventConfig.PrizeNums[i]));
             }

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

@@ -55,7 +55,7 @@ namespace Fort23.Mono
                 CombatDrive.Instance.CombatController.isUpdate = true;
             });
 
-            bnt_shengShi.onClick.AddListener(() => { DivineSenceInfoPanel.OpenPanel((count,useItems) => { Bnt_shengShi_onClick(count,useItems); }); });
+            bnt_shengShi.onClick.AddListener(() => { DivineSenceInfoPanel.OpenPanel((count, useItems) => { Bnt_shengShi_onClick(count, useItems); }); });
             Btn_GongFa.onClick.AddListener(async () =>
             {
                 if (currentOpenUIPanel is SkillSelectPanel)
@@ -74,12 +74,9 @@ namespace Fort23.Mono
                 }
 
                 UIManager.Instance.HideUIUIPanel(currentOpenUIPanel);
-                // EventSystemManager.Instance.isOpenUi = true;
                 MainHeroPanel mainHeroPanel = await MainHeroPanel.OpenPanel();
                 if (!mainHeroPanel.IsClose)
                     await mainHeroPanel.UIClosed();
-                // await mainHeroPanel.UIClosed();
-                // EventSystemManager.Instance.isOpenUi = false;
             });
             Btn_DongFu.onClick.AddListener(async () =>
             {
@@ -89,22 +86,17 @@ namespace Fort23.Mono
                 }
 
                 UIManager.Instance.HideUIUIPanel(currentOpenUIPanel);
-                // EventSystemManager.Instance.isOpenUi = true;
                 CombatDrive.Instance.CombatController.isUpdate = false;
-                HeroInformationPanel heroInformationPanel = await HeroInformationPanel.OpenPanel();
-                // await heroInformationPanel.UIClosed();
+                CaveMainPanel heroInformationPanel = await CaveMainPanel.OpenPanel();
                 if (!heroInformationPanel.IsClose)
                     await heroInformationPanel.UIClosed();
                 CombatDrive.Instance.CombatController.isUpdate = true;
-                // EventSystemManager.Instance.isOpenUi = false;
             });
 
             Btn_Back.onClick.AddListener(() =>
             {
                 UIManager.Instance.HideUIUIPanel(currentOpenUIPanel);
                 currentOpenUIPanel = null;
-                // UIManager.Instance.GetComponent<MainPanel>().Show();
-                // MainPanel.OpenPanel();
             });
         }
 
@@ -112,7 +104,7 @@ namespace Fort23.Mono
         {
         }
 
-        private async void Bnt_shengShi_onClick(int count,List<ItemInfo> useItems)
+        private async void Bnt_shengShi_onClick(int count, List<ItemInfo> useItems)
         {
             // EventSystemManager.Instance.DetectRandomEvents();
 
@@ -120,9 +112,10 @@ namespace Fort23.Mono
                 PlayerManager.Instance.gameConstantConfig.DetectEventCount)
             {
                 TipMessagePanel.OpenTipMessagePanel("神识值不够！");
-                
+
                 return;
             }
+
             EventSystemManager.Instance.CancelEvent();
             if (EventSystemManager.Instance.isTriggerEvent)
                 return;
@@ -131,7 +124,7 @@ namespace Fort23.Mono
             CombatDrive.Instance.CombatController.ChangeState(CombatController.idle);
             CombatController.currActiveCombat.CombatSenceController.StartPayShengShi(CombatController.currActiveCombat
                 .playerHeroEntity.GameObject.transform);
-            List<AccountFileInfo.EventList> eventLists = EventSystemManager.Instance.UseDivinesense(count,useItems);
+            List<AccountFileInfo.EventList> eventLists = EventSystemManager.Instance.UseDivinesense(count, useItems);
             await TimerComponent.Instance.WaitAsync(800);
             EventSystemManager.Instance.isTriggerEvent = false;
             if (eventLists == null || eventLists.Count == 0)
@@ -147,7 +140,7 @@ namespace Fort23.Mono
 
                 // DivineSenceEventResultPanel divineSenceEventResultPanel =
                 //     await DivineSenceEventResultPanel.OpenPanel(eventLists);
-                
+
                 await DivineSenceEventPreviewPanel.OpenPanel();
                 // await divineSenceEventResultPanel.UIClosed();
                 // EventSystemManager.Instance.isOpenUi = false;

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

@@ -93,22 +93,39 @@ namespace Fort23.Mono
                 UIManager.Instance.DormancyGComponent(shengShiEventWidgetType2);
             }
 
+            shengShiEventWidgetTypeList.Clear();
+
 
-            AccountFileInfo.EventList eventList = EventSystemManager.Instance.GetMainEventDta();
-            if (eventList != null)
+            //神识
+            if (saixuanType == 1)
             {
-                if (mainShengShiEventWidgetType2 == null)
-                    mainShengShiEventWidgetType2 = await UIManager.Instance.CreateGComponent<ShengShiEventWidgetType2>(null, ShengShiEventWidgetType2Root);
-                mainShengShiEventWidgetType2.CustomInit(eventList, GoOnClick);
-                mainShengShiEventWidgetType2.OnClick = OnClick;
+                Rect_Sv.sizeDelta = new Vector2(664, 925.5f);
+                Rect_Sv.anchoredPosition = new Vector2(-1.5f, -102.5f);
+                Text_Tips.gameObject.SetActive(false);
+                AccountFileInfo.EventList eventList = EventSystemManager.Instance.GetMainEventDta();
+                if (eventList != null)
+                {
+                    if (mainShengShiEventWidgetType2 == null)
+                        mainShengShiEventWidgetType2 = await UIManager.Instance.CreateGComponent<ShengShiEventWidgetType2>(null, ShengShiEventWidgetType2Root);
+                    mainShengShiEventWidgetType2.CustomInit(eventList, GoOnClick);
+                    mainShengShiEventWidgetType2.OnClick = OnClick;
+                }
             }
+            //道友
+            else
+            {
+                UIManager.Instance.DormancyGComponent(mainShengShiEventWidgetType2);
+                mainShengShiEventWidgetType2 = null;
 
+                Rect_Sv.sizeDelta = new Vector2(664, 1218f);
+                Rect_Sv.anchoredPosition = new Vector2(-1.5f, -43.8f);
+                Text_Tips.gameObject.SetActive(showEventList.Count > 0);
+            }
 
-            shengShiEventWidgetTypeList.Clear();
 
             int maxCount = PlayerManager.Instance.myHero.powerUpConfig.ShenshiMax / PlayerManager.Instance.gameConstantConfig.DetectEventCount;
 
-            Text_ShenShiCount.text = $"神识{EventSystemManager.Instance.GetShenShiCount()}/{maxCount}";
+            Text_ShenShiCount.text = $"{EventSystemManager.Instance.GetShenShiCount()}/{maxCount}";
             SaiXuan(saixuanType);
             showEventList.Sort(Sort);
             await Content.Init(this, showEventList.Count);

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

@@ -118,6 +118,28 @@ namespace Fort23.Mono
 	      return _Btn_Log;
 	     }
 	   }
+	  private RectTransform _Rect_Sv;
+	  public RectTransform Rect_Sv
+	   {
+	   get{
+	      if (_Rect_Sv == null)
+	       {
+	         _Rect_Sv  = GetUIUnit<RectTransform>("Rect_Sv"); 
+	       }
+	      return _Rect_Sv;
+	     }
+	   }
+	  private Text _Text_Tips;
+	  public Text Text_Tips
+	   {
+	   get{
+	      if (_Text_Tips == null)
+	       {
+	         _Text_Tips  = GetUIUnit<Text>("Text_Tips"); 
+	       }
+	      return _Text_Tips;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

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

@@ -13,11 +13,11 @@ namespace Fort23.Mono
     [UIBinding(prefab = "DivineSenceInfoPanel")]
     public partial class DivineSenceInfoPanel : UIPanel
     {
-        private Action<int,List<ItemInfo>> callback;
+        private Action<int, List<ItemInfo>> callback;
 
         private int useCount = 0;
-        
-        
+
+
         List<ItemInfo> useItems = new List<ItemInfo>();
 
         List<DivineSenceInfoBtnWidget> _divineSenceInfoBtnWidgets = new List<DivineSenceInfoBtnWidget>();
@@ -46,12 +46,13 @@ namespace Fort23.Mono
                 useItems.Clear();
                 foreach (var senceInfoBtnWidget in _divineSenceInfoBtnWidgets)
                 {
-                    if (senceInfoBtnWidget.type == 2 && senceInfoBtnWidget.ItemInfo != null )
+                    if (senceInfoBtnWidget.type == 2 && senceInfoBtnWidget.ItemInfo != null)
                     {
                         useItems.Add(senceInfoBtnWidget.ItemInfo);
                     }
                 }
-                callback?.Invoke(useCount,useItems);
+
+                callback?.Invoke(useCount, useItems);
                 UIManager.Instance.HideUIUIPanel(this);
             });
             Btn_Back.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
@@ -68,15 +69,12 @@ namespace Fort23.Mono
             });
 
             Btn_Tip.onClick.AddListener(() => { DivineSenceLevelPreviewPanel.OpenPanel(); });
-            
-            
-            Btn_Event.onClick.AddListener(() =>
-            {
-                DivineSenceEventPreviewPanel.OpenPanel();
-            });
+
+
+            Btn_Event.onClick.AddListener(() => { DivineSenceEventPreviewPanel.OpenPanel(); });
         }
 
-        public async void CustomInit(Action<int,List<ItemInfo>> callback)
+        public async void CustomInit(Action<int, List<ItemInfo>> callback)
         {
             _divineSenceInfoBtnWidgets.Clear();
             divineSenseConfig = ConfigComponent.Instance.Get<DivineSenseConfig>(AccountFileInfo.Instance.playerData.divineSenseLevel);
@@ -87,7 +85,7 @@ namespace Fort23.Mono
             Slider_Exp.maxValue = divineSenseConfig.exp;
             Slider_Exp.value = AccountFileInfo.Instance.playerData.divineSenseexp;
 
-            int count = AccountFileInfo.Instance.playerData.divineSensePoint / PlayerManager.Instance.gameConstantConfig.DetectEventCount;
+            int count = (int)(AccountFileInfo.Instance.playerData.divineSensePoint / PlayerManager.Instance.gameConstantConfig.DetectEventCount);
             maxCount = heroPowerUpConfig.ShenshiMax / PlayerManager.Instance.gameConstantConfig.DetectEventCount;
             maxCount = maxCount > 10 ? 10 : maxCount;
             count = count + EventSystemManager.Instance.GetShenShiCount() > maxCount ? maxCount - EventSystemManager.Instance.GetShenShiCount() : count;
@@ -161,7 +159,7 @@ namespace Fort23.Mono
 
             foreach (var keyValuePair in probabilitiesMap)
             {
-                QualityBonusChance[keyValuePair.Key-1] *= keyValuePair.Value+0.01f;
+                QualityBonusChance[keyValuePair.Key - 1] *= keyValuePair.Value + 0.01f;
             }
 
             List<float> probabilities = UtilTools.CalculateProbabilities(QualityBonusChance);
@@ -171,7 +169,7 @@ namespace Fort23.Mono
             }
         }
 
-        public async static CTask OpenPanel(Action<int,List<ItemInfo>> callback)
+        public async static CTask OpenPanel(Action<int, List<ItemInfo>> callback)
         {
             DivineSenceInfoPanel divineSenceInfoPanel = await UIManager.Instance.LoadAndOpenPanel<DivineSenceInfoPanel>(null, UILayer.Middle);
             divineSenceInfoPanel.CustomInit(callback);

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

@@ -182,12 +182,14 @@ namespace Fort23.Mono
                 for (var i = 0; i < randomEventConfig.PrizeIDs.Length; i++)
                 {
                     DropConfig dropConfig = ConfigComponent.Instance.Get<DropConfig>(randomEventConfig.PrizeIDs[i]);
-                    foreach (var i1 in dropConfig.showItemId)
+                    if (dropConfig.showItemId != null)
                     {
-                        ItemInfo itemInfo = new ItemInfo( i1, randomEventConfig.PrizeNums[i]);
-                        itemInfos.Add(itemInfo);
+                        foreach (var i1 in dropConfig.showItemId)
+                        {
+                            ItemInfo itemInfo = new ItemInfo( i1, randomEventConfig.PrizeNums[i]);
+                            itemInfos.Add(itemInfo);
+                        }
                     }
-       
                 }
 
                 for (var i = 0; i < itemInfos.Count; i++)

Assets/Scripts/GameUI/UI/HeroInformationPanel/CaveMainPanel.cs

@@ -0,0 +1,45 @@
+using Fort23.Core;
+
+namespace Fort23.Mono
+{
+	[UIBinding(prefab = "CaveMainPanel"  )]
+	public partial class CaveMainPanel : UIPanel
+	{
+		private void Init()
+		{
+			isAddStack = true;
+			IsShowAppBar = true;
+		}
+		protected override void AddEvent()
+		{
+
+		}
+		protected override void DelEvent()
+		{
+
+		}
+		public override void AddButtonEvent()
+		{
+			Btn_DaoLv.onClick.AddListener(() => { ImmortalBondPanel.OpenPanel(); });
+			
+			Btn_XiuLian.onClick.AddListener(() =>
+			{
+				 HeroInformationPanel.OpenPanel();
+			});
+
+		}
+		
+		public override CTask GetFocus()
+		{
+			AppBarPanel.OpenPanel(this);
+			return base.GetFocus();
+		}
+		
+		public async static CTask<CaveMainPanel> OpenPanel()
+		{
+			CaveMainPanel heroInformationPanel = await UIManager.Instance.LoadAndOpenPanel<CaveMainPanel>(null);
+			return heroInformationPanel;
+		}
+
+	}
+}

Assets/Scripts/GameUI/UI/HeroInformationPanel/CaveMainPanel.cs.meta

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

Assets/Scripts/GameUI/UI/HeroInformationPanel/CaveMainPanelData.cs

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

Assets/Scripts/GameUI/UI/HeroInformationPanel/CaveMainPanelData.cs.meta

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

Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroInformationPanel.cs

@@ -24,7 +24,7 @@ namespace Fort23.Mono
         private void Init()
         {
             isAddStack = true;
-            IsShowAppBar = true;
+            IsShowAppBar = false;
         }
 
         protected override void AddEvent()
@@ -35,11 +35,11 @@ namespace Fort23.Mono
         {
         }
 
-        public override CTask GetFocus()
-        {
-            AppBarPanel.OpenPanel(this);
-            return base.GetFocus();
-        }
+        // public override CTask GetFocus()
+        // {
+        //     AppBarPanel.OpenPanel(this);
+        //     return base.GetFocus();
+        // }
 
         public override CTask LoseFocus()
         {
@@ -53,6 +53,8 @@ namespace Fort23.Mono
 
             Btn_DanYao.onClick.AddListener(() => { UseExpElixirPanel.OpenPanel(); });
 
+            Btn_Back.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
+
 
             Btn_Dujie.onClick.AddListener(async () =>
             {

Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroInformationPanelData.cs

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

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

@@ -2,6 +2,7 @@ using Excel2Json;
 using Fort23.UTool;
 using UnityEngine;
 using UnityEngine.UI;
+using Utility;
 
 namespace Fort23.Mono
 {
@@ -29,7 +30,7 @@ namespace Fort23.Mono
 		{
 			ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(id);
 			Icon_ItemIcon.icon_name = itemConfig.icon;
-			Text_Count.text = $"{count}/{PlayerManager.Instance.BagController.GetItemCount(id)}";
+			Text_Count.text = $"{count}/{PlayerManager.Instance.BagController.GetItemCount(id).ToStringEx()}";
 			LayoutRebuilder.ForceRebuildLayoutImmediate(Text_Count.GetComponent<RectTransform>());
 			LayoutRebuilder.ForceRebuildLayoutImmediate(transform);
 		}

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

@@ -42,18 +42,7 @@ namespace Fort23.Mono
         {
             Btn_Coin.onClick.AddListener(() =>
             {
-                // if (_itemConfig.ID == GlobalParam.Item_Coin_ID)
-                // {
-                //     OnClickIcon_Coin_button();
-                // }
-                // else  if (_itemConfig.ID == GlobalParam.Item_Diamond_ID)
-                // {
-                //     OnClickIcon_Diamon_button();
-                // }
-                // else  if (_itemConfig.ID == GlobalParam.Item_HeroExp_ID)
-                // {
-                //     OnClickIcon_HeroExp_button();
-                // }
+       
                 if (_itemConfig.associateID == 3)
                 {
                     GongFaDetailsPanel.Open(new ItemInfo(_itemConfig.ID));
@@ -70,27 +59,7 @@ namespace Fort23.Mono
         }
 
 
-        private void OnClickIcon_HeroExp_button()
-        {
-            // TipMessagePanel.OpenTipMessagePanel("英雄经验，可用于升级英雄等级<color=#ff0000>（每杀死一个小怪能获得经验，击杀boss能获得大量经验）</color>",
-            //     new Vector2(Icon_HeroExp_button.transform.position.x, Icon_HeroExp_button.transform.position.y - 0.5f));
-            TipMessagePanel.OpenTipMessagePanel(LanguageManager.Instance.Text(104),
-                new Vector2(Icon_Energy.transform.position.x, Icon_Energy.transform.position.y - 0.5f));
-        }
-
-        private void OnClickIcon_Coin_button()
-        {
-            // TipMessagePanel.OpenTipMessagePanel("金币，用于抽取英雄宝箱<color=#ff0000>（每杀死一个小怪有几率获得金币，击杀boss能获得大量金币）</color>",
-            //     new Vector2(Icon_Coin_button.transform.position.x, Icon_Coin_button.transform.position.y - 0.5f));
-            TipMessagePanel.OpenTipMessagePanel(LanguageManager.Instance.Text(105),
-                new Vector2(Icon_Energy.transform.position.x, Icon_Energy.transform.position.y - 0.5f));
-        }
-
-        private void OnClickIcon_Diamon_button()
-        {
-            TipMessagePanel.OpenTipMessagePanel(LanguageManager.Instance.Text(106),
-                new Vector2(Icon_Energy.transform.position.x, Icon_Energy.transform.position.y - 0.5f));
-        }
+   
 
 
         public void CustomInit(int id)

Assets/Scripts/GameUI/UI/Task/TaskInfoPanel.cs

@@ -93,7 +93,8 @@ namespace Fort23.Mono
                     else
                     {
                         List<ItemInfo> items = DropManager.Instance.DropItem(taskConfig.PrizeNums[i]);
-                        itemInfos.AddRange(items);
+                        if(items != null)
+                            itemInfos.AddRange(items);
                     }
                 }
 

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

@@ -7,6 +7,7 @@ namespace Fort23.Mono
 	public partial class EventLogTitleWidget : ItemWidgetBasic
 	{
 		public XianTuLogInfoData data;
+		public XianTuData xiantuData;
 		private void Init()
 		{
 
@@ -24,9 +25,18 @@ namespace Fort23.Mono
 
 		}
 		
-		public void CustomInit(string text)
+		public void CustomInit(string  s)
 		{
-			Text_Name.text = text;
+			
+			Text_Name.text = s;
+			LayoutRebuilder.ForceRebuildLayoutImmediate(Text_Name.GetComponent<RectTransform>());
+			LayoutRebuilder.ForceRebuildLayoutImmediate(Text_Name.transform.parent.GetComponent<RectTransform>());
+		}
+		
+		public void CustomInit(XianTuData xiuData)
+		{
+			xiantuData = xiuData;
+			Text_Name.text = xiantuData.name;
 			LayoutRebuilder.ForceRebuildLayoutImmediate(Text_Name.GetComponent<RectTransform>());
 			LayoutRebuilder.ForceRebuildLayoutImmediate(Text_Name.transform.parent.GetComponent<RectTransform>());
 		}
@@ -39,5 +49,11 @@ namespace Fort23.Mono
 			LayoutRebuilder.ForceRebuildLayoutImmediate(Text_Name.transform.parent.GetComponent<RectTransform>());
 		}
 
+		public override void DestroyObj()
+		{
+			xiantuData = null;
+			data = null;
+			base.DestroyObj();
+		}
 	}
 }

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

@@ -14,6 +14,8 @@ namespace Fort23.Mono
         private XianTuLogConfig _xianTuLogConfig;
         List<EventMinLogWidget> eventMinLogWidgets = new List<EventMinLogWidget>();
 
+        public XianTuData XianTuData;
+
         private void Init()
         {
         }
@@ -32,11 +34,12 @@ namespace Fort23.Mono
             Btn_HuiGu.onClick.AddListener(() => { XianTuLogInfoPanel.OpenPanel(2,_xianTuLogConfig.ID); });
         }
 
-        public async CTask CustomInit(XianTuLogConfig xianTuLogConfig, List<int> places)
+        public async CTask CustomInit( XianTuData xianTuData, List<int> places)
         {
-            _xianTuLogConfig = xianTuLogConfig;
-            Text_Title.text = LanguageManager.Instance.Text(xianTuLogConfig.Title);
-            Text_Desc.text = LanguageManager.Instance.Text(xianTuLogConfig.Desc);
+            XianTuData = xianTuData;
+            _xianTuLogConfig = xianTuData.xianTuLogConfig;
+            Text_Title.text = LanguageManager.Instance.Text(_xianTuLogConfig.Title);
+            Text_Desc.text = LanguageManager.Instance.Text(_xianTuLogConfig.Desc);
 
             if (EventSystemManager.Instance.eventConfigsMap.ContainsKey(_xianTuLogConfig.ID))
             {
@@ -63,6 +66,8 @@ namespace Fort23.Mono
 
             eventMinLogWidgets.Clear();
 
+            XianTuData = null;
+            
             base.DormancyObj();
         }
     }

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

@@ -185,7 +185,7 @@ namespace Fort23.Mono
             {
                 // eventLogTitleWidget.SetActive(true);
                 Sv.SetParent(Marsk1, false);
-                eventLogTitleWidget.CustomInit(showXianTuLogInfoData[0].message);
+                eventLogTitleWidget.CustomInit(showXianTuLogInfoData[0]);
                 eventLogTitleWidget.own.SetActive(true);
             }
             else if (type == 2)

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

@@ -15,6 +15,7 @@ namespace Fort23.Mono
         public int type;
         public string name;
         public XianTuLogConfig xianTuLogConfig;
+        public XianTuData fatherXianTuData;
     }
 
     [UIBinding(prefab = "XianTuLogPanel")]
@@ -33,7 +34,6 @@ namespace Fort23.Mono
 
         List<XianTuData> xianTuDatas = new List<XianTuData>();
 
-        List<EventLogTitleWidget> xianTuTitleWidgets = new List<EventLogTitleWidget>();
 
         List<int> places = new List<int>();
 
@@ -41,6 +41,8 @@ namespace Fort23.Mono
 
         Map<int, List<int>> xianTuMapConfigd = new Map<int, List<int>>();
 
+        List<UIComponent> components = new List<UIComponent>();
+
         private void Init()
         {
             isAddStack = true;
@@ -82,7 +84,7 @@ namespace Fort23.Mono
             UIManager.Instance.DormancyAllGComponent<MainEventLogWidget>();
             UIManager.Instance.DormancyAllGComponent<EventLogWidget>();
             UIManager.Instance.DormancyAllGComponent<EventLogTitleWidget>();
-            xianTuTitleWidgets.Clear();
+
             type = 1;
             shoeXianTuLogConfigs = GetTypeXiantuLogConfigs(type);
             XaiXuanMap(shoeXianTuLogConfigs);
@@ -104,7 +106,7 @@ namespace Fort23.Mono
             UIManager.Instance.DormancyAllGComponent<MainEventLogWidget>();
             UIManager.Instance.DormancyAllGComponent<EventLogWidget>();
             UIManager.Instance.DormancyAllGComponent<EventLogTitleWidget>();
-            xianTuTitleWidgets.Clear();
+            components.Clear();
             type = 2;
             shoeXianTuLogConfigs = GetTypeXiantuLogConfigs(type);
             XaiXuanMap(shoeXianTuLogConfigs);
@@ -220,6 +222,7 @@ namespace Fort23.Mono
                     XianTuData xianTuData2 = new XianTuData();
                     xianTuData2.type = 2;
                     xianTuData2.xianTuLogConfig = xianTuLogConfig;
+                    xianTuData2.fatherXianTuData = xianTuData;
                     xianTuDatas.Add(xianTuData2);
                 }
 
@@ -347,7 +350,7 @@ namespace Fort23.Mono
             UIManager.Instance.DormancyAllGComponent<EventLogWidget>();
             shoeXianTuLogConfigs = GetTypeXiantuLogConfigs(type);
             XaiXuanMap(shoeXianTuLogConfigs);
-
+            components.Clear();
             if (xianTuDatas.Count > 0)
             {
                 eventLogTitleWidget.own.SetActive(true);
@@ -365,16 +368,16 @@ namespace Fort23.Mono
 
         private List<XianTuLogConfig> GetTypeXiantuLogConfigs(int type)
         {
-            List<XianTuLogConfig> xiaNTYULogConfigs = new List<XianTuLogConfig>();
+            List<XianTuLogConfig> xianTuLogConfiges = new List<XianTuLogConfig>();
             foreach (var xianTuLogConfig in xianTuLogConfigs)
             {
                 if (xianTuLogConfig.EventType == type)
                 {
-                    xiaNTYULogConfigs.Add(xianTuLogConfig);
+                    xianTuLogConfiges.Add(xianTuLogConfig);
                 }
             }
 
-            return xiaNTYULogConfigs;
+            return xianTuLogConfiges;
         }
 
         public async CTask<IScorllListWidget> GetIScorllListWidget(int index, RectTransform root)
@@ -397,15 +400,16 @@ namespace Fort23.Mono
                 if (xianTuData.type == 1)
                 {
                     EventLogTitleWidget eventLogTitleWidget = await UIManager.Instance.CreateGComponent<EventLogTitleWidget>(null, Content.GetComponent<RectTransform>());
-                    eventLogTitleWidget.CustomInit(xianTuData.name);
-                    xianTuTitleWidgets.Add(eventLogTitleWidget);
+                    eventLogTitleWidget.CustomInit(xianTuData);
+                    components.Add(eventLogTitleWidget);
+                    // xianTuTitleWidgets.Add(eventLogTitleWidget);
                     return eventLogTitleWidget;
                 }
                 else
                 {
                     EventLogWidget EventLogWidget = await UIManager.Instance.CreateGComponent<EventLogWidget>(null, Content.GetComponent<RectTransform>());
-                    await EventLogWidget.CustomInit(xianTuData.xianTuLogConfig, places);
-
+                    await EventLogWidget.CustomInit(xianTuData, places);
+                    components.Add(EventLogWidget);
                     return EventLogWidget;
                 }
             }
@@ -414,9 +418,9 @@ namespace Fort23.Mono
         public void HindIScorllListWidget(IScorllListWidget widget)
         {
             UIManager.Instance.DormancyGComponent(widget as UIComponent);
-            if (xianTuTitleWidgets.Contains(widget as EventLogTitleWidget))
+            if (components.Contains(widget as UIComponent))
             {
-                xianTuTitleWidgets.Remove(widget as EventLogTitleWidget);
+                components.Remove(widget as EventLogTitleWidget);
             }
         }
 
@@ -425,31 +429,63 @@ namespace Fort23.Mono
             XianTuLogPanel xianTuLogPanel = await UIManager.Instance.LoadAndOpenPanel<XianTuLogPanel>(null);
         }
 
+        List<UIComponent> _components = new List<UIComponent>();
+        private float maxY;
+        private float minY;
+
         [CustomMethod(CustomMethodType.Update)]
         public void Update()
         {
             if (type != 2)
                 return;
-            EventLogTitleWidget highestItem = null;
-            float maxY = float.MinValue;
 
 
-            foreach (var xianTuTitleWidget in xianTuTitleWidgets)
+            UIComponent highestItem = null;
+            maxY = float.MinValue;
+            minY = float.MaxValue;
+            _components.Clear();
+
+
+            foreach (var xianTuTitleWidget in components)
             {
                 float itemY = xianTuTitleWidget.own.transform.position.y; // 使用世界坐标的 Y 值
-                if (itemY > maxY)
+                if (itemY > eventLogTitleWidget.own.transform.position.y)
                 {
                     maxY = itemY;
-                    highestItem = xianTuTitleWidget;
+
+                    _components.Add(xianTuTitleWidget);
                 }
             }
 
+            foreach (var uiComponent in _components)
+            {
+                float itemY = uiComponent.own.transform.position.y; // 使用世界坐标的 Y 值
+                if (itemY < minY)
+                {
+                    minY = itemY;
+                    highestItem = uiComponent;
+                }
+            }
+
+
             if (highestItem != null)
             {
                 float outsideY = eventLogTitleWidget.own.transform.position.y;
-                if (maxY > outsideY - 5)
+                if (maxY > outsideY)
                 {
-                    eventLogTitleWidget.CustomInit(highestItem.Text_Name.text);
+                    XianTuData xianTuData = default;
+                    if (highestItem is EventLogTitleWidget)
+                    {
+                        EventLogTitleWidget eventLogTitleWidget = highestItem as EventLogTitleWidget;
+                        xianTuData = eventLogTitleWidget.xiantuData;
+                    }
+                    else if (highestItem is EventLogWidget)
+                    {
+                        EventLogWidget eventLogWidget = highestItem as EventLogWidget;
+                        xianTuData = eventLogWidget.XianTuData.fatherXianTuData;
+                    }
+
+                    eventLogTitleWidget.CustomInit(xianTuData.name);
                 }
             }
         }
@@ -459,7 +495,7 @@ namespace Fort23.Mono
             UIManager.Instance.DormancyAllGComponent<MainEventLogWidget>();
             UIManager.Instance.DormancyAllGComponent<EventLogWidget>();
             UIManager.Instance.DormancyAllGComponent<EventLogTitleWidget>();
-            xianTuTitleWidgets.Clear();
+            components.Clear();
             type = 0;
             foreach (var bigMapXianTuSaiWidget in bigMapXianTuSaiWidgets)
             {