修改法宝表现

Assets/Res/HeroAnimtion/fb_3202.asset

@@ -28,6 +28,34 @@ MonoBehaviour:
           _Names: []
         _Clip: {fileID: 1827226128182048838, guid: c90135f06b9d94b4db9178a90161ff04, type: 3}
         _NormalizedStartTime: NaN
+--- !u!114 &-2383963709254251051
+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: sk1
+  m_EditorClassIdentifier: 
+  _Transition:
+    rid: 5907434158729986048
+  references:
+    version: 2
+    RefIds:
+    - rid: 5907434158729986048
+      type: {class: ClipTransition, ns: Animancer, asm: Kybernetik.Animancer}
+      data:
+        _FadeDuration: 0.25
+        _Speed: 1
+        _Events:
+          _NormalizedTimes: []
+          _Callbacks: []
+          _Names: []
+        _Clip: {fileID: 1827226128182048838, guid: b7371bb362c9deb4280bc97e174ca47d, type: 3}
+        _NormalizedStartTime: NaN
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -45,6 +73,7 @@ MonoBehaviour:
     - {fileID: 2690223787658514382}
     - {fileID: 1128284835469881826}
     - {fileID: -4897859723478631765}
+    - {fileID: -2383963709254251051}
     _Modifiers:
     - _From: 0
       _To: 0
@@ -73,6 +102,27 @@ MonoBehaviour:
     - _From: 2
       _To: 2
       _Fade: 0
+    - _From: 1
+      _To: 3
+      _Fade: 0
+    - _From: 0
+      _To: 3
+      _Fade: 0
+    - _From: 3
+      _To: 3
+      _Fade: 0
+    - _From: 2
+      _To: 3
+      _Fade: 0
+    - _From: 3
+      _To: 2
+      _Fade: 0
+    - _From: 3
+      _To: 1
+      _Fade: 0
+    - _From: 3
+      _To: 0
+      _Fade: 0
     _Aliases: []
     _AliasAllTransitions: 0
 --- !u!114 &1128284835469881826

Assets/Scenes/testCombat.scene

@@ -2374,7 +2374,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].magicWeaponId.Array.data[0]
-      value: 10004
+      value: 10008
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].magicWeaponId.Array.data[1]

Assets/Scripts/GameLogic/Combat/Skill/MagicSkill/S3202.cs

@@ -20,18 +20,24 @@ namespace GameLogic.Combat.Skill.MagicSkill
 
         protected override void ProInitSkill()
         {
-            CombatMagicWeaponEntity.CustomizeShowTarget = GetTargetPos;
         }
 
         private Vector3 GetTargetPos()
         {
-            SpecialDotInfo specialDotInfo = CombatMagicWeaponEntity.RootMagicWeaponControl.combatHeroEntity.GetSpecialDotInfo("toupos1");
+            SpecialDotInfo specialDotInfo =
+                CombatMagicWeaponEntity.RootMagicWeaponControl.combatHeroEntity.GetSpecialDotInfo("toupos1");
             return specialDotInfo.GetWorlPos();
         }
 
         protected override void ProMagicUseSkill()
         {
+            TimeLineEventLogicGroupBasic sk1_show = ActivationTimeLineData("sk1_show");
+            sk1_show.TimeLineUpdateEnd = ShowFinish;
             _useCount++;
+        }
+
+        private void ShowFinish()
+        {
             isUpdate = true;
             _currTime = 0;
             float v = SelfSkillConfig.effectValue[0];
@@ -40,7 +46,14 @@ namespace GameLogic.Combat.Skill.MagicSkill
             CombatMagicWeaponEntity.RootMagicWeaponControl.combatHeroEntity.CurrCombatHeroInfo.Water += v;
             CombatMagicWeaponEntity.RootMagicWeaponControl.combatHeroEntity.CurrCombatHeroInfo.Fire += v;
             CombatMagicWeaponEntity.RootMagicWeaponControl.combatHeroEntity.CurrCombatHeroInfo.Earth += v;
-            ActivationTimeLineData("die");
+            CombatMagicWeaponEntity.combatHeroGameObject.SetPosition(GetTargetPos());
+            TimeLineEventLogicGroupBasic sk1 = ActivationTimeLineData("sk1");
+            sk1.TimeLineUpdateEnd = Skill1Finish;
+        }
+
+        private void Skill1Finish()
+        {
+            ActivationTimeLineData("sk1_xiaoshi");
             SkillPlayFinish();
         }
 

