Browse Source

fixed issue with AAs not showing in deck list, added new promos

mbunch_kascope 1 năm trước cách đây
mục cha
commit
f9883e232a
38 tập tin đã thay đổi với 202 bổ sung10 xóa
  1. 3 0
      Assets/CardBaseEntity/P/Black/Digimon/Coelamon-P-162.asset
  2. 8 0
      Assets/CardBaseEntity/P/Black/Digimon/Coelamon-P-162.asset.meta
  3. 3 0
      Assets/CardBaseEntity/P/Black/Digimon/Landramon-P-167.asset
  4. 8 0
      Assets/CardBaseEntity/P/Black/Digimon/Landramon-P-167.asset.meta
  5. 3 0
      Assets/CardBaseEntity/P/Black/Digimon/Landramon-P-167_P1.asset
  6. 8 0
      Assets/CardBaseEntity/P/Black/Digimon/Landramon-P-167_P1.asset.meta
  7. 3 0
      Assets/CardBaseEntity/P/Black/Tamer/Close-P-169.asset
  8. 8 0
      Assets/CardBaseEntity/P/Black/Tamer/Close-P-169.asset.meta
  9. 3 0
      Assets/CardBaseEntity/P/Black/Tamer/Close-P-169_P1.asset
  10. 8 0
      Assets/CardBaseEntity/P/Black/Tamer/Close-P-169_P1.asset.meta
  11. 3 0
      Assets/CardBaseEntity/P/Blue/Digimon/Shellmon-P-164.asset
  12. 8 0
      Assets/CardBaseEntity/P/Blue/Digimon/Shellmon-P-164.asset.meta
  13. 3 0
      Assets/CardBaseEntity/P/Blue/Digimon/Shellmon-P-164_P1.asset
  14. 8 0
      Assets/CardBaseEntity/P/Blue/Digimon/Shellmon-P-164_P1.asset.meta
  15. 3 0
      Assets/CardBaseEntity/P/Blue/Option/BishopDevice-P-161.asset
  16. 8 0
      Assets/CardBaseEntity/P/Blue/Option/BishopDevice-P-161.asset.meta
  17. 3 0
      Assets/CardBaseEntity/P/Blue/Tamer/YaoQinglan-P-168.asset
  18. 8 0
      Assets/CardBaseEntity/P/Blue/Tamer/YaoQinglan-P-168.asset.meta
  19. 3 0
      Assets/CardBaseEntity/P/Blue/Tamer/YaoQinglan-P-168_P1.asset
  20. 8 0
      Assets/CardBaseEntity/P/Blue/Tamer/YaoQinglan-P-168_P1.asset.meta
  21. 3 0
      Assets/CardBaseEntity/P/Green/Digimon/Dokugumon-P-163.asset
  22. 8 0
      Assets/CardBaseEntity/P/Green/Digimon/Dokugumon-P-163.asset.meta
  23. 3 0
      Assets/CardBaseEntity/P/Green/Digimon/Galemon-P-166.asset
  24. 8 0
      Assets/CardBaseEntity/P/Green/Digimon/Galemon-P-166.asset.meta
  25. 3 0
      Assets/CardBaseEntity/P/Green/Digimon/Galemon-P-166_P1.asset
  26. 8 0
      Assets/CardBaseEntity/P/Green/Digimon/Galemon-P-166_P1.asset.meta
  27. 3 0
      Assets/CardBaseEntity/P/Red/Digimon/Tyrannomon(XAntibody)-P-160.asset
  28. 8 0
      Assets/CardBaseEntity/P/Red/Digimon/Tyrannomon(XAntibody)-P-160.asset.meta
  29. 3 0
      Assets/CardBaseEntity/P/Yellow/Digimon/ShoeShoemon-P-165.asset
  30. 8 0
      Assets/CardBaseEntity/P/Yellow/Digimon/ShoeShoemon-P-165.asset.meta
  31. 3 0
      Assets/CardBaseEntity/P/Yellow/Digimon/ShoeShoemon-P-165_P1.asset
  32. 8 0
      Assets/CardBaseEntity/P/Yellow/Digimon/ShoeShoemon-P-165_P1.asset.meta
  33. 1 1
      Assets/CardEffect/EX5/White/XAntibodyProtoForm_EX5_070.cs
  34. 0 0
      Assets/CardEffect/EX5/White/XAntibodyProtoForm_EX5_070.cs.meta
  35. 8 0
      Assets/Editor/AttachCardData.cs
  36. 9 4
      Assets/Scripts/ContinuousController.cs
  37. 1 1
      Assets/Scripts/DeckData.cs
  38. 7 4
      Assets/Scripts/EditDeck.cs

