Преглед на файлове

renaming types, reverted piercing changes

mbunch_kascope преди 1 година
родител
ревизия
59f6a2a663

+ 2 - 2
Assets/CardBaseEntity/BT12/Black/Digimon/エンシェントワイズモン-BT12-071.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:42721b60a45c710689f29a8b68362121f8998e8028037e71086bb46391c8a3b1
-size 2580
+oid sha256:5f3368fdb738a60a08a4ffb1124f91cf11426460f390d44b121b51689a5ca58e
+size 2581

+ 2 - 2
Assets/CardBaseEntity/BT15/Blue/Digimon/Scorpiomon-BT15-027.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:900906da1ecb8328be95b841666b72f7996b78a449dff0a65944411025ccfecc
-size 1852
+oid sha256:844b0fbcb2b7733e8e87da500d56f44637a41c219f38a2e99736110c498fbc1c
+size 1853

+ 2 - 2
Assets/CardBaseEntity/BT7/Black/Digimon/エンシェントボルケーモン-BT7-066.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4cb6d38143ed1550e81bb5b5c0efaa44fcbe0ffc6ea5a73772ba2f0a33e6b5cf
-size 2557
+oid sha256:1e468146a7d8e619003c4a17d33c3d3881446149e5534f69daa1fb3f3d3b9404
+size 2558

+ 2 - 2
Assets/CardBaseEntity/BT7/Green/Digimon/エンシェントビートモン-BT7-054.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e41132589369bc37a97727438a175801baff923dd1f0c4f08212dba2c23aefdd
-size 2511
+oid sha256:7547fc6be272634c00c08287d924ddbd7b77d2826494b706e2a69d3ddc9bea66
+size 2525

+ 2 - 2
Assets/CardBaseEntity/BT7/Green/Digimon/エンシェントビートモン-BT7-054_P1.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a13501cf67c3858150221d350f9bb2a9400e32a43c2a1f292b3e599e7bbb6941
-size 2517
+oid sha256:381372205af4474b8d1aa2e1db39baa9a7c6d6d147e6224d77c22f5035c9006e
+size 2531

+ 2 - 2
Assets/CardBaseEntity/BT8/Blue/Digimon/アノマロカリモン-BT8-027.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f97fecfed87140829bb972e2c38be60233a7d0f8b0c1c88a964c3b5ffadefe4f
-size 1497
+oid sha256:131a7e41d9362f7960325173aea2ec68f42c21ca84bb9281ca72593f3b4c18e3
+size 1228

+ 2 - 2
Assets/Editor/Fixing Scripts/ScriptableObjects/CardEntity_Inconsistency.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ec0a216e53f66396c5929fdb72b9a4826941a511c02f73432d62573c24ac17b4
-size 492
+oid sha256:ca4f8e6076bfa5c76a02676756e8f364c24e7190b13b2029f5bdb021030b52ff
+size 500

+ 2 - 2
Assets/Scripts/AttackProcess.cs

@@ -399,7 +399,7 @@ public class AttackProcess : MonoBehaviourPunCallbacks
                 IBattle battle = new IBattle(AttackingPermanent: AttackingPermanent, DefendingPermanent: DefendingPermanent, null);
                 yield return ContinuousController.instance.StartCoroutine(battle.Battle());
 
-                /*#region effect when determine whether to do security check
+                #region effect when determine whether to do security check
                 Hashtable hashtable = new Hashtable()
                 {
                     {"battle", battle}
@@ -412,7 +412,7 @@ public class AttackProcess : MonoBehaviourPunCallbacks
                 {
                     GManager.instance.autoProcessing.PutStackedSkill(skillInfos_Pierce[0]);
                 }
-                #endregion*/
+                #endregion
                 
                 yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing.TriggeredSkillProcess(true, null));
                 GManager.instance.turnStateMachine.IsSelecting = true;

+ 2 - 2
Assets/Scripts/CardController.cs

@@ -3589,7 +3589,7 @@ public class IBattle
                 }
                 #endregion
 
-                #region effect when determine whether to do security check
+                /*#region effect when determine whether to do security check
                 Hashtable piercingHashtable = new Hashtable()
                 {
                     {"battle", this}
@@ -3602,7 +3602,7 @@ public class IBattle
                 {
                     GManager.instance.autoProcessing.PutStackedSkill(skillInfos_Pierce[0]);
                 }
-                #endregion
+                #endregion*/
             }
         }