修改bug

Assets/Res/UI/DialoguePanel/DialogueBubblePanel.prefab

@@ -220,7 +220,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 129, y: -20}
+  m_AnchoredPosition: {x: 129, y: -45}
   m_SizeDelta: {x: 230, y: 0}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &8563214976376415512

Assets/Res/UI/DialoguePanel/DialoguePanel.prefab

@@ -1,5 +1,173 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &1355586615258993514
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4759139436387948549}
+  - component: {fileID: 2639349974006009644}
+  - component: {fileID: 6514281938956791633}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: icon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &4759139436387948549
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1355586615258993514}
+  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: 5263293711959085783}
+  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: -248, y: 217}
+  m_SizeDelta: {x: 150, y: 200}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2639349974006009644
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1355586615258993514}
+  m_CullTransparentMesh: 1
+--- !u!114 &6514281938956791633
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1355586615258993514}
+  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: icon_tx116
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 3855e71da36cb4dfeb0ce0972ed08272, type: 3}
+  packInfo:
+    packName: allIcon
+    packgJsonPath: /Art/UIAssets/TextrueJson/allIcon.txt
+    packgSpritePath: Assets/Res/UIAtlas/allIcon.spriteatlasv2
+    lasetJsonGUID: 083ae4b3a7b2beffb51fed7b1b7800d3
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &1494634783487758265
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5263293711959085783}
+  - component: {fileID: 6131575939708198920}
+  - component: {fileID: 4141757274063490905}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: DialgueType2
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &5263293711959085783
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1494634783487758265}
+  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: 4759139436387948549}
+  - {fileID: 5421574002405006149}
+  m_Father: {fileID: 1803833552231621266}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: 130}
+  m_SizeDelta: {x: 715.4, y: 1386.8348}
+  m_Pivot: {x: 0.5, y: 0}
+--- !u!114 &6131575939708198920
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1494634783487758265}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 7
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!114 &4141757274063490905
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1494634783487758265}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 0
+  m_VerticalFit: 2
 --- !u!1 &3255008631453123208
 GameObject:
   m_ObjectHideFlags: 0
@@ -27,17 +195,17 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3255008631453123208}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3275273584098972649}
+  m_Father: {fileID: 8657432734085162108}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 357.7, y: -244.3}
-  m_SizeDelta: {x: 131, y: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: 324}
+  m_SizeDelta: {x: 131, y: 14}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &1752607932964163169
 CanvasRenderer:
@@ -79,7 +247,7 @@ MonoBehaviour:
     m_Top: 14
     m_Bottom: 0
   m_ChildAlignment: 7
-  m_Spacing: 5
+  m_Spacing: 21.66
   m_ChildForceExpandWidth: 1
   m_ChildForceExpandHeight: 1
   m_ChildControlWidth: 0
@@ -199,6 +367,8 @@ RectTransform:
   m_Children:
   - {fileID: 311482651042689352}
   - {fileID: 3275273584098972649}
+  - {fileID: 5263293711959085783}
+  - {fileID: 8657432734085162108}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -249,6 +419,31 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: OptionMarsk
+    gameObject: {fileID: 7335765504538105348}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: DialgueType1
+    gameObject: {fileID: 8841265337799555239}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: DialgueType2
+    gameObject: {fileID: 1494634783487758265}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: nextIcon2
+    gameObject: {fileID: 6411070171000765822}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: message2
+    gameObject: {fileID: 6272746750164222696}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &6013513864245940534
 GameObject:
@@ -285,9 +480,9 @@ RectTransform:
   - {fileID: 6614233195307115645}
   m_Father: {fileID: 3275273584098972649}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 357.7, y: -115.15}
   m_SizeDelta: {x: 685, y: 230.3}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6945069562181101411
