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

# Conflicts:
#	Excel2Json/Excel/EventConfig.xlsx   resolved by master version

Assets/Art/ArtHero/Nanzhu.prefab

@@ -2147,6 +2147,7 @@ Transform:
   - {fileID: 6451496337264497292}
   - {fileID: 6462292916796787477}
   - {fileID: 4735191508968974677}
+  - {fileID: 2143582316887135425}
   - {fileID: 8282430832565208355}
   - {fileID: 5153070799728726823}
   - {fileID: 9108087432562044339}
@@ -5254,6 +5255,92 @@ Transform:
   - {fileID: 3418669954467965652}
   m_Father: {fileID: 6673816901863878524}
   m_LocalEulerAnglesHint: {x: 0.5458288, y: -1.1020403, z: 2.4180224}
+--- !u!1 &8653394518515178750
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2143582316887135425}
+  - component: {fileID: 5785192706951711686}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: 1302_timeline
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2143582316887135425
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8653394518515178750}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -0.105, y: -1.027, z: 0.281}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5226940908611843665}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!320 &5785192706951711686
+PlayableDirector:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8653394518515178750}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_PlayableAsset: {fileID: 11400000, guid: 822da268b8f78b140a38e469ee654bf3, type: 2}
+  m_InitialState: 1
+  m_WrapMode: 2
+  m_DirectorUpdateMode: 1
+  m_InitialTime: 0
+  m_SceneBindings:
+  - key: {fileID: 8106544261917024806, guid: 303c217ff8abd144fbb3777507f7112d, type: 2}
+    value: {fileID: 8668756859310917473}
+  - key: {fileID: -894447145330074657, guid: 303c217ff8abd144fbb3777507f7112d, type: 2}
+    value: {fileID: 0}
+  - key: {fileID: 8106544261917024806, guid: 19d8d2a19b9b8c344b22ed7810485660, type: 2}
+    value: {fileID: 0}
+  - key: {fileID: -894447145330074657, guid: 19d8d2a19b9b8c344b22ed7810485660, type: 2}
+    value: {fileID: 0}
+  - key: {fileID: 8106544261917024806, guid: c7ded6a36a4cc50419dd85134158ed0f, type: 2}
+    value: {fileID: 0}
+  - key: {fileID: -894447145330074657, guid: c7ded6a36a4cc50419dd85134158ed0f, type: 2}
+    value: {fileID: 0}
+  - key: {fileID: 8106544261917024806, guid: a7f5b3d04e9827243a0cba3ecc0e8f8b, type: 2}
+    value: {fileID: 0}
+  - key: {fileID: -894447145330074657, guid: a7f5b3d04e9827243a0cba3ecc0e8f8b, type: 2}
+    value: {fileID: 0}
+  - key: {fileID: 8106544261917024806, guid: ceac90e2f7c338245b05eaeccefc74b3, type: 2}
+    value: {fileID: 0}
+  - key: {fileID: -894447145330074657, guid: ceac90e2f7c338245b05eaeccefc74b3, type: 2}
+    value: {fileID: 0}
+  - key: {fileID: 8106544261917024806, guid: 72d6945a5557bba4a9e3d04d68d55e18, type: 2}
+    value: {fileID: 0}
+  - key: {fileID: -894447145330074657, guid: 72d6945a5557bba4a9e3d04d68d55e18, type: 2}
+    value: {fileID: 0}
+  - key: {fileID: 8106544261917024806, guid: d0bcf401c14704a4694ed867dacd96ea, type: 2}
+    value: {fileID: 0}
+  - key: {fileID: -894447145330074657, guid: d0bcf401c14704a4694ed867dacd96ea, type: 2}
+    value: {fileID: 0}
+  - key: {fileID: 8106544261917024806, guid: b3dcbc1a1d489f64d81c4cf5eeeebfb5, type: 2}
+    value: {fileID: 0}
+  - key: {fileID: -894447145330074657, guid: b3dcbc1a1d489f64d81c4cf5eeeebfb5, type: 2}
+    value: {fileID: 0}
+  - key: {fileID: -2619250345888704379, guid: 822da268b8f78b140a38e469ee654bf3, type: 2}
+    value: {fileID: 0}
+  - key: {fileID: 5651971833199858375, guid: 822da268b8f78b140a38e469ee654bf3, type: 2}
+    value: {fileID: 0}
+  m_ExposedReferences:
+    m_References: []
 --- !u!1 &8746066260577238697
 GameObject:
   m_ObjectHideFlags: 0

Assets/Art/HeroTimeLine/gf_1302_timeline.playable

