From b125ed00e7e0db3e5851bf535cf19aae46d4cc37 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期五, 23 一月 2026 15:33:27 +0800
Subject: [PATCH] 125 战斗 战报检测+旧代码删除
---
Main/System/Battle/Motion/MotionBase.cs | 40 ++++++++++++++++------------------------
1 files changed, 16 insertions(+), 24 deletions(-)
diff --git a/Main/System/Battle/Motion/MotionBase.cs b/Main/System/Battle/Motion/MotionBase.cs
index 336772a..f7ca6eb 100644
--- a/Main/System/Battle/Motion/MotionBase.cs
+++ b/Main/System/Battle/Motion/MotionBase.cs
@@ -16,7 +16,7 @@
private Dictionary<Spine.TrackEntry, Action> trackEntryCallbacks = new Dictionary<Spine.TrackEntry, Action>();
- private Dictionary<int, SkillBase> skillTrackDict = new Dictionary<int, SkillBase>();
+ // private Dictionary<int, SkillBase> skillTrackDict = new Dictionary<int, SkillBase>();
public Action OnAttackAnimationComplete;
public Action OnHitAnimationComplete;
private List<Action> runningActions = new List<Action>();
@@ -91,7 +91,7 @@
currentTrack = null;
playingSkill = false;
playingSkillWithAnim = false;
- skillTrackDict.Clear();
+ // skillTrackDict.Clear();
}
public virtual Spine.TrackEntry PlayAnimation(MotionName motionName, bool loop, Action onComplete = null)
@@ -227,7 +227,7 @@
if (hasAnim)
{
// 妫�鏌ヨ建閬撴槸鍚﹀凡琚崰鐢紙淇锛氬師鏉ユ鏌� null != skillTrack 姘歌繙涓� false锛�
- if (activeSkillTracks.ContainsKey(trackIndex) || skillTrackDict.ContainsKey(trackIndex))
+ if (activeSkillTracks.ContainsKey(trackIndex) /*|| skillTrackDict.ContainsKey(trackIndex)*/)
{
//绛夊緟涓婁竴鎶�鑳藉姩鐢荤粨鏉� 鏆傛椂澶勭悊鍔炴硶
UniTaskExtension.DelayFrames((GameObject)null, 1, () =>
@@ -254,13 +254,13 @@
return null;
}
- if (skillTrackDict.ContainsKey(trackIndex))
- {
- skillBase.ForceFinished();
- skillTrackDict.Remove(trackIndex);
- }
+ // if (skillTrackDict.ContainsKey(trackIndex))
+ // {
+ // skillBase.ForceFinished();
+ // skillTrackDict.Remove(trackIndex);
+ // }
- skillTrackDict[trackIndex] = skillBase;
+ // skillTrackDict[trackIndex] = skillBase;
// 鍙湁涓绘妧鑳芥墠鏇存柊 currentTrack
if (!isSubSkill)
@@ -290,7 +290,7 @@
{
if (skillBase.IsFinished())
{
- skillTrackDict.Remove(trackIndex);
+ // skillTrackDict.Remove(trackIndex);
// 娓呯悊骞堕��鍑猴紙淇濊瘉鐘舵�佷竴鑷达級
if (skillTrack != null && activeSkillTracks.ContainsKey(trackIndex))
{
@@ -344,8 +344,8 @@
// 妫�鏌ュ綋鍓嶈建閬撴槸鍚﹁鏂版妧鑳借鐩�
if (!activeSkillTracks.ContainsKey(trackIndex) || activeSkillTracks[trackIndex] != skillTrack)
{
- skillTrackDict[trackIndex].ForceFinished();
- skillTrackDict.Remove(trackIndex);
+ // skillTrackDict[trackIndex].ForceFinished();
+ // skillTrackDict.Remove(trackIndex);
Debug.LogError("鎶�鑳藉姩鐢昏鎵撴柇锛屽己鍒剁粨鏉� " + skillConfig.SkillID);
skillBase.ForceFinished();
@@ -486,7 +486,7 @@
playingSkill = false;
}
- skillTrackDict.Remove(trackIndex);
+ // skillTrackDict.Remove(trackIndex);
RemoveAction(frameHandler);
onComplete?.Invoke();
@@ -644,11 +644,7 @@
activeSkillTracks.Clear();
// 寮哄埗缁撴潫鎵�鏈夋鍦ㄦ墽琛岀殑鎶�鑳�
- foreach (var kv in skillTrackDict)
- {
- kv.Value?.ForceFinished();
- }
- skillTrackDict.Clear();
+ // skillTrackDict.Clear();
// 閲嶇疆瀛愭妧鑳借建閬撴睜
if (availableSubTracks == null)
@@ -682,12 +678,8 @@
activeSkillTracks.Clear();
- // 寮哄埗缁撴潫鎵�鏈夋鍦ㄦ墽琛岀殑鎶�鑳斤紙澶嶆椿鏃堕渶瑕佹竻鐞嗘墍鏈夋妧鑳界姸鎬侊級
- foreach (var kv in skillTrackDict)
- {
- kv.Value?.ForceFinished();
- }
- skillTrackDict.Clear();
+ // 澶嶆椿 涓嶈兘娓呯悊姝ｅ湪鎵ц鐨勬妧鑳借建閬� 鏈夊彲鑳芥槸澶嶆椿鑷繁
+ // skillTrackDict.Clear();
// 3. 閲嶇疆瀛愭妧鑳借建閬撴睜
if (availableSubTracks == null)
--
Gitblit v1.8.0