+ 3 - 0
Assets/CardBaseEntity/P/Black/Digimon/Coelamon-P-162.asset

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c8d8ce4d01961d590a21d46d14108eac56a1b715e5f433dd52586e752657181c
+size 1266

+ 8 - 0
Assets/CardBaseEntity/P/Black/Digimon/Coelamon-P-162.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4d7b2ee9815a66844bc944c11719aefa
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 3 - 0
Assets/CardBaseEntity/P/Black/Digimon/Landramon-P-167.asset

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d71a6364ce26e2f33c5af48aa21e2748f655c456335902089095f8cf5c840fe9
+size 1583

+ 8 - 0
Assets/CardBaseEntity/P/Black/Digimon/Landramon-P-167.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5de692fe6cefec5458fc3b77060c8617
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 3 - 0
Assets/CardBaseEntity/P/Black/Digimon/Landramon-P-167_P1.asset

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9f09210b3e77001c75ba3ee0dca3c7d777a46b0f3e0661c51d9bf284e34d4a23
+size 1589

+ 8 - 0
Assets/CardBaseEntity/P/Black/Digimon/Landramon-P-167_P1.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: eb093c4dfbb266b4da717f286820a417
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 3 - 0
Assets/CardBaseEntity/P/Black/Tamer/Close-P-169.asset

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0935fe18c5bcc9b14423f7154ddb3d4cfc52e491c8cfae11a0b317f3738f7dc0
+size 1372

+ 8 - 0
Assets/CardBaseEntity/P/Black/Tamer/Close-P-169.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c93d75cd57872004a98932c3ea34074b
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 3 - 0
Assets/CardBaseEntity/P/Black/Tamer/Close-P-169_P1.asset

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:93106bf7d79b80a4225cc3bf3342257daedcc1b5b1046353abf5c0bdca792842
+size 1378

+ 8 - 0
Assets/CardBaseEntity/P/Black/Tamer/Close-P-169_P1.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c4e68b7b096c7dc419497f3f672df41d
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 3 - 0
Assets/CardBaseEntity/P/Blue/Digimon/Shellmon-P-164.asset

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:69b9158a54a1a6b310e30edd2d320df9e1a3469b8ce0a46592d5e22db37f5a3d
+size 1363

+ 8 - 0
Assets/CardBaseEntity/P/Blue/Digimon/Shellmon-P-164.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 561b2b21b02850e408f8e7ee13a32989
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 3 - 0
Assets/CardBaseEntity/P/Blue/Digimon/Shellmon-P-164_P1.asset

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:386ef9d9e1e65c3b7dbfc83c313e08694c05c204bf90a81457bce17178029b69
+size 1369

+ 8 - 0
Assets/CardBaseEntity/P/Blue/Digimon/Shellmon-P-164_P1.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 52a69bb6bebdf794db4088e4e5a42aad
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 3 - 0
Assets/CardBaseEntity/P/Blue/Option/BishopDevice-P-161.asset

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:60ce34a002b59cfb3ea4e00bff68a9aede7945c663bcf8d2e04f861c50236a72
+size 1566

+ 8 - 0
Assets/CardBaseEntity/P/Blue/Option/BishopDevice-P-161.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ef8db92e0c171874899fd8cabe40274d
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 3 - 0
Assets/CardBaseEntity/P/Blue/Tamer/YaoQinglan-P-168.asset

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:286b775c2870fe03b8a642789ab450c4400dd4ebe1e7a66244cd0e71ffeaf633
+size 1456

+ 8 - 0
Assets/CardBaseEntity/P/Blue/Tamer/YaoQinglan-P-168.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d1071e27bd0c917409ee44119e58373d
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 3 - 0
Assets/CardBaseEntity/P/Blue/Tamer/YaoQinglan-P-168_P1.asset

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5696d758069a28f629cf3d770c591e9f9a80567db9d4d883e7d55d0f72ea3083
+size 1462

