Просмотр исходного кода

fixed digivolution issue, added new LM cards

mbunch_kascope 1 год назад
Родитель
Сommit
00121df95e
44 измененных файлов с 248 добавлено и 2 удалено
  1. 1 1
      Assets/CardBaseEntity/CardEntity_JSONLoader.asset
  2. 3 0
      Assets/CardBaseEntity/LM/Black/Digimon/Cyberdramon-LM-025.asset
  3. 8 0
      Assets/CardBaseEntity/LM/Black/Digimon/Cyberdramon-LM-025.asset.meta
  4. 8 0
      Assets/CardBaseEntity/LM/Black/Option.meta
  5. 3 0
      Assets/CardBaseEntity/LM/Black/Option/Black_Scramble-LM-031.asset
  6. 8 0
      Assets/CardBaseEntity/LM/Black/Option/Black_Scramble-LM-031.asset.meta
  7. 3 0
      Assets/CardBaseEntity/LM/Black/Option/Sepia_Memory_Boost-LM-037.asset
  8. 8 0
      Assets/CardBaseEntity/LM/Black/Option/Sepia_Memory_Boost-LM-037.asset.meta
  9. 3 0
      Assets/CardBaseEntity/LM/Blue/Digimon/Gabumon_-_Bond_of_Friendship-LM-022.asset
  10. 8 0
      Assets/CardBaseEntity/LM/Blue/Digimon/Gabumon_-_Bond_of_Friendship-LM-022.asset.meta
  11. 8 0
      Assets/CardBaseEntity/LM/Blue/Option.meta
  12. 3 0
      Assets/CardBaseEntity/LM/Blue/Option/Blue_Scramble-LM-028.asset
  13. 8 0
      Assets/CardBaseEntity/LM/Blue/Option/Blue_Scramble-LM-028.asset.meta
  14. 3 0
      Assets/CardBaseEntity/LM/Blue/Option/Wisteria_Memory_Boost-LM-034.asset
  15. 8 0
      Assets/CardBaseEntity/LM/Blue/Option/Wisteria_Memory_Boost-LM-034.asset.meta
  16. 3 0
      Assets/CardBaseEntity/LM/Green/Digimon/Shivamon-LM-024.asset
  17. 8 0
      Assets/CardBaseEntity/LM/Green/Digimon/Shivamon-LM-024.asset.meta
  18. 8 0
      Assets/CardBaseEntity/LM/Green/Option.meta
  19. 3 0
      Assets/CardBaseEntity/LM/Green/Option/Green_Scramble-LM-030.asset
  20. 8 0
      Assets/CardBaseEntity/LM/Green/Option/Green_Scramble-LM-030.asset.meta
  21. 3 0
      Assets/CardBaseEntity/LM/Green/Option/Jade_Memory_Boost-LM-036.asset
  22. 8 0
      Assets/CardBaseEntity/LM/Green/Option/Jade_Memory_Boost-LM-036.asset.meta
  23. 3 0
      Assets/CardBaseEntity/LM/Purple/Digimon/Megidramon-LM-026.asset
  24. 8 0
      Assets/CardBaseEntity/LM/Purple/Digimon/Megidramon-LM-026.asset.meta
  25. 8 0
      Assets/CardBaseEntity/LM/Purple/Option.meta
  26. 3 0
      Assets/CardBaseEntity/LM/Purple/Option/Grape_Memory_Boost-LM-038.asset
  27. 8 0
      Assets/CardBaseEntity/LM/Purple/Option/Grape_Memory_Boost-LM-038.asset.meta
  28. 3 0
      Assets/CardBaseEntity/LM/Purple/Option/Purple_Scramble-LM-032.asset
  29. 8 0
      Assets/CardBaseEntity/LM/Purple/Option/Purple_Scramble-LM-032.asset.meta
  30. 3 0
      Assets/CardBaseEntity/LM/Red/Digimon/Agumon_-_Bond_of_Bravery-LM-021.asset
  31. 8 0
      Assets/CardBaseEntity/LM/Red/Digimon/Agumon_-_Bond_of_Bravery-LM-021.asset.meta
  32. 8 0
      Assets/CardBaseEntity/LM/Red/Option.meta
  33. 3 0
      Assets/CardBaseEntity/LM/Red/Option/Garnet_Memory_Boost-LM-033.asset
  34. 8 0
      Assets/CardBaseEntity/LM/Red/Option/Garnet_Memory_Boost-LM-033.asset.meta
  35. 3 0
      Assets/CardBaseEntity/LM/Red/Option/Red_Scramble-LM-027.asset
  36. 8 0
      Assets/CardBaseEntity/LM/Red/Option/Red_Scramble-LM-027.asset.meta
  37. 3 0
      Assets/CardBaseEntity/LM/Yellow/Digimon/Sakuyamon_Maid_Mode-LM-023.asset
  38. 8 0
      Assets/CardBaseEntity/LM/Yellow/Digimon/Sakuyamon_Maid_Mode-LM-023.asset.meta
  39. 8 0
      Assets/CardBaseEntity/LM/Yellow/Option.meta
  40. 3 0
      Assets/CardBaseEntity/LM/Yellow/Option/Amber_Memory_Boost-LM-035.asset
  41. 8 0
      Assets/CardBaseEntity/LM/Yellow/Option/Amber_Memory_Boost-LM-035.asset.meta
  42. 3 0
      Assets/CardBaseEntity/LM/Yellow/Option/Yellow_Scramble-LM-029.asset
  43. 8 0
      Assets/CardBaseEntity/LM/Yellow/Option/Yellow_Scramble-LM-029.asset.meta
  44. 1 1
      Assets/Editor/JSONLoader_CardEntity.cs