@@ -654,7 +849,7 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
---- !u!1 &8841265337799555239
+--- !u!1 &6411070171000765822
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -662,38 +857,477 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 3275273584098972649}
-  - component: {fileID: 7792863436289110911}
-  - component: {fileID: 8702702673051204598}
-  m_Layer: 5
+  - component: {fileID: 5838194811331929845}
+  - component: {fileID: 3386980232455913856}
+  - component: {fileID: 7658644057417415619}
+  - component: {fileID: 5722337626079041964}
+  m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: Dialgue
+  m_Name: nextIcon2
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &3275273584098972649
+--- !u!224 &5838194811331929845
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8841265337799555239}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_GameObject: {fileID: 6411070171000765822}
+  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: 5617782115550842872}
-  - {fileID: 3450449309247689875}
-  - {fileID: 4979100652905664733}
+  m_Children: []
+  m_Father: {fileID: 5421574002405006149}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 299, y: -650}
+  m_SizeDelta: {x: 38, y: 28}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3386980232455913856
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6411070171000765822}
+  m_CullTransparentMesh: 1
+--- !u!114 &7658644057417415619
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6411070171000765822}
+  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: 0.8064977, b: 0, 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_Arrow_Down
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  packInfo:
+    packName: all
+    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
+    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
+    lasetJsonGUID: bf80d9ac134912f98d951197cdcc8fc6
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!114 &5722337626079041964
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6411070171000765822}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6a23dadfaa104ddf929b8c98dd02623c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  maxDuration: 0
+  isUpdate: 0
+  currTime: 130.62094
+  GrpupInfos:
+  - Foldout: 1
+    isActive: 1
+    animName: 
+    isLoop: 1
+    allTargets:
+    - {fileID: 5838194811331929845}
+    TweenAssetInfo: {fileID: 11400000, guid: ad51b724902d50d4a8bfee51c7c2ac05, type: 2}
+    TargetFoldout: 0
+    maxDuration: 0
+    isUpdate: 1
+    currTime: 0
+  MinMaxGradient:
+    m_Mode: 0
+    m_GradientMin:
+      serializedVersion: 2
+      key0: {r: 1, g: 1, b: 1, a: 1}
+      key1: {r: 1, g: 1, b: 1, a: 1}
+      key2: {r: 0, g: 0, b: 0, a: 0}
+      key3: {r: 0, g: 0, b: 0, a: 0}
+      key4: {r: 0, g: 0, b: 0, a: 0}
+      key5: {r: 0, g: 0, b: 0, a: 0}
+      key6: {r: 0, g: 0, b: 0, a: 0}
+      key7: {r: 0, g: 0, b: 0, a: 0}
+      ctime0: 0
+      ctime1: 65535
+      ctime2: 0
+      ctime3: 0
+      ctime4: 0
+      ctime5: 0
+      ctime6: 0
+      ctime7: 0
+      atime0: 0
+      atime1: 65535
+      atime2: 0
+      atime3: 0
+      atime4: 0
+      atime5: 0
+      atime6: 0
+      atime7: 0
+      m_Mode: 0
+      m_ColorSpace: -1
+      m_NumColorKeys: 2
+      m_NumAlphaKeys: 2
+    m_GradientMax:
+      serializedVersion: 2
+      key0: {r: 1, g: 1, b: 1, a: 1}
+      key1: {r: 1, g: 1, b: 1, a: 1}
+      key2: {r: 0, g: 0, b: 0, a: 0}
+      key3: {r: 0, g: 0, b: 0, a: 0}
+      key4: {r: 0, g: 0, b: 0, a: 0}
+      key5: {r: 0, g: 0, b: 0, a: 0}
+      key6: {r: 0, g: 0, b: 0, a: 0}
+      key7: {r: 0, g: 0, b: 0, a: 0}
+      ctime0: 0
+      ctime1: 65535
+      ctime2: 0
+      ctime3: 0
+      ctime4: 0
+      ctime5: 0
+      ctime6: 0
+      ctime7: 0
+      atime0: 0
+      atime1: 65535
+      atime2: 0
+      atime3: 0
+      atime4: 0
+      atime5: 0
+      atime6: 0
+      atime7: 0
+      m_Mode: 0
+      m_ColorSpace: -1
+      m_NumColorKeys: 2
+      m_NumAlphaKeys: 2
+    m_ColorMin: {r: 0, g: 0, b: 0, a: 0}
+    m_ColorMax: {r: 0, g: 0, b: 0, a: 0}
+  isLoop: 0
+--- !u!1 &7335765504538105348
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8657432734085162108}
+  - component: {fileID: 6252178398409515274}
+  - component: {fileID: 7957336565528474887}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: OptionMarsk
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &8657432734085162108
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7335765504538105348}
+  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: 4979100652905664733}
+  m_Father: {fileID: 1803833552231621266}
+  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 &6252178398409515274
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7335765504538105348}
+  m_CullTransparentMesh: 1
+--- !u!114 &7957336565528474887
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7335765504538105348}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.6901961}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: 
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 0}
+  packInfo:
+    packName: 
+    packgJsonPath: 
+    packgSpritePath: 
+    lasetJsonGUID: 
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &7500484157751691611
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5421574002405006149}
+  - component: {fileID: 5189423333841057677}
+  - component: {fileID: 2540734850179623484}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5421574002405006149
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7500484157751691611}
+  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: 2160621711686017270}
+  - {fileID: 5838194811331929845}
+  m_Father: {fileID: 5263293711959085783}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 357.7, y: -693.4174}
+  m_SizeDelta: {x: 685, y: 1386.8348}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5189423333841057677
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7500484157751691611}
+  m_CullTransparentMesh: 1
+--- !u!114 &2540734850179623484
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7500484157751691611}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_dadi_02
+  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: 73747c90ef6f3497ab9cd07d8ff19dd0
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &7622772448727847372
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2160621711686017270}
+  - component: {fileID: 8565834461768571561}
+  - component: {fileID: 6272746750164222696}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: message2
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2160621711686017270
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7622772448727847372}
+  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: 5421574002405006149}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -3.4999943, y: 21.199951}
+  m_SizeDelta: {x: 635.8, y: 145.6}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8565834461768571561
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7622772448727847372}
+  m_CullTransparentMesh: 1
+--- !u!114 &6272746750164222696
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7622772448727847372}
+  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: 0
+  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: a61334e31cf014203a72ff5de1c54c27, type: 3}
+    m_FontSize: 24
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60"
+--- !u!1 &8841265337799555239
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3275273584098972649}
+  - component: {fileID: 7792863436289110911}
+  - component: {fileID: 8702702673051204598}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: DialgueType1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &3275273584098972649
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8841265337799555239}
+  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: 5617782115550842872}
+  - {fileID: 3450449309247689875}
   m_Father: {fileID: 1803833552231621266}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
   m_AnchoredPosition: {x: 0, y: 29}
