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

# Conflicts:
#	UserSettings/Layouts/default-2022.dwlt   resolved by origin/master(远端) version

Assets/Art/HeroTimeLine/gf_1403_timeline.playable

@@ -39,7 +39,7 @@ MonoBehaviour:
   intervalTime: 0
   isRoat: 0
   roatIndex: 0
---- !u!114 &-6187010753537468795
+--- !u!114 &-5165449034059424412
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
@@ -48,89 +48,36 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 15e0374501f39d54eb30235764636e0e, type: 3}
-  m_Name: Control Track (2)
+  m_Script: {fileID: 11500000, guid: f1fc88ca9f5b46d2929d20f65fbe5c4e, type: 3}
+  m_Name: TimeLineParticleSystemAsset(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)
   m_EditorClassIdentifier: 
-  m_Version: 3
-  m_AnimClip: {fileID: 0}
-  m_Locked: 0
-  m_Muted: 0
-  m_CustomPlayableFullTypename: 
-  m_Curves: {fileID: 0}
-  m_Parent: {fileID: -1312881930460134039}
-  m_Children: []
-  m_Clips:
-  - m_Version: 1
-    m_Start: 0.9
-    m_ClipIn: 0
-    m_Asset: {fileID: -1320149575983834653}
-    m_Duration: 1
-    m_TimeScale: 1
-    m_ParentTrack: {fileID: -6187010753537468795}
-    m_EaseInDuration: 0
-    m_EaseOutDuration: 0
-    m_BlendInDuration: 0
-    m_BlendOutDuration: 0
-    m_MixInCurve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      - serializedVersion: 3
-        time: 1
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    m_MixOutCurve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      - serializedVersion: 3
-        time: 1
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    m_BlendInCurveMode: 0
-    m_BlendOutCurveMode: 0
-    m_ExposedParameterNames: []
-    m_AnimationCurves: {fileID: 0}
-    m_Recordable: 0
-    m_PostExtrapolationMode: 0
-    m_PreExtrapolationMode: 0
-    m_PostExtrapolationTime: 0
-    m_PreExtrapolationTime: 0
-    m_DisplayName: fx_gf_1403
-  m_Markers:
-    m_Objects: []
+  sourceGameObject:
+    exposedName: 7c396901ebb33c94eb8099e8c2c675ef
+    defaultValue: {fileID: 0}
+  prefabGameObject: {fileID: 7925918448186698821, guid: 7f7c7fcbe429dd1449795013c5bfdb2c, type: 3}
+  updateParticle: 1
+  particleRandomSeed: 518
+  updateDirector: 1
+  updateITimeControl: 1
+  searchHierarchy: 1
+  active: 1
+  postPlayback: 2
+  targetType: 2
+  LocationType: 5
+  targetSpecialDotName: fxpos00
+  hitPointGroupName: 
+  isGround: 0
+  isFollowTarget: 0
+  isNotRotate: 0
+  isFollowRootTarget: 0
+  isAttSpeed: 0
+  isLoop: 0
+  loopAlone: 0
+  isActivityCustomTargetPos: 1
+  CustomTargetPosIndex: 0
+  intervalTime: 0
+  isRoat: 0
+  roatIndex: 0
 --- !u!114 &-5073625934344026965
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -158,98 +105,6 @@ MonoBehaviour:
   m_Clips: []
   m_Markers:
     m_Objects: []
---- !u!114 &-4629673878966622301
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 15e0374501f39d54eb30235764636e0e, type: 3}
-  m_Name: Control Track (3)
-  m_EditorClassIdentifier: 
-  m_Version: 3
-  m_AnimClip: {fileID: 0}
-  m_Locked: 0
-  m_Muted: 0
-  m_CustomPlayableFullTypename: 
-  m_Curves: {fileID: 0}
-  m_Parent: {fileID: -1312881930460134039}
-  m_Children: []
-  m_Clips:
-  - m_Version: 1
-    m_Start: 1
-    m_ClipIn: 0
-    m_Asset: {fileID: -1047239596506484229}
-    m_Duration: 1
-    m_TimeScale: 1
-    m_ParentTrack: {fileID: -4629673878966622301}
-    m_EaseInDuration: 0
-    m_EaseOutDuration: 0
-    m_BlendInDuration: 0
-    m_BlendOutDuration: 0
-    m_MixInCurve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      - serializedVersion: 3
-        time: 1
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    m_MixOutCurve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      - serializedVersion: 3
-        time: 1
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    m_BlendInCurveMode: 0
-    m_BlendOutCurveMode: 0
-    m_ExposedParameterNames: []
-    m_AnimationCurves: {fileID: 0}
-    m_Recordable: 0
-    m_PostExtrapolationMode: 0
-    m_PreExtrapolationMode: 0
-    m_PostExtrapolationTime: 0
-    m_PreExtrapolationTime: 0
-    m_DisplayName: fx_gf_1403
-  m_Markers:
-    m_Objects: []
 --- !u!114 &-3091699523814709828
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -366,45 +221,6 @@ MonoBehaviour:
     m_DisplayName: fx_gf1403_shou
   m_Markers:
     m_Objects: []
---- !u!114 &-1320149575983834653
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f1fc88ca9f5b46d2929d20f65fbe5c4e, type: 3}
-  m_Name: TimeLineParticleSystemAsset(Clone)(Clone)(Clone)(Clone)(Clone)
-  m_EditorClassIdentifier: 
-  sourceGameObject:
-    exposedName: 69f90aa09fd98d94e84026d9036a8b3b
-    defaultValue: {fileID: 0}
-  prefabGameObject: {fileID: 7925918448186698821, guid: 7f7c7fcbe429dd1449795013c5bfdb2c, type: 3}
-  updateParticle: 1
-  particleRandomSeed: 518
-  updateDirector: 1
-  updateITimeControl: 1
-  searchHierarchy: 1
-  active: 1
-  postPlayback: 2
-  targetType: 2
-  LocationType: 5
-  targetSpecialDotName: fxpos01
-  hitPointGroupName: 
-  isGround: 0
-  isFollowTarget: 0
-  isNotRotate: 0
-  isFollowRootTarget: 0
-  isAttSpeed: 0
-  isLoop: 0
-  loopAlone: 0
-  isActivityCustomTargetPos: 0
-  CustomTargetPosIndex: 0
-  intervalTime: 0
-  isRoat: 0
-  roatIndex: 0
 --- !u!114 &-1312881930460134039
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -425,53 +241,11 @@ MonoBehaviour:
   m_Curves: {fileID: 0}
   m_Parent: {fileID: 11400000}
   m_Children:
+  - {fileID: 3379530281373283979}
   - {fileID: -967561152183985454}
-  - {fileID: -6187010753537468795}
-  - {fileID: -4629673878966622301}
-  - {fileID: 1930595873469389689}
-  - {fileID: 1516179891659481466}
   m_Clips: []
   m_Markers:
     m_Objects: []
---- !u!114 &-1047239596506484229
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f1fc88ca9f5b46d2929d20f65fbe5c4e, type: 3}
-  m_Name: TimeLineParticleSystemAsset(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)
-  m_EditorClassIdentifier: 
-  sourceGameObject:
-    exposedName: ae184299a7c6a5e4f959837564fd1b40
-    defaultValue: {fileID: 0}
-  prefabGameObject: {fileID: 7925918448186698821, guid: 7f7c7fcbe429dd1449795013c5bfdb2c, type: 3}
-  updateParticle: 1
-  particleRandomSeed: 518
-  updateDirector: 1
-  updateITimeControl: 1
-  searchHierarchy: 1
-  active: 1
-  postPlayback: 2
-  targetType: 2
-  LocationType: 5
-  targetSpecialDotName: fxpos02
-  hitPointGroupName: 
-  isGround: 0
-  isFollowTarget: 0
-  isNotRotate: 0
-  isFollowRootTarget: 0
-  isAttSpeed: 0
-  isLoop: 0
-  loopAlone: 0
-  isActivityCustomTargetPos: 0
-  CustomTargetPosIndex: 0
-  intervalTime: 0
-  isRoat: 0
-  roatIndex: 0
 --- !u!114 &-967561152183985454
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -494,7 +268,7 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 0.8
+    m_Start: 0.6833333333333333
     m_ClipIn: 0
     m_Asset: {fileID: 1812708524235700609}
     m_Duration: 1
@@ -561,7 +335,7 @@ MonoBehaviour:
     m_PreExtrapolationMode: 0
     m_PostExtrapolationTime: 0
     m_PreExtrapolationTime: 0
-    m_DisplayName: fx_gf_1403
+    m_DisplayName: fx_gf1403_zdsf
   m_Markers:
     m_Objects: []
 --- !u!114 &-894447145330074657
@@ -679,137 +453,6 @@ MonoBehaviour:
     m_ScenePreview: 1
   m_DurationMode: 0
   m_MarkerTrack: {fileID: 0}
---- !u!114 &1516179891659481466
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 15e0374501f39d54eb30235764636e0e, type: 3}
-  m_Name: Control Track (5)
-  m_EditorClassIdentifier: 
-  m_Version: 3
-  m_AnimClip: {fileID: 0}
-  m_Locked: 0
-  m_Muted: 0
-  m_CustomPlayableFullTypename: 
-  m_Curves: {fileID: 0}
-  m_Parent: {fileID: -1312881930460134039}
-  m_Children: []
-  m_Clips:
-  - m_Version: 1
-    m_Start: 1.2
-    m_ClipIn: 0
-    m_Asset: {fileID: 6468979750813336159}
-    m_Duration: 1
-    m_TimeScale: 1
-    m_ParentTrack: {fileID: 1516179891659481466}
-    m_EaseInDuration: 0
-    m_EaseOutDuration: 0
-    m_BlendInDuration: 0
-    m_BlendOutDuration: 0
-    m_MixInCurve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      - serializedVersion: 3
-        time: 1
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    m_MixOutCurve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      - serializedVersion: 3
-        time: 1
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    m_BlendInCurveMode: 0
-    m_BlendOutCurveMode: 0
-    m_ExposedParameterNames: []
-    m_AnimationCurves: {fileID: 0}
-    m_Recordable: 0
-    m_PostExtrapolationMode: 0
-    m_PreExtrapolationMode: 0
-    m_PostExtrapolationTime: 0
-    m_PreExtrapolationTime: 0
-    m_DisplayName: fx_gf_1403
-  m_Markers:
-    m_Objects: []
---- !u!114 &1695802140634251288
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f1fc88ca9f5b46d2929d20f65fbe5c4e, type: 3}
-  m_Name: TimeLineParticleSystemAsset(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)
-  m_EditorClassIdentifier: 
-  sourceGameObject:
-    exposedName: dcd881d49d0929748b113c0f89531fc4
-    defaultValue: {fileID: 0}
-  prefabGameObject: {fileID: 7925918448186698821, guid: 7f7c7fcbe429dd1449795013c5bfdb2c, type: 3}
-  updateParticle: 1
-  particleRandomSeed: 518
-  updateDirector: 1
-  updateITimeControl: 1
-  searchHierarchy: 1
-  active: 1
-  postPlayback: 2
-  targetType: 2
-  LocationType: 5
-  targetSpecialDotName: fxpos03
-  hitPointGroupName: 
-  isGround: 0
-  isFollowTarget: 0
-  isNotRotate: 0
-  isFollowRootTarget: 0
-  isAttSpeed: 0
-  isLoop: 0
-  loopAlone: 0
-  isActivityCustomTargetPos: 0
-  CustomTargetPosIndex: 0
-  intervalTime: 0
-  isRoat: 0
-  roatIndex: 0
 --- !u!114 &1812708524235700609
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -825,7 +468,7 @@ MonoBehaviour:
   sourceGameObject:
     exposedName: e20bf4512a71e3f4b88aae93cfd53283
     defaultValue: {fileID: 0}
-  prefabGameObject: {fileID: 7925918448186698821, guid: 7f7c7fcbe429dd1449795013c5bfdb2c, type: 3}
+  prefabGameObject: {fileID: 6337404402994539093, guid: a74353d8aca854645839bac36676dc3a, type: 3}
   updateParticle: 1
   particleRandomSeed: 518
   updateDirector: 1
@@ -844,12 +487,12 @@ MonoBehaviour:
   isAttSpeed: 0
   isLoop: 0
   loopAlone: 0
-  isActivityCustomTargetPos: 0
+  isActivityCustomTargetPos: 1
   CustomTargetPosIndex: 0
   intervalTime: 0
   isRoat: 0
   roatIndex: 0
---- !u!114 &1930595873469389689
+--- !u!114 &3379530281373283979
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
@@ -859,7 +502,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 15e0374501f39d54eb30235764636e0e, type: 3}
-  m_Name: Control Track (4)
+  m_Name: Control Track (1)
   m_EditorClassIdentifier: 
   m_Version: 3
   m_AnimClip: {fileID: 0}
@@ -871,12 +514,12 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 1.1
+    m_Start: 0.6833333333333333
     m_ClipIn: 0
-    m_Asset: {fileID: 1695802140634251288}
+    m_Asset: {fileID: -5165449034059424412}
     m_Duration: 1
     m_TimeScale: 1
-    m_ParentTrack: {fileID: 1930595873469389689}
+    m_ParentTrack: {fileID: 3379530281373283979}
     m_EaseInDuration: 0
     m_EaseOutDuration: 0
     m_BlendInDuration: 0
@@ -1033,45 +676,6 @@ MonoBehaviour:
     m_DisplayName: fx_gf1403_sf
   m_Markers:
     m_Objects: []
---- !u!114 &6468979750813336159
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f1fc88ca9f5b46d2929d20f65fbe5c4e, type: 3}
-  m_Name: TimeLineParticleSystemAsset(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)
-  m_EditorClassIdentifier: 
-  sourceGameObject:
-    exposedName: 350549bfb05db9245a93af196ceeefd7
-    defaultValue: {fileID: 0}
-  prefabGameObject: {fileID: 7925918448186698821, guid: 7f7c7fcbe429dd1449795013c5bfdb2c, type: 3}
-  updateParticle: 1
-  particleRandomSeed: 518
-  updateDirector: 1
-  updateITimeControl: 1
-  searchHierarchy: 1
-  active: 1
-  postPlayback: 2
-  targetType: 2
-  LocationType: 5
-  targetSpecialDotName: fxpos04
-  hitPointGroupName: 
-  isGround: 0
-  isFollowTarget: 0
-  isNotRotate: 0
-  isFollowRootTarget: 0
-  isAttSpeed: 0
-  isLoop: 0
-  loopAlone: 0
-  isActivityCustomTargetPos: 0
-  CustomTargetPosIndex: 0
-  intervalTime: 0
-  isRoat: 0
-  roatIndex: 0
 --- !u!114 &6478050454879568048
 MonoBehaviour:
   m_ObjectHideFlags: 1

Assets/Art/VFX/FXMeshs/shou/shouAnima.controller

@@ -11,7 +11,7 @@ AnimatorStateMachine:
   m_ChildStates:
   - serializedVersion: 1
     m_State: {fileID: 3572407031775819339}
-    m_Position: {x: 200, y: 0, z: 0}
+    m_Position: {x: 310, y: 120, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []

Assets/Art/VFX/FXPrefabs/fx_gf1403_shou.prefab

@@ -4964,7 +4964,6 @@ GameObject:
   serializedVersion: 7
   m_Component:
   - component: {fileID: 5932135344847874538}
-  - component: {fileID: 4356481239972748023}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: fx_gf1403_shou
@@ -4986,31 +4985,15 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 250296743141983878}
+  - {fileID: 3369540520689533305}
+  - {fileID: 5836899684286005921}
+  - {fileID: 8416171086820461018}
+  - {fileID: 4896862322877179464}
   - {fileID: 8103037085035861143}
   - {fileID: 5904105465604935310}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: -5.194, z: 0}
---- !u!95 &4356481239972748023
-Animator:
-  serializedVersion: 5
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1902332234314221939}
-  m_Enabled: 1
-  m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 0}
-  m_CullingMode: 0
-  m_UpdateMode: 0
-  m_ApplyRootMotion: 0
-  m_LinearVelocityBlending: 0
-  m_StabilizeFeet: 0
-  m_WarningMessage: 
-  m_HasTransformHierarchy: 1
-  m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorStateOnDisable: 0
-  m_WriteDefaultValuesOnDisable: 0
 --- !u!1 &2005706739885597007
 GameObject:
   m_ObjectHideFlags: 0