+ 1 - 1
Assets/CardBaseEntity/CardEntity_JSONLoader.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fdd657da0e0ecbf0c1c62789804bff127b2fc5a5f03013b37f9b6f617552c076
+oid sha256:3e4c6a6f12e12cc5674166bf867988d4182154452f8f436100a9f573191d2828
 size 477

+ 3 - 0
Assets/CardBaseEntity/LM/Black/Digimon/Cyberdramon-LM-025.asset

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

+ 8 - 0
Assets/CardBaseEntity/LM/Black/Digimon/Cyberdramon-LM-025.asset.meta

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

+ 8 - 0
Assets/CardBaseEntity/LM/Black/Option.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c4704c859075ffd459fa5a4aad02bab0
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 3 - 0
Assets/CardBaseEntity/LM/Black/Option/Black_Scramble-LM-031.asset

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

+ 8 - 0
Assets/CardBaseEntity/LM/Black/Option/Black_Scramble-LM-031.asset.meta

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

+ 3 - 0
Assets/CardBaseEntity/LM/Black/Option/Sepia_Memory_Boost-LM-037.asset

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

+ 8 - 0
Assets/CardBaseEntity/LM/Black/Option/Sepia_Memory_Boost-LM-037.asset.meta

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

+ 3 - 0
Assets/CardBaseEntity/LM/Blue/Digimon/Gabumon_-_Bond_of_Friendship-LM-022.asset

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

+ 8 - 0
Assets/CardBaseEntity/LM/Blue/Digimon/Gabumon_-_Bond_of_Friendship-LM-022.asset.meta

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

+ 8 - 0
Assets/CardBaseEntity/LM/Blue/Option.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 45a7a98aecafa4d4aab8c42115612dd4
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 3 - 0
Assets/CardBaseEntity/LM/Blue/Option/Blue_Scramble-LM-028.asset

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

+ 8 - 0
Assets/CardBaseEntity/LM/Blue/Option/Blue_Scramble-LM-028.asset.meta

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

+ 3 - 0
Assets/CardBaseEntity/LM/Blue/Option/Wisteria_Memory_Boost-LM-034.asset

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

+ 8 - 0
Assets/CardBaseEntity/LM/Blue/Option/Wisteria_Memory_Boost-LM-034.asset.meta

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

+ 3 - 0
Assets/CardBaseEntity/LM/Green/Digimon/Shivamon-LM-024.asset

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