Assets/Scripts/GameLogic/Combat/Skill/MagicSkill/S3401.cs

@@ -53,6 +53,8 @@ namespace GameLogic.Combat.Skill.MagicSkill
             moveTime += t * addT;
             Vector3 d = Vector3.Lerp(pos, endPos, moveTime);
             fxAILogicBasic.gameObject.transform.position = d;
+            Quaternion quaternion = Quaternion.LookRotation(dir);
+            fxAILogicBasic.gameObject.transform.rotation = quaternion;
             if (moveTime >= 1)
             {
                 fxAILogicBasic.Dispose();
@@ -78,17 +80,23 @@ namespace GameLogic.Combat.Skill.MagicSkill
         private bool _isUpdae;
         private IUnRegister _unRegister;
 
+        private TimeLineEventLogicGroupBasic _timeLineEventLogicGroupBasic;
+
         protected override void ProMagicUseSkill()
         {
+            _currTime = 0;
+            _isUpdae = false;
             TimeLineEventLogicGroupBasic timeLineEventLogicGroupBasic = ActivationTimeLineData("sk1_xiaoshi");
             timeLineEventLogicGroupBasic.TimeLineUpdateEnd = delegate()
             {
+                Vector3 targetPos = CombatMagicWeaponEntity.RootMagicWeaponControl.combatHeroEntity
+                    .GetSpecialDotInfo("toupos2").GetWorlPos();
                 Transform root = CombatMagicWeaponEntity.RootMagicWeaponControl.combatHeroEntity.GameObject.transform;
-                Vector3 pos = root.TransformPoint(new Vector3(0, 4, 4));
-                Quaternion quaternion = Quaternion.Euler(120, 0, 0);
+                // Vector3 pos = root.TransformPoint(new Vector3(0, 4, 4));
+                Quaternion quaternion = Quaternion.Euler(110, 0, 0);
                 CombatHeroEntity.GameObject.transform.rotation = root.rotation * quaternion;
                 // Vector3 d = root.rotation * _dir;
-                CombatHeroEntity.GameObject.transform.position = pos;
+                CombatHeroEntity.GameObject.transform.position = targetPos;
                 TimeLineEventLogicGroupBasic sk1_show = ActivationTimeLineData("sk1_show");
                 sk1_show.TimeLineUpdateEnd = ShowFinish;
             };
@@ -96,7 +104,7 @@ namespace GameLogic.Combat.Skill.MagicSkill
 
         protected void ShowFinish()
         {
-            ActivationTimeLineData("sk1");
+            _timeLineEventLogicGroupBasic = ActivationTimeLineData("sk1");
             SpecialDotInfo specialDotInfo =
                 CombatMagicWeaponEntity.GetSpecialDotInfo("sk1");
             _unRegister = specialDotInfo.targetTran.gameObject.OnTriggerEnterEvent(this, OnTriggerExitEvent);
@@ -125,6 +133,12 @@ namespace GameLogic.Combat.Skill.MagicSkill
             if (_currTime > effectValue[1])
             {
                 _isUpdae = false;
+                if (_timeLineEventLogicGroupBasic != null)
+                {
+                    _timeLineEventLogicGroupBasic.CloseLoopFx();
+                }
+
+                ActivationTimeLineData("sk1_xiaoshi");
                 SkillPlayFinish();
             }
         }
@@ -133,7 +147,7 @@ namespace GameLogic.Combat.Skill.MagicSkill
         {
             _isUpdae = false;
 
-
+            _currTime = 0;
             _unRegister.UnRegister();
             CombatHeroEntity.CloseLoopFx();
         }