+ 8 - 0
Assets/CardBaseEntity/P/Blue/Tamer/YaoQinglan-P-168_P1.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4146a571bf8fdfe408e0247fe65d4621
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 3 - 0
Assets/CardBaseEntity/P/Green/Digimon/Dokugumon-P-163.asset

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a2ff3d22ff0aae219de5689271d0f2b2a572cb324d157fafd47f501bf0a5dd01
+size 1132

+ 8 - 0
Assets/CardBaseEntity/P/Green/Digimon/Dokugumon-P-163.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d4c248831dee7554ea6ac3bfef30c6e6
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 3 - 0
Assets/CardBaseEntity/P/Green/Digimon/Galemon-P-166.asset

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:04cf52b3d69553f6f0f8aa3b6f984a3517399d6c1edfabed00f6ac1be2d027e1
+size 1377

+ 8 - 0
Assets/CardBaseEntity/P/Green/Digimon/Galemon-P-166.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9db30a7fc40199b4ca63f8bc286c5fa7
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 3 - 0
Assets/CardBaseEntity/P/Green/Digimon/Galemon-P-166_P1.asset

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3dcd3b0ee1b15596162c5ed32adeefd75a835a34af6e3ac90adc9e3f0719defe
+size 1383

+ 8 - 0
Assets/CardBaseEntity/P/Green/Digimon/Galemon-P-166_P1.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 39c48bd50e653c54182b1a5569964d86
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 3 - 0
Assets/CardBaseEntity/P/Red/Digimon/Tyrannomon(XAntibody)-P-160.asset

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:abd4fa655c39d38a99778649749cd73caa4f32c43c686a89d433ca53d6f4a3dd
+size 1558

+ 8 - 0
Assets/CardBaseEntity/P/Red/Digimon/Tyrannomon(XAntibody)-P-160.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0241b2ebbbfcf334391be37272f76f2d
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 3 - 0
Assets/CardBaseEntity/P/Yellow/Digimon/ShoeShoemon-P-165.asset

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3140525e7324f8e71610b07e833f893f7d6a00fbea4246a49f0d22041e2f3cb1
+size 1391

+ 8 - 0
Assets/CardBaseEntity/P/Yellow/Digimon/ShoeShoemon-P-165.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0169efddeb70e08469448712a87d6b58
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 3 - 0
Assets/CardBaseEntity/P/Yellow/Digimon/ShoeShoemon-P-165_P1.asset

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9f6cc9e6454dacc57ce21a8ac8c2b2f463428aa9f1a9a2400d823f76e315b481
+size 1397

+ 8 - 0
Assets/CardBaseEntity/P/Yellow/Digimon/ShoeShoemon-P-165_P1.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f6d0e2f0c4f87254ba85c539f1974021
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 1 - 1
Assets/CardEffect/EX5/White/XAntibodyPF_EX5_070.cs → Assets/CardEffect/EX5/White/XAntibodyProtoForm_EX5_070.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using Photon;
 using System;
 using Photon.Pun;
