Browse Source

修改表现

李桃 3 days ago
parent
commit
e221cd1380

+ 17 - 301
Assets/Art/HeroTimeLine/gf_1401_timeline.playable

@@ -107,7 +107,7 @@ MonoBehaviour:
   sourceGameObject:
     exposedName: 25fd4f19b41e6fd43902a13b18b909d6
     defaultValue: {fileID: 0}
-  prefabGameObject: {fileID: 0}
+  prefabGameObject: {fileID: 2604790741987567871, guid: f0f81a55ea2f8c845ac461ad46d08e84, type: 3}
   updateParticle: 1
   particleRandomSeed: 4171
   updateDirector: 1
@@ -115,19 +115,19 @@ MonoBehaviour:
   searchHierarchy: 0
   active: 1
   postPlayback: 2
-  targetType: 0
-  LocationType: 0
-  targetSpecialDotName: 
-  isUseRandom: 0
+  targetType: 2
+  LocationType: 5
+  targetSpecialDotName: zdpos9
+  isUseRandom: 1
   xoff:
-    x: 0
-    y: 0
+    x: 1
+    y: -1
   yoff:
-    x: 0
-    y: 0
+    x: 1
+    y: -1
   zoff:
-    x: 0
-    y: 0
+    x: 1
+    y: -1
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0
@@ -136,7 +136,7 @@ MonoBehaviour:
   isAttSpeed: 0
   isLoop: 0
   loopAlone: 0
-  isActivityCustomTargetPos: 0
+  isActivityCustomTargetPos: 1
   CustomTargetPosIndex: 0
   intervalTime: 0
   isRoat: 0
@@ -185,7 +185,6 @@ MonoBehaviour:
   m_Curves: {fileID: 0}
   m_Parent: {fileID: 11400000}
   m_Children:
-  - {fileID: -602889773965061612}
   - {fileID: -2761801548011835268}
   - {fileID: 6199972027955363102}
   m_Clips: []
@@ -213,7 +212,6 @@ MonoBehaviour:
   m_Children:
   - {fileID: 8106544261917024806}
   - {fileID: -894447145330074657}
-  - {fileID: -1223227800801429518}
   - {fileID: -8041341778034734623}
   - {fileID: 6066676420339436833}
   m_Clips: []
@@ -234,7 +232,7 @@ MonoBehaviour:
   sourceGameObject:
     exposedName: dcbffc3826f89a847b3e2d4b742e3242
     defaultValue: {fileID: 0}
-  prefabGameObject: {fileID: 0}
+  prefabGameObject: {fileID: 6269886970061681727, guid: 747bde107901d8d43bf479f0a24eefaf, type: 3}
   updateParticle: 1
   particleRandomSeed: 2781
   updateDirector: 1
@@ -360,98 +358,6 @@ MonoBehaviour:
     m_DisplayName: fx_gf_1401
   m_Markers:
     m_Objects: []
---- !u!114 &-1223227800801429518
-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: 1
-  m_CustomPlayableFullTypename: 
-  m_Curves: {fileID: 0}
-  m_Parent: {fileID: -5073625934344026965}
-  m_Children: []
-  m_Clips:
-  - m_Version: 1
-    m_Start: 0.1
-    m_ClipIn: 0
-    m_Asset: {fileID: 4036464651189746888}
-    m_Duration: 2
-    m_TimeScale: 1
-    m_ParentTrack: {fileID: -1223227800801429518}
-    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_lieyanjian_qy
-  m_Markers:
-    m_Objects: []
 --- !u!114 &-1179596182510708275
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -567,98 +473,6 @@ MonoBehaviour:
   m_Markers:
     m_Objects: []
   m_PostPlaybackState: 3
---- !u!114 &-602889773965061612
-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: 1
-  m_CustomPlayableFullTypename: 
-  m_Curves: {fileID: 0}
-  m_Parent: {fileID: -5408356913757677258}
-  m_Children: []
-  m_Clips:
-  - m_Version: 1
-    m_Start: 0.9
-    m_ClipIn: 0
-    m_Asset: {fileID: 3479211134189885673}
-    m_Duration: 1
-    m_TimeScale: 1
-    m_ParentTrack: {fileID: -602889773965061612}
-    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_lieyanjian
-  m_Markers:
-    m_Objects: []
 --- !u!114 &-234042125778899457
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -674,7 +488,7 @@ MonoBehaviour:
   sourceGameObject:
     exposedName: 748287b5bdcda2a4b8dbbbda0013c8af
     defaultValue: {fileID: 0}
-  prefabGameObject: {fileID: 0}
+  prefabGameObject: {fileID: 7430783002085209103, guid: 9208c6f86c09aff4e88f50002e0a954a, type: 3}
   updateParticle: 1
   particleRandomSeed: 5071
   updateDirector: 1
@@ -682,9 +496,9 @@ MonoBehaviour:
   searchHierarchy: 0
   active: 1
   postPlayback: 2
-  targetType: 0
-  LocationType: 0
-  targetSpecialDotName: 
+  targetType: 1
+  LocationType: 5
+  targetSpecialDotName: hitpos
   isUseRandom: 0
   xoff:
     x: 0
@@ -730,104 +544,6 @@ MonoBehaviour:
     m_ScenePreview: 1
   m_DurationMode: 0
   m_MarkerTrack: {fileID: 0}
---- !u!114 &3479211134189885673
-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)
-  m_EditorClassIdentifier: 
-  sourceGameObject:
-    exposedName: d0f44458d6eed554aa82dc341cc3bd38
-    defaultValue: {fileID: 0}
-  prefabGameObject: {fileID: 3406478517066756076, guid: ea181fbbeb562ee4ea001111cfa2b819, type: 3}
-  updateParticle: 1
-  particleRandomSeed: 518
-  updateDirector: 1
-  updateITimeControl: 1
-  searchHierarchy: 1
-  active: 1
-  postPlayback: 2
-  targetType: 2
-  LocationType: 5
-  targetSpecialDotName: zdpos9
-  isUseRandom: 1
-  xoff:
-    x: 1
-    y: -1
-  yoff:
-    x: 1
-    y: -1
-  zoff:
-    x: 1
-    y: -1
-  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 &4036464651189746888
-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
-  m_EditorClassIdentifier: 
-  sourceGameObject:
-    exposedName: 5ca15d59ee2b619418c577e96b4fe134
-    defaultValue: {fileID: 0}
-  prefabGameObject: {fileID: 6415426395430326359, guid: 9e08a12f977720c4ab39f3c69f35c0c1, type: 3}
-  updateParticle: 1
-  particleRandomSeed: 2432
-  updateDirector: 1
-  updateITimeControl: 1
-  searchHierarchy: 0
-  active: 1
-  postPlayback: 2
-  targetType: 1
-  LocationType: 5
-  targetSpecialDotName: zdpos9
-  isUseRandom: 0
-  xoff:
-    x: 0
-    y: 0
-  yoff:
-    x: 0
-    y: 0
-  zoff:
-    x: 0
-    y: 0
-  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 &6066676420339436833
 MonoBehaviour:
   m_ObjectHideFlags: 1

File diff suppressed because it is too large
+ 0 - 0
Assets/Res/TimeLineAssets/1401_timeline_TD.txt


File diff suppressed because it is too large
+ 0 - 0
Assets/Res/TimeLineAssets/lieyanjian_timeline_TD.txt


File diff suppressed because it is too large
+ 0 - 0
Assets/StreamingAssets/assetConfig.txt


File diff suppressed because it is too large
+ 188 - 637
UserSettings/Layouts/default-2022.dwlt


Some files were not shown because too many files changed in this diff