@@ -5043,7 +5026,7 @@ Transform:
   m_Children:
   - {fileID: 1890898099823483322}
   m_Father: {fileID: 4162052961440376972}
-  m_LocalEulerAnglesHint: {x: -81.61231, y: 89.102, z: -32.467533}
+  m_LocalEulerAnglesHint: {x: -78.15537, y: 89.998474, z: -74.42552}
 --- !u!1 &2157266638039983213
 GameObject:
   m_ObjectHideFlags: 0
@@ -5070,13 +5053,12 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2157266638039983213}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.000000039115523, y: -0.00000007217751, z: 0.0000001937151, w: 1}
-  m_LocalPosition: {x: -0.334046, y: -0.00000015258789, z: 0.000000009536743}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalRotation: {x: -0.26938015, y: 0.65982324, z: -0.44476417, w: 0.5424504}
+  m_LocalPosition: {x: 0.6387378, y: 2.670563, z: -0.7652178}
+  m_LocalScale: {x: 1.5000001, y: 1.5000001, z: 1.5000001}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 3090413383996363729}
-  m_Father: {fileID: 6641245085620608577}
+  m_Children: []
+  m_Father: {fileID: 5932135344847874538}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &8335447552457029814
 MonoBehaviour:
@@ -5122,10 +5104,9 @@ Transform:
   m_LocalPosition: {x: -0.19049919, y: -0.00000012418255, z: 3.3527556e-10}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 3369540520689533305}
+  m_Children: []
   m_Father: {fileID: 3940290833952891870}
-  m_LocalEulerAnglesHint: {x: -0.33689022, y: -3.6849244, z: 66.21131}
+  m_LocalEulerAnglesHint: {x: -1.1970285, y: 2.4483993, z: 16.510923}
 --- !u!1 &2992981210924851538
 GameObject:
   m_ObjectHideFlags: 0
@@ -15010,7 +14991,7 @@ Transform:
   m_Children:
   - {fileID: 6344994986662018812}
   m_Father: {fileID: 4162052961440376972}
-  m_LocalEulerAnglesHint: {x: 17.847103, y: -155.82611, z: 149.361}
+  m_LocalEulerAnglesHint: {x: 17.8471, y: -155.8261, z: 147.78426}
 --- !u!1 &3727837832225675339
 GameObject:
   m_ObjectHideFlags: 0
@@ -15037,13 +15018,12 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3727837832225675339}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.000000008381901, y: -2.0764636e-15, z: 0.00000024773183, w: 1}
-  m_LocalPosition: {x: -0.33404595, y: -0.00000022888183, z: 0.000000028610229}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalRotation: {x: 0.8317669, y: -0.5093061, z: -0.14758833, w: 0.16428295}
+  m_LocalPosition: {x: -1.0615451, y: 2.1474648, z: 0.10810719}
+  m_LocalScale: {x: 1.4999999, y: 1.5, z: 1.4999999}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 2354333606343165124}
-  m_Father: {fileID: 4964564356148331204}
+  m_Children: []
+  m_Father: {fileID: 5932135344847874538}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &2574821290545762030
 MonoBehaviour:
@@ -19929,7 +19909,7 @@ Transform:
   m_Children:
   - {fileID: 8423287219818621384}
   m_Father: {fileID: 1543880658161292444}
-  m_LocalEulerAnglesHint: {x: -0.3276577, y: 0.32137728, z: 74.05453}
+  m_LocalEulerAnglesHint: {x: 0.85711884, y: 3.215961, z: 34.92041}
 --- !u!1 &4199772302808704400
 GameObject:
   m_ObjectHideFlags: 0
@@ -24872,7 +24852,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 4162052961440376972}
-  m_LocalEulerAnglesHint: {x: 0.57961285, y: -84.19306, z: 90.000496}
+  m_LocalEulerAnglesHint: {x: 0.57961166, y: -84.19306, z: 90.000496}
 --- !u!137 &7080589144546422816
 SkinnedMeshRenderer:
   m_ObjectHideFlags: 0
@@ -24984,7 +24964,7 @@ Transform:
   - {fileID: 5078625951300969882}
   - {fileID: 695999223479828286}
   m_Father: {fileID: 8103037085035861143}
-  m_LocalEulerAnglesHint: {x: 77.70823, y: -2.661903, z: -92.723724}
+  m_LocalEulerAnglesHint: {x: -15.592295, y: 7.2203383, z: -92.51731}
 --- !u!1 &4853317777632748439
 GameObject:
   m_ObjectHideFlags: 0
@@ -29918,7 +29898,7 @@ Transform:
   m_Children:
   - {fileID: 864897486496911379}
   m_Father: {fileID: 4162052961440376972}
-  m_LocalEulerAnglesHint: {x: -88.502884, y: 51.37658, z: 2.5326262}
+  m_LocalEulerAnglesHint: {x: -88.502975, y: 51.378464, z: -46.033985}
 --- !u!1 &5347842260159216803
 GameObject:
   m_ObjectHideFlags: 0
@@ -29951,7 +29931,7 @@ Transform:
   m_Children:
   - {fileID: 6641245085620608577}
   m_Father: {fileID: 2031725753808815750}
-  m_LocalEulerAnglesHint: {x: -1.127756, y: 1.3276305, z: 69.9913}
+  m_LocalEulerAnglesHint: {x: -1.9265175, y: 2.5255113, z: 28.899538}
 --- !u!1 &5684899429536855251
 GameObject:
   m_ObjectHideFlags: 0
@@ -29984,7 +29964,7 @@ Transform:
   m_Children:
   - {fileID: 4964564356148331204}
   m_Father: {fileID: 5078625951300969882}
-  m_LocalEulerAnglesHint: {x: -1.8534833, y: 2.360503, z: 66.12193}
+  m_LocalEulerAnglesHint: {x: -1.8320458, y: 2.3333416, z: 19.83844}
 --- !u!1 &5725372609006701162
 GameObject:
   m_ObjectHideFlags: 0
@@ -30017,7 +29997,7 @@ Transform:
   m_Children:
   - {fileID: 3940290833952891870}
   m_Father: {fileID: 4162052961440376972}
-  m_LocalEulerAnglesHint: {x: -75.641785, y: 97.15002, z: -22.29468}
+  m_LocalEulerAnglesHint: {x: -67.67009, y: 102.071266, z: -85.9797}
 --- !u!1 &5844647296398345891
 GameObject:
   m_ObjectHideFlags: 0
@@ -30047,10 +30027,9 @@ Transform:
   m_LocalPosition: {x: -0.23498672, y: -0.00000015258789, z: -4.1638567e-16}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 250296743141983878}
+  m_Children: []
   m_Father: {fileID: 6344994986662018812}
-  m_LocalEulerAnglesHint: {x: 5.629108e-12, y: -2.1911718e-13, z: 87.770836}
+  m_LocalEulerAnglesHint: {x: -1.4112392e-12, y: -4.1466353e-12, z: -18.740152}
 --- !u!1 &5864545171062134434
 GameObject:
   m_ObjectHideFlags: 0
@@ -35035,10 +35014,9 @@ Transform:
   m_LocalPosition: {x: -0.32964382, y: -0.00000020440667, z: -8.894135e-10}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 8416171086820461018}
+  m_Children: []
   m_Father: {fileID: 864897486496911379}
-  m_LocalEulerAnglesHint: {x: -0.098034866, y: -1.9551381, z: 57.156673}
+  m_LocalEulerAnglesHint: {x: -0.000052474144, y: -0.000006567057, z: 8.689538}
 --- !u!1 &6408282406052744023
 GameObject:
   m_ObjectHideFlags: 0
@@ -35071,7 +35049,7 @@ Transform:
   m_Children:
   - {fileID: 5323414742904706790}
   m_Father: {fileID: 129363949261748708}
-  m_LocalEulerAnglesHint: {x: -0.6390916, y: 0.8139845, z: 88.71907}
+  m_LocalEulerAnglesHint: {x: -1.7868115, y: 2.275568, z: 40.22272}
 --- !u!1 &6514078651144568398
 GameObject:
   m_ObjectHideFlags: 0
@@ -35101,10 +35079,9 @@ Transform:
   m_LocalPosition: {x: -0.28221297, y: -0.00000017818063, z: -0.0000000020815063}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 5836899684286005921}
+  m_Children: []
   m_Father: {fileID: 1890898099823483322}
-  m_LocalEulerAnglesHint: {x: 0.13059679, y: -1.5363728, z: 48.16482}
+  m_LocalEulerAnglesHint: {x: -0.00008003157, y: -0.000021689246, z: 14.663469}
 --- !u!1 &6719936837662395686
 GameObject:
   m_ObjectHideFlags: 0
@@ -35131,13 +35108,12 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6719936837662395686}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.00000005029142, y: -0.000000040978193, z: 0.000000111758695, w: 1}
-  m_LocalPosition: {x: -0.33404595, y: -0.00000014305114, z: -0.000000009536743}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalRotation: {x: -0.36226997, y: 0.6420804, z: -0.40459362, w: 0.54110736}
+  m_LocalPosition: {x: 0.12891996, y: 2.8526452, z: -0.84986675}
+  m_LocalScale: {x: 1.5000001, y: 1.4999999, z: 1.5000001}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 5601453129840816661}
-  m_Father: {fileID: 5323414742904706790}
+  m_Children: []
+  m_Father: {fileID: 5932135344847874538}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &8304639261820544731
 MonoBehaviour:
@@ -35180,13 +35156,12 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6735897202995120418}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.0000002658926, y: -0.00000005227053, z: 0.0000001862645, w: 1}
-  m_LocalPosition: {x: -0.3340461, y: -0.00000019073485, z: 0.00000014781952}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalRotation: {x: -0.47152245, y: 0.5922183, z: -0.39547035, w: 0.52014166}
+  m_LocalPosition: {x: -0.48068726, y: 2.7450957, z: -0.92340827}
+  m_LocalScale: {x: 1.5, y: 1.5, z: 1.5000005}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 162346396487758828}
-  m_Father: {fileID: 7286627290955371869}
+  m_Children: []
+  m_Father: {fileID: 5932135344847874538}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &995933256996575172
 MonoBehaviour:
@@ -40191,7 +40166,7 @@ Transform:
   m_Children:
   - {fileID: 6958931125109242060}
   m_Father: {fileID: 4162052961440376972}
-  m_LocalEulerAnglesHint: {x: -82.03654, y: -76.40154, z: 124.83036}
+  m_LocalEulerAnglesHint: {x: -82.0366, y: -76.401985, z: 79.181404}
 --- !u!1 &7710605695154294734
 GameObject:
   m_ObjectHideFlags: 0
@@ -40218,13 +40193,12 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7710605695154294734}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.000000029802326, y: 0.000000039115545, z: 0.00000016391279, w: 1}
-  m_LocalPosition: {x: -0.33404586, y: 0, z: -0.000000114440915}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalRotation: {x: -0.14189124, y: 0.6854612, z: -0.4744043, w: 0.53380746}
+  m_LocalPosition: {x: 1.0324063, y: 2.1925995, z: -0.5694389}
+  m_LocalScale: {x: 1.4999999, y: 1.5, z: 1.5000001}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 5033906653067217713}
-  m_Father: {fileID: 8423287219818621384}
+  m_Children: []
+  m_Father: {fileID: 5932135344847874538}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &6341697348904185874
 MonoBehaviour:
@@ -45174,7 +45148,7 @@ Transform:
   m_Children:
   - {fileID: 7286627290955371869}
   m_Father: {fileID: 6224257195508175609}
-  m_LocalEulerAnglesHint: {x: -0.88223857, y: 1.1235665, z: 80.57144}
+  m_LocalEulerAnglesHint: {x: -1.6605948, y: 2.114479, z: 34.867493}
 --- !u!1 &8967577776060335441
 GameObject:
   m_ObjectHideFlags: 0
@@ -45204,537 +45178,6 @@ Transform:
   m_LocalPosition: {x: -0.23498672, y: -0.00000015258789, z: -4.1638567e-16}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 4896862322877179464}
+  m_Children: []
   m_Father: {fileID: 6958931125109242060}
