ISkill 添加实际可选取的目标数量；顺序表修复排序和硬直时间重复的问题

Entity/Skill/NormalAttack.cs

@@ -273,6 +273,22 @@ namespace Milimoe.FunGame.Core.Entity
             return selectable;
         }
 
+        /// <summary>
+        /// 实际可选取的目标数量
+        /// </summary>
+        public int RealCanSelectTargetCount(List<Character> enemys, List<Character> teammates)
+        {
+            int count = CanSelectTargetCount;
+            if (SelectAllTeammates)
+            {
+                return teammates.Count + 1;
+            }
+            if (SelectAllEnemies)
+            {
+                return enemys.Count;
+            }
+            return count;
+        }
 
         /// <summary>
         /// 选取普攻目标

Entity/Skill/Skill.cs

@@ -377,6 +377,23 @@ namespace Milimoe.FunGame.Core.Entity
             return selectable;
         }
 
+        /// <summary>
+        /// 实际可选取的目标数量
+        /// </summary>
+        public int RealCanSelectTargetCount(List<Character> enemys, List<Character> teammates)
+        {
+            int count = CanSelectTargetCount;
+            if (SelectAllTeammates)
+            {
+                return teammates.Count + 1;
+            }
+            if (SelectAllEnemies)
+            {
+                return enemys.Count;
+            }
+            return count;
+        }
+
         /// <summary>
         /// 选取技能目标
         /// </summary>

Interface/Entity/Typical/ISkill.cs

@@ -110,5 +110,13 @@ namespace Milimoe.FunGame.Core.Interface.Entity
         /// <param name="teammates"></param>
         /// <returns></returns>
         public List<Character> GetSelectableTargets(Character caster, List<Character> enemys, List<Character> teammates);
+
+        /// <summary>
+        /// 实际可选取的目标数量
+        /// </summary>
+        /// <param name="enemys"></param>
+        /// <param name="teammates"></param>
+        /// <returns></returns>
+        public int RealCanSelectTargetCount(List<Character> enemys, List<Character> teammates);
     }
 }

Model/GamingQueue.cs

@@ -580,19 +580,12 @@ namespace Milimoe.FunGame.Core.Model
         {
             if (_queue.Count == 0) return null;
 
-            // 硬直时间为 0 的角色或预释放爆发技的角色先行动，取第一个
+            // 硬直时间为 0 的角色
-            Character? character = _queue.FirstOrDefault(c => c.CharacterState == CharacterState.PreCastSuperSkill);
+            Character? character = null;
-            if (character is null)
+            Character temp = _queue[0];
+            if (_hardnessTimes[temp] == 0)
             {
-                Character temp = _queue[0];
+                character = temp;
-                if (_hardnessTimes[temp] == 0)
-                {
-                    character = temp;
-                }
-            }
-            else
-            {
-                _hardnessTimes[character] = 0;
             }
 
             if (character != null)
@@ -1282,8 +1275,8 @@ namespace Milimoe.FunGame.Core.Model
                         character.CharacterState == CharacterState.ActionRestricted ||
                         character.CharacterState == CharacterState.BattleRestricted)
                     {
-                        baseTime += 5;
+                        baseTime += 3;
-                        WriteLine($"[ {character} ] {CharacterSet.GetCharacterState(character.CharacterState)}，放弃行动将额外获得 5 {GameplayEquilibriumConstant.InGameTime}硬直时间！");
+                        WriteLine($"[ {character} ] {CharacterSet.GetCharacterState(character.CharacterState)}，放弃行动将额外获得 3 {GameplayEquilibriumConstant.InGameTime}硬直时间！");
                     }
                     decided = true;
                     WriteLine($"[ {character} ] 结束了回合！");
@@ -1305,7 +1298,7 @@ namespace Milimoe.FunGame.Core.Model
                 }
                 else
                 {
-                    if (baseTime == 0) baseTime += 10;
+                    if (baseTime == 0) baseTime += 8;
                     decided = true;
                     WriteLine($"[ {character} ] 完全行动不能！");
                 }
@@ -2228,6 +2221,7 @@ namespace Milimoe.FunGame.Core.Model
                 Skill? skill = item.Skills.Active;
                 if (skill != null)
                 {
+                    skill.GamingQueue = this;
                     List<Character> targets = await SelectTargetsAsync(character, skill, enemys, teammates);
                     if (targets.Count > 0)
                     {