-public class XAntibodyPF_EX5_070 : CEntity_Effect
+public class XAntibodyProtoForm_EX5_070 : CEntity_Effect
 {
     public override List<ICardEffect> CardEffects(EffectTiming timing, CardSource card)
     {

+ 0 - 0
Assets/CardEffect/EX5/White/XAntibodyPF_EX5_070.cs.meta → Assets/CardEffect/EX5/White/XAntibodyProtoForm_EX5_070.cs.meta


+ 8 - 0
Assets/Editor/AttachCardData.cs

@@ -13,6 +13,7 @@ public class AttachCardData : MonoBehaviour
         List<CEntity_Base> List = GetAsset.LoadAll<CEntity_Base>("Assets/CardBaseEntity/");
 
         List<string> UnimplementedCardSpriteNames = new List<string>() { "P-147" };
+        List<string> DebugCardSpriteNames = new List<string>() { "EX5-070_P1" };
 
         foreach (GameObject obj in Selection.gameObjects)
         {
@@ -33,11 +34,18 @@ public class AttachCardData : MonoBehaviour
                         continue;
                     }
 
+                    
+
                     if (String.IsNullOrEmpty(cEntity_Base.CardSpriteName))
                     {
                         continue;
                     }
 
+                    if (DebugCardSpriteNames.Contains(cEntity_Base.CardSpriteName))
+                    {
+                        Debug.Log(cEntity_Base.CardID);
+                    }
+
                     cEntity_Bases.Add(cEntity_Base);
                 }
 

+ 9 - 4
Assets/Scripts/ContinuousController.cs

@@ -866,10 +866,15 @@ public class ContinuousController : MonoBehaviour
     #region カードIndexからカードを取得
     public CEntity_Base getCardEntityByCardID(int cardIndex)
     {
-        int searchIndex = cardIndex - 1;
-        int count = 0;
+        //int searchIndex = cardIndex - 1;
+        //int count = 0;
 
-        do
+        CEntity_Base cEntity_Base = SortedCardList.First(entity => entity.CardIndex == cardIndex);
+
+        return cEntity_Base;
+
+        //TODO: REMOVE IN FUTURE
+        /*do
         {
             if (count != 0)
             {
@@ -920,7 +925,7 @@ public class ContinuousController : MonoBehaviour
 
         while (count <= 20);
 
-        return null;
+        return null;*/
     }
     #endregion
 

+ 1 - 1
Assets/Scripts/DeckData.cs

@@ -218,6 +218,7 @@ public class DeckData
 
         if (DeckCardIDs != null)
         {
+            Debug.Log(DeckCardIDs.Count);
             foreach (int DeckCardID in DeckCardIDs)
             {
                 CEntity_Base cEntity_Base = ContinuousController.instance.getCardEntityByCardID(DeckCardID);
@@ -360,7 +361,6 @@ public class DeckData
         List<CEntity_Base> _DeckCards = DeckCards();
 
         _DeckCards.Add(cEntity_Base);
-
         _DeckCards = SortedDeckCardsList(_DeckCards);
 
         DeckCardIDs = GetDeckCardCodes(_DeckCards);

+ 7 - 4
Assets/Scripts/EditDeck.cs

@@ -1034,14 +1034,14 @@ public class EditDeck : MonoBehaviour
                 cardPrefab_CreateDeck.OffAddRemoveButton();
             }
         }
-
+        Debug.Log($"CARD TO ADD: {_cardPrefab_CreateDeck.cEntity_Base}");
         yield return StartCoroutine(AddDeckCards(_cardPrefab_CreateDeck.cEntity_Base));
 
         List<CEntity_Base> DeckCards = new List<CEntity_Base>();
 
         foreach (CEntity_Base cEntity_Base in EdittingDeckData.AllDeckCards())
         {
-            Debug.Log($"ADD: {cEntity_Base.CardIndex} || {cEntity_Base.CardID}");
+            //Debug.Log($"ADD: {cEntity_Base.CardIndex} || {cEntity_Base.CardID}");
             DeckCards.Add(cEntity_Base);
         }
         Debug.Log($"ADDED EDITTING DECK DATA ENTITIES TO DECK CARDS LIST: {DeckCards.Count} || {DeckCards.IndexOf(_cardPrefab_CreateDeck.cEntity_Base)}  || {DeckCards.Count((cEntity_Base) => cEntity_Base == _cardPrefab_CreateDeck.cEntity_Base)}");
@@ -1183,16 +1183,19 @@ public class EditDeck : MonoBehaviour
     #region add cards to deck
     public IEnumerator AddDeckCards(CEntity_Base cEntity_Base)
     {
+        Debug.Log($"ADD DECK CARD: {cEntity_Base.CardID}: {DeckBuildingRule.CanAddCard(cEntity_Base, EdittingDeckData)}");
         if (!DeckBuildingRule.CanAddCard(cEntity_Base, EdittingDeckData))
         {
             yield break;
         }
-
+        Debug.Log($"ADD DECK CARD: {EdittingDeckData.DeckCardIDs.Count}");
         EdittingDeckData.AddCard(cEntity_Base);
 
+        Debug.Log($"ADD DECK CARD: {EdittingDeckData.DeckCardIDs.Count}");
+        Debug.Log($"ADD DECK CARD: {EdittingDeckData.DeckCards().Count}");
         EdittingDeckData.DeckCardIDs = DeckData.GetDeckCardCodes(DeckData.SortedDeckCardsList(EdittingDeckData.DeckCards()));
         EdittingDeckData.DigitamaDeckCardIDs = DeckData.GetDeckCardCodes(DeckData.SortedDeckCardsList(EdittingDeckData.DigitamaDeckCards()));
-
+        
         ReflectDeckData();
         cardDistribution.SetCardDistribution(EdittingDeckData);
     }