-  m_LocalEulerAnglesHint: {x: 0.0003313709, y: -1.5724003, z: 51.892612}
---- !u!1001 &181987716913973310
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 5836899684286005921}
-    m_Modifications:
-    - target: {fileID: 2910968322215582703, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2910968322215582703, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2910968322215582703, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2910968322215582703, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 2910968322215582703, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2910968322215582703, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2910968322215582703, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2910968322215582703, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: -90
-      objectReference: {fileID: 0}
-    - target: {fileID: 2910968322215582703, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2910968322215582703, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3079759193219236317, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: randomSeed
-      value: 9535
-      objectReference: {fileID: 0}
-    - target: {fileID: 3079759193219236317, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: autoRandomSeed
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3079759193219236317, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: startDelay.scalar
-      value: 1.1
-      objectReference: {fileID: 0}
-    - target: {fileID: 3705361371323410955, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: startDelay.scalar
-      value: 1.1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4088453079471901887, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: startDelay.scalar
-      value: 1.1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4541993371710630898, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: randomSeed
-      value: 9535
-      objectReference: {fileID: 0}
-    - target: {fileID: 4541993371710630898, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: autoRandomSeed
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4541993371710630898, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: startDelay.scalar
-      value: 1.1
-      objectReference: {fileID: 0}
-    - target: {fileID: 6337404402994539093, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: m_Name
-      value: fx_gf1403_zdsf
-      objectReference: {fileID: 0}
-    - target: {fileID: 6844377127527115764, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: randomSeed
-      value: 9535
-      objectReference: {fileID: 0}
-    - target: {fileID: 6844377127527115764, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: autoRandomSeed
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 9067751440105260568, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: startDelay.scalar
-      value: 1.2
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: a74353d8aca854645839bac36676dc3a, type: 3}
---- !u!4 &3090413383996363729 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 2910968322215582703, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-  m_PrefabInstance: {fileID: 181987716913973310}
-  m_PrefabAsset: {fileID: 0}
---- !u!1001 &633199627931901739
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 250296743141983878}
-    m_Modifications:
-    - target: {fileID: 2910968322215582703, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2910968322215582703, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2910968322215582703, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2910968322215582703, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 2910968322215582703, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2910968322215582703, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2910968322215582703, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2910968322215582703, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: -90
-      objectReference: {fileID: 0}
-    - target: {fileID: 2910968322215582703, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2910968322215582703, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3079759193219236317, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: randomSeed
-      value: 1981
-      objectReference: {fileID: 0}
-    - target: {fileID: 3079759193219236317, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: autoRandomSeed
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3079759193219236317, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: startDelay.scalar
-      value: 0.8
-      objectReference: {fileID: 0}
-    - target: {fileID: 3705361371323410955, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: startDelay.scalar
-      value: 0.8
-      objectReference: {fileID: 0}
-    - target: {fileID: 4088453079471901887, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: startDelay.scalar
-      value: 0.8
-      objectReference: {fileID: 0}
-    - target: {fileID: 4541993371710630898, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: randomSeed
-      value: 1981
-      objectReference: {fileID: 0}
-    - target: {fileID: 4541993371710630898, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: autoRandomSeed
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4541993371710630898, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: startDelay.scalar
-      value: 0.8
-      objectReference: {fileID: 0}
-    - target: {fileID: 6337404402994539093, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: m_Name
-      value: fx_gf1403_zdsf
-      objectReference: {fileID: 0}
-    - target: {fileID: 6844377127527115764, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: randomSeed
-      value: 1981
-      objectReference: {fileID: 0}
-    - target: {fileID: 6844377127527115764, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: autoRandomSeed
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 9067751440105260568, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: startDelay.scalar
-      value: 0.9
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: a74353d8aca854645839bac36676dc3a, type: 3}
---- !u!4 &2354333606343165124 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 2910968322215582703, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-  m_PrefabInstance: {fileID: 633199627931901739}
-  m_PrefabAsset: {fileID: 0}
---- !u!1001 &3036854877824526339
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 4896862322877179464}
-    m_Modifications:
-    - target: {fileID: 2910968322215582703, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2910968322215582703, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2910968322215582703, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2910968322215582703, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 2910968322215582703, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2910968322215582703, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2910968322215582703, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2910968322215582703, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: -90
-      objectReference: {fileID: 0}
-    - target: {fileID: 2910968322215582703, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2910968322215582703, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3079759193219236317, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: randomSeed
-      value: 9925
-      objectReference: {fileID: 0}
-    - target: {fileID: 3079759193219236317, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: autoRandomSeed
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3079759193219236317, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: startDelay.scalar
-      value: 0.9
-      objectReference: {fileID: 0}
-    - target: {fileID: 3705361371323410955, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: startDelay.scalar
-      value: 0.9
-      objectReference: {fileID: 0}
-    - target: {fileID: 4088453079471901887, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: startDelay.scalar
-      value: 0.9
-      objectReference: {fileID: 0}
-    - target: {fileID: 4541993371710630898, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: randomSeed
-      value: 9925
-      objectReference: {fileID: 0}
-    - target: {fileID: 4541993371710630898, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: autoRandomSeed
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4541993371710630898, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: startDelay.scalar
-      value: 0.9
-      objectReference: {fileID: 0}
-    - target: {fileID: 6337404402994539093, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: m_Name
-      value: fx_gf1403_zdsf
-      objectReference: {fileID: 0}
-    - target: {fileID: 6844377127527115764, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: randomSeed
-      value: 9925
-      objectReference: {fileID: 0}
-    - target: {fileID: 6844377127527115764, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: autoRandomSeed
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 9067751440105260568, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: startDelay.scalar
-      value: 1
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: a74353d8aca854645839bac36676dc3a, type: 3}
---- !u!4 &162346396487758828 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 2910968322215582703, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-  m_PrefabInstance: {fileID: 3036854877824526339}
-  m_PrefabAsset: {fileID: 0}
---- !u!1001 &7339052878456842746
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 8416171086820461018}
-    m_Modifications:
-    - target: {fileID: 2910968322215582703, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2910968322215582703, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2910968322215582703, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2910968322215582703, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 2910968322215582703, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2910968322215582703, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2910968322215582703, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2910968322215582703, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: -90
-      objectReference: {fileID: 0}
-    - target: {fileID: 2910968322215582703, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2910968322215582703, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3079759193219236317, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: randomSeed
-      value: 8873
-      objectReference: {fileID: 0}
-    - target: {fileID: 3079759193219236317, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: autoRandomSeed
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3079759193219236317, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: startDelay.scalar
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 3705361371323410955, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: startDelay.scalar
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4088453079471901887, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: startDelay.scalar
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4541993371710630898, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: randomSeed
-      value: 8873
-      objectReference: {fileID: 0}
-    - target: {fileID: 4541993371710630898, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: autoRandomSeed
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4541993371710630898, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: startDelay.scalar
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 6337404402994539093, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: m_Name
-      value: fx_gf1403_zdsf
-      objectReference: {fileID: 0}
-    - target: {fileID: 6844377127527115764, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: randomSeed
-      value: 8873
-      objectReference: {fileID: 0}
-    - target: {fileID: 6844377127527115764, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: autoRandomSeed
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 9067751440105260568, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: startDelay.scalar
-      value: 1.1
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: a74353d8aca854645839bac36676dc3a, type: 3}
---- !u!4 &5601453129840816661 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 2910968322215582703, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-  m_PrefabInstance: {fileID: 7339052878456842746}
-  m_PrefabAsset: {fileID: 0}
---- !u!1001 &7906580600195059934
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 3369540520689533305}
-    m_Modifications:
-    - target: {fileID: 2910968322215582703, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2910968322215582703, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2910968322215582703, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2910968322215582703, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 2910968322215582703, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2910968322215582703, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2910968322215582703, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2910968322215582703, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: -90
-      objectReference: {fileID: 0}
-    - target: {fileID: 2910968322215582703, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2910968322215582703, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3079759193219236317, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: randomSeed
-      value: 7689
-      objectReference: {fileID: 0}
-    - target: {fileID: 3079759193219236317, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: autoRandomSeed
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3079759193219236317, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: startDelay.scalar
-      value: 1.2
-      objectReference: {fileID: 0}
-    - target: {fileID: 3705361371323410955, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: startDelay.scalar
-      value: 1.2
-      objectReference: {fileID: 0}
-    - target: {fileID: 4088453079471901887, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: startDelay.scalar
-      value: 1.2
-      objectReference: {fileID: 0}
-    - target: {fileID: 4541993371710630898, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: randomSeed
-      value: 7689
-      objectReference: {fileID: 0}
-    - target: {fileID: 4541993371710630898, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: autoRandomSeed
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4541993371710630898, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: startDelay.scalar
-      value: 1.2
-      objectReference: {fileID: 0}
-    - target: {fileID: 6337404402994539093, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: m_Name
-      value: fx_gf1403_zdsf
-      objectReference: {fileID: 0}
-    - target: {fileID: 6844377127527115764, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: randomSeed
-      value: 7689
-      objectReference: {fileID: 0}
-    - target: {fileID: 6844377127527115764, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: autoRandomSeed
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 9067751440105260568, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-      propertyPath: startDelay.scalar
-      value: 1.3
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: a74353d8aca854645839bac36676dc3a, type: 3}
---- !u!4 &5033906653067217713 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 2910968322215582703, guid: a74353d8aca854645839bac36676dc3a, type: 3}
-  m_PrefabInstance: {fileID: 7906580600195059934}
-  m_PrefabAsset: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0.053522047, y: -0.2327298, z: 6.210766}

Assets/Art/VFX/FXPrefabs/fx_gf_1101.prefab

@@ -9869,8 +9869,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   moveTarget: {fileID: 0}
-  delayTime: 0
-  multipleTargetDelayTime: 0
+  delayTime: 0.3
+  multipleTargetDelayTime: 0.1
   hitFxName: fx_gf_1101_hit
   hitAudioName: 
   extraMoveSpeed: 0

Assets/Art/VFX/FXPrefabs/fx_gf_1403.prefab

@@ -19762,6 +19762,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ced634dc38e34b2196415a552336d24c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  moveTarget: {fileID: 0}
   delayTime: 0
   multipleTargetDelayTime: 0
   hitFxName: fx_gf_1403_hit
@@ -19774,10 +19775,12 @@ MonoBehaviour:
   size: 1
   isInit: 0
   speed: 20
+  roatRoot: {fileID: 0}
+  raotIndex: 0
   parabolaCurveType: 0
   isTriggerGroundEnd: 0
   GroundHitFxName: 
-  isUseX: 0
+  isUseX: 1
   BesselPath:
     isActive: 0
     controlPoints: []

Assets/Res/Config/EventConditionConfig.json

@@ -46,6 +46,23 @@
       "Operation": null,
       "ConditionType": 8,
       "finishCount": 1
+    },
+    {
+      "ID": 6,
+      "message": 2094,
+      "Operation": null,
+      "ConditionType": 9,
+      "finishCount": 6
+    },
+    {
+      "ID": 7,
+      "message": null,
+      "Operation": null,
+      "ConditionType": 5,
+      "ConditionPara": [
+        100001
+      ],
+      "finishCount": 1
     }
   ]
 }

Assets/Res/Config/EventConfig.json

@@ -87,8 +87,8 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": null,
-      "XiantuID": null,
+      "placeID": 3,
+      "XiantuID": 2,
       "EventConditionId": 1,
       "EventValue": [
         1004
@@ -115,8 +115,8 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": null,
-      "XiantuID": null,
+      "placeID": 3,
+      "XiantuID": 2,
       "EventConditionId": 7,
       "EventValue": [
         500
@@ -143,8 +143,8 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": null,
-      "XiantuID": null,
+      "placeID": 2,
+      "XiantuID": 3,
       "EventConditionId": null,
       "EventCount": null,
       "EventName": 218,
@@ -168,8 +168,8 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": null,
-      "XiantuID": null,
+      "placeID": 2,
+      "XiantuID": 3,
       "EventConditionId": null,
       "EventCount": null,
       "EventName": 219,
@@ -193,8 +193,8 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": null,
-      "XiantuID": null,
+      "placeID": 2,
+      "XiantuID": 3,
       "EventConditionId": null,
       "EventCount": null,
       "EventName": 220,
@@ -652,8 +652,8 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": 1,
-      "XiantuID": 2,
+      "placeID": null,
+      "XiantuID": null,
       "EventConditionId": null,
       "EventCount": null,
       "EventName": 2067,
@@ -680,8 +680,8 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": 2,
-      "XiantuID": 2,
+      "placeID": null,
+      "XiantuID": null,
       "EventConditionId": null,
       "EventCount": null,
       "EventName": 2069,
@@ -705,7 +705,7 @@
       ],
       "RefreshProbability": 30,
       "RefreshCount": 2,
-      "placeID": 1,
+      "placeID": null,
       "XiantuID": null,
       "EventConditionId": null,
       "EventCount": null,

Assets/Res/Config/EventLinkConfig.json

@@ -4,10 +4,11 @@
       "ID": 100,
       "conciseEventMessage": 216,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         216
       ],
-      "NPCID": null,
+      "EventID": null,
       "optionType": null,
       "ResultType": null
     },
@@ -15,10 +16,11 @@
       "ID": 1001,
       "conciseEventMessage": 177,
       "EventConditionMessage": null,
+      "NPCID": 2,
       "LanID": [
         177
       ],
-      "NPCID": 2,
+      "EventID": null,
       "optionType": 1,
       "optionPara1": [
         1002,
@@ -34,10 +36,11 @@
       "ID": 1002,
       "conciseEventMessage": 178,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         178
       ],
-      "NPCID": null,
+      "EventID": null,
       "optionType": 2,
       "optionPara1": [
         100001
@@ -52,10 +55,11 @@
       "ID": 1003,
       "conciseEventMessage": 179,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         179
       ],
-      "NPCID": null,
+      "EventID": null,
       "optionType": 1,
       "optionPara1": [
         1005
@@ -69,10 +73,11 @@
       "ID": 1004,
       "conciseEventMessage": 180,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         180
       ],
-      "NPCID": null,
+      "EventID": null,
       "optionType": 3,
       "PrizeIDs": [
         1002
@@ -86,10 +91,11 @@
       "ID": 1005,
       "conciseEventMessage": 181,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         181
       ],
-      "NPCID": null,
+      "EventID": null,
       "optionType": 3,
       "PrizeIDs": [
         1001
@@ -103,10 +109,11 @@
       "ID": 1010,
       "conciseEventMessage": 182,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         182
       ],
-      "NPCID": null,
+      "EventID": null,
       "optionType": 1,
       "optionPara1": [
         1011,
@@ -122,10 +129,11 @@
       "ID": 1011,
       "conciseEventMessage": 183,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         183
       ],
-      "NPCID": null,
+      "EventID": null,
       "optionType": 1,
       "optionPara1": [
         1014,
@@ -141,11 +149,12 @@
       "ID": 1012,
       "conciseEventMessage": 184,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         184,
         187
       ],
-      "NPCID": null,
+      "EventID": null,
       "optionType": 3,
       "PrizeIDs": [
         1001
@@ -159,10 +168,11 @@
       "ID": 1014,
       "conciseEventMessage": 185,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         185
       ],
-      "NPCID": null,
+      "EventID": null,
       "optionType": 2,
       "optionPara1": [
         100002
@@ -177,11 +187,12 @@
       "ID": 1015,
       "conciseEventMessage": 186,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         186,
         189
       ],
-      "NPCID": null,
+      "EventID": null,
       "optionType": 3,
       "PrizeIDs": [
         1003
@@ -195,10 +206,11 @@
       "ID": 1016,
       "conciseEventMessage": 188,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         188
       ],
-      "NPCID": null,
+      "EventID": null,
       "optionType": null,
       "PrizeIDs": [
         1001
@@ -212,10 +224,11 @@
       "ID": 1020,
       "conciseEventMessage": 190,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         190
       ],
-      "NPCID": null,
+      "EventID": null,
       "optionType": 1,
       "optionPara1": [
         1021,
@@ -231,10 +244,11 @@
       "ID": 1021,
       "conciseEventMessage": 191,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         191
       ],
-      "NPCID": null,
+      "EventID": null,
       "optionType": 2,
       "optionPara1": [
         100003
@@ -255,10 +269,11 @@
       "ID": 1022,
       "conciseEventMessage": 192,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         192
       ],
-      "NPCID": null,
+      "EventID": null,
       "optionType": 4,
       "PrizeIDs": [
         1002
@@ -272,11 +287,12 @@
       "ID": 1024,
       "conciseEventMessage": 193,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         193,
         196
       ],
-      "NPCID": null,
+      "EventID": null,
       "optionType": 2,
       "optionPara1": [
         100004
@@ -297,11 +313,12 @@
       "ID": 1025,
       "conciseEventMessage": 194,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         194,
         197
       ],
-      "NPCID": null,
+      "EventID": null,
       "optionType": 3,
       "PrizeIDs": [
         1002
@@ -315,10 +332,11 @@
       "ID": 1026,
       "conciseEventMessage": 207,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         207
       ],
-      "NPCID": null,
+      "EventID": null,
       "optionType": 1,
       "optionPara1": [
         1024,
@@ -334,10 +352,11 @@
       "ID": 1030,
       "conciseEventMessage": 221,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         221
       ],
-      "NPCID": null,
+      "EventID": null,
       "optionType": 3,
       "PrizeIDs": [
         1002
@@ -351,10 +370,11 @@
       "ID": 1040,
       "conciseEventMessage": 222,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         222
       ],
-      "NPCID": null,
+      "EventID": null,
       "optionType": 3,
       "PrizeIDs": [
         1002
@@ -368,10 +388,11 @@
       "ID": 1050,
       "conciseEventMessage": 223,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         223
       ],
-      "NPCID": null,
+      "EventID": null,
       "optionType": 3,
       "PrizeIDs": [
         1002,
@@ -387,10 +408,11 @@
       "ID": 1060,
       "conciseEventMessage": 224,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         224
       ],
-      "NPCID": null,
+      "EventID": null,
       "optionType": null,
       "ResultType": null
     },
@@ -398,10 +420,11 @@
       "ID": 10001,
       "conciseEventMessage": 208,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         208
       ],
-      "NPCID": null,
+      "EventID": null,
       "optionType": 2,
       "optionPara1": [
         100001
@@ -416,10 +439,11 @@
       "ID": 10002,
       "conciseEventMessage": 209,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         209
       ],
-      "NPCID": null,
+      "EventID": null,
       "optionType": 3,
       "PrizeIDs": [
         1003
@@ -433,12 +457,13 @@
       "ID": 10003,
       "conciseEventMessage": 210,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         210,
         211,
         1903
       ],
-      "NPCID": null,
+      "EventID": null,
       "optionType": 3,
       "PrizeIDs": [
         1005
@@ -452,13 +477,14 @@
       "ID": 10004,
       "conciseEventMessage": 212,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         212,
         213,
         214,
         215
       ],
-      "NPCID": null,
+      "EventID": null,
       "optionType": 3,
       "PrizeIDs": [
         1006
@@ -472,10 +498,11 @@
       "ID": 10005,
       "conciseEventMessage": 1901,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         1901
       ],
-      "NPCID": null,
+      "EventID": null,
       "optionType": 2,
       "optionPara1": [
         100002
@@ -490,10 +517,11 @@
       "ID": 10006,
       "conciseEventMessage": 1902,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         1902
       ],
-      "NPCID": null,
+      "EventID": null,
       "optionType": 2,
       "optionPara1": [
         100003
@@ -508,10 +536,11 @@
       "ID": 9003,
       "conciseEventMessage": 2036,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         2036
       ],
-      "NPCID": null,
+      "EventID": null,
       "optionType": 1,
       "optionPara1": [
         9004,
@@ -527,10 +556,11 @@
       "ID": 9004,
       "conciseEventMessage": 2037,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         2037
       ],
-      "NPCID": null,
+      "EventID": null,
       "optionType": 2,
       "optionPara1": [
         100001
@@ -545,10 +575,11 @@
       "ID": 9005,
       "conciseEventMessage": 2038,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         2038
       ],
-      "NPCID": null,
+      "EventID": null,
       "optionType": null,
       "ResultType": null
     },
@@ -556,10 +587,11 @@
       "ID": 9006,
       "conciseEventMessage": 2039,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         2039
       ],
-      "NPCID": null,
+      "EventID": null,
       "optionType": null,
       "ResultType": null
     },
@@ -567,10 +599,11 @@
       "ID": 9007,
       "conciseEventMessage": 2040,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         2040
       ],
-      "NPCID": null,
+      "EventID": null,
       "optionType": 4,
       "ResultType": 1,
       "ResultOptions": [
@@ -582,6 +615,7 @@
       "conciseEventMessage": null,
       "EventConditionMessage": null,
       "NPCID": null,
+      "EventID": null,
       "optionType": 3,
       "PrizeIDs": [
         1001
@@ -595,10 +629,11 @@
       "ID": 9025,
       "conciseEventMessage": 2074,
       "EventConditionMessage": 2073,
+      "NPCID": null,
       "LanID": [
         2074
       ],
-      "NPCID": null,
+      "EventID": null,
       "optionType": 1,
       "optionPara1": [
         9026
@@ -613,6 +648,7 @@
       "conciseEventMessage": null,
       "EventConditionMessage": null,
       "NPCID": null,
+      "EventID": null,
       "optionType": null,
       "ResultType": 3,
       "ResultOptions": [
@@ -624,6 +660,7 @@
       "conciseEventMessage": 2070,
       "EventConditionMessage": null,
       "NPCID": null,
+      "EventID": null,
       "ConditionId": [
         3
       ],
@@ -635,6 +672,7 @@
       "conciseEventMessage": 2076,
       "EventConditionMessage": 2077,
       "NPCID": null,
+      "EventID": null,
       "optionType": 2,
       "optionPara1": [
         100001
@@ -642,15 +680,56 @@
       "ResultType": null
     },
     {
-      "ID": 100001,
+      "ID": 1000101,
       "conciseEventMessage": 2086,
       "EventConditionMessage": null,
+      "NPCID": null,
+      "LanID": [
+        2083
+      ],
+      "EventID": 10001,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000102
+      ]
+    },
+    {
+      "ID": 1000102,
+      "conciseEventMessage": 2086,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "LanID": [
+        2084
+      ],
+      "EventID": 10001,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000103
+      ]
+    },
+    {
+      "ID": 1000103,
+      "conciseEventMessage": 2086,
+      "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
-        2083,
-        2084,
         2085
       ],
+      "EventID": 10001,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000104
+      ]
+    },
+    {
+      "ID": 1000104,
+      "conciseEventMessage": 2086,
+      "EventConditionMessage": null,
       "NPCID": null,
+      "EventID": 10001,
       "ConditionId": [
         5
       ],
@@ -661,37 +740,263 @@
       ]
     },
     {
-      "ID": 100002,
-      "conciseEventMessage": 1911,
+      "ID": 1000201,
+      "conciseEventMessage": 2091,
       "EventConditionMessage": null,
       "NPCID": null,
-      "optionType": 2,
-      "optionPara1": [
-        100001
+      "LanID": [
+        2092
+      ],
+      "EventID": 10002,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000202
+      ]
+    },
+    {
+      "ID": 1000202,
+      "conciseEventMessage": 2091,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "LanID": [
+        2093
+      ],
+      "EventID": 10002,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000203
+      ]
+    },
+    {
+      "ID": 1000203,
+      "conciseEventMessage": 2091,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "EventID": 10002,
+      "ConditionId": [
+        6
       ],
+      "optionType": null,
       "ResultType": 3,
       "ResultOptions": [
         10003
       ]
     },
     {
-      "ID": 100003,
-      "conciseEventMessage": 1912,
+      "ID": 1000301,
+      "conciseEventMessage": 2095,
       "EventConditionMessage": null,
       "NPCID": null,
+      "LanID": [
+        2096
+      ],
+      "EventID": 10003,
       "optionType": null,
-      "ResultType": 3,
+      "ResultType": 1,
       "ResultOptions": [
-        10004
+        1000302
       ]
     },
     {
-      "ID": 100004,
-      "conciseEventMessage": 1913,
+      "ID": 1000302,
+      "conciseEventMessage": 2095,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "LanID": [
+        2097
+      ],
+      "EventID": 10003,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000303
+      ]
+    },
+    {
+      "ID": 1000303,
+      "conciseEventMessage": 2095,
+      "EventConditionMessage": null,
+      "NPCID": 101,
+      "LanID": [
+        2098
+      ],
+      "EventID": 10003,
+      "optionType": 1,
+      "optionPara1": [
+        1000304
+      ],
+      "optionPara2": [
+        2099
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1000304,
+      "conciseEventMessage": 2095,
+      "EventConditionMessage": null,
+      "NPCID": 102,
+      "LanID": [
+        2100
+      ],
+      "EventID": 10003,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000305
+      ]
+    },
+    {
+      "ID": 1000305,
+      "conciseEventMessage": 2095,
+      "EventConditionMessage": null,
+      "NPCID": 102,
+      "LanID": [
+        2101
+      ],
+      "EventID": 10003,
+      "optionType": 1,
+      "optionPara1": [
+        1000306
+      ],
+      "optionPara2": [
+        2102
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1000306,
+      "conciseEventMessage": 2095,
+      "EventConditionMessage": null,
+      "NPCID": 102,
+      "LanID": [
+        2103
+      ],
+      "EventID": 10003,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000307
+      ]
+    },
+    {
+      "ID": 1000307,
+      "conciseEventMessage": 2095,
+      "EventConditionMessage": null,
+      "NPCID": 102,
+      "LanID": [
+        2104
+      ],
+      "EventID": 10003,
+      "optionType": 1,
+      "optionPara1": [
+        1000308
+      ],
+      "optionPara2": [
+        2105,
+        2106
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1000308,
+      "conciseEventMessage": 2095,
+      "EventConditionMessage": null,
+      "NPCID": 101,
+      "LanID": [
+        2107
+      ],
+      "EventID": 10003,
+      "optionType": 1,
+      "optionPara1": [
+        1000309
+      ],
+      "optionPara2": [
+        2108
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 1000309,
+      "conciseEventMessage": 2095,
       "EventConditionMessage": null,
       "NPCID": null,
+      "LanID": [
+        2109
+      ],
+      "EventID": 10003,
       "optionType": null,
+      "ResultType": 3,
+      "ResultOptions": [
+        10004
+      ]
+    },
+    {
+      "ID": 1000401,
+      "conciseEventMessage": 2110,
+      "EventConditionMessage": 2115,
+      "NPCID": 101,
+      "LanID": [
+        2111
+      ],
+      "EventID": 10004,
+      "optionType": 1,
+      "optionPara1": [
+        1000402
+      ],
+      "optionPara2": [
+        2112
+      ],
       "ResultType": null
+    },
+    {
+      "ID": 1000402,
+      "conciseEventMessage": 2110,
+      "EventConditionMessage": 2115,
+      "NPCID": 102,
+      "LanID": [
+        2113
+      ],
+      "EventID": 10004,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000403
+      ]
+    },
+    {
+      "ID": 1000403,
+      "conciseEventMessage": 2110,
+      "EventConditionMessage": 2115,
+      "NPCID": 101,
+      "LanID": [
+        2114
+      ],
+      "EventID": 10004,
+      "optionType": 2,
+      "optionPara1": [
+        100001
+      ],
+      "ResultType": 2,
+      "ResultOptions": [
+        1000404
+      ]
+    },
+    {
+      "ID": 1000404,
+      "conciseEventMessage": 2110,
+      "EventConditionMessage": null,
+      "NPCID": 102,
+      "LanID": [
+        2115
+      ],
+      "EventID": 10004,
+      "optionType": null,
+      "ResultType": 3,
+      "ResultOptions": [
+        10005
+      ]
     }
   ]
 }

Assets/Res/Config/EventNPC.json

@@ -2,58 +2,87 @@
   "configList": [
     {
       "ID": 1,
+      "name": null,
       "ID_1": null,
       "DaoyouID": null
     },
     {
       "ID": 2,
+      "name": null,
       "ID_1": null,
       "DaoyouID": 1
     },
     {
       "ID": 3,
+      "name": null,
       "ID_1": null,
       "DaoyouID": 2
     },
     {
       "ID": 4,
+      "name": null,
       "ID_1": null,
       "DaoyouID": 3
     },
     {
       "ID": 5,
+      "name": null,
       "ID_1": null,
       "DaoyouID": 4
     },
     {
       "ID": 6,
+      "name": null,
       "ID_1": null,
       "DaoyouID": 5
     },
     {
       "ID": 7,
+      "name": null,
       "ID_1": null,
       "DaoyouID": 6
     },
     {
       "ID": 8,
+      "name": null,
       "ID_1": null,
       "DaoyouID": 7
     },
     {
       "ID": 9,
+      "name": null,
       "ID_1": null,
       "DaoyouID": 8
     },
     {
       "ID": 10,
+      "name": null,
       "ID_1": null,
       "DaoyouID": 9
     },
     {
       "ID": 11,
+      "name": null,
       "ID_1": null,
       "DaoyouID": 10
+    },
+    {
+      "ID": 100,
+      "name": null,
+      "ID_1": null,
+      "DaoyouID": null
+    },
+    {
+      "ID": 101,
+      "name": null,
+      "ID_1": null,
+      "DaoyouID": null
+    },
+    {
+      "ID": 102,
+      "name": null,
+      "ID_1": null,
+      "DaoyouID": null
     }
   ]
 }

Assets/Res/Config/HeroModelConfig.json

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

Assets/Res/Config/LanguageChineseConfig.json

@@ -7654,19 +7654,19 @@
     },
     {
       "ID": 1914,
-      "txt": "    北冥有鱼，其名为鲲……不过北海遥远，何时能寻得鲲鹏的踪迹。\n    好在我的神识尚在，可探天地，再加上刚刚的风铃，或许能寻得前路线索。"
+      "txt": ""
     },
     {
       "ID": 1915,
-      "txt": "神识探得北海方向，有一条古径，隐于云山之间。\n不过，古径深处妖气弥漫，有妖兽盘踞，需要破除后才能通过。\n鲲鹏的秘密，可能和这些妖兽有关。"
+      "txt": ""
     },
     {
       "ID": 1916,
-      "txt": "鲲鹏需要去南海最深处的天池，可缺少龙卷风，没有大风，大鹏无法飞起来"
+      "txt": ""
     },
     {
       "ID": 1917,
-      "txt": "需要达到境界"
+      "txt": ""
     },
     {
       "ID": 1918,
@@ -8346,1774 +8346,3714 @@
     },
     {
       "ID": 2087,
-      "txt": "0"
+      "txt": "第一章.逍遥游"
     },
     {
       "ID": 2088,
-      "txt": "0"
+      "txt": "无用的大葫芦"
     },
     {
       "ID": 2089,
-      "txt": "0"
+      "txt": "多次渡劫失败的你，误入“无何有之乡”，在这里受到了列子的指引，踏上了寻找七道心境的修仙之路。"
     },
     {
       "ID": 2090,
-      "txt": "0"
+      "txt": "惠子种出了巨大葫芦，他觉得毫无用处，非常生气！"
     },
     {
       "ID": 2091,
-      "txt": "0"
+      "txt": "前往妖兽盘踞的地方"
     },
     {
       "ID": 2092,
-      "txt": "0"
+      "txt": "神识发现有一条古径，隐于云山之间，不过似乎有妖兽盘踞。"
     },
     {
       "ID": 2093,
-      "txt": "0"
+      "txt": "没其他办法了，过去看看吧。"
     },
     {
       "ID": 2094,
-      "txt": "0"
+      "txt": "继续飞行一段时间{0}/{1}"
     },
     {
       "ID": 2095,
-      "txt": "0"
+      "txt": "蜩鸟和小麻雀对你的到来很好奇"
     },
     {
       "ID": 2096,
-      "txt": "0"
+      "txt": "应该就是这里了，似乎有古老的阵法挡住了去路"
     },
     {
       "ID": 2097,
-      "txt": "0"
+      "txt": "（结界门前，三只小鸟飞来，落在一旁古松上）"
     },
     {
       "ID": 2098,
-      "txt": "0"
+      "txt": "（拍翅）：“咦？又是妄图穿行北海之人？”"
     },
     {
       "ID": 2099,
-      "txt": "0"
+      "txt": "我在寻找鲲鹏，你们知道它在哪里吗？"
     },
     {
       "ID": 2100,
-      "txt": "0"
+      "txt": "（扑棱翅膀）是想要从北海飞往南海的超级大鸟吧？"
     },
     {
       "ID": 2101,
-      "txt": "0"
+      "txt": "我就想不明白，她为何要飞如此之远，太奇怪啦！"
     },
     {
       "ID": 2102,
-      "txt": "0"
+      "txt": "鲲鹏是在追求心中的目标吧。"
     },
     {
       "ID": 2103,
-      "txt": "0"
+      "txt": "（偏头想了想）目标？我天天在这里上蹿下跳，在附近树林飞来飞去，就已经很幸福啦。"
     },
     {
       "ID": 2104,
-      "txt": "0"
+      "txt": "就那大傻鸟，非要飞那么远，又笨又蠢...真没意思。"
     },
     {
       "ID": 2105,
-      "txt": "0"
+      "txt": "你说得也有一定道理…"
     },
     {
       "ID": 2106,
-      "txt": "0"
+      "txt": "你懂什么..这大鹏鸟可比你更有志向多了。"
     },
     {
       "ID": 2107,
-      "txt": "0"
+      "txt": "（翻飞一圈）志向有什么用？到头来还不是风停了就落地。"
     },
     {
       "ID": 2108,
-      "txt": "0"
+      "txt": "......"
     },
     {
       "ID": 2109,
-      "txt": "0"
+      "txt": "（此时，结界微动，一缕风穿林而过，古径阵法竟有一丝松动）"
     },
     {
       "ID": 2110,
-      "txt": "0"
+      "txt": "原来它们就是镇守阵法的结界兽"
     },
     {
       "ID": 2111,
-      "txt": "0"
+      "txt": "这结界似乎有所反应…"
     },
     {
       "ID": 2112,
-      "txt": "0"
+      "txt": "与你们聊天很有意思，不过今天我是非过去不可，没人能阻止我重返仙途！"
     },
     {
       "ID": 2113,
-      "txt": "0"
+      "txt": "\"小鸟..\"现身吧！"
     },
     {
       "ID": 2114,
-      "txt": "0"
+      "txt": "（轻轻飞下来..）又来...来吧来吧.."
     },
     {
       "ID": 2115,
-      "txt": "0"
+      "txt": "击败结界兽怎么想过去，就去吧.."
     },
     {
       "ID": 2116,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2117,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2118,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2119,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2120,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2121,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2122,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2123,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2124,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2125,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2126,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2127,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2128,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2129,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2130,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2131,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2132,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2133,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2134,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2135,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2136,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2137,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2138,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2139,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2140,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2141,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2142,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2143,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2144,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2145,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2146,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2147,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2148,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2149,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2150,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2151,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2152,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2153,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2154,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2155,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2156,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2157,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2158,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2159,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2160,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2161,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2162,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2163,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2164,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2165,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2166,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2167,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2168,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2169,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2170,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2171,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2172,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2173,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2174,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2175,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2176,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2177,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2178,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2179,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2180,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2181,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2182,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2183,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2184,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2185,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2186,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2187,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2188,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2189,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2190,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2191,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2192,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2193,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2194,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2195,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2196,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2197,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2198,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2199,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2200,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2201,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2202,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2203,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2204,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2205,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2206,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2207,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2208,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2209,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2210,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2211,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2212,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2213,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2214,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2215,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2216,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2217,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2218,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2219,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2220,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2221,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2222,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2223,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2224,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2225,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2226,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2227,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2228,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2229,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2230,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2231,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2232,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2233,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2234,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2235,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2236,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2237,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2238,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2239,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2240,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2241,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2242,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2243,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2244,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2245,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2246,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2247,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2248,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2249,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2250,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2251,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2252,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2253,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2254,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2255,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2256,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2257,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2258,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2259,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2260,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2261,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2262,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2263,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2264,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2265,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2266,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2267,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2268,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2269,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2270,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2271,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2272,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2273,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2274,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2275,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2276,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2277,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2278,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2279,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2280,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2281,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2282,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2283,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2284,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2285,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2286,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2287,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2288,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2289,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2290,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2291,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2292,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2293,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2294,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2295,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2296,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2297,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2298,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2299,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2300,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2301,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2302,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2303,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2304,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2305,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2306,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2307,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2308,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2309,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2310,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2311,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2312,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2313,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2314,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2315,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2316,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2317,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2318,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2319,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2320,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2321,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2322,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2323,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2324,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2325,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2326,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2327,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2328,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2329,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2330,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2331,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2332,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2333,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2334,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2335,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2336,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2337,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2338,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2339,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2340,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2341,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2342,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2343,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2344,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2345,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2346,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2347,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2348,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2349,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2350,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2351,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2352,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2353,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2354,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2355,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2356,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2357,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2358,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2359,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2360,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2361,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2362,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2363,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2364,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2365,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2366,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2367,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2368,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2369,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2370,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2371,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2372,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2373,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2374,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2375,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2376,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2377,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2378,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2379,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2380,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2381,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2382,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2383,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2384,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2385,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2386,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2387,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2388,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2389,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2390,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2391,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2392,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2393,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2394,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2395,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2396,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2397,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2398,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2399,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2400,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2401,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2402,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2403,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2404,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2405,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2406,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2407,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2408,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2409,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2410,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2411,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2412,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2413,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2414,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2415,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2416,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2417,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2418,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2419,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2420,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2421,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2422,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2423,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2424,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2425,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2426,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2427,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2428,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2429,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2430,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2431,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2432,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2433,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2434,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2435,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2436,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2437,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2438,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2439,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2440,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2441,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2442,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2443,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2444,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2445,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2446,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2447,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2448,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2449,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2450,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2451,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2452,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2453,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2454,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2455,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2456,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2457,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2458,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2459,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2460,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2461,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2462,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2463,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2464,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2465,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2466,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2467,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2468,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2469,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2470,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2471,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2472,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2473,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2474,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2475,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2476,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2477,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2478,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2479,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2480,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2481,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2482,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2483,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2484,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2485,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2486,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2487,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2488,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2489,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2490,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2491,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2492,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2493,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2494,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2495,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2496,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2497,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2498,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2499,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2500,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2501,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2502,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2503,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2504,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2505,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2506,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2507,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2508,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2509,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2510,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2511,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2512,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2513,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2514,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2515,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2516,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2517,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2518,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2519,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2520,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2521,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2522,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2523,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2524,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2525,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2526,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2527,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2528,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2529,
+      "txt": ""
+    },
+    {
+      "ID": 2530,
+      "txt": ""
+    },
+    {
+      "ID": 2531,
+      "txt": ""
+    },
+    {
+      "ID": 2532,
+      "txt": ""
+    },
+    {
+      "ID": 2533,
+      "txt": ""
+    },
+    {
+      "ID": 2534,
+      "txt": ""
+    },
+    {
+      "ID": 2535,
+      "txt": ""
+    },
+    {
+      "ID": 2536,
+      "txt": ""
+    },
+    {
+      "ID": 2537,
+      "txt": ""
+    },
+    {
+      "ID": 2538,
+      "txt": ""
+    },
+    {
+      "ID": 2539,
+      "txt": ""
+    },
+    {
+      "ID": 2540,
+      "txt": ""
+    },
+    {
+      "ID": 2541,
+      "txt": ""
+    },
+    {
+      "ID": 2542,
+      "txt": ""
+    },
+    {
+      "ID": 2543,
+      "txt": ""
+    },
+    {
+      "ID": 2544,
+      "txt": ""
+    },
+    {
+      "ID": 2545,
+      "txt": ""
+    },
+    {
+      "ID": 2546,
+      "txt": ""
+    },
+    {
+      "ID": 2547,
+      "txt": ""
+    },
+    {
+      "ID": 2548,
+      "txt": ""
+    },
+    {
+      "ID": 2549,
+      "txt": ""
+    },
+    {
+      "ID": 2550,
+      "txt": ""
+    },
+    {
+      "ID": 2551,
+      "txt": ""
+    },
+    {
+      "ID": 2552,
+      "txt": ""
+    },
+    {
+      "ID": 2553,
+      "txt": ""
+    },
+    {
+      "ID": 2554,
+      "txt": ""
+    },
+    {
+      "ID": 2555,
+      "txt": ""
+    },
+    {
+      "ID": 2556,
+      "txt": ""
+    },
+    {
+      "ID": 2557,
+      "txt": ""
+    },
+    {
+      "ID": 2558,
+      "txt": ""
+    },
+    {
+      "ID": 2559,
+      "txt": ""
+    },
+    {
+      "ID": 2560,
+      "txt": ""
+    },
+    {
+      "ID": 2561,
+      "txt": ""
+    },
+    {
+      "ID": 2562,
+      "txt": ""
+    },
+    {
+      "ID": 2563,
+      "txt": ""
+    },
+    {
+      "ID": 2564,
+      "txt": ""
+    },
+    {
+      "ID": 2565,
+      "txt": ""
+    },
+    {
+      "ID": 2566,
+      "txt": ""
+    },
+    {
+      "ID": 2567,
+      "txt": ""
+    },
+    {
+      "ID": 2568,
+      "txt": ""
+    },
+    {
+      "ID": 2569,
+      "txt": ""
+    },
+    {
+      "ID": 2570,
+      "txt": ""
+    },
+    {
+      "ID": 2571,
+      "txt": ""
+    },
+    {
+      "ID": 2572,
+      "txt": ""
+    },
+    {
+      "ID": 2573,
+      "txt": ""
+    },
+    {
+      "ID": 2574,
+      "txt": ""
+    },
+    {
+      "ID": 2575,
+      "txt": ""
+    },
+    {
+      "ID": 2576,
+      "txt": ""
+    },
+    {
+      "ID": 2577,
+      "txt": ""
+    },
+    {
+      "ID": 2578,
+      "txt": ""
+    },
+    {
+      "ID": 2579,
+      "txt": ""
+    },
+    {
+      "ID": 2580,
+      "txt": ""
+    },
+    {
+      "ID": 2581,
+      "txt": ""
+    },
+    {
+      "ID": 2582,
+      "txt": ""
+    },
+    {
+      "ID": 2583,
+      "txt": ""
+    },
+    {
+      "ID": 2584,
+      "txt": ""
+    },
+    {
+      "ID": 2585,
+      "txt": ""
+    },
+    {
+      "ID": 2586,
+      "txt": ""
+    },
+    {
+      "ID": 2587,
+      "txt": ""
+    },
+    {
+      "ID": 2588,
+      "txt": ""
+    },
+    {
+      "ID": 2589,
+      "txt": ""
+    },
+    {
+      "ID": 2590,
+      "txt": ""
+    },
+    {
+      "ID": 2591,
+      "txt": ""
+    },
+    {
+      "ID": 2592,
+      "txt": ""
+    },
+    {
+      "ID": 2593,
+      "txt": ""
+    },
+    {
+      "ID": 2594,
+      "txt": ""
+    },
+    {
+      "ID": 2595,
+      "txt": ""
+    },
+    {
+      "ID": 2596,
+      "txt": ""
+    },
+    {
+      "ID": 2597,
+      "txt": ""
+    },
+    {
+      "ID": 2598,
+      "txt": ""
+    },
+    {
+      "ID": 2599,
+      "txt": ""
+    },
+    {
+      "ID": 2600,
+      "txt": ""
+    },
+    {
+      "ID": 2601,
+      "txt": ""
+    },
+    {
+      "ID": 2602,
+      "txt": ""
+    },
+    {
+      "ID": 2603,
+      "txt": ""
+    },
+    {
+      "ID": 2604,
+      "txt": ""
+    },
+    {
+      "ID": 2605,
+      "txt": ""
+    },
+    {
+      "ID": 2606,
+      "txt": ""
+    },
+    {
+      "ID": 2607,
+      "txt": ""
+    },
+    {
+      "ID": 2608,
+      "txt": ""
+    },
+    {
+      "ID": 2609,
+      "txt": ""
+    },
+    {
+      "ID": 2610,
+      "txt": ""
+    },
+    {
+      "ID": 2611,
+      "txt": ""
+    },
+    {
+      "ID": 2612,
+      "txt": ""
+    },
+    {
+      "ID": 2613,
+      "txt": ""
+    },
+    {
+      "ID": 2614,
+      "txt": ""
+    },
+    {
+      "ID": 2615,
+      "txt": ""
+    },
+    {
+      "ID": 2616,
+      "txt": ""
+    },
+    {
+      "ID": 2617,
+      "txt": ""
+    },
+    {
+      "ID": 2618,
+      "txt": ""
+    },
+    {
+      "ID": 2619,
+      "txt": ""
+    },
+    {
+      "ID": 2620,
+      "txt": ""
+    },
+    {
+      "ID": 2621,
+      "txt": ""
+    },
+    {
+      "ID": 2622,
+      "txt": ""
+    },
+    {
+      "ID": 2623,
+      "txt": ""
+    },
+    {
+      "ID": 2624,
+      "txt": ""
+    },
+    {
+      "ID": 2625,
+      "txt": ""
+    },
+    {
+      "ID": 2626,
+      "txt": ""
+    },
+    {
+      "ID": 2627,
+      "txt": ""
+    },
+    {
+      "ID": 2628,
+      "txt": ""
+    },
+    {
+      "ID": 2629,
+      "txt": ""
+    },
+    {
+      "ID": 2630,
+      "txt": ""
+    },
+    {
+      "ID": 2631,
+      "txt": ""
+    },
+    {
+      "ID": 2632,
+      "txt": ""
+    },
+    {
+      "ID": 2633,
+      "txt": ""
+    },
+    {
+      "ID": 2634,
+      "txt": ""
+    },
+    {
+      "ID": 2635,
+      "txt": ""
+    },
+    {
+      "ID": 2636,
+      "txt": ""
+    },
+    {
+      "ID": 2637,
+      "txt": ""
+    },
+    {
+      "ID": 2638,
+      "txt": ""
+    },
+    {
+      "ID": 2639,
+      "txt": ""
+    },
+    {
+      "ID": 2640,
+      "txt": ""
+    },
+    {
+      "ID": 2641,
+      "txt": ""
+    },
+    {
+      "ID": 2642,
+      "txt": ""
+    },
+    {
+      "ID": 2643,
+      "txt": ""
+    },
+    {
+      "ID": 2644,
+      "txt": ""
+    },
+    {
+      "ID": 2645,
+      "txt": ""
+    },
+    {
+      "ID": 2646,
+      "txt": ""
+    },
+    {
+      "ID": 2647,
+      "txt": ""
+    },
+    {
+      "ID": 2648,
+      "txt": ""
+    },
+    {
+      "ID": 2649,
+      "txt": ""
+    },
+    {
+      "ID": 2650,
+      "txt": ""
+    },
+    {
+      "ID": 2651,
+      "txt": ""
+    },
+    {
+      "ID": 2652,
+      "txt": ""
+    },
+    {
+      "ID": 2653,
+      "txt": ""
+    },
+    {
+      "ID": 2654,
+      "txt": ""
+    },
+    {
+      "ID": 2655,
+      "txt": ""
+    },
+    {
+      "ID": 2656,
+      "txt": ""
+    },
+    {
+      "ID": 2657,
+      "txt": ""
+    },
+    {
+      "ID": 2658,
+      "txt": ""
+    },
+    {
+      "ID": 2659,
+      "txt": ""
+    },
+    {
+      "ID": 2660,
+      "txt": ""
+    },
+    {
+      "ID": 2661,
+      "txt": ""
+    },
+    {
+      "ID": 2662,
+      "txt": ""
+    },
+    {
+      "ID": 2663,
+      "txt": ""
+    },
+    {
+      "ID": 2664,
+      "txt": ""
+    },
+    {
+      "ID": 2665,
+      "txt": ""
+    },
+    {
+      "ID": 2666,
+      "txt": ""
+    },
+    {
+      "ID": 2667,
+      "txt": ""
+    },
+    {
+      "ID": 2668,
+      "txt": ""
+    },
+    {
+      "ID": 2669,
+      "txt": ""
+    },
+    {
+      "ID": 2670,
+      "txt": ""
+    },
+    {
+      "ID": 2671,
+      "txt": ""
+    },
+    {
+      "ID": 2672,
+      "txt": ""
+    },
+    {
+      "ID": 2673,
+      "txt": ""
+    },
+    {
+      "ID": 2674,
+      "txt": ""
+    },
+    {
+      "ID": 2675,
+      "txt": ""
+    },
+    {
+      "ID": 2676,
+      "txt": ""
+    },
+    {
+      "ID": 2677,
+      "txt": ""
+    },
+    {
+      "ID": 2678,
+      "txt": ""
+    },
+    {
+      "ID": 2679,
+      "txt": ""
+    },
+    {
+      "ID": 2680,
+      "txt": ""
+    },
+    {
+      "ID": 2681,
+      "txt": ""
+    },
+    {
+      "ID": 2682,
+      "txt": ""
+    },
+    {
+      "ID": 2683,
+      "txt": ""
+    },
+    {
+      "ID": 2684,
+      "txt": ""
+    },
+    {
+      "ID": 2685,
+      "txt": ""
+    },
+    {
+      "ID": 2686,
+      "txt": ""
+    },
+    {
+      "ID": 2687,
+      "txt": ""
+    },
+    {
+      "ID": 2688,
+      "txt": ""
+    },
+    {
+      "ID": 2689,
+      "txt": ""
+    },
+    {
+      "ID": 2690,
+      "txt": ""
+    },
+    {
+      "ID": 2691,
+      "txt": ""
+    },
+    {
+      "ID": 2692,
+      "txt": ""
+    },
+    {
+      "ID": 2693,
+      "txt": ""
+    },
+    {
+      "ID": 2694,
+      "txt": ""
+    },
+    {
+      "ID": 2695,
+      "txt": ""
+    },
+    {
+      "ID": 2696,
+      "txt": ""
+    },
+    {
+      "ID": 2697,
+      "txt": ""
+    },
+    {
+      "ID": 2698,
+      "txt": ""
+    },
+    {
+      "ID": 2699,
+      "txt": ""
+    },
+    {
+      "ID": 2700,
+      "txt": ""
+    },
+    {
+      "ID": 2701,
+      "txt": ""
+    },
+    {
+      "ID": 2702,
+      "txt": ""
+    },
+    {
+      "ID": 2703,
+      "txt": ""
+    },
+    {
+      "ID": 2704,
+      "txt": ""
+    },
+    {
+      "ID": 2705,
+      "txt": ""
+    },
+    {
+      "ID": 2706,
+      "txt": ""
+    },
+    {
+      "ID": 2707,
+      "txt": ""
+    },
+    {
+      "ID": 2708,
+      "txt": ""
+    },
+    {
+      "ID": 2709,
+      "txt": ""
+    },
+    {
+      "ID": 2710,
+      "txt": ""
+    },
+    {
+      "ID": 2711,
+      "txt": ""
+    },
+    {
+      "ID": 2712,
+      "txt": ""
+    },
+    {
+      "ID": 2713,
+      "txt": ""
+    },
+    {
+      "ID": 2714,
+      "txt": ""
+    },
+    {
+      "ID": 2715,
+      "txt": ""
+    },
+    {
+      "ID": 2716,
+      "txt": ""
+    },
+    {
+      "ID": 2717,
+      "txt": ""
+    },
+    {
+      "ID": 2718,
+      "txt": ""
+    },
+    {
+      "ID": 2719,
+      "txt": ""
+    },
+    {
+      "ID": 2720,
+      "txt": ""
+    },
+    {
+      "ID": 2721,
+      "txt": ""
+    },
+    {
+      "ID": 2722,
+      "txt": ""
+    },
+    {
+      "ID": 2723,
+      "txt": ""
+    },
+    {
+      "ID": 2724,
+      "txt": ""
+    },
+    {
+      "ID": 2725,
+      "txt": ""
+    },
+    {
+      "ID": 2726,
+      "txt": ""
+    },
+    {
+      "ID": 2727,
+      "txt": ""
+    },
+    {
+      "ID": 2728,
+      "txt": ""
+    },
+    {
+      "ID": 2729,
+      "txt": ""
+    },
+    {
+      "ID": 2730,
+      "txt": ""
+    },
+    {
+      "ID": 2731,
+      "txt": ""
+    },
+    {
+      "ID": 2732,
+      "txt": ""
+    },
+    {
+      "ID": 2733,
+      "txt": ""
+    },
+    {
+      "ID": 2734,
+      "txt": ""
+    },
+    {
+      "ID": 2735,
+      "txt": ""
+    },
+    {
+      "ID": 2736,
+      "txt": ""
+    },
+    {
+      "ID": 2737,
+      "txt": ""
+    },
+    {
+      "ID": 2738,
+      "txt": ""
+    },
+    {
+      "ID": 2739,
+      "txt": ""
+    },
+    {
+      "ID": 2740,
+      "txt": ""
+    },
+    {
+      "ID": 2741,
+      "txt": ""
+    },
+    {
+      "ID": 2742,
+      "txt": ""
+    },
+    {
+      "ID": 2743,
+      "txt": ""
+    },
+    {
+      "ID": 2744,
+      "txt": ""
+    },
+    {
+      "ID": 2745,
+      "txt": ""
+    },
+    {
+      "ID": 2746,
+      "txt": ""
+    },
+    {
+      "ID": 2747,
+      "txt": ""
+    },
+    {
+      "ID": 2748,
+      "txt": ""
+    },
+    {
+      "ID": 2749,
+      "txt": ""
+    },
+    {
+      "ID": 2750,
+      "txt": ""
+    },
+    {
+      "ID": 2751,
+      "txt": ""
+    },
+    {
+      "ID": 2752,
+      "txt": ""
+    },
+    {
+      "ID": 2753,
+      "txt": ""
+    },
+    {
+      "ID": 2754,
+      "txt": ""
+    },
+    {
+      "ID": 2755,
+      "txt": ""
+    },
+    {
+      "ID": 2756,
+      "txt": ""
+    },
+    {
+      "ID": 2757,
+      "txt": ""
+    },
+    {
+      "ID": 2758,
+      "txt": ""
+    },
+    {
+      "ID": 2759,
+      "txt": ""
+    },
+    {
+      "ID": 2760,
+      "txt": ""
+    },
+    {
+      "ID": 2761,
+      "txt": ""
+    },
+    {
+      "ID": 2762,
+      "txt": ""
+    },
+    {
+      "ID": 2763,
+      "txt": ""
+    },
+    {
+      "ID": 2764,
+      "txt": ""
+    },
+    {
+      "ID": 2765,
+      "txt": ""
+    },
+    {
+      "ID": 2766,
+      "txt": ""
+    },
+    {
+      "ID": 2767,
+      "txt": ""
+    },
+    {
+      "ID": 2768,
+      "txt": ""
+    },
+    {
+      "ID": 2769,
+      "txt": ""
+    },
+    {
+      "ID": 2770,
+      "txt": ""
+    },
+    {
+      "ID": 2771,
+      "txt": ""
+    },
+    {
+      "ID": 2772,
+      "txt": ""
+    },
+    {
+      "ID": 2773,
+      "txt": ""
+    },
+    {
+      "ID": 2774,
+      "txt": ""
+    },
+    {
+      "ID": 2775,
+      "txt": ""
+    },
+    {
+      "ID": 2776,
+      "txt": ""
+    },
+    {
+      "ID": 2777,
+      "txt": ""
+    },
+    {
+      "ID": 2778,
+      "txt": ""
+    },
+    {
+      "ID": 2779,
+      "txt": ""
+    },
+    {
+      "ID": 2780,
+      "txt": ""
+    },
+    {
+      "ID": 2781,
+      "txt": ""
+    },
+    {
+      "ID": 2782,
+      "txt": ""
+    },
+    {
+      "ID": 2783,
+      "txt": ""
+    },
+    {
+      "ID": 2784,
+      "txt": ""
+    },
+    {
+      "ID": 2785,
+      "txt": ""
+    },
+    {
+      "ID": 2786,
+      "txt": ""
+    },
+    {
+      "ID": 2787,
+      "txt": ""
+    },
+    {
+      "ID": 2788,
+      "txt": ""
+    },
+    {
+      "ID": 2789,
+      "txt": ""
+    },
+    {
+      "ID": 2790,
+      "txt": ""
+    },
+    {
+      "ID": 2791,
+      "txt": ""
+    },
+    {
+      "ID": 2792,
+      "txt": ""
+    },
+    {
+      "ID": 2793,
+      "txt": ""
+    },
+    {
+      "ID": 2794,
+      "txt": ""
+    },
+    {
+      "ID": 2795,
+      "txt": ""
+    },
+    {
+      "ID": 2796,
+      "txt": ""
+    },
+    {
+      "ID": 2797,
+      "txt": ""
+    },
+    {
+      "ID": 2798,
+      "txt": ""
+    },
+    {
+      "ID": 2799,
+      "txt": ""
+    },
+    {
+      "ID": 2800,
+      "txt": ""
+    },
+    {
+      "ID": 2801,
+      "txt": ""
+    },
+    {
+      "ID": 2802,
+      "txt": ""
+    },
+    {
+      "ID": 2803,
+      "txt": ""
+    },
+    {
+      "ID": 2804,
+      "txt": ""
+    },
+    {
+      "ID": 2805,
+      "txt": ""
+    },
+    {
+      "ID": 2806,
+      "txt": ""
+    },
+    {
+      "ID": 2807,
+      "txt": ""
+    },
+    {
+      "ID": 2808,
+      "txt": ""
+    },
+    {
+      "ID": 2809,
+      "txt": ""
+    },
+    {
+      "ID": 2810,
+      "txt": ""
+    },
+    {
+      "ID": 2811,
+      "txt": ""
+    },
+    {
+      "ID": 2812,
+      "txt": ""
+    },
+    {
+      "ID": 2813,
+      "txt": ""
+    },
+    {
+      "ID": 2814,
+      "txt": ""
+    },
+    {
+      "ID": 2815,
+      "txt": ""
+    },
+    {
+      "ID": 2816,
+      "txt": ""
+    },
+    {
+      "ID": 2817,
+      "txt": ""
+    },
+    {
+      "ID": 2818,
+      "txt": ""
+    },
+    {
+      "ID": 2819,
+      "txt": ""
+    },
+    {
+      "ID": 2820,
+      "txt": ""
+    },
+    {
+      "ID": 2821,
+      "txt": ""
+    },
+    {
+      "ID": 2822,
+      "txt": ""
+    },
+    {
+      "ID": 2823,
+      "txt": ""
+    },
+    {
+      "ID": 2824,
+      "txt": ""
+    },
+    {
+      "ID": 2825,
+      "txt": ""
+    },
+    {
+      "ID": 2826,
+      "txt": ""
+    },
+    {
+      "ID": 2827,
+      "txt": ""
+    },
+    {
+      "ID": 2828,
+      "txt": ""
+    },
+    {
+      "ID": 2829,
+      "txt": ""
+    },
+    {
+      "ID": 2830,
+      "txt": ""
+    },
+    {
+      "ID": 2831,
+      "txt": ""
+    },
+    {
+      "ID": 2832,
+      "txt": ""
+    },
+    {
+      "ID": 2833,
+      "txt": ""
+    },
+    {
+      "ID": 2834,
+      "txt": ""
+    },
+    {
+      "ID": 2835,
+      "txt": ""
+    },
+    {
+      "ID": 2836,
+      "txt": ""
+    },
+    {
+      "ID": 2837,
+      "txt": ""
+    },
+    {
+      "ID": 2838,
+      "txt": ""
+    },
+    {
+      "ID": 2839,
+      "txt": ""
+    },
+    {
+      "ID": 2840,
+      "txt": ""
+    },
+    {
+      "ID": 2841,
+      "txt": ""
+    },
+    {
+      "ID": 2842,
+      "txt": ""
+    },
+    {
+      "ID": 2843,
+      "txt": ""
+    },
+    {
+      "ID": 2844,
+      "txt": ""
+    },
+    {
+      "ID": 2845,
+      "txt": ""
+    },
+    {
+      "ID": 2846,
+      "txt": ""
+    },
+    {
+      "ID": 2847,
+      "txt": ""
+    },
+    {
+      "ID": 2848,
+      "txt": ""
+    },
+    {
+      "ID": 2849,
+      "txt": ""
+    },
+    {
+      "ID": 2850,
+      "txt": ""
+    },
+    {
+      "ID": 2851,
+      "txt": ""
+    },
+    {
+      "ID": 2852,
+      "txt": ""
+    },
+    {
+      "ID": 2853,
+      "txt": ""
+    },
+    {
+      "ID": 2854,
+      "txt": ""
+    },
+    {
+      "ID": 2855,
+      "txt": ""
+    },
+    {
+      "ID": 2856,
+      "txt": ""
+    },
+    {
+      "ID": 2857,
+      "txt": ""
+    },
+    {
+      "ID": 2858,
+      "txt": ""
+    },
+    {
+      "ID": 2859,
+      "txt": ""
+    },
+    {
+      "ID": 2860,
+      "txt": ""
+    },
+    {
+      "ID": 2861,
+      "txt": ""
+    },
+    {
+      "ID": 2862,
+      "txt": ""
+    },
+    {
+      "ID": 2863,
+      "txt": ""
+    },
+    {
+      "ID": 2864,
+      "txt": ""
+    },
+    {
+      "ID": 2865,
+      "txt": ""
+    },
+    {
+      "ID": 2866,
+      "txt": ""
+    },
+    {
+      "ID": 2867,
+      "txt": ""
+    },
+    {
+      "ID": 2868,
+      "txt": ""
+    },
+    {
+      "ID": 2869,
+      "txt": ""
+    },
+    {
+      "ID": 2870,
+      "txt": ""
+    },
+    {
+      "ID": 2871,
+      "txt": ""
+    },
+    {
+      "ID": 2872,
+      "txt": ""
+    },
+    {
+      "ID": 2873,
+      "txt": ""
+    },
+    {
+      "ID": 2874,
+      "txt": ""
+    },
+    {
+      "ID": 2875,
+      "txt": ""
+    },
+    {
+      "ID": 2876,
+      "txt": ""
+    },
+    {
+      "ID": 2877,
+      "txt": ""
+    },
+    {
+      "ID": 2878,
+      "txt": ""
+    },
+    {
+      "ID": 2879,
+      "txt": ""
+    },
+    {
+      "ID": 2880,
+      "txt": ""
+    },
+    {
+      "ID": 2881,
+      "txt": ""
+    },
+    {
+      "ID": 2882,
+      "txt": ""
+    },
+    {
+      "ID": 2883,
+      "txt": ""
+    },
+    {
+      "ID": 2884,
+      "txt": ""
+    },
+    {
+      "ID": 2885,
+      "txt": ""
+    },
+    {
+      "ID": 2886,
+      "txt": ""
+    },
+    {
+      "ID": 2887,
+      "txt": ""
+    },
+    {
+      "ID": 2888,
+      "txt": ""
+    },
+    {
+      "ID": 2889,
+      "txt": ""
+    },
+    {
+      "ID": 2890,
+      "txt": ""
+    },
+    {
+      "ID": 2891,
+      "txt": ""
+    },
+    {
+      "ID": 2892,
+      "txt": ""
+    },
+    {
+      "ID": 2893,
+      "txt": ""
+    },
+    {
+      "ID": 2894,
+      "txt": ""
+    },
+    {
+      "ID": 2895,
+      "txt": ""
+    },
+    {
+      "ID": 2896,
+      "txt": ""
+    },
+    {
+      "ID": 2897,
+      "txt": ""
+    },
+    {
+      "ID": 2898,
+      "txt": ""
+    },
+    {
+      "ID": 2899,
+      "txt": ""
+    },
+    {
+      "ID": 2900,
+      "txt": ""
+    },
+    {
+      "ID": 2901,
+      "txt": ""
+    },
+    {
+      "ID": 2902,
+      "txt": ""
+    },
+    {
+      "ID": 2903,
+      "txt": ""
+    },
+    {
+      "ID": 2904,
+      "txt": ""
+    },
+    {
+      "ID": 2905,
+      "txt": ""
+    },
+    {
+      "ID": 2906,
+      "txt": ""
+    },
+    {
+      "ID": 2907,
+      "txt": ""
+    },
+    {
+      "ID": 2908,
+      "txt": ""
+    },
+    {
+      "ID": 2909,
+      "txt": ""
+    },
+    {
+      "ID": 2910,
+      "txt": ""
+    },
+    {
+      "ID": 2911,
+      "txt": ""
+    },
+    {
+      "ID": 2912,
+      "txt": ""
+    },
+    {
+      "ID": 2913,
+      "txt": ""
+    },
+    {
+      "ID": 2914,
+      "txt": ""
+    },
+    {
+      "ID": 2915,
+      "txt": ""
+    },
+    {
+      "ID": 2916,
+      "txt": ""
+    },
+    {
+      "ID": 2917,
+      "txt": ""
+    },
+    {
+      "ID": 2918,
+      "txt": ""
+    },
+    {
+      "ID": 2919,
+      "txt": ""
+    },
+    {
+      "ID": 2920,
+      "txt": ""
+    },
+    {
+      "ID": 2921,
+      "txt": ""
+    },
+    {
+      "ID": 2922,
+      "txt": ""
+    },
+    {
+      "ID": 2923,
+      "txt": ""
+    },
+    {
+      "ID": 2924,
+      "txt": ""
+    },
+    {
+      "ID": 2925,
+      "txt": ""
+    },
+    {
+      "ID": 2926,
+      "txt": ""
+    },
+    {
+      "ID": 2927,
+      "txt": ""
+    },
+    {
+      "ID": 2928,
+      "txt": ""
+    },
+    {
+      "ID": 2929,
+      "txt": ""
+    },
+    {
+      "ID": 2930,
+      "txt": ""
+    },
+    {
+      "ID": 2931,
+      "txt": ""
+    },
+    {
+      "ID": 2932,
+      "txt": ""
+    },
+    {
+      "ID": 2933,
+      "txt": ""
+    },
+    {
+      "ID": 2934,
+      "txt": ""
+    },
+    {
+      "ID": 2935,
+      "txt": ""
+    },
+    {
+      "ID": 2936,
+      "txt": ""
+    },
+    {
+      "ID": 2937,
+      "txt": ""
+    },
+    {
+      "ID": 2938,
+      "txt": ""
+    },
+    {
+      "ID": 2939,
+      "txt": ""
+    },
+    {
+      "ID": 2940,
+      "txt": ""
+    },
+    {
+      "ID": 2941,
+      "txt": ""
+    },
+    {
+      "ID": 2942,
+      "txt": ""
+    },
+    {
+      "ID": 2943,
+      "txt": ""
+    },
+    {
+      "ID": 2944,
+      "txt": ""
+    },
+    {
+      "ID": 2945,
+      "txt": ""
+    },
+    {
+      "ID": 2946,
+      "txt": ""
+    },
+    {
+      "ID": 2947,
+      "txt": ""
+    },
+    {
+      "ID": 2948,
+      "txt": ""
+    },
+    {
+      "ID": 2949,
+      "txt": ""
+    },
+    {
+      "ID": 2950,
+      "txt": ""
+    },
+    {
+      "ID": 2951,
+      "txt": ""
+    },
+    {
+      "ID": 2952,
+      "txt": ""
+    },
+    {
+      "ID": 2953,
+      "txt": ""
+    },
+    {
+      "ID": 2954,
+      "txt": ""
+    },
+    {
+      "ID": 2955,
+      "txt": ""
+    },
+    {
+      "ID": 2956,
+      "txt": ""
+    },
+    {
+      "ID": 2957,
+      "txt": ""
+    },
+    {
+      "ID": 2958,
+      "txt": ""
+    },
+    {
+      "ID": 2959,
+      "txt": ""
+    },
+    {
+      "ID": 2960,
+      "txt": ""
+    },
+    {
+      "ID": 2961,
+      "txt": ""
+    },
+    {
+      "ID": 2962,
+      "txt": ""
+    },
+    {
+      "ID": 2963,
+      "txt": ""
+    },
+    {
+      "ID": 2964,
+      "txt": ""
+    },
+    {
+      "ID": 2965,
+      "txt": ""
+    },
+    {
+      "ID": 2966,
+      "txt": ""
+    },
+    {
+      "ID": 2967,
+      "txt": ""
+    },
+    {
+      "ID": 2968,
+      "txt": ""
+    },
+    {
+      "ID": 2969,
+      "txt": ""
+    },
+    {
+      "ID": 2970,
+      "txt": ""
+    },
+    {
+      "ID": 2971,
+      "txt": ""
+    },
+    {
+      "ID": 2972,
+      "txt": ""
+    },
+    {
+      "ID": 2973,
+      "txt": ""
+    },
+    {
+      "ID": 2974,
+      "txt": ""
+    },
+    {
+      "ID": 2975,
+      "txt": ""
+    },
+    {
+      "ID": 2976,
+      "txt": ""
+    },
+    {
+      "ID": 2977,
+      "txt": ""
+    },
+    {
+      "ID": 2978,
+      "txt": ""
+    },
+    {
+      "ID": 2979,
+      "txt": ""
+    },
+    {
+      "ID": 2980,
+      "txt": ""
+    },
+    {
+      "ID": 2981,
+      "txt": ""
+    },
+    {
+      "ID": 2982,
+      "txt": ""
+    },
+    {
+      "ID": 2983,
+      "txt": ""
+    },
+    {
+      "ID": 2984,
+      "txt": ""
+    },
+    {
+      "ID": 2985,
+      "txt": ""
+    },
+    {
+      "ID": 2986,
+      "txt": ""
+    },
+    {
+      "ID": 2987,
+      "txt": ""
+    },
+    {
+      "ID": 2988,
+      "txt": ""
+    },
+    {
+      "ID": 2989,
+      "txt": ""
+    },
+    {
+      "ID": 2990,
+      "txt": ""
+    },
+    {
+      "ID": 2991,
+      "txt": ""
+    },
+    {
+      "ID": 2992,
+      "txt": ""
+    },
+    {
+      "ID": 2993,
+      "txt": ""
+    },
+    {
+      "ID": 2994,
+      "txt": ""
+    },
+    {
+      "ID": 2995,
+      "txt": ""
+    },
+    {
+      "ID": 2996,
+      "txt": ""
+    },
+    {
+      "ID": 2997,
+      "txt": ""
+    },
+    {
+      "ID": 2998,
+      "txt": ""
+    },
+    {
+      "ID": 2999,
+      "txt": ""
+    },
+    {
+      "ID": 3000,
+      "txt": "0"
+    },
+    {
+      "ID": 3001,
+      "txt": "0"
+    },
+    {
+      "ID": 3002,
+      "txt": "0"
+    },
+    {
+      "ID": 3003,
+      "txt": "0"
+    },
+    {
+      "ID": 3004,
+      "txt": "0"
+    },
+    {
+      "ID": 3005,
+      "txt": "0"
+    },
+    {
+      "ID": 3006,
+      "txt": "0"
+    },
+    {
+      "ID": 3007,
+      "txt": "0"
+    },
+    {
+      "ID": 3008,
+      "txt": "0"
+    },
+    {
+      "ID": 3009,
+      "txt": "0"
+    },
+    {
+      "ID": 3010,
+      "txt": "0"
+    },
+    {
+      "ID": 3011,
+      "txt": "0"
+    },
+    {
+      "ID": 3012,
+      "txt": "0"
+    },
+    {
+      "ID": 3013,
+      "txt": "0"
+    },
+    {
+      "ID": 3014,
       "txt": "0"
     }
   ]

Assets/Res/Config/XianTuLogConfig.json

@@ -3,14 +3,23 @@
     {
       "ID": 1,
       "EventType": 1,
-      "Ttile": 2082,
-      "Desc": 2083
+      "Title": 2087,
+      "Desc": 2089,
+      "BigMapID": 1
     },
     {
       "ID": 2,
       "EventType": 2,
-      "Ttile": 2084,
-      "Desc": 2085
+      "Title": 2088,
+      "Desc": 2090,
+      "BigMapID": 2
+    },
+    {
+      "ID": 3,
+      "EventType": 2,
+      "Title": 2088,
+      "Desc": 2090,
+      "BigMapID": 3
     }
   ]
 }

Assets/Res/HeroAnimtion/Nanzhu.asset

@@ -28,6 +28,34 @@ MonoBehaviour:
           _Names: []
         _Clip: {fileID: 1827226128182048838, guid: 290c55b85c6ca73439a5bb5c42a0ec13, type: 3}
         _NormalizedStartTime: NaN
+--- !u!114 &-6171717114427328642
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c5a8877f26e7a6a43aaf06fade1a064a, type: 3}
+  m_Name: attack3
+  m_EditorClassIdentifier: 
+  _Transition:
+    rid: 3899372218745094146
+  references:
+    version: 2
+    RefIds:
+    - rid: 3899372218745094146
+      type: {class: ClipTransition, ns: Animancer, asm: Kybernetik.Animancer}
+      data:
+        _FadeDuration: 0.25
+        _Speed: 1
+        _Events:
+          _NormalizedTimes: []
+          _Callbacks: []
+          _Names: []
+        _Clip: {fileID: 1827226128182048838, guid: 298173b205ae514408dd8f455d360fa5, type: 3}
+        _NormalizedStartTime: NaN
 --- !u!114 &-4718902783258376847
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -75,6 +103,7 @@ MonoBehaviour:
     - {fileID: -6275841264099654957}
     - {fileID: -4718902783258376847}
     - {fileID: 4162791575905085679}
+    - {fileID: -6171717114427328642}
     _Modifiers:
     - _From: 0
       _To: 0
@@ -151,6 +180,39 @@ MonoBehaviour:
     - _From: 4
       _To: 0
       _Fade: 0
+    - _From: 0
+      _To: 5
+      _Fade: 0
+    - _From: 2
+      _To: 5
+      _Fade: 0
+    - _From: 1
+      _To: 5
+      _Fade: 0
+    - _From: 3
+      _To: 5
+      _Fade: 0
+    - _From: 4
+      _To: 5
+      _Fade: 0
+    - _From: 5
+      _To: 5
+      _Fade: 0
+    - _From: 5
+      _To: 4
+      _Fade: 0
+    - _From: 5
+      _To: 3
+      _Fade: 0
+    - _From: 5
+      _To: 2
+      _Fade: 0
+    - _From: 5
+      _To: 0
+      _Fade: 0
+    - _From: 5
+      _To: 1
+      _Fade: 0
     _Aliases: []
     _AliasAllTransitions: 0
 --- !u!114 &1485322484274848399

Assets/Res/TimeLineAssets/1302_timeline_TD.txt

@@ -0,0 +1 @@
+{"timeLineName":"1302_timeline","key":["TineLineAnimationPlayableSerialization","TimeLineMaxTimeSerializtion","TimeLinePlayFxSerializtion"],"value":["{\"animName\":\"attack7\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1301\",\"isActivity\":false,\"startTime\":0,\"endTime\":1.133333,\"continuedTime\":1.133333,\"targetEntityType\":0,\"totalTime\":0}","{\"isEquip\":false,\"equipId\":0,\"groupName\":\"1301\",\"isActivity\":false,\"startTime\":0,\"endTime\":0.8,\"continuedTime\":0.8,\"targetEntityType\":0,\"totalTime\":0}","{\"fxName\":\"fx_gf_duzhen\",\"randomSeed\":518,\"locationType\":5,\"targetSpecialDotName\":\"0\",\"hitPointGroupName\":\"\",\"isGround\":false,\"isFollowTarget\":false,\"isFollowRootTarget\":false,\"isNotRotate\":false,\"isAttSpeed\":false,\"CustomTargetPosIndex\":0,\"isActivityCustomTargetPos\":true,\"isLoop\":false,\"loopAlone\":false,\"intervalTime\":0,\"isRoat\":false,\"roatIndex\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"1301_fashe\",\"isActivity\":false,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":2,\"totalTime\":0}"],"heroName":"1302_timeline","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

Assets/Res/TimeLineAssets/1302_timeline_TD.txt.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ByxKtiP7UH5Rwv7NuQNSwV970kC0mZwJoSOPbPNY+DOyLwTM77wTW4WKIxQ1
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/UI/CombatPanel.prefab

@@ -1482,6 +1482,7 @@ GameObject:
   serializedVersion: 7
   m_Component:
   - component: {fileID: 4287798501111193387}
+  - component: {fileID: 8588517758620161246}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: ' BossHpRoot'
@@ -1510,6 +1511,30 @@ RectTransform:
   m_AnchoredPosition: {x: 138, y: 3}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &8588517758620161246
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1340706786225753752}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 0
+  m_StartCorner: 0
+  m_StartAxis: 0
+  m_CellSize: {x: 100, y: 100}
+  m_Spacing: {x: 0, y: 0}
+  m_Constraint: 0
+  m_ConstraintCount: 2
 --- !u!1 &1343676762713764609
 GameObject:
   m_ObjectHideFlags: 0
@@ -1692,9 +1717,9 @@ RectTransform:
   - {fileID: 866017355225982164}
   m_Father: {fileID: 4287798501111193387}
   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_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 50, y: -50}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &8348247039291786454
@@ -14909,7 +14934,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -38.9, y: -90}
+  m_AnchoredPosition: {x: 26.6, y: -62.5}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &6704248604383440065

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

@@ -1,203 +0,0 @@
-fileFormatVersion: 2
-guid: DXof4HuuB36dFdvE5qsWJ4VR14chnypABpxEGSu4bRc+U4zdltq1a1pMk7J9
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 13
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-    flipGreenChannel: 0
-  isReadable: 0
-  webStreaming: 0
-  priorityLevel: 0
-  uploadedMode: 2
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMipmapLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 0
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  swizzle: 50462976
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Android
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WeixinMiniGame
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: HMIAndroid
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: OpenHarmony
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Res/UI/XianTuLogPanel/4f0fbfe5751de5c514595a3711285d4.png.meta

@@ -1,203 +0,0 @@
-fileFormatVersion: 2
-guid: DXpOtH6vAS4o3ZDj1xTktZsLx+G5HjTEk36YE+14cR5t0xBfV1yghFvApbki
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 13
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-    flipGreenChannel: 0
-  isReadable: 0
-  webStreaming: 0
-  priorityLevel: 0
-  uploadedMode: 2
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMipmapLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 0
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  swizzle: 50462976
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Android
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WeixinMiniGame
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: HMIAndroid
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: OpenHarmony
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Res/UI/XianTuLogPanel/EventLogInfoWidget.prefab

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

Assets/Res/UI/XianTuLogPanel/XianTuLogInfoPanel.prefab

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

Assets/Res/UI/XianTuLogPanel/XianTuSaiXuanWidget.prefab

@@ -0,0 +1,332 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &3010060112929588141
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2397912466611057526}
+  - component: {fileID: 43859780477946217}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Button
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2397912466611057526
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3010060112929588141}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 6593923505059071937}
+  - {fileID: 1884686712654273815}
+  m_Father: {fileID: 2255013146822197070}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &43859780477946217
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3010060112929588141}
+  m_CullTransparentMesh: 1
+--- !u!1 &4361283601685093543
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2255013146822197070}
+  - component: {fileID: 882304056947836370}
+  - component: {fileID: 4978844846321001597}
+  - component: {fileID: 5563659626202568180}
+  - component: {fileID: 4313453455728757518}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: XianTuSaiXuanWidget
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2255013146822197070
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4361283601685093543}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 2397912466611057526}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 78.144, y: 36.0626}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &882304056947836370
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4361283601685093543}
+  m_CullTransparentMesh: 1
+--- !u!114 &4978844846321001597
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4361283601685093543}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: Text_Name
+    gameObject: {fileID: 3321307045676531026}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 1
+--- !u!114 &5563659626202568180
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4361283601685093543}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ef7878ea2dacc454894d556c1d97bca0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - StateInfos:
+    - Target: {fileID: 5196016631604194328}
+      UIStateV4Types: 40000000
+      UIStateV4Datas:
+      - {x: 0.98823535, y: 0.96470594, z: 0.94117653, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+    - Target: {fileID: 8533574500684186698}
+      UIStateV4Types: 80000000
+      UIStateV4Datas:
+      - {x: 0.5019608, y: 0.5019608, z: 0.5019608, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+  - StateInfos:
+    - Target: {fileID: 5196016631604194328}
+      UIStateV4Types: 40000000
+      UIStateV4Datas:
+      - {x: 0.65882355, y: 0.5764706, z: 0.49411768, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+    - Target: {fileID: 8533574500684186698}
+      UIStateV4Types: 80000000
+      UIStateV4Datas:
+      - {x: 0.9294118, y: 0.9294118, z: 0.9294118, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+  AllComs:
+  - {fileID: 5196016631604194328}
+  - {fileID: 8533574500684186698}
+  AllComsStateTypes: 4000000080000000
+  CurrIndex: 0
+--- !u!114 &4313453455728757518
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4361283601685093543}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 09a9a136688f46fbb2a843418fc53144, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isScriptControl: 1
+  uiToggleList: {fileID: 0}
+  CustomStateController: {fileID: 0}
+--- !u!1 &5196016631604194328
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6593923505059071937}
+  - component: {fileID: 8360256546683998588}
+  - component: {fileID: 3018369136703272782}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6593923505059071937
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5196016631604194328}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 2397912466611057526}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8360256546683998588
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5196016631604194328}
+  m_CullTransparentMesh: 1
+--- !u!114 &3018369136703272782
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5196016631604194328}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.98823535, g: 0.96470594, b: 0.94117653, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &8533574500684186698
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1884686712654273815}
+  - component: {fileID: 1704184540188715246}
+  - component: {fileID: 3321307045676531026}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text_Name
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1884686712654273815
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8533574500684186698}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 2397912466611057526}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1704184540188715246
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8533574500684186698}
+  m_CullTransparentMesh: 1
+--- !u!114 &3321307045676531026
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8533574500684186698}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 18
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u7B2C\u4E00\u7AE0"

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

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

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