@@ -0,0 +1,467 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!114 &-7977526021668698878
+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)
+  m_EditorClassIdentifier: 
+  sourceGameObject:
+    exposedName: 0fe4945eff477364aa099e29493c3ec8
+    defaultValue: {fileID: 0}
+  prefabGameObject: {fileID: 2479121996645702572, guid: 5d240c70bc7399948aa912e7bb6c3aa8, type: 3}
+  updateParticle: 1
+  particleRandomSeed: 518
+  updateDirector: 1
+  updateITimeControl: 1
+  searchHierarchy: 1
+  active: 1
+  postPlayback: 2
+  targetType: 2
+  LocationType: 5
+  targetSpecialDotName: 0
+  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 &-3287993412395920561
+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: d0fc6f5187a81dc47999eefade6f0935, type: 3}
+  m_Name: "1301@\u53D1\u5C04\u6BD2\u9488"
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 0
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: 11400000}
+  m_Children:
+  - {fileID: -2619250345888704379}
+  - {fileID: 5651971833199858375}
+  - {fileID: -2369211992482019178}
+  m_Clips: []
+  m_Markers:
+    m_Objects: []
+--- !u!114 &-2788380121387854151
+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: d0fc6f5187a81dc47999eefade6f0935, type: 3}
+  m_Name: "1301_fashe@\u53D1\u5C04\u6BD2\u9488 (1)"
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 0
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: 11400000}
+  m_Children:
+  - {fileID: 7192609876556129792}
+  m_Clips: []
+  m_Markers:
+    m_Objects: []
+--- !u!114 &-2619250345888704379
+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: d21dcc2386d650c4597f3633c75a1f98, type: 3}
+  m_Name: Animation Track
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 0
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: -3287993412395920561}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: 936068096229915937}
+    m_Duration: 1.1333333333333333
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: -2619250345888704379}
+    m_EaseInDuration: 0
+    m_EaseOutDuration: 0
+    m_BlendInDuration: -1
+    m_BlendOutDuration: -1
+    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: 1
+    m_PreExtrapolationMode: 1
+    m_PostExtrapolationTime: Infinity
+    m_PreExtrapolationTime: 0
+    m_DisplayName: attack7
+  m_Markers:
+    m_Objects: []
+  m_InfiniteClipPreExtrapolation: 0
+  m_InfiniteClipPostExtrapolation: 0
+  m_InfiniteClipOffsetPosition: {x: 0, y: 0, z: 0}
+  m_InfiniteClipOffsetEulerAngles: {x: 0, y: 0, z: 0}
+  m_InfiniteClipTimeOffset: 0
+  m_InfiniteClipRemoveOffset: 0
+  m_InfiniteClipApplyFootIK: 1
+  mInfiniteClipLoop: 0
+  m_MatchTargetFields: 63
+  m_Position: {x: 0, y: 0, z: 0}
+  m_EulerAngles: {x: 0, y: 0, z: 0}
+  m_AvatarMask: {fileID: 0}
+  m_ApplyAvatarMask: 1
+  m_TrackOffset: 0
+  m_InfiniteClip: {fileID: 0}
+  m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
+  m_ApplyOffsets: 0
+--- !u!114 &-2369211992482019178
+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: 3fc2695741642bd42a34534ca2286500, type: 3}
+  m_Name: Customize Track
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 0
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: -3287993412395920561}
+  m_Children: []
+  m_Clips: []
+  m_Markers:
+    m_Objects: []
+--- !u!114 &11400000
+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: bfda56da833e2384a9677cd3c976a436, type: 3}
+  m_Name: gf_1302_timeline
+  m_EditorClassIdentifier: 
+  m_Version: 0
+  m_Tracks:
+  - {fileID: -3287993412395920561}
+  - {fileID: -2788380121387854151}
+  m_FixedDuration: 0
+  m_EditorSettings:
+    m_Framerate: 60
+    m_ScenePreview: 1
+  m_DurationMode: 0
+  m_MarkerTrack: {fileID: 0}
+--- !u!114 &936068096229915937
+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: 09e4fb4d0e1c4ef796502c9420b2361c, type: 3}
+  m_Name: TimeLinePlayEntityAnimtionAsset
+  m_EditorClassIdentifier: 
+  m_Clip: {fileID: 1827226128182048838, guid: 80ee11b7a19d33a41844c35bd52b9614, type: 3}
+  m_Position: {x: 0, y: 0, z: 0}
+  m_EulerAngles: {x: 0, y: 0, z: 0}
+  m_UseTrackMatchFields: 1
+  m_MatchTargetFields: 63
+  m_RemoveStartOffset: 1
+  m_ApplyFootIK: 1
+  m_Loop: 0
+  m_Version: 1
+  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
+  isRunPlay: 0
+  layerId: 0
+--- !u!114 &5651971833199858375
+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: 21bf7f712d84d26478ebe6a299f21738, type: 3}
+  m_Name: Activation Track
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 0
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: -3287993412395920561}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: 5904406818350819231}
+    m_Duration: 0.8
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: 5651971833199858375}
+    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: Active
+  m_Markers:
+    m_Objects: []
+  m_PostPlaybackState: 3
+--- !u!114 &5904406818350819231
+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: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
+  m_Name: ActivationPlayableAsset
+  m_EditorClassIdentifier: 
+--- !u!114 &7192609876556129792
+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 (1)
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 0
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: -2788380121387854151}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: -7977526021668698878}
+    m_Duration: 1
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: 7192609876556129792}
+    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_duzhen
+  m_Markers:
+    m_Objects: []