-  m_SizeDelta: {x: 715.4, y: 0}
+  m_SizeDelta: {x: 715.4, y: 230.3}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!114 &7792863436289110911
 MonoBehaviour:

Assets/Res/UI/DivineSence/BossInfoPanel.prefab

@@ -629,7 +629,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 0, y: -46.2}
-  m_SizeDelta: {x: 706.78, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &8924209297497028959
 CanvasRenderer:
@@ -1076,7 +1076,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 0, y: -0}
-  m_SizeDelta: {x: 511.09, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &8409106499957115708
 CanvasRenderer:

Assets/Res/UI/DivineSence/ShengShiEventWidget.prefab

@@ -250,17 +250,17 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
-  - key: Massge
-    gameObject: {fileID: 1326197565086495762}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
   - key: bg
     gameObject: {fileID: 8488195482551738332}
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
   - key: Text_Name
+    gameObject: {fileID: 1326197565086495762}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_Type
     gameObject: {fileID: 8600374623529695105}
     isAssetBundle: 0
     isList: 0
@@ -589,7 +589,7 @@ GameObject:
   - component: {fileID: 8600374623529695105}
   m_Layer: 5
   m_HasEditorInfo: 1
-  m_Name: Text_Name
+  m_Name: Text_Type
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -672,7 +672,7 @@ GameObject:
   - component: {fileID: 5529441806350073449}
   m_Layer: 5
   m_HasEditorInfo: 1
-  m_Name: Massge
+  m_Name: Text_Name
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

Assets/Res/UI/DivineSence/ShengShiEventWidgetType2.prefab

@@ -736,6 +736,7 @@ RectTransform:
   - {fileID: 8807649875490934103}
   - {fileID: 1357522047238736597}
   - {fileID: 3650536308811846443}
+  - {fileID: 7566769296908980725}
   - {fileID: 712579681456886399}
   - {fileID: 2781605243884814213}
   - {fileID: 6760469126628422357}
@@ -1040,6 +1041,16 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Text_Mapname
+    gameObject: {fileID: 5637155694417808183}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_Type
+    gameObject: {fileID: 4649399110665748015}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &6161269103075097772
 GameObject:
@@ -1474,8 +1485,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 11.421}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 141.7, y: 57.1}
-  m_SizeDelta: {x: 172.7552, y: 65.7585}
+  m_AnchoredPosition: {x: 203.5, y: 58.2}
+  m_SizeDelta: {x: 113.3769, y: 43.1564}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3700033355154013030
 CanvasRenderer:
@@ -1527,6 +1538,102 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &8552613376447685522
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7566769296908980725}
+  - component: {fileID: 3905264220941356025}
+  - component: {fileID: 5637155694417808183}
+  - component: {fileID: 1262941091157409969}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_Mapname
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7566769296908980725
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8552613376447685522}
+  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: 3764721290890148754}
+  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: 61, y: 52.255}
+  m_SizeDelta: {x: 186.0683, y: 42.713}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3905264220941356025
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8552613376447685522}
+  m_CullTransparentMesh: 1
+--- !u!114 &5637155694417808183
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8552613376447685522}
+  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.2924528, g: 0.2690014, b: 0.2690014, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 24
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u8FD9\u662F\u4E00\u6BB5\u63CF\u8FF0"
+--- !u!114 &1262941091157409969
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8552613376447685522}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0.4811321, g: 0.43347278, b: 0.43347278, a: 0.5}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
 --- !u!1 &8848809442754795059
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/Task/TaskInfoPanel.prefab