@@ -1,203 +0,0 @@
-fileFormatVersion: 2
-guid: DX4Yty2oUi6l7m0/4+BGs1myWoLX8nvOLoj/upXTlL9ec3PMLY5v1mVzherq
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 13
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-    flipGreenChannel: 0
-  isReadable: 0
-  webStreaming: 0
-  priorityLevel: 0
-  uploadedMode: 2
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMipmapLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 0
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  swizzle: 50462976
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Android
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WeixinMiniGame
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: HMIAndroid
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: OpenHarmony
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scenes/testCombat.scene

@@ -752,14 +752,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 865
+      x: 893
       y: 264
       width: 90
       height: 90
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 865, y: 264}
+    atlasRectOffset: {x: 893, y: 264}
     settingsRaw: 67
-    uvTransform: {x: 100, y: 910, z: 100, w: 309}
+    uvTransform: {x: 100, y: 938, z: 100, w: 309}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: 0.45, y: 0.19999999}
@@ -2297,7 +2297,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 9214784224709271120, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -8062,14 +8062,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 865
+      x: 893
       y: 264
       width: 90
       height: 90
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 865, y: 264}
+    atlasRectOffset: {x: 893, y: 264}
     settingsRaw: 67
-    uvTransform: {x: 100, y: 910, z: 100, w: 309}
+    uvTransform: {x: 100, y: 938, z: 100, w: 309}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: 0.45, y: 0.19999999}
@@ -9827,14 +9827,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 865
+      x: 893
       y: 264
       width: 90
       height: 90
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 865, y: 264}
+    atlasRectOffset: {x: 893, y: 264}
     settingsRaw: 67
