mapaler
/
PADDashFormation
Not watched
1
0
Fork 0
Code
Releases 163 Wiki evaluate Activity
Issues 0 Pull Requests 0 Datasets Model Cloudbrain HPC
Browse Source

Merge branch 'master' into skillParser 

# Conflicts:
#	monsters-info/ckey.json
tags/v19.0
枫谷剑仙 5 years ago
parent
8e6eff4f07 9054d01fdb
commit
d7ad433f20
26 changed files with 15 additions and 15 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      images/cards_en/CARDS_068.PNG
  2. BIN
      images/cards_en/CARDS_069.PNG
  3. BIN
      images/cards_en/CARDS_071.PNG
  4. BIN
      images/cards_ja/CARDS_071.PNG
  5. BIN
      images/cards_ja/CARDS_072.PNG
  6. BIN
      images/cards_ko/CARDS_068.PNG
  7. BIN
      images/cards_ko/CARDS_069.PNG
  8. BIN
      images/cards_ko/CARDS_071.PNG
  9. +1
    -1
      monsters-info/ckey.json
  10. +1
    -1
      monsters-info/custom/chs.json
  11. +1
    -1
      monsters-info/custom/cht.json
  12. +1
    -1
      monsters-info/mon_en.json
  13. +1
    -1
      monsters-info/mon_ja.json
  14. +1
    -1
      monsters-info/mon_ko.json
  15. +1
    -1
      monsters-info/official-API/en-card.json
  16. +1
    -1
      monsters-info/official-API/en-skill.json
  17. +1
    -1
      monsters-info/official-API/ja-card.json
  18. +1
    -1
      monsters-info/official-API/ja-skill.json
  19. +1
    -1
      monsters-info/official-API/ko-card.json
  20. +1
    -1
      monsters-info/official-API/ko-skill.json
  21. +1
    -1
      monsters-info/skill_en.json
  22. +1
    -1
      monsters-info/skill_ja.json
  23. +1
    -1
      monsters-info/skill_ko.json
  24. BIN
      sound/voice/ja/padv282.wav
  25. BIN
      sound/voice/ja/padv283.wav
  26. BIN
      sound/voice/ja/padv284.wav

BIN
images/cards_en/CARDS_068.PNG View File

Before After
Width: 1024  |  Height: 1024  |  Size: 682 kB Width: 1024  |  Height: 1024  |  Size: 720 kB

BIN
images/cards_en/CARDS_069.PNG View File

Before After
Width: 1024  |  Height: 1024  |  Size: 485 kB Width: 1024  |  Height: 1024  |  Size: 529 kB

BIN
images/cards_en/CARDS_071.PNG View File

Before After
Width: 1024  |  Height: 1024  |  Size: 31 kB

BIN
images/cards_ja/CARDS_071.PNG View File

Before After
Width: 1024  |  Height: 1024  |  Size: 760 kB Width: 1024  |  Height: 1024  |  Size: 810 kB

BIN
images/cards_ja/CARDS_072.PNG View File

Before After
Width: 1024  |  Height: 1024  |  Size: 101 kB

BIN
images/cards_ko/CARDS_068.PNG View File

Before After
Width: 1024  |  Height: 1024  |  Size: 682 kB Width: 1024  |  Height: 1024  |  Size: 720 kB

BIN
images/cards_ko/CARDS_069.PNG View File

Before After
Width: 1024  |  Height: 1024  |  Size: 485 kB Width: 1024  |  Height: 1024  |  Size: 529 kB

BIN
images/cards_ko/CARDS_071.PNG View File

Before After
Width: 1024  |  Height: 1024  |  Size: 31 kB

+ 1
- 1
monsters-info/ckey.json View File

@@ -1 +1 @@
[{"code":"ja","ckey":{"card":"28e0ffdae722c11b378f802caabefc0e","skill":"614df68ca015f37452d64a85708e26d1"},"updateTime":1616153089310},{"code":"en","ckey":{"card":"1eec12ff3f829f4c9ce71ccb1a6d3f54","skill":"f1674ef0fcaba5f1ff36b034abbc2a9d"},"updateTime":1616059757458},{"code":"ko","ckey":{"card":"0175f46be7abfeca3df156545ec49018","skill":"a881d3f3d7f5aee6be4855b444f87117"},"updateTime":1616059757458}]
[{"code":"ja","ckey":{"card":"bb6f3e6c6a3d16b4803cde98d69942c3","skill":"f1a5fcfc55bd450ddac0ebab81e00830"},"updateTime":1616595572486},{"code":"en","ckey":{"card":"4bf8ff961d602073d8997362c6b97de8","skill":"3b0f8ca7a9c84d0c71a84a9da71a9ee7"},"updateTime":1616581350642},{"code":"ko","ckey":{"card":"5cd2809bf948e3f809c0148fbba35148","skill":"1f35542f1c5ecc31436b044a13681ddd"},"updateTime":1616581350642}]

+ 1
- 1
monsters-info/custom/chs.json
File diff suppressed because it is too large
View File


+ 1
- 1
monsters-info/custom/cht.json
File diff suppressed because it is too large
View File


+ 1
- 1
monsters-info/mon_en.json
File diff suppressed because it is too large
View File


+ 1
- 1
monsters-info/mon_ja.json
File diff suppressed because it is too large
View File


+ 1
- 1
monsters-info/mon_ko.json
File diff suppressed because it is too large
View File


+ 1
- 1
monsters-info/official-API/en-card.json
File diff suppressed because it is too large
View File


+ 1
- 1
monsters-info/official-API/en-skill.json
File diff suppressed because it is too large
View File


+ 1
- 1
monsters-info/official-API/ja-card.json
File diff suppressed because it is too large
View File


+ 1
- 1
monsters-info/official-API/ja-skill.json
File diff suppressed because it is too large
View File


+ 1
- 1
monsters-info/official-API/ko-card.json
File diff suppressed because it is too large
View File


+ 1
- 1
monsters-info/official-API/ko-skill.json
File diff suppressed because it is too large
View File


+ 1
- 1
monsters-info/skill_en.json
File diff suppressed because it is too large
View File


+ 1
- 1
monsters-info/skill_ja.json
File diff suppressed because it is too large
View File


+ 1
- 1
monsters-info/skill_ko.json
File diff suppressed because it is too large
View File


BIN
sound/voice/ja/padv282.wav View File


BIN
sound/voice/ja/padv283.wav View File


BIN
sound/voice/ja/padv284.wav View File


Write Preview
Loading…
Cancel
Save