@@ -31,12 +31,8 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2896655462721008753}
-  - {fileID: 2569128129379278262}
   - {fileID: 4688522053669353716}
-  - {fileID: 8515100903656146540}
-  - {fileID: 3220702368838562604}
-  - {fileID: 112700476894147953}
-  - {fileID: 708683880219238892}
+  - {fileID: 2569128129379278262}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -104,7 +100,6 @@ GameObject:
   - component: {fileID: 708683880219238892}
   - component: {fileID: 4283077157061789222}
   - component: {fileID: 4881049144302649175}
-  - component: {fileID: 5435399637829414925}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: ItemRoot
@@ -126,11 +121,11 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4038523271141183626}
-  m_Father: {fileID: 8599819629026832582}
+  m_Father: {fileID: 8887379241100265904}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: 666.9}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 410.77, y: 248.4609}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &4283077157061789222
@@ -165,26 +160,6 @@ MonoBehaviour:
   m_Spacing: {x: 2.8, y: 0}
   m_Constraint: 1
   m_ConstraintCount: 4
---- !u!114 &5435399637829414925
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1408015899473625068}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_IgnoreLayout: 1
-  m_MinWidth: -1
-  m_MinHeight: -1
-  m_PreferredWidth: -1
-  m_PreferredHeight: -1
-  m_FlexibleWidth: -1
-  m_FlexibleHeight: -1
-  m_LayoutPriority: 1
 --- !u!1 &2132268725135064903
 GameObject:
   m_ObjectHideFlags: 0
@@ -215,12 +190,13 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 8887379241100265904}
   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: 0, y: 46.5656}
+  m_AnchoredPosition: {x: 0, y: 46.565613}
   m_SizeDelta: {x: 475.8763, y: 777.9515}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9156533754913033698
@@ -514,16 +490,16 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3627747089450203247}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 8599819629026832582}
+  m_Father: {fileID: 8887379241100265904}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 1}
-  m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -467.9}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 238, y: -84.5865}
   m_SizeDelta: {x: 410.77, y: 0}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &9047568930966635103
@@ -582,6 +558,128 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 0
   m_VerticalFit: 2
+--- !u!1 &6187359724244078961
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8887379241100265904}
+  - component: {fileID: 2541774699167515807}
+  - component: {fileID: 8352399863819387752}
+  - component: {fileID: 4096449100553992080}
+  - component: {fileID: 1843378295882593034}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8887379241100265904
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6187359724244078961}
+  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: 8515100903656146540}
+  - {fileID: 3220702368838562604}
+  - {fileID: 112700476894147953}
+  - {fileID: 708683880219238892}
+  m_Father: {fileID: 2569128129379278262}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0.000030517578}
+  m_SizeDelta: {x: 476, y: 0}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &2541774699167515807
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6187359724244078961}
+  m_CullTransparentMesh: 1
+--- !u!114 &8352399863819387752
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6187359724244078961}
+  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: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &4096449100553992080
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6187359724244078961}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 4
+  m_Spacing: 28.8
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!114 &1843378295882593034
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6187359724244078961}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 0
+  m_VerticalFit: 2
 --- !u!1 &6488653642591306706
 GameObject:
   m_ObjectHideFlags: 0
@@ -831,16 +929,16 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7852697166483862012}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 8599819629026832582}
+  m_Father: {fileID: 8887379241100265904}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 1}
-  m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -575.3}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 238, y: -199.3865}
   m_SizeDelta: {x: 410.77, y: 0}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &3214678112079635339
@@ -925,16 +1023,16 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8794085188831228050}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 8599819629026832582}
+  m_Father: {fileID: 8887379241100265904}
   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.0000038147, y: 390.8}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 410.7655, y: 55.7865}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &126500885704442088

Assets/Res/UI/XianTuLogPanel/EventLogTitleWidget.prefab

@@ -36,9 +36,9 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 375, y: -812}
-  m_SizeDelta: {x: 750, y: 71.88623}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 717.06, y: 71.88623}
+  m_Pivot: {x: 0, y: 1}
 --- !u!222 &7526096831240874525
 CanvasRenderer:
   m_ObjectHideFlags: 0

Assets/Scripts/GameData/ExcelConfig/EventLinkConfig.cs

@@ -56,6 +56,12 @@ public int EventID;
 public int[] ConditionId;
 
 