Assets/Art/HeroTimeLine/gf_1302_timeline.playable.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: B3gd4XuvVXN5JwsjWSE/RL8wyM3qhKp6REpATqbiQ+q8JGSxobEB2mWLMvPQ
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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_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
-  parabolaCurveType: 0
+  roatRoot: {fileID: 0}
+  raotIndex: 0
+  parabolaCurveType: 1
   isTriggerGroundEnd: 0
   GroundHitFxName: 
-  isUseX: 0
+  isUseX: 1
   BesselPath:
     isActive: 0
     controlPoints: []

Assets/Art/cs3.scene

@@ -134213,6 +134213,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 5785192706951711686, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_SceneBindings.Array.data[16].value
+      value: 
+      objectReference: {fileID: 1342716591}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []

Assets/Art/nanzhujiao/attack7.FBX.meta

@@ -0,0 +1,149 @@
+fileFormatVersion: 2
+guid: B3pK4CusAXxiAY2GgWT7OBffGjMjxs+/V4pGfPdkbZ97oCqs1+ne2q5yFZU6
+ModelImporter:
+  serializedVersion: 22348
+  internalIDToNameTable: []
+  externalObjects: {}
+  materials:
+    materialImportMode: 2
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    removeConstantScaleCurves: 0
+    motionNodeName: 
+    rigImportErrors: 
+    rigImportWarnings: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 1
+    aCLCompressionLevel: 0
+    aCLCurvePrecision: 0.01
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations:
+    - serializedVersion: 16
+      name: attack7
+      takeName: Take 001
+      internalID: 1827226128182048838
+      firstFrame: 0
+      lastFrame: 34
+      wrapMode: 0
+      orientationOffsetY: 0
+      level: 0
+      cycleOffset: 0
+      loop: 0
+      hasAdditiveReferencePose: 0
+      loopTime: 0
+      loopBlend: 0
+      loopBlendOrientation: 0
+      loopBlendPositionY: 0
+      loopBlendPositionXZ: 0
+      keepOriginalOrientation: 0
+      keepOriginalPositionY: 1
+      keepOriginalPositionXZ: 0
+      heightFromFeet: 0
+      mirror: 0
+      bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
+      curves: []
+      events: []
+      transformMask: []
+      maskType: 3
+      maskSource: {instanceID: 0}
+      additiveReferencePoseFrame: 0
+    isReadable: 0
+    virtualGeometry: 0
+    hasBoneWeight: 0
+    generateGeometryBuffer: 0
+    positionPrecision: -2147483648
+    normalPrecision: -1
+    tangentPrecision: -1
+    surfaceCompensation: 0
+    allMeshUse: 1
+    ignoreSimpleMesh: 0
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importPhysicalCameras: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    nodeNameCollisionStrategy: 1
+    fileIdsGeneration: 2
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    bakeAxisConversion: 0
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    optimizeBones: 1
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVMarginMethod: 1
+    secondaryUVMinLightmapResolution: 40
+    secondaryUVMinObjectScale: 1
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+    strictVertexDataChecks: 0
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 1
+  humanDescription:
+    serializedVersion: 3
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    globalScale: 1
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
+  animationType: 2
+  humanoidOversampling: 1
+  avatarSetup: 0
+  addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+  importBlendShapeDeformPercent: 1
+  remapMaterialsIfMaterialImportModeIsNone: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Config/EventConfig.json

@@ -343,8 +343,8 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": null,
-      "XiantuID": null,
+      "placeID": 1,
+      "XiantuID": 1,
       "EventConditionId": null,
       "EventCount": null,
       "EventName": 1906,
@@ -368,8 +368,8 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": null,
-      "XiantuID": null,
+      "placeID": 1,
+      "XiantuID": 1,
       "EventConditionId": null,
       "EventCount": null,
       "EventName": 1907,
@@ -393,8 +393,8 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": null,
-      "XiantuID": null,
+      "placeID": 1,
+      "XiantuID": 1,
       "EventConditionId": null,
       "EventCount": null,
       "EventName": 1908,
@@ -418,8 +418,8 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": null,
-      "XiantuID": null,
+      "placeID": 1,
+      "XiantuID": 1,
       "EventConditionId": null,
       "EventCount": null,
       "EventName": 1909,
@@ -652,8 +652,8 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": null,
-      "XiantuID": null,
+      "placeID": 1,
+      "XiantuID": 2,
       "EventConditionId": null,
       "EventCount": null,
       "EventName": 2067,
@@ -680,8 +680,8 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
-      "placeID": null,
-      "XiantuID": null,
+      "placeID": 2,
+      "XiantuID": 2,
       "EventConditionId": null,
       "EventCount": null,
       "EventName": 2069,
@@ -705,7 +705,7 @@
       ],
       "RefreshProbability": 30,
       "RefreshCount": 2,
