소스 검색

update to deletion during battle

mbunch_kascope 1 년 전
부모
커밋
a0a6d6b980
2개의 변경된 파일7개의 추가작업 그리고 18개의 파일을 삭제
  1. 6 17
      Assets/Scripts/CardController.cs
  2. 1 1
      ProjectSettings/ProjectSettings.asset

+ 6 - 17
Assets/Scripts/CardController.cs

@@ -2775,7 +2775,8 @@ public class DestroyPermanentsClass
             {
                 if (permanent.TopCard != null)
                 {
-                    permanent.IsDestroyedByBattle = true;
+                    if(CardEffectCommons.GetLoserPermanentsFromHashtable(battle.hashtable).Contains(permanent))
+                        permanent.IsDestroyedByBattle = true;
                 }
             }
             #endregion
@@ -3561,23 +3562,11 @@ public class IBattle
                 yield return ContinuousController.instance.StartCoroutine(new DestroyPermanentsClass(LoserPermanents, hashtable).Destroy());
 
                 //Fix winner/loser permanents
-                int index = -1;
-                foreach (Permanent permanent in LoserPermanents)
-                {
-                    if(permanent.TopCard != null)
-                    {
-                        index = LoserPermanents.IndexOf(permanent);
-                    }
-                }
-
-                if(index >= 0)
-                {
-                    LoserPermanents.RemoveAt(index);
-                    _LoserPermanents.RemoveAt(index);
+                LoserPermanents = LoserPermanents.Filter(permanent => permanent.TopCard != null);
+                _LoserPermanents = _LoserPermanents.Filter(permanent => permanent.TopCard != null);
 
-                    hashtable["LoserPermanents"] = _LoserPermanents;
-                    hashtable["LoserPermanents_real"] = LoserPermanents;
-                }
+                hashtable["LoserPermanents"] = _LoserPermanents;
+                hashtable["LoserPermanents_real"] = LoserPermanents;
 
                 #region effect when determine whether to do security check
                 List<SkillInfo> skillInfos_Pierce = AutoProcessing.GetSkillInfos(hashtable, EffectTiming.OnDetermineDoSecurityCheck)

+ 1 - 1
ProjectSettings/ProjectSettings.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bb2ff1f2295ae193f824de1544c8671a968601c0db77f0c08d5a1233c4ddb1fe
+oid sha256:a8a452cc62bc7b2ea873d28fbce8bd33b3696e2f1c436299ff206a3faed79cd1
 size 20167