From dc7922d80c1d133b6261b8af1d521567d2c0a35d Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 30 十月 2025 16:51:39 +0800
Subject: [PATCH] Merge branch 'master' of http://mobile.secondworld.net.cn:10010/r/Project_SG_scripts
---
Main/System/Battle/Motion/MotionBase.cs | 498 +++++++++++++++++++++++++++++++-----------------------
1 files changed, 283 insertions(+), 215 deletions(-)
diff --git a/Main/System/Battle/Motion/MotionBase.cs b/Main/System/Battle/Motion/MotionBase.cs
index 99e5e3b..5a29950 100644
--- a/Main/System/Battle/Motion/MotionBase.cs
+++ b/Main/System/Battle/Motion/MotionBase.cs
@@ -1,325 +1,393 @@
using System;
-using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using Spine.Unity;
-using Cysharp.Threading.Tasks;
-/// <summary>
-/// 瑙掕壊鍔ㄧ敾鍩虹被锛屽鐞嗘墍鏈変笌鍔ㄧ敾鐩稿叧鐨勫姛鑳�
-/// </summary>
public class MotionBase
{
- public static float MotionTimeScale = 2f;
-
+ public float MotionTimeScale = 1f;
public static List<string> AttackMotionList = new List<string>
{
- MotionName.attack.ToString(),
- MotionName.angerSkill.ToString(),
- MotionName.passiveSkill.ToString(),
+ MotionName.attack.ToString().ToLower(),
+ MotionName.angerSkill.ToString().ToLower(),
+ MotionName.passiveSkill.ToString().ToLower(),
};
- private Dictionary<Spine.TrackEntry, Action> trackEntryCompleteDict = new Dictionary<Spine.TrackEntry, Action>();
-
- // 鍔ㄧ敾浜嬩欢
+ private Dictionary<Spine.TrackEntry, Action> trackEntryCallbacks = new Dictionary<Spine.TrackEntry, Action>();
public Action OnAttackAnimationComplete;
public Action OnHitAnimationComplete;
- public Action<MotionName> onAnimationComplete;
+ private List<Action> runningActions = new List<Action>();
- #region 缁勪欢寮曠敤
-
- protected SkeletonGraphic skeletonGraphic;
- protected Spine.AnimationState spineAnimationState;
+ public SkeletonAnimation skeletonAnim;
+ protected Spine.AnimationState animState;
protected Spine.Skeleton skeleton;
-
- #endregion
-
- #region 鍔ㄧ敾璁剧疆
-
- // 鍔ㄧ敾娣峰悎鏃堕棿
protected float defaultMixDuration = 0f;
-
- #endregion
+ private Spine.TrackEntry currentTrack;
+ private SkeletonIllusionShadow illusionShadow;
+ private bool playingSkillAnim = false;
- private Spine.TrackEntry currentTrackEntry;
+ private bool isUnderControl = false;
- #region 鍒濆鍖栨柟娉�
+ private float pauseTime = 0f;
- /// <summary>
- /// 鍒濆鍖栧姩鐢荤粍浠�
- /// </summary>
- /// <param name="skeletonGraphic">楠ㄩ鍔ㄧ敾缁勪欢</param>
- public virtual void Init(SkeletonGraphic skeletonGraphic)
+ private float resumeTime = 0f;
+
+ public virtual void Init(SkeletonAnimation skelAnim)
{
- this.skeletonGraphic = skeletonGraphic;
-
- if (skeletonGraphic != null)
+ skeletonAnim = skelAnim;
+ if (skeletonAnim == null)
{
- spineAnimationState = skeletonGraphic.AnimationState;
- spineAnimationState.TimeScale = MotionTimeScale;
- skeletonGraphic.timeScale = MotionTimeScale;
-
- skeleton = skeletonGraphic.Skeleton;
-
- // 璁剧疆鍔ㄧ敾娣峰悎鏃堕棿
- if (spineAnimationState != null)
- {
- spineAnimationState.Data.DefaultMix = defaultMixDuration;
- }
-
- // 鎾斁榛樿鍔ㄧ敾
- PlayAnimation(MotionName.idle, true);
-
- // 璁剧疆鍔ㄧ敾浜嬩欢鐩戝惉
- SetupAnimationHandlers();
+ BattleDebug.LogError("缂哄皯SkeletonGraphic缁勪欢!");
+ return;
}
- else
- {
- Debug.LogError("缂哄皯SkeletonGraphic缁勪欢!");
- }
+
+ animState = skeletonAnim.AnimationState;
+ skeletonAnim.timeScale = MotionTimeScale;
+ skeleton = skeletonAnim.Skeleton;
+
+ if (animState != null)
+ animState.Data.DefaultMix = defaultMixDuration;
+
+ PlayAnimation(MotionName.idle, true);
+ SetupAnimationHandlers();
-
+ if (skelAnim.gameObject != null)
+ illusionShadow = skelAnim.gameObject.AddMissingComponent<SkeletonIllusionShadow>();
}
public virtual void Release()
{
- if (spineAnimationState != null)
+ trackEntryCallbacks.Clear();
+ if (animState != null)
{
- spineAnimationState.Complete -= OnAnimationComplete;
- spineAnimationState.ClearTracks();
- spineAnimationState = null;
+ animState.Complete -= OnAnimationComplete;
+ animState.ClearTracks();
+ animState = null;
}
-
- skeletonGraphic = null;
+ skeletonAnim = null;
skeleton = null;
- currentTrackEntry = null;
+ currentTrack = null;
+ playingSkillAnim = false;
}
- #endregion
-
- #region 鍔ㄧ敾鎺у埗
-
- /// <summary>
- /// 鎾斁鎸囧畾鍔ㄧ敾
- /// </summary>
- /// <param name="motionName">鍔ㄧ敾鏋氫妇</param>
- /// <param name="loop">鏄惁寰幆</param>
- /// <param name="_onComplete">鍔ㄧ敾鎾斁瀹屾垚鍥炶皟</param>
- /// <returns>鍔ㄧ敾杞ㄩ亾鏉＄洰</returns>
- public virtual Spine.TrackEntry PlayAnimation(MotionName motionName, bool loop, Action _onComplete = null)
+ public virtual Spine.TrackEntry PlayAnimation(MotionName motionName, bool loop, Action onComplete = null)
{
- if (spineAnimationState == null) return null;
+ if (playingSkillAnim || animState == null) return null;
- // 濡傛灉褰撳墠鍔ㄧ敾鏈畬鎴�
- if (currentTrackEntry != null && !currentTrackEntry.IsComplete)
+ if (currentTrack != null && !currentTrack.IsComplete && trackEntryCallbacks.TryGetValue(currentTrack, out var prevCallback))
{
- if (trackEntryCompleteDict.TryGetValue(currentTrackEntry, out var __onComplete))
- {
- __onComplete?.Invoke();
- trackEntryCompleteDict.Remove(currentTrackEntry);
- }
- currentTrackEntry = null;
+ trackEntryCallbacks.Remove(currentTrack);
+ prevCallback?.Invoke();
+ currentTrack = null;
}
- // 鐩存帴浣跨敤 ToString() 鑰屼笉鏄皟鐢� GetAnimationName
- currentTrackEntry = spineAnimationState.SetAnimation(0, motionName.ToString(), loop);
+ currentTrack = animState.SetAnimation(0, motionName.ToString(), loop);
+ if (onComplete != null && currentTrack != null)
+ trackEntryCallbacks[currentTrack] = onComplete;
- // 缁戝畾鍥炶皟
- if (_onComplete != null && currentTrackEntry != null)
- {
- trackEntryCompleteDict[currentTrackEntry] = _onComplete;
- }
-
- return currentTrackEntry;
+ return currentTrack;
}
- public Spine.TrackEntry PlaySkillAnimation(SkillConfig skillConfig, Action onComplete = null, Action onBeginPhaseEnd = null, Action onActivePhaseEnd = null)
+ private void AddAction(Action action) => runningActions.Add(action);
+ private void RemoveAction(Action action) => runningActions.Remove(action);
+
+ public Spine.TrackEntry PlaySkillAnimation(SkillConfig skillConfig, SkillBase skillBase, bool isSubSkill, Action onComplete = null)
{
if (skillConfig == null)
{
Debug.LogError("鎶�鑳介厤缃负绌猴紝鏃犳硶鎾斁鎶�鑳藉姩鐢�");
return null;
}
+ if (animState == null || skeleton == null)
+ {
+ Debug.LogError("SkeletonGraphic鎴朅nimationState鏈垵濮嬪寲锛屾棤娉曟挱鏀炬妧鑳藉姩鐢�");
+ return null;
+ }
- return PlayAnimation(skillConfig.SkillMotionName, skillConfig.StartupFrames, skillConfig.ActiveFrames, skillConfig.LoopCount,
- onComplete, onBeginPhaseEnd, onActivePhaseEnd);
+ if (string.IsNullOrEmpty(skillConfig.SkillMotionName))
+ {
+ PlaySkillNoAnim(skillConfig, skillBase, onComplete, isSubSkill);
+ return null;
+ }
+
+ Spine.Animation targetAnim = FindAnim(skillConfig.SkillMotionName);
+ if (targetAnim == null)
+ {
+ skillBase.ForceFinished();
+ return null;
+ }
+
+ return ExecuteSkillAnim(skillConfig, skillBase, onComplete, targetAnim, true, isSubSkill);
}
- public virtual Spine.TrackEntry PlayAnimation(
- string animationName,
- int loopBeginFrame,
- int loopEndFrame,
- int loopTimes,
- Action _onComplete = null,
- Action onBeginPhaseEnd = null, // 鍓嶆憞缁撴潫鍥炶皟
- Action onActivePhaseEnd = null // 涓憞缁撴潫鍥炶皟
- )
+ private Spine.TrackEntry ExecuteSkillAnim(SkillConfig skillConfig, SkillBase skillBase, Action onComplete,
+ Spine.Animation targetAnim, bool hasAnim, bool isSubSkill)
{
- if (spineAnimationState == null || skeleton == null) return null;
+ bool isPangdeSkill = 1003020 == skillConfig.SkillID;
- var anim = skeleton.Data.FindAnimation(animationName);
- if (anim == null) return null;
+ int loopCount = skillConfig.LoopCount;
+ int[] activeFrames = skillConfig.ActiveFrames ?? new int[0];
+ int frameCount = activeFrames.Length;
+ float recoveryFrame = skillConfig.RecoveryFrames;
- float fps = BattleConst.skillMotionFps;
- float beginTime = loopBeginFrame / fps;
- float endTime = loopEndFrame / fps;
-
- currentTrackEntry = spineAnimationState.SetAnimation(0, anim, false);
-
- int curLoop = 0;
- bool finished = false;
- bool beginPhaseTriggered = false;
-
- Spine.Unity.UpdateBonesDelegate updateLocalHandler = null;
- updateLocalHandler = (ISkeletonAnimation animated) =>
+ Spine.TrackEntry skillTrack = null;
+ if (hasAnim)
{
- if (finished) return;
- var entry = currentTrackEntry;
- if (entry == null || entry.Animation != anim)
+ skillTrack = animState.SetAnimation(0, targetAnim, false);
+ currentTrack = skillTrack;
+ }
+
+ playingSkillAnim = true;
+
+ int currentLoop = 0, triggerCount = 0, failCount = 0;
+ bool beginTriggered = false, finalStarted = false, finalEnded = false, middleStarted = false;
+ bool[] triggeredFrames = new bool[frameCount];
+ float startTime = hasAnim ? 0 : Time.time;
+
+ skillBase.OnSkillStart();
+
+ Action frameHandler = null;
+ frameHandler = () =>
+ {
+ if (skillBase.IsFinished())
{
- skeletonGraphic.UpdateLocal -= updateLocalHandler;
+ playingSkillAnim = false;
+ RemoveAction(frameHandler);
return;
}
- // 鍓嶆憞缁撴潫锛堝彧瑙﹀彂涓�娆★級
- if (!beginPhaseTriggered && entry.TrackTime >= beginTime)
+ float trackTime = 0f; //hasAnim ? skillTrack.TrackTime * skillTrack.TimeScale : (Time.time - startTime) * MotionTimeScale;
+
+ if (hasAnim)
{
- beginPhaseTriggered = true;
- onBeginPhaseEnd?.Invoke();
+ trackTime = skillTrack.TrackTime;
+ }
+ else
+ {
+ float adjustedTime = Time.time;
+ if (pauseTime > 0f && resumeTime > pauseTime)
+ {
+ startTime = startTime + (resumeTime - pauseTime);
+ pauseTime = 0f;
+ resumeTime = 0f;
+ }
+ trackTime = (adjustedTime - startTime) * MotionTimeScale;
}
- // 涓憞缁撴潫锛堟瘡娆″埌endTime閮借Е鍙戯級
- if (entry.TrackTime >= endTime)
- {
- onActivePhaseEnd?.Invoke();
+ float currentFrame = trackTime * BattleConst.skillMotionFps;
- curLoop++;
- if (curLoop >= loopTimes)
+ if (hasAnim)
+ {
+ if (currentTrack != skillTrack)
{
- finished = true;
- skeletonGraphic.UpdateLocal -= updateLocalHandler;
- _onComplete?.Invoke();
+ Debug.LogError("鎶�鑳藉姩鐢昏鎵撴柇锛屽己鍒剁粨鏉� " + skillConfig.SkillID);
+ skillBase.ForceFinished();
+ RemoveAction(frameHandler);
+ playingSkillAnim = false;
return;
}
- entry.TrackTime = beginTime;
- beginPhaseTriggered = false; // 閲嶇疆锛屼笅涓�杞墠鎽囧彲鍐嶆瑙﹀彂
+
+ if (skillTrack.TrackTime == 0) failCount++;
+ if (failCount > 100)
+ {
+ Debug.LogError("鎶�鑳藉姩鐢绘挱鏀惧け璐ワ紝寮哄埗缁撴潫 " + skillConfig.SkillID);
+ skillBase.ForceFinished();
+ RemoveAction(frameHandler);
+ playingSkillAnim = false;
+ return;
+ }
+ }
+
+ if (!beginTriggered && currentFrame >= skillConfig.StartupFrames && currentLoop == 0)
+ {
+ beginTriggered = true;
+ skillBase.OnStartSkillFrameEnd();
+ }
+
+ if (!middleStarted && currentFrame >= skillConfig.StartupFrames && currentLoop <= loopCount)
+ {
+ middleStarted = true;
+ skillBase.OnMiddleFrameStart(currentLoop);
+ }
+
+ for (int i = 0; i < frameCount && i < triggeredFrames.Length; i++)
+ {
+ if (!triggeredFrames[i] && currentFrame >= activeFrames[i])
+ {
+ skillBase.OnMiddleFrameEnd(currentLoop, triggerCount++);
+ triggeredFrames[i] = true;
+ }
+ }
+
+ bool allTriggered = Array.TrueForAll(triggeredFrames, x => x);
+
+ if (allTriggered && currentLoop < loopCount)
+ {
+ currentLoop++;
+ Array.Clear(triggeredFrames, 0, frameCount);
+ middleStarted = false;
+
+ if (currentLoop < loopCount)
+ {
+ if (BattleConst.skillMotionFps > 0)
+ {
+ if (hasAnim)
+ skillTrack.TrackTime = skillConfig.StartupFrames / BattleConst.skillMotionFps;
+ else
+ startTime = Time.time - (skillConfig.StartupFrames / BattleConst.skillMotionFps);
+ }
+ beginTriggered = false;
+ }
+ else
+ {
+ finalStarted = false;
+ finalEnded = false;
+ }
+ }
+
+ if (currentLoop >= loopCount)
+ {
+ if (!finalStarted && currentFrame >= recoveryFrame)
+ {
+ finalStarted = true;
+ skillBase.OnFinalFrameStart();
+ }
+ if (finalStarted && !finalEnded && currentFrame >= recoveryFrame)
+ {
+ finalEnded = true;
+ if (!isSubSkill)
+ {
+ playingSkillAnim = false;
+ }
+ RemoveAction(frameHandler);
+ onComplete?.Invoke();
+ skillBase.OnFinalFrameEnd();
+ }
}
};
- skeletonGraphic.UpdateLocal += updateLocalHandler;
- if (_onComplete != null && currentTrackEntry != null)
+ AddAction(frameHandler);
+ return skillTrack;
+ }
+
+ private Spine.Animation FindAnim(string animName)
+ {
+ if (string.IsNullOrEmpty(animName)) return null;
+
+ Spine.Animation targetAnim = skeleton.Data.FindAnimation(animName);
+ if (targetAnim == null && skeleton.Data.Animations != null)
{
- trackEntryCompleteDict[currentTrackEntry] = _onComplete;
+ for (int i = 0; i < skeleton.Data.Animations.Count; i++)
+ {
+ var anim = skeleton.Data.Animations.Items[i];
+ if (anim?.Name != null && anim.Name.ToLower() == animName.ToLower())
+ {
+ targetAnim = anim;
+ break;
+ }
+ }
}
- return currentTrackEntry;
+ if (targetAnim == null)
+ Debug.LogError($"鎵句笉鍒板姩鐢�: {animName}");
+
+ return targetAnim;
}
-
-
- /// <summary>
- /// 璁剧疆鍔ㄧ敾浜嬩欢鐩戝惉
- /// </summary>
+
+ private void PlaySkillNoAnim(SkillConfig skillConfig, SkillBase skillBase, Action onComplete, bool isSubSkill) =>
+ ExecuteSkillAnim(skillConfig, skillBase, onComplete, null, false, isSubSkill);
+
protected virtual void SetupAnimationHandlers()
{
- if (spineAnimationState == null) return;
-
- // 鐩戝惉鍔ㄧ敾瀹屾垚浜嬩欢
- spineAnimationState.Complete += OnAnimationComplete;
+ if (animState != null)
+ animState.Complete += OnAnimationComplete;
}
- /// <summary>
- /// 鍔ㄧ敾瀹屾垚浜嬩欢澶勭悊
- /// </summary>
protected virtual void OnAnimationComplete(Spine.TrackEntry trackEntry)
{
- string animation = trackEntry.Animation.Name;
+ if (trackEntry?.Animation?.Name == null) return;
- // 鏀诲嚮鍔ㄧ敾瀹屾垚鍚庢仮澶嶅埌寰呮満鐘舵��
- if (AttackMotionList.Contains(animation))
+ string animName = trackEntry.Animation.Name.ToLower();
+
+ if (AttackMotionList.Contains(animName))
{
OnAttackAnimationComplete?.Invoke();
PlayAnimation(MotionName.idle, true);
}
- // 鍙椾激鍔ㄧ敾瀹屾垚鍚庢仮澶嶅埌寰呮満鐘舵�� 鍙兘瑙﹀彂澶氭 鍥犱负鏈夊娈垫敾鍑荤殑瀛樺湪
- else if (animation == MotionName.hit.ToString())
+ else if (animName == MotionName.hit.ToString().ToLower())
{
OnHitAnimationComplete?.Invoke();
PlayAnimation(MotionName.idle, true);
}
- onAnimationComplete?.Invoke((MotionName)Enum.Parse(typeof(MotionName), animation));
-
- // 鍙皟鐢ㄦ湰娆rackEntry鐨勫洖璋�
- if (trackEntryCompleteDict.TryGetValue(trackEntry, out var cb))
+
+ if (trackEntryCallbacks.TryGetValue(trackEntry, out var callback))
{
- cb?.Invoke();
- trackEntryCompleteDict.Remove(trackEntry);
+ trackEntryCallbacks.Remove(trackEntry);
+ callback?.Invoke();
}
}
-
- public void Test(string animationName, int beginFrame, int activeFrame, int endFrame, int activeFrameLoopCount)
+ public void SetControledAnimation()
{
- // 瑕佸鐞嗗墠鎽嘼eginFrame 鍚庢憞endFrame 涓憞activeFrame
+ // 鍙楀埌纭帶鐨勬椂鍊欙紝淇濇寔鍙楀嚮鍔ㄧ敾鐨勭涓夊抚锛岀洿鍒版帶鍒剁粨鏉� 鎴栬�呮渶鍚庝竴鍑绘浜★紝绉婚櫎鎺у埗鏁堟灉鍚庯紝鎭㈠鍒板緟鏈虹姸鎬佹垨鑰呮挱鏀炬浜″姩鐢�
+ // 杩欓噷鏄彈鍒扮‖鎺ф椂鍊� 闇�瑕佽〃鐜扮殑鍔ㄧ敾
- // 涓憞鏄湁澶氭鐨刟ctiveFrameLoopCount
+ var entry = PlayAnimation(MotionName.hit, false);
+ float threeFrameTrackTime = 3f / BattleConst.skillMotionFps;
+ entry.TrackTime = threeFrameTrackTime;
+ entry.TimeScale = 0;
- var state = spineAnimationState;
- var anim = skeleton.Data.FindAnimation(animationName);
+ isUnderControl = true;
- // 璁惧畾浣犺寰幆鐨勫尯闂达紙鍗曚綅锛氱锛�
- float loopStart = 0.5f;
- float loopEnd = 1.2f;
-
- // 鎾斁鍔ㄧ敾
- state.SetAnimation(0, anim, true);
- // state.GetCurrent(0).TrackTime = loopStart;
-
- int curFrame = 0;
-
- skeletonGraphic.UpdateLocal += (skeletonAnim) =>
- {
- // if (curFrame == beginFrame)
- // {
- // OnBeginFrame?.Invoke();
- // }
- // else if (curFrame == activeFrame)
- // {
- // OnActiveFrame?.Invoke();
- // }
- // else if (curFrame == endFrame)
- // {
- // OnEndFrame?.Invoke();
- // }
- // var trackEntry = state.GetCurrent(0);
- // if (trackEntry != null && trackEntry.Animation == anim)
- // {
- // if (trackEntry.TrackTime > loopEnd)
- // {
- // // 鍥炲埌loopStart锛屽疄鐜板尯闂村惊鐜�
- // trackEntry.TrackTime = loopStart;
- // }
- // }
- };
}
-
+
+ public void CancelControledAnimation()
+ {
+ // 纭帶缁撴潫锛屾仮澶嶅姩鐢绘挱鏀�
+ isUnderControl = false;
+ PlayAnimation(MotionName.idle, true);
+ }
public virtual void Run()
{
+ for (int i = runningActions.Count - 1; i >= 0; i--)
+ runningActions[i]?.Invoke();
+ illusionShadow?.Run();
}
public virtual void Pause()
{
- spineAnimationState.TimeScale = 0f;
- skeletonGraphic.timeScale = 0f;
+ if (skeletonAnim != null) skeletonAnim.timeScale = 0f;
+ pauseTime = Time.time;
}
public virtual void Resume()
{
- spineAnimationState.TimeScale = MotionTimeScale;
- skeletonGraphic.timeScale = MotionTimeScale;
+ if (skeletonAnim != null) skeletonAnim.timeScale = MotionTimeScale;
+ resumeTime = Time.time;
}
- #endregion
-
+ public void HaveRest()
+ {
+ trackEntryCallbacks.Clear();
+ runningActions.Clear();
+ playingSkillAnim = false;
+ PlayAnimation(MotionName.idle, true);
+ }
+
+ public void SetSpeedRatio(float ratio)
+ {
+ MotionTimeScale = ratio;
+ if (skeletonAnim != null) skeletonAnim.timeScale = ratio;
+ }
+
+ public void ShowIllusionShadow(bool isVisible, Color color = default)
+ {
+ if (illusionShadow != null)
+ {
+ illusionShadow.SetSkeletonAnimation(skeletonAnim);
+ illusionShadow.Show(isVisible, color);
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0