-      "placeID": null,
+      "placeID": 1,
       "XiantuID": null,
       "EventConditionId": null,
       "EventCount": null,

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/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: -63.5}
+  m_AnchoredPosition: {x: 220.36674, y: -45}
   m_SizeDelta: {x: 334.7335, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8146511189872025584

Assets/Res/UI/XianTuLogPanel/EventLogTitleWidget.prefab

@@ -62,7 +62,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   data:
-  - key: Text_Title
+  - key: Text_Name
     gameObject: {fileID: 2194615720204698487}
     isAssetBundle: 0
     isList: 0

Assets/Res/UI/XianTuLogPanel/EventLogWidget.prefab

@@ -0,0 +1,695 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &1472859695811504642
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4733962394378200353}
+  - component: {fileID: 3769551301239044558}
+  - component: {fileID: 7467764674496468684}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy) (3)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4733962394378200353
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1472859695811504642}
+  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: 6794025366168539138}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -0.000015258789, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3769551301239044558
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1472859695811504642}
+  m_CullTransparentMesh: 1
+--- !u!114 &7467764674496468684
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1472859695811504642}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 28
+    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: "\u56DE\u987E"
+--- !u!1 &3461041091718681590
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6794025366168539138}
+  - component: {fileID: 310160323895417828}
+  - component: {fileID: 4270503861808590299}
+  - component: {fileID: 6214131077572265761}
+  - component: {fileID: 2677492765828677823}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Btn_HuiGu
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6794025366168539138
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3461041091718681590}
+  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: 4733962394378200353}
+  m_Father: {fileID: 2536002154273356826}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -16.249, y: -18.7}
+  m_SizeDelta: {x: 135.3224, y: 42.7897}
+  m_Pivot: {x: 1, y: 1}
+--- !u!222 &310160323895417828
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3461041091718681590}
+  m_CullTransparentMesh: 1
+--- !u!114 &4270503861808590299
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3461041091718681590}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: btn_lingwu
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!114 &6214131077572265761
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3461041091718681590}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 4270503861808590299}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &2677492765828677823
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3461041091718681590}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 1
+  m_MinWidth: -1
+  m_MinHeight: -1
+  m_PreferredWidth: -1
+  m_PreferredHeight: -1
+  m_FlexibleWidth: -1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1
+--- !u!1 &5646098362420776515
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4362099780799771148}
+  - component: {fileID: 5268933777313226111}
+  - component: {fileID: 4511586371247475064}
+  - component: {fileID: 655996518589123973}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text_Title
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4362099780799771148
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5646098362420776515}
+  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: 2536002154273356826}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 250.92104, y: -37.17517}
+  m_SizeDelta: {x: 411.13, y: 51.906006}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5268933777313226111
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5646098362420776515}
+  m_CullTransparentMesh: 1
+--- !u!114 &4511586371247475064
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5646098362420776515}
+  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.19607843, g: 0.19607843, b: 0.19607843, 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: 39
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u65E0\u7528\u7684\u5927\u846B\u82A6"
+--- !u!114 &655996518589123973
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5646098362420776515}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 1
+  m_MinWidth: -1
+  m_MinHeight: -1
+  m_PreferredWidth: -1
+  m_PreferredHeight: -1
+  m_FlexibleWidth: -1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1
+--- !u!1 &7193835923914035927
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2536002154273356826}
+  - component: {fileID: 6370782449385013889}
+  - component: {fileID: 2234133760324097876}
+  - component: {fileID: 7137641655310059253}
+  - component: {fileID: 205686692303663091}
+  - component: {fileID: 7941567161701813530}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: EventLogWidget
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2536002154273356826
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7193835923914035927}
+  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: 4362099780799771148}
+  - {fileID: 2882719619463602608}
+  - {fileID: 6794025366168539138}
+  - {fileID: 1871022461139175883}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 0, y: -499.3}
+  m_SizeDelta: {x: 717.06, y: 0}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &6370782449385013889
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7193835923914035927}
+  m_CullTransparentMesh: 1
+--- !u!114 &2234133760324097876
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7193835923914035927}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.9686275, g: 0.9490197, b: 0.91372555, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: 
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 0}
+  packInfo:
+    packName: 
+    packgJsonPath: 
+    packgSpritePath: 
+    lasetJsonGUID: 
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!114 &7137641655310059253
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7193835923914035927}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: Text_Title
+    gameObject: {fileID: 4511586371247475064}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_Desc
+    gameObject: {fileID: 6810977129241860878}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Btn_HuiGu
+    gameObject: {fileID: 6214131077572265761}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Connect
+    gameObject: {fileID: 1871022461139175883}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 1
+--- !u!114 &205686692303663091
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7193835923914035927}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 109
+    m_Bottom: 20
+  m_ChildAlignment: 1
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!114 &7941567161701813530
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7193835923914035927}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 0
+  m_VerticalFit: 2
+--- !u!1 &8342908203108568082
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1871022461139175883}
+  - component: {fileID: 571816460892779519}
+  - component: {fileID: 1942987878420023602}
+  - component: {fileID: 7505773647993809892}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Connect
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1871022461139175883
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8342908203108568082}
+  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: 2536002154273356826}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 358.53, y: -109}
+  m_SizeDelta: {x: 675.87, y: 0}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &571816460892779519
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8342908203108568082}
+  m_CullTransparentMesh: 1
+--- !u!114 &1942987878420023602
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8342908203108568082}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 1
+  m_Spacing: 17.5
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!114 &7505773647993809892
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8342908203108568082}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 0
+  m_VerticalFit: 2
+--- !u!1 &8596154205088115967
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2882719619463602608}
+  - component: {fileID: 2760803313704178638}
+  - component: {fileID: 6810977129241860878}
+  - component: {fileID: 6818914705278352513}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text_Desc
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2882719619463602608
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8596154205088115967}
+  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: 2536002154273356826}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 372.421, y: -85.9}
+  m_SizeDelta: {x: 650.89, y: 41.305603}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2760803313704178638
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8596154205088115967}
+  m_CullTransparentMesh: 1
+--- !u!114 &6810977129241860878
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8596154205088115967}
+  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: 23
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u60E0\u5B50\u79CD\u51FA\u4E86\u5DE8\u5927\u846B\u82A6\uFF0C\u4ED6\u89C9\u5F97\u6BEB\u65E0\u7528\u5904\uFF0C\u975E\u5E38\u751F\u6C14\uFF01"
+--- !u!114 &6818914705278352513
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8596154205088115967}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 1
+  m_MinWidth: -1
+  m_MinHeight: -1
+  m_PreferredWidth: -1
+  m_PreferredHeight: -1
+  m_FlexibleWidth: -1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1

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

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: CHIZsXmlB3PuWupMSce4BrM85zx+eq0l+4YF5VbAMDDDkEr68mB0skgXs1Zg
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/UI/XianTuLogPanel/EventMinLogWidget.prefab