-    uvTransform: {x: 100, y: 910, z: 100, w: 309}
+    uvTransform: {x: 100, y: 938, z: 100, w: 309}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: 0.45, y: 0.19999999}

Assets/Scripts/Core/Event/Event/CustomEventType.cs

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

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

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

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

@@ -28,7 +28,8 @@ namespace Utility
 
         private static StringBuilder sb;
 
-   
+
+        private static long startGUID;
 
         public static long oneDay = 86400000;
 
@@ -104,6 +105,12 @@ namespace Utility
             return sb.ToString();
         }
 
+        public static long GetLOGGUID()
+        {
+            startGUID++;
+            return startGUID;
+        }
+
         // /// <summary>
         // /// 获取描述文本
         // /// </summary>

Assets/Scripts/GameData/ExcelConfig/EventLinkConfig.cs

@@ -32,6 +32,12 @@ public int conciseEventMessage;
 public int EventConditionMessage;
 
 
+		/// <summary>
+		///对话NPCID
+		/// </summary>
+public int NPCID;
+
+
 		/// <summary>
 		///对话
 		/// </summary>
@@ -39,13 +45,13 @@ public int[] LanID;
 
 
 		/// <summary>
-		///对话NPCID
+		///属于哪个事件
 		/// </summary>
-public int NPCID;
+public int EventID;
 
 
 		/// <summary>
