DESKTOP-FB72PO8\Administrator 5 dagar sedan
förälder
incheckning
1f10babc74

+ 40 - 436
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

+ 1 - 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: []

+ 5 - 562
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
@@ -4995,27 +4994,6 @@ Transform:
   - {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
@@ -5079,8 +5057,7 @@ Transform:
   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_Children: []
   m_Father: {fileID: 5932135344847874538}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &8335447552457029814
@@ -15045,8 +15022,7 @@ Transform:
   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_Children: []
   m_Father: {fileID: 5932135344847874538}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &2574821290545762030
@@ -35136,8 +35112,7 @@ Transform:
   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_Children: []
   m_Father: {fileID: 5932135344847874538}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &8304639261820544731
@@ -35185,8 +35160,7 @@ Transform:
   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_Children: []
   m_Father: {fileID: 5932135344847874538}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &995933256996575172
@@ -40223,8 +40197,7 @@ Transform:
   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_Children: []
   m_Father: {fileID: 5932135344847874538}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &6341697348904185874
@@ -45208,533 +45181,3 @@ Transform:
   m_Children: []
   m_Father: {fileID: 6958931125109242060}
   m_LocalEulerAnglesHint: {x: 0.053522047, y: -0.2327298, z: 6.210766}
---- !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}

+ 5 - 2
Assets/Art/VFX/FXPrefabs/fx_gf_1403.prefab

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

+ 62 - 0
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

+ 1 - 0
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}}

+ 7 - 0
Assets/Res/TimeLineAssets/1302_timeline_TD.txt.meta

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

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 1
Assets/Res/TimeLineAssets/1403_timeline_TD.txt


+ 10 - 10
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}

+ 5 - 7
Assets/Scripts/GameLogic/Combat/Skill/S1403.cs

@@ -12,7 +12,7 @@ namespace GameLogic.Combat.Skill
     /// </summary>
     public class S1403 : SkillBasic
     {
-        private static Vector3[] zdPosIndex = new Vector3[] { new Vector3(-1.06f,2.14f,0.1f),new Vector3(-0.48f,2.7f,-0.92f),new Vector3(0.128f,2.85f,-0.84f),new Vector3
+        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()
@@ -25,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);
             }
 
 

+ 1 - 1
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);

Vissa filer visades inte eftersom för många filer har ändrats