@@ -0,0 +1,277 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &2892432335616484045
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4186854761324400044}
+  - component: {fileID: 5251948896444246358}
+  - component: {fileID: 1853759246892402300}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text_MapName
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4186854761324400044
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2892432335616484045}
+  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: 6164727708320999124}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 546.6935, y: -0.00000047684}
+  m_SizeDelta: {x: 120.9065, y: 53.646}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &5251948896444246358
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2892432335616484045}
+  m_CullTransparentMesh: 1
+--- !u!114 &1853759246892402300
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2892432335616484045}
+  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: 25
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u5317\u6D77"
+--- !u!1 &7027082775659811363
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6164727708320999124}
+  - component: {fileID: 490661599509613740}
+  - component: {fileID: 3986517593618901093}
+  - component: {fileID: 1870515251875016888}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: EventMinLogWidget
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6164727708320999124
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7027082775659811363}
+  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: 625944845005079530}
+  - {fileID: 4186854761324400044}
+  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: 669.98, y: 53.6459}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &490661599509613740
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7027082775659811363}
+  m_CullTransparentMesh: 1
+--- !u!114 &3986517593618901093
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7027082775659811363}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.9960785, g: 0.9921569, b: 0.96470594, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: 
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 0}
+  packInfo:
+    packName: 
+    packgJsonPath: 
+    packgSpritePath: 
+    lasetJsonGUID: 
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!114 &1870515251875016888
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7027082775659811363}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: Text_Name
+    gameObject: {fileID: 3135112741264155416}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_MapName
+    gameObject: {fileID: 1853759246892402300}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 0
+--- !u!1 &8706979544831021535
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 625944845005079530}
+  - component: {fileID: 9076508543581580122}
+  - component: {fileID: 3135112741264155416}
+  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 &625944845005079530
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8706979544831021535}
+  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: 6164727708320999124}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 38.6, y: -0.00000047684}
+  m_SizeDelta: {x: 160, y: 53.646}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &9076508543581580122
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8706979544831021535}
+  m_CullTransparentMesh: 1
+--- !u!114 &3135112741264155416
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8706979544831021535}
+  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.6392157, g: 0.54901963, b: 0.32941177, 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: 25
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u60E0\u5B50\u7684\u70E6\u607C"

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

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: XS5O5H/4Ai/QZRkn8boMUrRDlxxWIYD6iCZ1arqdLThWVyuzul2w+HhgcnIW
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/UI/XianTuLogPanel/XianTuLogInfoPanel.prefab

@@ -34,7 +34,7 @@ RectTransform:
   - {fileID: 3323078826294969636}
   - {fileID: 9037408276187403176}
   - {fileID: 4984119799780491756}
-  - {fileID: 3581464887972855309}
+  - {fileID: 86150896025242752}
   - {fileID: 1239183305622828816}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -464,17 +464,17 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4665951811628086642}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6744614164039454483}
-  m_Father: {fileID: 8599819629026832582}
+  m_Father: {fileID: 86150896025242752}
   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: 4.0348, y: -96.16577}
+  m_AnchoredPosition: {x: 4.3120217, y: 124}
   m_SizeDelta: {x: 741.93, y: 1122.1326}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5904849993517078433