-		///条件判断Id
+		///条件判断类型
 		/// </summary>
 public int[] ConditionId;
 
@@ -57,7 +63,7 @@ public int optionType;
 
 
 		/// <summary>
-		///事件常量1 1=事件IDs 2=战斗ID
+		///事件常量1 1=步骤IDs 2=战斗ID
 		/// </summary>
 public int[] optionPara1;
 
@@ -81,7 +87,7 @@ public int[] PrizeNums;
 
 
 		/// <summary>
-		///事件结束类型 1：跳转步骤 2：根据战斗结果跳转步骤 3.触发新事件
+		///事件结束类型 1：跳转步骤 2：根据战斗结果跳转 3.触发新事件
 		/// </summary>
 public int ResultType;
 

Assets/Scripts/GameData/ExcelConfig/EventNPC.cs

@@ -20,6 +20,12 @@ namespace Excel2Json
 public int ID;
 
 
+		/// <summary>
+		///名字
+		/// </summary>
+public int name;
+
+
 		/// <summary>
 		///半身像icon
 		/// </summary>

Assets/Scripts/GameData/ExcelConfig/XianTuLogConfig.cs

@@ -29,7 +29,7 @@ public int EventType;
 		/// <summary>
 		///名称
 		/// </summary>
-public int Ttile;
+public int Title;
 
 
 		/// <summary>
