Merge branch 'master' into char_list

Browse Source

...

This commit is contained in:

starg09 2021-05-01 04:57:40 +01:00

parent 30fed264c3 1f6d1ed98c

commit 4b60f4ed3b

857 changed files with 3812 additions and 1954 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN

magica/resource/download/asset/master/resource/image_native/card/image/card_10234_c.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 912 KiB After Width:  |  Height:  |  Size: 842 KiB

BIN

magica/resource/download/asset/master/resource/image_native/card/image/card_10235_c.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 720 KiB After Width:  |  Height:  |  Size: 719 KiB

BIN

magica/resource/download/asset/master/resource/image_native/card/image/card_10254_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 889 KiB

BIN

magica/resource/download/asset/master/resource/image_native/card/image/card_10255_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 799 KiB

BIN

magica/resource/download/asset/master/resource/image_native/card/image/card_10394_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 590 KiB

BIN

magica/resource/download/asset/master/resource/image_native/card/image/card_10395_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 546 KiB

BIN

magica/resource/download/asset/master/resource/image_native/card/image/card_30524_c.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 267 KiB After Width:  |  Height:  |  Size: 439 KiB

BIN

magica/resource/download/asset/master/resource/image_native/card/image/card_30524_d.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 9.8 KiB After Width:  |  Height:  |  Size: 10 KiB

BIN

magica/resource/download/asset/master/resource/image_native/card/image/card_30524_f.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 21 KiB After Width:  |  Height:  |  Size: 21 KiB

BIN

magica/resource/download/asset/master/resource/image_native/card/image/card_30524_l.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 144 KiB After Width:  |  Height:  |  Size: 186 KiB

BIN

magica/resource/download/asset/master/resource/image_native/card/image/card_30524_m.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 80 KiB After Width:  |  Height:  |  Size: 78 KiB

BIN

magica/resource/download/asset/master/resource/image_native/card/image/card_30524_s.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 68 KiB After Width:  |  Height:  |  Size: 20 KiB

BIN

magica/resource/download/asset/master/resource/image_native/card/image/card_30524_v.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 131 KiB After Width:  |  Height:  |  Size: 41 KiB

BIN

magica/resource/download/asset/master/resource/image_native/card/image/card_30525_c.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 267 KiB After Width:  |  Height:  |  Size: 434 KiB

BIN

magica/resource/download/asset/master/resource/image_native/card/image/card_30525_d.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 9.5 KiB After Width:  |  Height:  |  Size: 10 KiB

BIN

magica/resource/download/asset/master/resource/image_native/card/image/card_30525_f.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 20 KiB After Width:  |  Height:  |  Size: 22 KiB

BIN

magica/resource/download/asset/master/resource/image_native/card/image/card_30525_l.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 221 KiB After Width:  |  Height:  |  Size: 178 KiB

BIN

magica/resource/download/asset/master/resource/image_native/card/image/card_30525_m.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 76 KiB After Width:  |  Height:  |  Size: 81 KiB

BIN

magica/resource/download/asset/master/resource/image_native/card/image/card_30525_s.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 19 KiB After Width:  |  Height:  |  Size: 19 KiB

BIN

magica/resource/download/asset/master/resource/image_native/card/image/card_30525_v.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 35 KiB After Width:  |  Height:  |  Size: 41 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1158_c.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 191 KiB After Width:  |  Height:  |  Size: 624 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1181_c.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 191 KiB After Width:  |  Height:  |  Size: 611 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1182_c.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 260 KiB After Width:  |  Height:  |  Size: 842 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1259_c.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 165 KiB After Width:  |  Height:  |  Size: 550 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1334_c.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 139 KiB After Width:  |  Height:  |  Size: 474 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1417_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 669 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1420_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 778 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1437_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 955 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1439_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 914 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1441_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 944 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1443_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 796 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1445_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 738 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1449_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 748 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1453_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 673 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1455_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.1 MiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1456_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.2 MiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1457_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 812 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1458_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 766 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1460_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 734 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1462_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 755 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1465_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 685 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1467_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.3 MiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1469_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 833 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1472_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.2 MiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1474_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 679 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1475_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 628 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1476_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.0 MiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1477_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 807 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1478_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 762 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1481_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 899 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1486_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 700 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1489_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 739 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1490_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 666 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1492_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 811 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1494_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 716 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1496_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 767 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1501_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 783 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1504_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 710 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1509_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 882 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1510_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.0 MiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1511_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 831 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1515_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 798 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1516_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 669 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1519_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 740 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1520_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 739 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1521_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 838 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1524_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 826 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1525_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 747 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1526_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 819 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1529_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 933 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1531_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 993 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1534_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 815 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1535_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 823 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1536_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.0 MiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1537_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 585 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1538_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 939 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1541_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 889 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1542_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 867 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1545_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 699 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1548_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 882 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1550_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 673 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1552_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 825 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1555_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 746 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1557_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 718 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1558_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 891 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1559_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 639 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1561_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 640 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1564_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1018 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1566_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 755 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1568_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 758 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1569_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 972 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1571_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 667 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1574_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.0 MiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1575_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.3 MiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1577_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.4 MiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1579_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 407 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1580_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 861 KiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1582_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.3 MiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1583_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.4 MiB

BIN

magica/resource/download/asset/master/resource/image_native/memoria/memoria_1584_c.png Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.1 MiB

Some files were not shown because too many files have changed in this diff Show More