@@ -678,6 +678,109 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &8258924345047993119
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 86150896025242752}
+  - component: {fileID: 870975753901625595}
+  - component: {fileID: 8279077416340389211}
+  - component: {fileID: 6640372110663749329}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &86150896025242752
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8258924345047993119}
+  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: 3581464887972855309}
+  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 &870975753901625595
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8258924345047993119}
+  m_CullTransparentMesh: 1
+--- !u!114 &8279077416340389211
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8258924345047993119}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 0
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: 
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 0}
+  packInfo:
+    packName: 
+    packgJsonPath: 
+    packgSpritePath: 
+    lasetJsonGUID: 
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!114 &6640372110663749329
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8258924345047993119}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ShowMaskGraphic: 0
 --- !u!1 &9135198254365544974
 GameObject:
   m_ObjectHideFlags: 0
@@ -742,7 +845,7 @@ MonoBehaviour:
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
+  m_Maskable: 0
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []

Assets/Res/UI/XianTuLogPanel/XianTuLogPanel.prefab

@@ -67,6 +67,16 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Btn_Main
+    gameObject: {fileID: 3821727731485423146}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Btn_Event
+    gameObject: {fileID: 4236599677396176136}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &1850343213030836377
 GameObject:
@@ -86,7 +96,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &3323078826294969636
 RectTransform:
   m_ObjectHideFlags: 0
@@ -134,7 +144,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 200ea3d5bcc03d04c9dbf9c00906593c, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -340,9 +350,9 @@ MonoBehaviour:
   Page: {x: 1, y: 1}
   bottom: 0
   wdiget: {fileID: 0}
-  sizeData: {x: 707, y: 163}
-  isCustomizeHeight: 0
-  posOff: {x: 13, y: 0}
+  sizeData: {x: 10, y: 10}
+  isCustomizeHeight: 1
+  posOff: {x: 0, y: 0}
   isDelay: 0
   delayTime: 0
   isAdaptationWidth: 0
@@ -547,9 +557,10 @@ GameObject:
   - component: {fileID: 4389887259738624222}
   - component: {fileID: 9059370227144255306}
   - component: {fileID: 5262371952481576886}
+  - component: {fileID: 3821727731485423146}
   m_Layer: 5
   m_HasEditorInfo: 1
-  m_Name: Text (Legacy) (1)
+  m_Name: Btn_Main
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -616,6 +627,50 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u4E3B\u7EBF"
+--- !u!114 &3821727731485423146
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6002680713102466570}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 5262371952481576886}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &6833021426073465471
 GameObject:
   m_ObjectHideFlags: 0
@@ -760,9 +815,10 @@ GameObject:
   - component: {fileID: 7996455914375576794}
   - component: {fileID: 7908693561814886841}
   - component: {fileID: 6037209487185954565}
+  - component: {fileID: 4236599677396176136}
   m_Layer: 5
   m_HasEditorInfo: 1
-  m_Name: Text (Legacy) (2)
+  m_Name: Btn_Event
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -829,6 +885,50 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u4E8B\u4EF6"
+--- !u!114 &4236599677396176136
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8362329558097965615}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 6037209487185954565}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &9135198254365544974
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -0,0 +1,203 @@
+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/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);

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -30,6 +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, AccountFileInfo.EventConditionData> EventConditionDataMap = new Map<int, AccountFileInfo.EventConditionData>();
 
@@ -37,6 +39,21 @@ 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)
+            {
+                if (eventConfigsMap.ContainsKey(eventConfig.XiantuID))
+                {
+                    eventConfigsMap[eventConfig.XiantuID].Add(eventConfig);
+                }
+                else
+                {
+                    eventConfigsMap.Add(eventConfig.XiantuID, new List<EventConfig>() { eventConfig });
+                }
+            }
+        }
 
         // foreach (var playerDataEventConditionData in AccountFileInfo.Instance.playerData.eventConditionDatas)
         // {

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

@@ -0,0 +1,34 @@
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace Fort23.Mono
+{
+	[UIBinding(prefab = "EventLogTitleWidget"  )]
+	public partial class EventLogTitleWidget : ItemWidgetBasic
+	{
+		private void Init()
+		{
+
+		}
+		public override void AddEvent()
+		{
+
+		}
+		public override void DelEvent()
+		{
+
+		}
+		public override void AddButtonEvent()
+		{
+
+		}
+		
+		public void CustomInit(string text)
+		{
+			Text_Name.text = text;
+			LayoutRebuilder.ForceRebuildLayoutImmediate(Text_Name.GetComponent<RectTransform>());
+			LayoutRebuilder.ForceRebuildLayoutImmediate(Text_Name.transform.parent.GetComponent<RectTransform>());
+		}
+
+	}
+}

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

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