@@ -38,6 +38,12 @@ public int Ttile;
 public int Desc;
 
 
+		/// <summary>
+		///属于哪个章节
+		/// </summary>
+public int BigMapID;
+
+
 	}
 
 }

Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/CombatSenceController.cs

@@ -247,12 +247,12 @@ namespace GameLogic.Combat.CombatTool
             {
                 if (NextBesselPath == null)
                 {
-                    int odds = Random.Range(0, 100);
-                    if (odds < 50)
-                    {
-                        NextBesselPath = InitBesselPath(currBesselPath.b, Random.Range(0, 100) < 50 ? -1 : 1);
-                    }
-                    else
+                    // int odds = Random.Range(0, 100);
+                    // if (odds < 50)
+                    // {
+                    //     NextBesselPath = InitBesselPath(currBesselPath.b, Random.Range(0, 100) < 50 ? -1 : 1);
+                    // }
+                    // else
                     {
                         NextBesselPath = InitBesselPath(currBesselPath.b);
                     }
@@ -263,7 +263,7 @@ namespace GameLogic.Combat.CombatTool
             {
                 if (NextBesselPath == null)
                 {
-                    NextBesselPath = InitBesselPath(currBesselPath.b, Random.Range(0, 100) < 50 ? -1 : 1);
+                    NextBesselPath = InitBesselPath(currBesselPath.b);
                 }
 
                 currTime = currTime % 1;

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

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

Assets/Scripts/GameLogic/Combat/Skill/S1403.cs

@@ -12,7 +12,8 @@ namespace GameLogic.Combat.Skill
     /// </summary>
     public class S1403 : SkillBasic
     {
-        private static int[] zdPosIndex = new int[] { 9, 8, 7, 6, 5, 4, 3, 2, 1 };
+        private static Vector3[] zdPosIndex = new Vector3[] { new Vector3(-1.06f,2.14f,0.1f),new Vector3(-0.48f,2.75f,-0.92f),new Vector3(0.128f,2.85f,-0.84f),new Vector3
+            (0.63f,2.67f,-0.765f),new Vector3(1.03f,2.19f,-0.569f)};
 
         protected override void ProUseSkill()
         {
@@ -24,12 +25,10 @@ namespace GameLogic.Combat.Skill
             ballisticsCount = (int)effectValue[0]*5;
             for (int j = 0; j < 5; j++)
             {
-                SpecialDotInfo specialDotInfo = CombatHeroEntity.GetSpecialDotInfo("zdpos" + (j + 2));
-                for (int i = 0; i < effectValue[0]; i++)
-                {
-                    ActivationTimeLineData("1403_fashe", currTarget: currTarget,
-                        customizePos: new Vector3[] { specialDotInfo.GetWorlPos() },startTime:i*-0.2f);
-                }
+               Vector3 pos= CombatHeroEntity.GameObject.transform.TransformPoint(zdPosIndex[j]);
+                // SpecialDotInfo specialDotInfo = CombatHeroEntity.GetSpecialDotInfo("zdpos" + (j + 2));
+                ActivationTimeLineData("1403_fashe", currTarget: currTarget,
+                    customizePos: new Vector3[] {pos },startTime:j*-0.1f);
             }
 
 

Assets/Scripts/GameLogic/Paritcle/ParitcleLogic/FxParabolaBulletLogic.cs

@@ -75,7 +75,7 @@ namespace Common.Combat.FxAILogic
             {
                 Vector3 off = _currPos - CombatHeroEntity.GameObject.transform.position;
                 float x = Mathf.Sign(Random.Range(-1, 1));
-                if (isUseX)
+                // if (isUseX)
                 {
                     Vector3 pos =
                         CombatHeroEntity.GameObject.transform.InverseTransformPoint(gameObject.transform.position);
@@ -85,8 +85,8 @@ namespace Common.Combat.FxAILogic
                 startDir = CombatHeroEntity.GameObject.transform.TransformPoint(off +
                     new Vector3(
                         x,
-                        0,
-                        Random.Range(0.1f, 5f)));
+                        Random.Range(0.1f, 3f),
+                        Random.Range(0.1f, 4f)));
 
                 startDir = (startDir - _currPos).normalized;
                 dirLerpTime = 0;

Assets/Scripts/GameUI/EventManager/DialogueManager.cs

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

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -30,8 +30,8 @@ public class EventSystemManager : Singleton<EventSystemManager>
     public bool isOpenUi;
 
     Action onCompleteCallback;
-    
-    public Map<int,List<EventConfig>> eventConfigsMap = new Map<int,List<EventConfig>>();
+
+    public Map<int, List<EventConfig>> eventConfigsMap = new Map<int, List<EventConfig>>();
 
     // public Map<int, AccountFileInfo.EventConditionData> EventConditionDataMap = new Map<int, AccountFileInfo.EventConditionData>();
 
@@ -39,7 +39,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
     {
         eventConfigs = ConfigComponent.Instance.GetAll<EventConfig>().ToList();
         divineSenseConfigs = ConfigComponent.Instance.GetAll<DivineSenseConfig>().ToList();
-        
+
         foreach (var eventConfig in eventConfigs)
         {
             if (eventConfig.XiantuID != 0)
@@ -64,6 +64,12 @@ public class EventSystemManager : Singleton<EventSystemManager>
         EventManager.Instance.AddEventListener(CustomEventType.DetectRandomEvent, RenfenceRandomEvent);
         EventManager.Instance.AddEventListener(CustomEventType.AddItem, ItemUpdate);
         EventManager.Instance.AddEventListener(CustomEventType.JingJieUpgrade, JingJieUpgrade);
+        EventManager.Instance.AddEventListener(CustomEventType.CancelEvent, Cancel);
+    }
+
+    private void Cancel(IEventData e)
+    {
+        CancelEvent();
     }
 
     private void JingJieUpgrade(IEventData e)
@@ -142,6 +148,8 @@ public class EventSystemManager : Singleton<EventSystemManager>
         if (eventConfigs == null || eventConfigs.Count == 0)
             return default;
 
+        CeekEventCompletes(8, new[] { 1 });
+
         //扣除神识值 增加神识经验
         int xiaoHao = eventConfigs.Count * PlayerManager.Instance.gameConstantConfig.DetectEventCount;
         AccountFileInfo.Instance.playerData.divineSenseexp += xiaoHao;
@@ -196,6 +204,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
                 count++;
             }
         }
+
         return count;
     }
 
@@ -390,7 +399,6 @@ public class EventSystemManager : Singleton<EventSystemManager>
                 {
                     return null;
                 }
-                
             }
             else
             {
@@ -400,6 +408,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
             eventList.guid = IdGenerater.GenerateIdInt();
             eventList.curStep = eventConfig.EventLinksId[0];
+            eventList.selectEventLinkIds.Add(eventConfig.EventLinksId[0]);
         }
 
         //初始化神识链条，用于监听条件是否完成
@@ -473,7 +482,9 @@ public class EventSystemManager : Singleton<EventSystemManager>
         LogTool.Log($"触发事件: {evt.EventName} (ID: {evt.ID}, 品质: {evt.EventQuality})");
         CombatDrive.Instance.CombatController.ChangeState(CombatController.idle);
 
-        DialogueManager.Instance.StartDialogue(null, evt.EventLinksId[0], evt.ID, () => { CompleteEvent(evt.ID); });
+        AccountFileInfo.EventList eventList = AddEvent(evt.ID);
+        CurrentEventList = eventList;
+        DialogueManager.Instance.StartDialogue(eventList, evt.EventLinksId[0], evt.ID, () => { CompleteEvent(evt.ID); });
     }
 
     /// <summary>
@@ -481,6 +492,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
     /// </summary>
     public async CTask TriggerEvent(AccountFileInfo.EventList evt, Action oncompleteCallBack = null)
     {
+        // ChancleEvent();
         if (isTriggerEvent)
             return;
         CTask cTask = CTask.Create();
@@ -634,6 +646,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
                 break;
 
+
             //获得道具
             case 6:
                 if (eventConditionConfig.ConditionType == 6 && eventConditionConfig.ConditionPara[0] == value[0])
@@ -646,6 +659,19 @@ public class EventSystemManager : Singleton<EventSystemManager>
                     }
                 }
 