+ 8 - 0
Assets/CardBaseEntity/LM/Green/Digimon/Shivamon-LM-024.asset.meta

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

+ 8 - 0
Assets/CardBaseEntity/LM/Green/Option.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 462cf6c8002a5c1438a55242d597e2a6
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 3 - 0
Assets/CardBaseEntity/LM/Green/Option/Green_Scramble-LM-030.asset

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

+ 8 - 0
Assets/CardBaseEntity/LM/Green/Option/Green_Scramble-LM-030.asset.meta

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

+ 3 - 0
Assets/CardBaseEntity/LM/Green/Option/Jade_Memory_Boost-LM-036.asset

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

+ 8 - 0
Assets/CardBaseEntity/LM/Green/Option/Jade_Memory_Boost-LM-036.asset.meta

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

+ 3 - 0
Assets/CardBaseEntity/LM/Purple/Digimon/Megidramon-LM-026.asset

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

+ 8 - 0
Assets/CardBaseEntity/LM/Purple/Digimon/Megidramon-LM-026.asset.meta

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

+ 8 - 0
Assets/CardBaseEntity/LM/Purple/Option.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 01838da29b7385b439383e08c35d1d57
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 3 - 0
Assets/CardBaseEntity/LM/Purple/Option/Grape_Memory_Boost-LM-038.asset

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

+ 8 - 0
Assets/CardBaseEntity/LM/Purple/Option/Grape_Memory_Boost-LM-038.asset.meta

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

+ 3 - 0
Assets/CardBaseEntity/LM/Purple/Option/Purple_Scramble-LM-032.asset

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

+ 8 - 0
Assets/CardBaseEntity/LM/Purple/Option/Purple_Scramble-LM-032.asset.meta

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

+ 3 - 0
Assets/CardBaseEntity/LM/Red/Digimon/Agumon_-_Bond_of_Bravery-LM-021.asset

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

+ 8 - 0
Assets/CardBaseEntity/LM/Red/Digimon/Agumon_-_Bond_of_Bravery-LM-021.asset.meta

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

+ 8 - 0
Assets/CardBaseEntity/LM/Red/Option.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0777bc2f74cf1c8449e4dc0bab858cac
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 3 - 0
Assets/CardBaseEntity/LM/Red/Option/Garnet_Memory_Boost-LM-033.asset

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

+ 8 - 0
Assets/CardBaseEntity/LM/Red/Option/Garnet_Memory_Boost-LM-033.asset.meta

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

+ 3 - 0
Assets/CardBaseEntity/LM/Red/Option/Red_Scramble-LM-027.asset

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

+ 8 - 0
Assets/CardBaseEntity/LM/Red/Option/Red_Scramble-LM-027.asset.meta

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

+ 3 - 0
Assets/CardBaseEntity/LM/Yellow/Digimon/Sakuyamon_Maid_Mode-LM-023.asset

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

+ 8 - 0
Assets/CardBaseEntity/LM/Yellow/Digimon/Sakuyamon_Maid_Mode-LM-023.asset.meta

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

+ 8 - 0
Assets/CardBaseEntity/LM/Yellow/Option.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d9ec837720133d2469129c9d38fa22d7
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 3 - 0
Assets/CardBaseEntity/LM/Yellow/Option/Amber_Memory_Boost-LM-035.asset

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

+ 8 - 0
Assets/CardBaseEntity/LM/Yellow/Option/Amber_Memory_Boost-LM-035.asset.meta

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

+ 3 - 0
Assets/CardBaseEntity/LM/Yellow/Option/Yellow_Scramble-LM-029.asset

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

+ 8 - 0
Assets/CardBaseEntity/LM/Yellow/Option/Yellow_Scramble-LM-029.asset.meta

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

+ 1 - 1
Assets/Editor/JSONLoader_CardEntity.cs

@@ -309,7 +309,7 @@ namespace DCGO.CardEntities
                         evoCosts.Add(evoCost);
                     }
                 }
-                else if (digivolveCondition.level.ToLower().Contains("lv"))
+                else
                 {
                     EvoCost evoCost = new EvoCost();