+		/// <summary>
+		///对话框类型
+		/// </summary>
+public int DialogueType;
+
+
 		/// <summary>
 		///步骤类型 1=提供选项 2=进入战斗 3=获得奖励 4=扣除道具
 		/// </summary>

Assets/Scripts/GameUI/EventManager/EventHelper.cs

@@ -11,50 +11,28 @@ public static class EventHelper
     {
         string result = String.Empty;
         EventConditionConfig eventCondition = ConfigComponent.Instance.Get<EventConditionConfig>(eventConditionData.eventCondition);
-        // AccountFileInfo.EventLinkData eventLinkData =
-        //     AccountFileInfo.Instance.playerData.eventLinkDatas.FirstOrDefault(e => e.eventLinkId == eventConfigId);
 
-        // int fishCount = eventCondition == null ? 0 : eventLinkData.fishCount;
 
         result = LanguageManager.Instance.Text(eventCondition.message, eventConditionData.fishCount, eventCondition.finishCount);
-        // switch (eventCondition.ConditionType)
-        // {
-        //     case 1:
-        //         // ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(eventCondition.ConditionPara[0]);
-        //         // result =
-        //         //     $"需要拥有{LanguageManager.Instance.Text(itemConfig.itemName)} {fishCount}/{eventCondition.finishCount}";
-        //         // result = LanguageManager.Instance.Text(eventCondition.conciseEventMessage,fishCount, eventCondition.finishCount.ToString() + "个");
-        //
-        //         break;
-        //     case 3:
-        //         // HeroPowerUpConfig heroPowerUpConfig =
-        //         //     ConfigComponent.Instance.Get<HeroPowerUpConfig>(eventCondition.ConditionPara[0]);
-        //         // string jingjie = LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[0]) +
-        //         //                  LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[1]) +
-        //         //                  LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[2]);
-        //         //
-        //         // result =
-        //         //     $"需要达到境界{jingjie}";
-        //         // result = LanguageManager.Instance.Text(eventCondition.conciseEventMessage, jingjie);
-        //         break;
-        //
-        //     case 5:
-        //         // result = LanguageManager.Instance.Text(eventCondition.conciseEventMessage, fishCount.ToString(), eventCondition.finishCount.ToString());
-        //         // result =
-        //         //     $"需要完成战斗{eventCondition.ConditionPara[0]} {fishCount}/{eventCondition.finishCount}";
-        //         break;
-        //     case 6:
-        //
-        //         // ItemConfig itemConfig1 = ConfigComponent.Instance.Get<ItemConfig>(eventCondition.ConditionPara[0]);
-        //         // // result = LanguageManager.Instance.Text(eventCondition.conciseEventMessage, fishCount.ToString(), eventCondition.finishCount.ToString());
-        //         // result =
-        //         //     $"需要获得{LanguageManager.Instance.Text(itemConfig1.itemName)} {fishCount}/{eventCondition.finishCount}";
-        //         break;
-        //     default:
-        //         // result =LanguageManager.Instance.Text(eventCondition.conciseEventMessage);
-        //         break;
-        // }
+
 
         return result;
     }
+
+    public static string GetEventType(int type)
+    {
+        switch (type)
+        {
+            case 1:
+                return "主线";
+            case 2:
+                return "支线";
+            case 3:
+                return "通用";
+            case 4:
+                return "地图通用";
+            default:
+                return "没有";
+        }
+    }
 }

Assets/Scripts/GameUI/ScorolList/ScrollList.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Fort23.Core;
+using Fort23.Mono;
 using Fort23.UTool;
 using UnityEngine;
 using UnityEngine.UI;
@@ -222,6 +223,15 @@ public class ScrollList : MonoBehaviour, IScrollListContent
         }
     }
 
+    private void Update()
+    {
+        if (Input.GetKeyDown(KeyCode.Y))
+        {
+            HindWidget();
+        }
+        
+    }
+
     protected async CTask<IScorllListWidget> Cread(int index, bool isUp)
     {
         int showIndex = index - m_startIndex;
@@ -635,16 +645,12 @@ public class ScrollList : MonoBehaviour, IScrollListContent
         isShow = false;
         isHind = false;
 
-
         Vector2 pos = Vector2.zero;
         float minx = pos.x - (root.rect.size.x * root.pivot.x);
         float miny = pos.y - (root.rect.size.y * root.pivot.y);
         float maxx = pos.x + (root.rect.size.x * (1 - root.pivot.x));
         float maxy = pos.y + (root.rect.size.y * (1 - root.pivot.y));
-
-        // UIManager.Instance.Canvas
-
-        // Debug.Log(pos);
+        
         Vector2 rootPos = posint;
 
 
@@ -677,17 +683,6 @@ public class ScrollList : MonoBehaviour, IScrollListContent
                     isHind = true;
                 }
             }