+                break;
+
+            //使用神识
+            case 8:
+                if (eventConditionConfig.ConditionType == 5)
+                {
+                    conditionData.fishCount += value[1];
+
+                    if (IsEvenkLinkComplete(conditionData))
+                    {
+                    }
+                }
+
                 break;
         }
 
@@ -748,14 +774,18 @@ public class EventSystemManager : Singleton<EventSystemManager>
             }
         }
 
-        //先不移除 下次探索神识移除
-        eventList.isCompleted = true;
 
-        // AccountFileInfo.Instance.playerData.completeEvents.Add(eventList);
-        //
-        //
-        //
-        // AccountFileInfo.Instance.playerData.eventList.Remove(eventList);
+        if (eventConfig.EventTriggerType == 4)
+        {
+            AccountFileInfo.Instance.playerData.completeEvents.Add(eventList);
+            AccountFileInfo.Instance.playerData.eventList.Remove(eventList);
+            TaskInfoPanel.OpenPanel(eventList);
+        }
+        else
+        {
+            //先不移除 下次探索神识移除
+            eventList.isCompleted = true;
+        }
 
         if (AccountFileInfo.Instance.playerData.CurrentZuiZhongEventList.guid == eventList.guid)
         {
@@ -765,11 +795,6 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
         AccountFileInfo.Instance.SavePlayerData();
 
-        if (eventConfig.EventTriggerType == 4)
-        {
-            TaskInfoPanel.OpenPanel(eventList);
-        }
-
 
         CombatDrive.Instance.CombatController.ChangeState(CombatController.update);
         EventManager.Instance.Dispatch(CustomEventType.CompleteEvent, null);
@@ -823,4 +848,13 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
         return null;
     }
+
+
+    public void CancelEvent()
+    {
+        CombatDrive.Instance.CombatController.ChangeState(CombatController.update);
+        DialogueManager.Instance.ChancleEvent();
+        CurrentEventList = null;
+        isTriggerEvent = false;
+    }
 }

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

@@ -6,6 +6,7 @@ using GameLogic.Combat.Hero;
 using GameLogic.Combat.Hero.Turntable;
 using GameLogic.Combat.Skill;
 using UnityEngine;
+using Utility;
 
 namespace Fort23.Mono
 {
@@ -13,15 +14,16 @@ namespace Fort23.Mono
     public partial class BossHpWidget : UIComponent
     {
         private CombatHeroEntity combatHeroEntity;
-
         private CombatHeroSkillControl combatHeroSkillControl;
-
         protected BetterList<EnemyGf_skill> currShowGfWidget = new BetterList<EnemyGf_skill>();
-
         private HeroHpWidget heroHpWidget;
 
+        private string bossWidgetKey="bossWidget";
+        private string bossFaBaoKey="bossFaBao";
         private void Init()
         {
+            bossWidgetKey= "bossWidget"+UtilTools.GetLOGGUID();
+            bossFaBaoKey= "bossFaBao"+UtilTools.GetLOGGUID();
         }
 
         public override void AddEvent()
@@ -40,8 +42,8 @@ namespace Fort23.Mono
             CombatEventManager.Instance.RemoveEventListener(CombatEventType.UseSkillFinish, UseSkillFinish);
             UIManager.Instance.DormancyGComponent(heroHpWidget);
             heroHpWidget = null;
-            UIManager.Instance.DormancyAllGComponent<gf_widget>("bossWidget");
-            UIManager.Instance.DormancyAllGComponent<MagicWeaponWidget>("bossFaBao");
+            UIManager.Instance.DormancyAllGComponent<gf_widget>(bossWidgetKey);
+            UIManager.Instance.DormancyAllGComponent<MagicWeaponWidget>(bossFaBaoKey);
         }
 
 
@@ -85,7 +87,7 @@ namespace Fort23.Mono
         private async CTask ReshSkill()
         {
             currShowGfWidget.Clear();
-            UIManager.Instance.DormancyAllGComponent<EnemyGf_skill>("bossWidget");
+            UIManager.Instance.DormancyAllGComponent<EnemyGf_skill>(bossWidgetKey);
 
             int maxCount = 2;
             SkillBasic[] skillQueue = combatHeroSkillControl.GetSkillQueue();
@@ -101,7 +103,7 @@ namespace Fort23.Mono
                 EnemyGf_skill gfWidget = await UIManager.Instance.CreateGComponentForObject<EnemyGf_skill>(
                     this.gf_widget,
                     null,
-                    SkillRoot, poolName: "bossWidget", isInstance: true);
+                    SkillRoot, poolName: bossWidgetKey, isInstance: true);
                 gfWidget.InitSkillWidget(skillBasic, combatHeroEntity);
                 gfWidget.transform.SetAsLastSibling();
                 currShowGfWidget.Add(gfWidget);
@@ -138,7 +140,7 @@ namespace Fort23.Mono
                         EnemyGf_skill gfWidget = await UIManager.Instance.CreateGComponentForObject<EnemyGf_skill>(
                             this.gf_widget,
                             null,
-                            SkillRoot, poolName: "bossWidget", isInstance: true);
+                            SkillRoot, poolName: bossWidgetKey, isInstance: true);
                         gfWidget.InitWidget(minSlots, combatHeroEntity);
                         gfWidget.transform.SetAsLastSibling();
                         currShowGfWidget.Add(gfWidget);
@@ -173,7 +175,7 @@ namespace Fort23.Mono
                 MagicWeaponWidget shengShiEventWidget =
                     await UIManager.Instance.CreateGComponentForObject<MagicWeaponWidget>(MagicWeaponWidget, null,
                         FaBaoRoot,
-                        isInstance: true, poolName: "bossFaBao");
+                        isInstance: true, poolName: bossFaBaoKey);
                 shengShiEventWidget.InitWidget(combatMagicWeaponEntity);
             }
         }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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