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

# Conflicts:
#	Assets/Res/Config/LanguageChineseConfig.json   resolved by origin/master(远端) version
#	Assets/Res/Config/XianTuLogConfig.json   resolved by origin/master(远端) version
#	Excel2Json/Excel/EventConfig.xlsx   resolved by origin/master(远端) version
#	Excel2Json/Excel/Language.xlsx   resolved by origin/master(远端) version
#	Excel2Json/Excel/Maps.xlsx   resolved by origin/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_1101.prefab

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

Assets/Art/VFX/FXPrefabs/fx_gf_1403.prefab

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

Assets/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/EventConditionConfig.json

@@ -46,6 +46,13 @@
       "Operation": null,
       "ConditionType": 8,
       "finishCount": 1
+    },
+    {
+      "ID": 6,
+      "message": 2094,
+      "Operation": null,
+      "ConditionType": 9,
+      "finishCount": 6
     }
   ]
 }

Assets/Res/Config/EventConfig.json

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

Assets/Res/Config/EventLinkConfig.json

@@ -4,10 +4,12 @@
       "ID": 100,
       "conciseEventMessage": 216,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         216
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": null,
       "ResultType": null
     },
@@ -15,10 +17,12 @@
       "ID": 1001,
       "conciseEventMessage": 177,
       "EventConditionMessage": null,
+      "NPCID": 2,
       "LanID": [
         177
       ],