Assets/Scripts/GameUI/UI/XianTuLogPanel/EventLogTitleWidgetData.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 EventLogTitleWidget 
+	{
+	  #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/EventLogTitleWidgetData.cs.meta

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

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

@@ -0,0 +1,66 @@
+using System.Collections.Generic;
+using System.Linq;
+using Core.Language;
+using Excel2Json;
+using Fort23.Core;
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace Fort23.Mono
+{
+    [UIBinding(prefab = "EventLogWidget")]
+    public partial class EventLogWidget : ItemWidgetBasic
+    {
+        private XianTuLogConfig _xianTuLogConfig;
+        List<EventMinLogWidget> eventMinLogWidgets = new List<EventMinLogWidget>();
+
+        private void Init()
+        {
+        }
+
+        public override void AddEvent()
+        {
+        }
+
+        public override void DelEvent()
+        {
+        }
+
+        public override void AddButtonEvent()
+        {
+            base.AddButtonEvent();
+            Btn_HuiGu.onClick.AddListener(() => { XianTuLogInfoPanel.OpenPanel(_xianTuLogConfig.ID); });
+        }
+
+        public async CTask CustomInit(XianTuLogConfig xianTuLogConfig)
+        {
+            _xianTuLogConfig = xianTuLogConfig;
+            Text_Title.text = LanguageManager.Instance.Text(xianTuLogConfig.Ttile);
+            Text_Desc.text = LanguageManager.Instance.Text(xianTuLogConfig.Desc);
+
+            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);
+                eventMinLogWidgets.Add(eventMinLogWidget);
+            }
+            
+            LayoutRebuilder.ForceRebuildLayoutImmediate(Connect);
+            LayoutRebuilder.ForceRebuildLayoutImmediate(Connect.transform.parent.GetComponent<RectTransform>());
+        }
+
+        public override void DormancyObj()
+        {
+            foreach (var eventMinLogWidget in eventMinLogWidgets)
+            {
+                UIManager.Instance.DormancyGComponent(eventMinLogWidget);
+            }
+
+            eventMinLogWidgets.Clear();
+
+            base.DormancyObj();
+        }
+    }
+}

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

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

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

@@ -0,0 +1,62 @@
+using Fort23.Core;
+using Fort23.UTool;
+using UnityEngine.UI;
+using UnityEngine;
+using System.Collections.Generic;
+namespace Fort23.Mono
+{
+	public partial class EventLogWidget 
+	{
+	  #region 自定义数据 
+	  private Text _Text_Title;
+	  public Text Text_Title
+	   {
+	   get{
+	      if (_Text_Title == null)
+	       {
+	         _Text_Title  = GetUIUnit<Text>("Text_Title"); 
+	       }
+	      return _Text_Title;
+	     }
+	   }
+	  private Text _Text_Desc;
+	  public Text Text_Desc
+	   {
+	   get{
+	      if (_Text_Desc == null)
+	       {
+	         _Text_Desc  = GetUIUnit<Text>("Text_Desc"); 
+	       }
+	      return _Text_Desc;
+	     }
+	   }
+	  private Button _Btn_HuiGu;
+	  public Button Btn_HuiGu
+	   {
+	   get{
+	      if (_Btn_HuiGu == null)
+	       {
+	         _Btn_HuiGu  = GetUIUnit<Button>("Btn_HuiGu"); 
+	       }
+	      return _Btn_HuiGu;
+	     }
+	   }
+	  private RectTransform _Connect;
+	  public RectTransform Connect
+	   {
+	   get{
+	      if (_Connect == null)
+	       {
+	         _Connect  = GetUIUnit<RectTransform>("Connect"); 
+	       }
+	      return _Connect;
+	     }
+	   }
+	  #endregion 自定义数据结束 
+	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
+	{
+	 await base.SetUIGameObject(gObjectPoolInterface);
+	 Init();
+	}
+	}
+}

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

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

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

@@ -0,0 +1,41 @@
+using Core.Language;
+using Excel2Json;
+using Fort23.UTool;
+
+namespace Fort23.Mono
+{
+    [UIBinding(prefab = "EventMinLogWidget")]
+    public partial class EventMinLogWidget : UIComponent
+    {
+        private EventConfig eventConfig;
+
+        private void Init()
+        {
+        }
+
+        public override void AddEvent()
+        {
+        }
+
+        public override void DelEvent()
+        {
+        }
+
+        public override void AddButtonEvent()
+        {
+        }
+
+        public void CustomInit(int id, AccountFileInfo.EventList eventList)
+        {
+            eventConfig = ConfigComponent.Instance.Get<EventConfig>(id);
+            if (eventList == null)
+            {
+                Text_Name.text = "???";
+            }
+            else
+            {
+                Text_Name.text = LanguageManager.Instance.Text(eventConfig.EventName);
+            }
+        }
+    }
+}

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

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

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

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

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

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

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

