修改翻滚

Assets/Art/HeroTimeLine/Hero03.playable

@@ -552,6 +552,7 @@ MonoBehaviour:
   m_Children:
   - {fileID: -3153904920175548778}
   - {fileID: -1194444990711841923}
+  - {fileID: -4574379201153612004}
   m_Clips: []
   m_Markers:
     m_Objects: []
@@ -805,6 +806,99 @@ MonoBehaviour:
   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 &-4574379201153612004
+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: -7018264418762285241}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: 2364957889005612843}
+    m_Duration: 0.5333333333333333
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: -4574379201153612004}
+    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 &-3767543464806788740
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -1568,6 +1662,18 @@ MonoBehaviour:
   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 &2364957889005612843
+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 &2406230606845025980
 MonoBehaviour:
   m_ObjectHideFlags: 1

Assets/Art/VFX/FXPrefabs/fx_hero03_zd.prefab

@@ -4794,6 +4794,7 @@ GameObject:
   - component: {fileID: 8338271220869426142}
   - component: {fileID: 281698734530898582}
   - component: {fileID: 2750357880578430250}
+  - component: {fileID: 3691117106846173520}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: fx_hero03_zd
@@ -4801,7 +4802,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &3098232039505894201
 Transform:
   m_ObjectHideFlags: 0
@@ -9629,8 +9630,30 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: f1821a44633e40668ff3010995e64538, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  hitFxName: fx_hero03_zd_hit
   isPenetrate: 0
   speed: 10
+--- !u!135 &3691117106846173520
+SphereCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2838628120464477315}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Radius: 0.3
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!1 &4301970179992291552
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/CombatHero/Hero03.prefab

@@ -305,6 +305,52 @@ Transform:
   - {fileID: 6915646560443956458}
   m_Father: {fileID: 7927737584220669992}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &734675211222781256
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5241352190156543695}
+  - component: {fileID: 1652323813812221465}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: zdpos1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &5241352190156543695
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 734675211222781256}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0.521, z: -0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3659170751059264042}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1652323813812221465
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 734675211222781256}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cebc90e0510b492d94dbb8ad1eefcd1a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DotName: zdpos1
 --- !u!1 &828051885250597545
 GameObject:
   m_ObjectHideFlags: 0
@@ -876,6 +922,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4671787398161153408}
+  - {fileID: 5241352190156543695}
   m_Father: {fileID: 2450270977946639245}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &3468404261507816066
@@ -2046,7 +2093,7 @@ Transform:
   m_GameObject: {fileID: 7250588360328875136}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -0, y: 0, z: 0}
+  m_LocalPosition: {x: -0.006, y: -0.357, z: -0.002}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []

Assets/Scenes/testCombat.scene

@@ -986,6 +986,96 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   MyWfx: {fileID: 1329555973}
+--- !u!1001 &1354674195
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 2838628120464477315, guid: ee24abc0e00535348ad3b4c5c38c9f34, type: 3}
+      propertyPath: m_Name
+      value: fx_hero03_zd
+      objectReference: {fileID: 0}
+    - target: {fileID: 2838628120464477315, guid: ee24abc0e00535348ad3b4c5c38c9f34, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3098232039505894201, guid: ee24abc0e00535348ad3b4c5c38c9f34, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 26.77153
+      objectReference: {fileID: 0}
+    - target: {fileID: 3098232039505894201, guid: ee24abc0e00535348ad3b4c5c38c9f34, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3098232039505894201, guid: ee24abc0e00535348ad3b4c5c38c9f34, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 3.8160229
+      objectReference: {fileID: 0}
+    - target: {fileID: 3098232039505894201, guid: ee24abc0e00535348ad3b4c5c38c9f34, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3098232039505894201, guid: ee24abc0e00535348ad3b4c5c38c9f34, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3098232039505894201, guid: ee24abc0e00535348ad3b4c5c38c9f34, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3098232039505894201, guid: ee24abc0e00535348ad3b4c5c38c9f34, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3098232039505894201, guid: ee24abc0e00535348ad3b4c5c38c9f34, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3098232039505894201, guid: ee24abc0e00535348ad3b4c5c38c9f34, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3098232039505894201, guid: ee24abc0e00535348ad3b4c5c38c9f34, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 2838628120464477315, guid: ee24abc0e00535348ad3b4c5c38c9f34, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 1354674197}
+  m_SourcePrefab: {fileID: 100100000, guid: ee24abc0e00535348ad3b4c5c38c9f34, type: 3}
+--- !u!1 &1354674196 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 2838628120464477315, guid: ee24abc0e00535348ad3b4c5c38c9f34, type: 3}
+  m_PrefabInstance: {fileID: 1354674195}
+  m_PrefabAsset: {fileID: 0}
+--- !u!135 &1354674197
+SphereCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1354674196}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Radius: 0.3
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!1 &1421949364
 GameObject:
   m_ObjectHideFlags: 0
@@ -1169,3 +1259,4 @@ SceneRoots:
   - {fileID: 454428535}
   - {fileID: 1311898224}
   - {fileID: 128676609}
+  - {fileID: 1354674195}

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

@@ -1,5 +1,6 @@
 using System;
 using Core.Triiger;
+using GameLogic.Combat.CombatTool;
 using GameLogic.Combat.Hero;
 using UnityEngine;
 using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface;
@@ -42,6 +43,12 @@ namespace Common.Combat.FxAILogic
             {
                 timeLineTriggerEvent.TimeLineTrigger(TimeLineEventParticleLogicBasic.TimeLineEventLogicGroup.groupName,
                     target.GetMainHotPoin<ILifetCycleHitPoint>(), this, triggerData);
+                if (!string.IsNullOrEmpty(hitFxName))
+                {
+                    CombatController.currActiveCombat.GameTimeLineParticleFactory.CreateParticle(hitFxName,
+                        collision.ClosestPoint(gameObject.transform.position), null, false, null, null);
+                }
+
                 Dispose();
             }
         }

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

@@ -19,6 +19,7 @@ namespace Common.Combat.FxAILogic
         private TimeLineEventParticleLogicBasic _timeLineEventParticleLogicBasic;
         private ILifetCycleHitPoint _attTarget;
 
+       [Header("碰撞时的特效")] public string hitFxName;
         public ILifetCycleHitPoint AttTarget
         {
             get { return _attTarget; }