-
-            // if (p.x > minx && p.x < maxx && p.y > miny && p.y < maxy)
-            // {
-            //     isShow = true;
-            // }
-
-            // if (p.x > minx - size.x - 100 && p.x < maxx + size.x + 100 && p.y > miny - size.y - 100 &&
-            //     p.y < maxy + size.y + 100)
-            // {
-            //     isHind = true;
-            // }
         }
     }
 

Assets/Scripts/GameUI/UI/CombatPanel/ShengShiEventWidget.cs

@@ -43,24 +43,7 @@ namespace Fort23.Mono
             this.eventList = eventList;
             randomEventConfig = ConfigComponent.Instance.Get<EventConfig>(eventList.eventID);
             Text_Name.text = LanguageManager.Instance.Text(randomEventConfig.EventName);
-
-            // EventLinkConfig conditionConfig = ConfigComponent.Instance.Get<EventLinkConfig>(randomEventConfig.EventLinksId[0]);
-            // string desc = String.Empty;
-            // if (conditionConfig.LanID == null)
-            // {
-            //     desc = EventHelper.GetTaskMessage(randomEventConfig.EventLinksId[0]);
-            // }
-            // else
-            // {
-            //     desc = LanguageManager.Instance.Text(conditionConfig.LanID[0]);
-            //     if (desc.Length > 8)
-            //     {
-            //         desc = desc.Substring(0, 8);
-            //         desc += "...";
-            //     }
-            // }
-            Massge.text = LanguageManager.Instance.Text(randomEventConfig.Description);
-            // Massge.text = LanguageManager.Instance.Text(desc);
+            Text_Type.text = EventHelper.GetEventType(randomEventConfig.EventTag);
         }
     }
 }

Assets/Scripts/GameUI/UI/CombatPanel/ShengShiEventWidgetData.cs

@@ -19,17 +19,6 @@ namespace Fort23.Mono
 	      return _myButton;
 	     }
 	   }
-	  private Text _Massge;
-	  public Text Massge
-	   {
-	   get{
-	      if (_Massge == null)
-	       {
-	         _Massge  = GetUIUnit<Text>("Massge"); 
-	       }
-	      return _Massge;
-	     }
-	   }
 	  private MyImage _bg;
 	  public MyImage bg
 	   {
@@ -52,6 +41,17 @@ namespace Fort23.Mono
 	      return _Text_Name;
 	     }
 	   }