-      "NPCID": 2,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 1,
       "optionPara1": [
         1002,
@@ -34,10 +38,12 @@
       "ID": 1002,
       "conciseEventMessage": 178,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         178
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 2,
       "optionPara1": [
         100001
@@ -52,10 +58,12 @@
       "ID": 1003,
       "conciseEventMessage": 179,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         179
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 1,
       "optionPara1": [
         1005
@@ -69,10 +77,12 @@
       "ID": 1004,
       "conciseEventMessage": 180,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         180
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 3,
       "PrizeIDs": [
         1002
@@ -86,10 +96,12 @@
       "ID": 1005,
       "conciseEventMessage": 181,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         181
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 3,
       "PrizeIDs": [
         1001
@@ -103,10 +115,12 @@
       "ID": 1010,
       "conciseEventMessage": 182,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         182
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 1,
       "optionPara1": [
         1011,
@@ -122,10 +136,12 @@
       "ID": 1011,
       "conciseEventMessage": 183,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         183
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 1,
       "optionPara1": [
         1014,
@@ -141,11 +157,13 @@
       "ID": 1012,
       "conciseEventMessage": 184,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         184,
         187
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 3,
       "PrizeIDs": [
         1001
@@ -159,10 +177,12 @@
       "ID": 1014,
       "conciseEventMessage": 185,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         185
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 2,
       "optionPara1": [
         100002
@@ -177,11 +197,13 @@
       "ID": 1015,
       "conciseEventMessage": 186,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         186,
         189
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 3,
       "PrizeIDs": [
         1003
@@ -195,10 +217,12 @@
       "ID": 1016,
       "conciseEventMessage": 188,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         188
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": null,
       "PrizeIDs": [
         1001
@@ -212,10 +236,12 @@
       "ID": 1020,
       "conciseEventMessage": 190,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         190
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 1,
       "optionPara1": [
         1021,
@@ -231,10 +257,12 @@
       "ID": 1021,
       "conciseEventMessage": 191,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         191
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 2,
       "optionPara1": [
         100003
@@ -255,10 +283,12 @@
       "ID": 1022,
       "conciseEventMessage": 192,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         192
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 4,
       "PrizeIDs": [
         1002
@@ -272,11 +302,13 @@
       "ID": 1024,
       "conciseEventMessage": 193,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         193,
         196
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 2,
       "optionPara1": [
         100004
@@ -297,11 +329,13 @@
       "ID": 1025,
       "conciseEventMessage": 194,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         194,
         197
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 3,
       "PrizeIDs": [
         1002
@@ -315,10 +349,12 @@
       "ID": 1026,
       "conciseEventMessage": 207,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         207
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 1,
       "optionPara1": [
         1024,
@@ -334,10 +370,12 @@
       "ID": 1030,
       "conciseEventMessage": 221,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         221
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 3,
       "PrizeIDs": [
         1002
@@ -351,10 +389,12 @@
       "ID": 1040,
       "conciseEventMessage": 222,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         222
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 3,
       "PrizeIDs": [
         1002
@@ -368,10 +408,12 @@
       "ID": 1050,
       "conciseEventMessage": 223,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         223
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 3,
       "PrizeIDs": [
         1002,
@@ -387,10 +429,12 @@
       "ID": 1060,
       "conciseEventMessage": 224,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         224
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": null,
       "ResultType": null
     },
@@ -398,10 +442,12 @@
       "ID": 10001,
       "conciseEventMessage": 208,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         208
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 2,
       "optionPara1": [
         100001
@@ -416,10 +462,12 @@
       "ID": 10002,
       "conciseEventMessage": 209,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         209
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 3,
       "PrizeIDs": [
         1003
@@ -433,12 +481,14 @@
       "ID": 10003,
       "conciseEventMessage": 210,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         210,
         211,
         1903
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 3,
       "PrizeIDs": [
         1005
@@ -452,13 +502,15 @@
       "ID": 10004,
       "conciseEventMessage": 212,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         212,
         213,
         214,
         215
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 3,
       "PrizeIDs": [
         1006
@@ -472,10 +524,12 @@
       "ID": 10005,
       "conciseEventMessage": 1901,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         1901
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 2,
       "optionPara1": [
         100002
@@ -490,10 +544,12 @@
       "ID": 10006,
       "conciseEventMessage": 1902,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         1902
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 2,
       "optionPara1": [
         100003
@@ -508,10 +564,12 @@
       "ID": 9003,
       "conciseEventMessage": 2036,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         2036
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 1,
       "optionPara1": [
         9004,
@@ -527,10 +585,12 @@
       "ID": 9004,
       "conciseEventMessage": 2037,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         2037
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 2,
       "optionPara1": [
         100001
@@ -545,10 +605,12 @@
       "ID": 9005,
       "conciseEventMessage": 2038,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         2038
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": null,
       "ResultType": null
     },
@@ -556,10 +618,12 @@
       "ID": 9006,
       "conciseEventMessage": 2039,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         2039
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": null,
       "ResultType": null
     },
@@ -567,10 +631,12 @@
       "ID": 9007,
       "conciseEventMessage": 2040,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
         2040
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 4,
       "ResultType": 1,
       "ResultOptions": [
@@ -582,6 +648,8 @@
       "conciseEventMessage": null,
       "EventConditionMessage": null,
       "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 3,
       "PrizeIDs": [
         1001
@@ -595,10 +663,12 @@
       "ID": 9025,
       "conciseEventMessage": 2074,
       "EventConditionMessage": 2073,
+      "NPCID": null,
       "LanID": [
         2074
       ],
-      "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 1,
       "optionPara1": [
         9026
@@ -613,6 +683,8 @@
       "conciseEventMessage": null,
       "EventConditionMessage": null,
       "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": null,
       "ResultType": 3,
       "ResultOptions": [
@@ -624,9 +696,8 @@
       "conciseEventMessage": 2070,
       "EventConditionMessage": null,
       "NPCID": null,
-      "ConditionId": [
-        3
-      ],
+      "EventID": null,
+      "ConditionId": 3,
       "optionType": null,
       "ResultType": null
     },
@@ -635,6 +706,8 @@
       "conciseEventMessage": 2076,
       "EventConditionMessage": 2077,
       "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": 2,
       "optionPara1": [
         100001
@@ -642,18 +715,60 @@
       "ResultType": null
     },
     {
-      "ID": 100001,
+      "ID": 1000101,
       "conciseEventMessage": 2086,
       "EventConditionMessage": null,
+      "NPCID": null,
       "LanID": [
-        2083,
-        2084,
-        2085
+        2083
+      ],
+      "EventID": 10001,
+      "ConditionId": null,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000102
+      ]
+    },
+    {
+      "ID": 1000102,
+      "conciseEventMessage": 2086,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "LanID": [
+        2084
       ],
+      "EventID": 10001,
+      "ConditionId": null,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000103
+      ]
+    },
+    {
+      "ID": 1000103,
+      "conciseEventMessage": 2086,
+      "EventConditionMessage": null,
       "NPCID": null,
-      "ConditionId": [
-        5
+      "LanID": [
+        2085
       ],
+      "EventID": 10001,
+      "ConditionId": null,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1000104
+      ]
+    },
+    {
+      "ID": 1000104,
+      "conciseEventMessage": 2086,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "EventID": 10001,
+      "ConditionId": 5,
       "optionType": null,
       "ResultType": 3,
       "ResultOptions": [
@@ -661,24 +776,57 @@
       ]
     },
     {
-      "ID": 100002,
-      "conciseEventMessage": 1911,
+      "ID": 1000201,
+      "conciseEventMessage": 2091,
       "EventConditionMessage": null,
       "NPCID": null,
-      "optionType": 2,
-      "optionPara1": [
-        100001
+      "LanID": [
+        2092
       ],
+      "EventID": 10002,
+      "ConditionId": null,
+      "optionType": null,
+      "ResultType": 3,
+      "ResultOptions": [
+        10003
+      ]
+    },
+    {
+      "ID": 1000202,
+      "conciseEventMessage": 2091,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "LanID": [
+        2093
+      ],
+      "EventID": 10002,
+      "ConditionId": null,
+      "optionType": null,
+      "ResultType": 3,
+      "ResultOptions": [
+        10003
+      ]
+    },
+    {
+      "ID": 1000203,
+      "conciseEventMessage": 2091,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "EventID": 10002,
+      "ConditionId": 6,
+      "optionType": null,
       "ResultType": 3,
       "ResultOptions": [
         10003
       ]
     },
     {
-      "ID": 100003,
-      "conciseEventMessage": 1912,
+      "ID": 1000301,
+      "conciseEventMessage": 2095,
       "EventConditionMessage": null,
       "NPCID": null,
+      "EventID": 10003,
+      "ConditionId": null,
       "optionType": null,
       "ResultType": 3,
       "ResultOptions": [
@@ -690,6 +838,8 @@
       "conciseEventMessage": 1913,
       "EventConditionMessage": null,
       "NPCID": null,
+      "EventID": null,
+      "ConditionId": null,
       "optionType": null,
       "ResultType": null
     }

Assets/Res/Config/LanguageChineseConfig.json

@@ -8330,19 +8330,19 @@
     },
     {
       "ID": 2083,
-      "txt": "北冥有鱼，其名为鲲……"
+      "txt": ""
     },
     {
       "ID": 2084,
-      "txt": "不过北海遥远，何时能寻得鲲鹏的踪迹。"
+      "txt": ""
     },
     {
       "ID": 2085,
-      "txt": "好在我的神识尚在，可探天地，再加上刚刚的风铃，或许能寻得前路线索。"
+      "txt": ""
     },
     {
       "ID": 2086,
-      "txt": "使用风铃唤醒还未泯灭的神识"
+      "txt": "北冥有鱼，其名为鲲……"
     },
     {
       "ID": 2087,
@@ -8350,11 +8350,11 @@
     },
     {
       "ID": 2088,
-      "txt": "多次渡劫失败的你，误入“无何有之乡”，在这里受到了列子的指引，踏上了寻找七道心境的修仙之路。"
+      "txt": "无用的大葫芦"
     },
     {
       "ID": 2089,
-      "txt": "无用的大葫芦"
+      "txt": "多次渡劫失败的你，误入“无何有之乡”，在这里受到了列子的指引，踏上了寻找七道心境的修仙之路。"
     },
     {
       "ID": 2090,
@@ -8362,23 +8362,23 @@
     },
     {
       "ID": 2091,
-      "txt": "长寿的彭祖"
+      "txt": "神识发现有一条古径，隐于云山之间，不过似乎有妖兽盘踞。"
     },
     {
       "ID": 2092,
-      "txt": "一位叫彭祖的凡人，寿命很长。"
+      "txt": ""
     },
     {
       "ID": 2093,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2094,
-      "txt": "0"
+      "txt": "继续飞行一段时间{0}/{1}"
     },
     {
       "ID": 2095,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 2096,

Assets/Res/Config/XianTuLogConfig.json

@@ -3,30 +3,16 @@
     {
       "ID": 1,
       "EventType": 1,
-      "MapId": 1,
-      "Ttile": 2087,
-      "Desc": 2088
+      "Title": 2087,
+      "Desc": 2089,
+      "BigMapID": null
     },
     {
       "ID": 2,
       "EventType": 2,
-      "MapId": 1,
-      "Ttile": 2089,
-      "Desc": 2090
-    },
-    {
-      "ID": 3,
-      "EventType": 2,
-      "MapId": 2,
-      "Ttile": 2091,
-      "Desc": 2092
-    },
-    {
-      "ID": 4,
-      "EventType": 2,
-      "MapId": 3,
-      "Ttile": 2091,
-      "Desc": 2092
+      "Title": 2088,
+      "Desc": 2090,
+      "BigMapID": 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/CombatPanel.prefab

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

Assets/Scenes/testCombat.scene

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

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

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

Assets/Scripts/GameData/ExcelConfig/EventLinkConfig.cs

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

Assets/Scripts/GameData/ExcelConfig/XianTuLogConfig.cs

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

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

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

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

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

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

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

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

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