@@ -49,22 +49,32 @@ namespace Fort23.Mono
         {
             showXianTuLogInfoData.Clear();
             _xianTuLogConfig = ConfigComponent.Instance.Get<XianTuLogConfig>(id);
-            foreach (var @e in _xianTuLogConfig.Events)
+            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 = ConfigComponent.Instance.Get<EventConfig>(e);
-                AccountFileInfo.EventList eventList = AccountFileInfo.Instance.playerData.completeEvents.FirstOrDefault(cl => cl.eventID == e);
+                EventConfig eventConfig = c;
+                AccountFileInfo.EventList eventList = AccountFileInfo.Instance.playerData.completeEvents.FirstOrDefault(cl => cl.eventID == c.ID);
                 if (eventList == null)
                 {
-                    XianTuLogInfoData xianTuLogInfoData = new XianTuLogInfoData();
-                    xianTuLogInfoData.type = 2;
-                    xianTuLogInfoData.message = "????????";
-
-                    XianTuLogInfoData xianTuLogInfoData1 = new XianTuLogInfoData();
-                    xianTuLogInfoData1.type = 3;
-                    xianTuLogInfoData1.message = "?????????????????????????????????";
-
-                    showXianTuLogInfoData.Add(xianTuLogInfoData);
-                    showXianTuLogInfoData.Add(xianTuLogInfoData1);
+                    //主线没有做不显示问好
+                    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
                 {
@@ -102,7 +112,14 @@ namespace Fort23.Mono
 
             XianTuLogInfoData xianTuLogInfoData = showXianTuLogInfoData[index];
 
-            if (xianTuLogInfoData.type == 2)
+            if (xianTuLogInfoData.type == 1)
+            {
+                EventLogTitleWidget eventLogTitleWidget = await UIManager.Instance.CreateGComponent<EventLogTitleWidget>(null, ContentRoot);
+                eventLogTitleWidget.CustomInit(xianTuLogInfoData.message);
+                components.Add(eventLogTitleWidget);
+                return eventLogTitleWidget;
+            }
+            else if (xianTuLogInfoData.type == 2)
             {
                 EventLogInfoWidget eventLogInfoWidget = await UIManager.Instance.CreateGComponent<EventLogInfoWidget>(null, ContentRoot);
                 eventLogInfoWidget.CustomInit(xianTuLogInfoData.message);

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

@@ -11,6 +11,8 @@ namespace Fort23.Mono
     [UIBinding(prefab = "XianTuLogPanel")]
     public partial class XianTuLogPanel : UIPanel, IScrollListContent
     {
+        private int type = 1;
+
         List<XianTuLogConfig> xianTuLogConfigs = new List<XianTuLogConfig>();
         List<XianTuLogConfig> shoeXianTuLogConfigs = new List<XianTuLogConfig>();
 
@@ -31,16 +33,39 @@ namespace Fort23.Mono
         public override void AddButtonEvent()
         {
             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);
+            });
         }
 
         public override CTask<bool> AsyncInit(object[] uiData)
         {
             xianTuLogConfigs = ConfigComponent.Instance.GetAll<XianTuLogConfig>().ToList();
-            shoeXianTuLogConfigs = GetTypeXiantuLogConfigs(1);
+            shoeXianTuLogConfigs = GetTypeXiantuLogConfigs(type);
             Content.Init(this, shoeXianTuLogConfigs.Count);
             return base.AsyncInit(uiData);
         }
 
+
         private List<XianTuLogConfig> GetTypeXiantuLogConfigs(int type)
         {
             List<XianTuLogConfig> xiaNTYULogConfigs = new List<XianTuLogConfig>();
@@ -62,11 +87,20 @@ namespace Fort23.Mono
                 return null;
             }
 
+            if (type == 1)
+            {
+                MainEventLogWidget mainEventLogWidget = await UIManager.Instance.CreateGComponent<MainEventLogWidget>(null, Content.GetComponent<RectTransform>());
+                mainEventLogWidget.CustomInit(shoeXianTuLogConfigs[index]);
 
-            MainEventLogWidget mainEventLogWidget = await UIManager.Instance.CreateGComponent<MainEventLogWidget>(null, Content.GetComponent<RectTransform>());
-            mainEventLogWidget.CustomInit(shoeXianTuLogConfigs[index]);
+                return mainEventLogWidget;
+            }
+            else
+            {
+                EventLogWidget EventLogWidget = await UIManager.Instance.CreateGComponent<EventLogWidget>(null, Content.GetComponent<RectTransform>());
+                await EventLogWidget.CustomInit(shoeXianTuLogConfigs[index]);
 
-            return mainEventLogWidget;
+                return EventLogWidget;
+            }
         }
 
         public void HindIScorllListWidget(IScorllListWidget widget)
@@ -78,5 +112,13 @@ namespace Fort23.Mono
         {
             XianTuLogPanel xianTuLogPanel = await UIManager.Instance.LoadAndOpenPanel<XianTuLogPanel>(null);
         }
+
+        public override void Close()
+        {
+            UIManager.Instance.DormancyAllGComponent<MainEventLogWidget>();
+            UIManager.Instance.DormancyAllGComponent<EventLogWidget>();
+            type = 2;
+            base.Close();
+        }
     }
 }

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

@@ -30,6 +30,28 @@ namespace Fort23.Mono
 	      return _Btn_Close;
 	     }
 	   }
+	  private Button _Btn_Main;
+	  public Button Btn_Main
+	   {
+	   get{
+	      if (_Btn_Main == null)
+	       {
+	         _Btn_Main  = GetUIUnit<Button>("Btn_Main"); 
+	       }
+	      return _Btn_Main;
+	     }
+	   }
+	  private Button _Btn_Event;
+	  public Button Btn_Event
+	   {
+	   get{
+	      if (_Btn_Event == null)
+	       {
+	         _Btn_Event  = GetUIUnit<Button>("Btn_Event"); 
+	       }
+	      return _Btn_Event;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{