+	  private Text _Text_Type;
+	  public Text Text_Type
+	   {
+	   get{
+	      if (_Text_Type == null)
+	       {
+	         _Text_Type  = GetUIUnit<Text>("Text_Type"); 
+	       }
+	      return _Text_Type;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/DialoguePanel/DialoguePanel.cs

@@ -36,12 +36,16 @@ namespace Fort23.Mono
 
         private int type;
 
-        public static async void OpenDialoguePanel(AccountFileInfo.EventList CurrentEventList,int id, string[] icon,
+        private Text showText;
+
+        private GameObject shownextIcon;
+
+        public static async void OpenDialoguePanel(AccountFileInfo.EventList CurrentEventList, int id, string[] icon,
             ShowDialogueEventData.MessageShowType messageShowType,
             Action<int?> finish)
         {
             DialoguePanel dialoguePanel = await UIManager.Instance.LoadAndOpenPanel<DialoguePanel>(null, UILayer.Top);
-            dialoguePanel.ShowPanel(CurrentEventList,id, icon, messageShowType, finish);
+            dialoguePanel.ShowPanel(CurrentEventList, id, icon, messageShowType, finish);
         }
 
 
@@ -80,7 +84,7 @@ namespace Fort23.Mono
             {
                 _sb.Clear();
                 _sb.Append(_currShowMessage);
-                message.text = _sb.ToString();
+                showText.text = _sb.ToString();
                 _currShowIndex = _currShowMessage.Length;
                 _isUpdate = false;
                 ShowNextIcon();
@@ -92,7 +96,7 @@ namespace Fort23.Mono
                     //     ShowOptions();
                     // }
 
-                    if (eventConditionConfig.ID != 0  && !_isShowingOptions)
+                    if (eventConditionConfig.ID != 0 && !_isShowingOptions)
                     {
                         ShowOptions();
                     }
@@ -123,7 +127,7 @@ namespace Fort23.Mono
             }
         }
 
-        public void ShowPanel(AccountFileInfo.EventList CurrentEventList,int id, string[] icon,
+        public void ShowPanel(AccountFileInfo.EventList CurrentEventList, int id, string[] icon,
             ShowDialogueEventData.MessageShowType messageShowType,
             Action<int?> finish)
         {
@@ -136,6 +140,21 @@ namespace Fort23.Mono
             this.finish = finish;
             index = 0;
             StaticUpdater.Instance.AddRenderUpdateCallBack(Update);
+            if (eventConditionConfig.DialogueType == 0 || eventConditionConfig.DialogueType == 1)
+            {
+                DialgueType1.gameObject.SetActive(true);
+                DialgueType2.gameObject.SetActive(false);
+                showText = message;
+                shownextIcon = nextIcon;
+            }
+            else
+            {
+                DialgueType1.gameObject.SetActive(false);
+                DialgueType2.gameObject.SetActive(true);
+                showText = message2;
+                shownextIcon = nextIcon2;
+            }
+
             StartShowMassge();
         }
 
@@ -157,7 +176,7 @@ namespace Fort23.Mono
         {
             if (index >= dialogueMessaga.Length)
             {
-                if (eventConditionConfig.ID != 0  && !_isShowingOptions)
+                if (eventConditionConfig.ID != 0 && !_isShowingOptions)
                 {
                     ShowOptions();
                 }
@@ -179,8 +198,6 @@ namespace Fort23.Mono
                                 return;
                             }
                         }
-
-                     
                     }
 
 
@@ -193,7 +210,7 @@ namespace Fort23.Mono
             }
 
             _isShowNextButton = false;
-            nextIcon.SetActive(false);
+            shownextIcon.SetActive(false);
             string m = LanguageManager.Instance.Text(dialogueMessaga[index]);
 
             if (showIconName != null && index < showIconName.Length)
@@ -205,14 +222,14 @@ namespace Fort23.Mono
             switch (messageShowType)
             {
                 case ShowDialogueEventData.MessageShowType.Default:
-                    message.text = m;
+                    showText.text = m;
                     ShowNextIcon();
                     break;
                 case ShowDialogueEventData.MessageShowType.Verbatim:
                     _sb.Clear();
                     _currShowMessage = m.ToCharArray();
                     _sb.Append(_currShowMessage[0]);
-                    message.text = _sb.ToString();
+                    showText.text = _sb.ToString();
                     _isUpdate = true;
                     _currShowIndex = 1;
                     _skipTyping = false;
@@ -235,24 +252,26 @@ namespace Fort23.Mono
 
                     DialogueOptionWidget dialogueOptionWidget =
                         await UIManager.Instance.CreateGComponent<DialogueOptionWidget>(null, OptionRoot);
-                    dialogueOptionWidget.CustomInit(_eventLinkData,op, eventConditionConfig.ID, SelectOption);
+                    dialogueOptionWidget.CustomInit(_eventLinkData, op, eventConditionConfig.ID, SelectOption);
                 }
-            }
 
+                DialogueOptionWidget dialogueOptionWidget1 =
+                    await UIManager.Instance.CreateGComponent<DialogueOptionWidget>(null, OptionRoot);
+                dialogueOptionWidget1.CustomInit((DialogueOptionWidget obj) =>
+                {
+                    UIManager.Instance.HideUIUIPanel(this);
+                    finish?.Invoke(-1);
+                });
 
-            DialogueOptionWidget dialogueOptionWidget1 =
-                await UIManager.Instance.CreateGComponent<DialogueOptionWidget>(null, OptionRoot);
-            dialogueOptionWidget1.CustomInit((DialogueOptionWidget obj) =>
-            {
-                UIManager.Instance.HideUIUIPanel(this);
-                finish?.Invoke(-1);
-            });
+                LayoutRebuilder.ForceRebuildLayoutImmediate(Dialgue);
 
-            LayoutRebuilder.ForceRebuildLayoutImmediate(Dialgue);
+                OptionMarsk.SetActive(true);
+            }
         }
 
         private void SelectOption(DialogueOptionWidget obj)
         {
+            OptionMarsk.SetActive(false);
             int selectedOptionID = obj.eventConditionConfig.ID;
             // if (obj.eventConditionConfig.ID != 0 && obj.eventConditionConfig.ConditionType != 0)
             // {
@@ -269,7 +288,7 @@ namespace Fort23.Mono
 
         private void ShowNextIcon()
         {
-            nextIcon.SetActive(true);
+            shownextIcon.SetActive(true);
             _isShowNextButton = true;
         }
 
@@ -300,7 +319,7 @@ namespace Fort23.Mono
                         //     ShowOptions();
                         // }
 
-                        if (eventConditionConfig.ID != 0  && !_isShowingOptions)
+                        if (eventConditionConfig.ID != 0 && !_isShowingOptions)
                         {
                             ShowOptions();
                         }
@@ -317,7 +336,7 @@ namespace Fort23.Mono
                     _currShowTime -= _showTime;
                     _sb.Append(_currShowMessage[_currShowIndex]);
                     _currShowIndex++;
-                    message.text = _sb.ToString();
+                    showText.text = _sb.ToString();
                 }
             }
         }
@@ -332,7 +351,11 @@ namespace Fort23.Mono
             _eventLinkData = null;
             CurrentEventList = null;
             _currShowMessage = null;
-            dialogueMessaga = null; 
+            dialogueMessaga = null;
+
+            DialgueType1.gameObject.SetActive(false);
+            DialgueType2.gameObject.SetActive(false);
+            OptionMarsk.SetActive(false);
             base.Close();
         }
     }

Assets/Scripts/GameUI/UI/DialoguePanel/DialoguePanelData.cs

@@ -74,6 +74,61 @@ namespace Fort23.Mono
 	      return _Dialgue;
 	     }
 	   }
+	  private GameObject _OptionMarsk;
+	  public GameObject OptionMarsk
+	   {
+	   get{
+	      if (_OptionMarsk == null)
+	       {
+	         _OptionMarsk  = GetUIUnit<GameObject>("OptionMarsk"); 
+	       }
+	      return _OptionMarsk;
+	     }
+	   }
+	  private GameObject _DialgueType1;
+	  public GameObject DialgueType1
+	   {
+	   get{
+	      if (_DialgueType1 == null)
+	       {
+	         _DialgueType1  = GetUIUnit<GameObject>("DialgueType1"); 
+	       }
+	      return _DialgueType1;
+	     }
+	   }
+	  private GameObject _DialgueType2;
+	  public GameObject DialgueType2
+	   {
+	   get{
+	      if (_DialgueType2 == null)
+	       {
+	         _DialgueType2  = GetUIUnit<GameObject>("DialgueType2"); 
+	       }
+	      return _DialgueType2;
+	     }
+	   }
+	  private GameObject _nextIcon2;
+	  public GameObject nextIcon2
+	   {
+	   get{
+	      if (_nextIcon2 == null)
+	       {
+	         _nextIcon2  = GetUIUnit<GameObject>("nextIcon2"); 
+	       }
+	      return _nextIcon2;
+	     }
+	   }
+	  private Text _message2;
+	  public Text message2
+	   {
+	   get{
+	      if (_message2 == null)
+	       {
+	         _message2  = GetUIUnit<Text>("message2"); 
+	       }
+	      return _message2;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

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

@@ -126,6 +126,17 @@ namespace Fort23.Mono
                 }
             }
 
+            if (randomEventConfig.placeID != 0)
+            {
+                PlacesConfig placesConfig = ConfigComponent.Instance.Get<PlacesConfig>(randomEventConfig.placeID);
+                Text_Mapname.text = LanguageManager.Instance.Text(placesConfig.placeName);
+                Text_Mapname.gameObject.SetActive(true);
+            }
+            else
+            {
+                Text_Mapname.gameObject.SetActive(false);
+            }
+            Text_Type.text = EventHelper.GetEventType(randomEventConfig.EventTag);
             for (var i = 0; i < itemInfos.Count; i++)
             {
                 WidgetItem widgetItem = await UIManager.Instance.CreateGComponent<WidgetItem>(null, ItemRoot);

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

@@ -107,6 +107,28 @@ namespace Fort23.Mono
 	      return _Icon_Marsk;
 	     }
 	   }
+	  private Text _Text_Mapname;
+	  public Text Text_Mapname
+	   {
+	   get{
+	      if (_Text_Mapname == null)
+	       {
+	         _Text_Mapname  = GetUIUnit<Text>("Text_Mapname"); 
+	       }
+	      return _Text_Mapname;
+	     }
+	   }
+	  private Text _Text_Type;
+	  public Text Text_Type
+	   {
+	   get{
+	      if (_Text_Type == null)
+	       {
+	         _Text_Type  = GetUIUnit<Text>("Text_Type"); 
+	       }
+	      return _Text_Type;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

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

@@ -221,7 +221,7 @@ namespace Fort23.Mono
         [CustomMethod(CustomMethodType.Update)]
         public void Update()
         {
-            if (type != 2)
+            if (type != 1)
                 return;
             EventLogTitleWidget highestItem = null;
             float maxY = float.MinValue;
@@ -240,7 +240,7 @@ namespace Fort23.Mono
             if (highestItem != null)
             {
                 float outsideY = eventLogTitleWidget.own.transform.position.y;
-                if (maxY > outsideY - 5)
+                if (maxY > outsideY )
                 {
                     eventLogTitleWidget.CustomInit(highestItem.Text_Name.text);
                 }