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

tags/v19.0
枫谷剑仙 5 years ago
parent
9370eb1c58 58e1d4d4f7
commit
39ac76f1db
38 changed files with 29 additions and 16 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      images/awoken.png
  2. BIN
      images/cards_en/CARDS_062.PNG
  3. BIN
      images/cards_en/CARDS_066.PNG
  4. BIN
      images/cards_en/CARDS_067.PNG
  5. BIN
      images/cards_en/CARDS_068.PNG
  6. BIN
      images/cards_en/CARDS_069.PNG
  7. BIN
      images/cards_ja/CARDS_057.PNG
  8. BIN
      images/cards_ja/CARDS_068.PNG
  9. BIN
      images/cards_ja/CARDS_069.PNG
  10. BIN
      images/cards_ja/CARDS_070.PNG
  11. BIN
      images/cards_ko/CARDS_062.PNG
  12. BIN
      images/cards_ko/CARDS_066.PNG
  13. BIN
      images/cards_ko/CARDS_067.PNG
  14. BIN
      images/cards_ko/CARDS_068.PNG
  15. BIN
      images/cards_ko/CARDS_069.PNG
  16. BIN
      images/project file/awoken.fw.png
  17. +1
    -1
      monsters-info/ckey.json
  18. +1
    -1
      monsters-info/custom/chs.json
  19. +1
    -1
      monsters-info/custom/cht.json
  20. +1
    -1
      monsters-info/mon_en.json
  21. +1
    -1
      monsters-info/mon_ja.json
  22. +1
    -1
      monsters-info/mon_ko.json
  23. +1
    -1
      monsters-info/official-API/en-card.json
  24. +1
    -1
      monsters-info/official-API/en-skill.json
  25. +1
    -1
      monsters-info/official-API/ja-card.json
  26. +1
    -1
      monsters-info/official-API/ja-skill.json
  27. +1
    -1
      monsters-info/official-API/ko-card.json
  28. +1
    -1
      monsters-info/official-API/ko-skill.json
  29. +1
    -1
      monsters-info/skill_en.json
  30. +1
    -1
      monsters-info/skill_ja.json
  31. +1
    -1
      monsters-info/skill_ko.json
  32. +2
    -0
      multi.html
  33. +1
    -1
      script-json_data.js
  34. +3
    -0
      solo.html
  35. BIN
      sound/voice/ja/padv270.wav
  36. BIN
      sound/voice/ja/padv271.wav
  37. +3
    -0
      style-monsterimages.css
  38. +5
    -0
      triple.html

BIN
images/awoken.png View File

Before After
Width: 96  |  Height: 2496  |  Size: 157 kB Width: 96  |  Height: 2528  |  Size: 160 kB

BIN
images/cards_en/CARDS_062.PNG View File

Before After
Width: 1024  |  Height: 1024  |  Size: 944 kB Width: 1024  |  Height: 1024  |  Size: 972 kB

BIN
images/cards_en/CARDS_066.PNG View File

Before After
Width: 1024  |  Height: 1024  |  Size: 424 kB Width: 1024  |  Height: 1024  |  Size: 443 kB

BIN
images/cards_en/CARDS_067.PNG View File

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

BIN
images/cards_en/CARDS_068.PNG View File

Before After
Width: 1024  |  Height: 1024  |  Size: 279 kB Width: 1024  |  Height: 1024  |  Size: 440 kB

BIN
images/cards_en/CARDS_069.PNG View File

Before After
Width: 1024  |  Height: 1024  |  Size: 115 kB Width: 1024  |  Height: 1024  |  Size: 229 kB

BIN
images/cards_ja/CARDS_057.PNG View File

Before After
Width: 1024  |  Height: 1024  |  Size: 923 kB Width: 1024  |  Height: 1024  |  Size: 934 kB

BIN
images/cards_ja/CARDS_068.PNG View File

Before After
Width: 1024  |  Height: 1024  |  Size: 722 kB Width: 1024  |  Height: 1024  |  Size: 732 kB

BIN
images/cards_ja/CARDS_069.PNG View File

Before After
Width: 1024  |  Height: 1024  |  Size: 806 kB Width: 1024  |  Height: 1024  |  Size: 963 kB

BIN
images/cards_ja/CARDS_070.PNG View File

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

BIN
images/cards_ko/CARDS_062.PNG View File

Before After
Width: 1024  |  Height: 1024  |  Size: 944 kB Width: 1024  |  Height: 1024  |  Size: 972 kB

BIN
images/cards_ko/CARDS_066.PNG View File

Before After
Width: 1024  |  Height: 1024  |  Size: 452 kB Width: 1024  |  Height: 1024  |  Size: 471 kB

BIN
images/cards_ko/CARDS_067.PNG View File

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

BIN
images/cards_ko/CARDS_068.PNG View File

Before After
Width: 1024  |  Height: 1024  |  Size: 279 kB Width: 1024  |  Height: 1024  |  Size: 440 kB

BIN
images/cards_ko/CARDS_069.PNG View File

Before After
Width: 1024  |  Height: 1024  |  Size: 115 kB Width: 1024  |  Height: 1024  |  Size: 229 kB

BIN
images/project file/awoken.fw.png View File

Before After
Width: 96  |  Height: 2496  |  Size: 378 kB Width: 96  |  Height: 2528  |  Size: 383 kB

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

@@ -1 +1 @@
[{"code":"ja","ckey":{"card":"9771c4cc3d8ed6bb51c16f1bd77b33b6","skill":"585d847150ee756754369f18c8701b9b"},"updateTime":1610337963136},{"code":"en","ckey":{"card":"64f597728a1ae89789444a7d4786c503","skill":"c0bbc019e90ab5c4d21b696c790067b4"},"updateTime":1608891418581},{"code":"ko","ckey":{"card":"f471edb01c0315d066830d4a835e35db","skill":"4f9460edf6e1a7fa1ddfa27ab009aea3"},"updateTime":1608891418581}]
[{"code":"ja","ckey":{"card":"3339acf8fb2591c551640850dc4bcb7b","skill":"c49fd4b9f4876aeef07d6742f663c30a"},"updateTime":1611417064917},{"code":"en","ckey":{"card":"ae4a2e963f2d62835616dbf7cbfa8444","skill":"9d01347d2bea0dab6a38f0e3e5efc6c9"},"updateTime":1611341699784},{"code":"ko","ckey":{"card":"f50a7a9f7c3b1a5a2c205b746b7f2862","skill":"68010643d35280452d379dce743bdcdc"},"updateTime":1611341699784}]

+ 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


+ 2
- 0
multi.html View File

@@ -645,6 +645,7 @@ var formation = new Formation(teamsCount,5);
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="75"></button><!--2串木--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="76"></button><!--2串光--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="77"></button><!--2串暗--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="78"></button><!--十字--></li>
</ul>
</div>
<div class="sawoken-div"><!--超觉醒-->
@@ -727,6 +728,7 @@ var formation = new Formation(teamsCount,5);
<li class="awoken-count"><input type="checkbox" class="sawoken-check" name="types" value="75" id="search-awoken-75" /><label class="awoken-icon" data-awoken-icon="75" for="search-awoken-75"></label><!--2串木--></li>
<li class="awoken-count"><input type="checkbox" class="sawoken-check" name="types" value="76" id="search-awoken-76" /><label class="awoken-icon" data-awoken-icon="76" for="search-awoken-76"></label><!--2串光--></li>
<li class="awoken-count"><input type="checkbox" class="sawoken-check" name="types" value="77" id="search-awoken-77" /><label class="awoken-icon" data-awoken-icon="77" for="search-awoken-77"></label><!--2串暗--></li>
<li class="awoken-count"><input type="checkbox" class="sawoken-check" name="types" value="78" id="search-awoken-78" /><label class="awoken-icon" data-awoken-icon="78" for="search-awoken-78"></label><!--十字--></li>
</ul>
</div>
<div class="control-div"><!--控制栏-->


+ 1
- 1
script-json_data.js View File

@@ -49,7 +49,7 @@ const equivalent_awoken = [
{small:21,big:56,times:2}, //SB
];
//官方的觉醒排列顺序
const official_awoken_sorting = [21,19,43,45,10,11,12,13,49,56,53,61,50,52,68,69,70,28,27,48,62,57,58,60,59,54,55,14,15,16,17,18,29,20,44,51,22,23,24,25,26,32,31,33,34,4,5,6,7,8,35,36,37,38,1,2,3,46,47,39,40,41,42,65,66,67,9,71,72,30,64,63,73,74,75,76,77];
const official_awoken_sorting = [21,19,43,45,10,11,12,13,49,56,53,61,50,52,68,69,70,28,27,48,62,57,58,60,59,54,55,14,15,16,17,18,29,20,44,51,22,23,24,25,26,32,31,33,34,4,5,6,7,8,35,36,37,38,1,2,3,46,47,39,40,41,42,65,66,67,9,71,72,30,64,63,73,74,75,76,77,78];
//排序程序列表
const sort_function_list = [
{tag:"sort_none",name:"无",function:()=>0},


+ 3
- 0
solo.html View File

@@ -407,6 +407,7 @@ var formation = new Formation(teamsCount,6);
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="75"></span><span class="count"></span></li><!--2串木-->
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="76"></span><span class="count"></span></li><!--2串光-->
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="77"></span><span class="count"></span></li><!--2串暗-->
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="78"></span><span class="count"></span></li><!--十字-->
</ul>
</div>
</li>
@@ -567,6 +568,7 @@ var formation = new Formation(teamsCount,6);
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="75"></button><!--2串木--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="76"></button><!--2串光--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="77"></button><!--2串暗--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="78"></button><!--十字--></li>
</ul>
</div>
<div class="sawoken-div"><!--超觉醒-->
@@ -649,6 +651,7 @@ var formation = new Formation(teamsCount,6);
<li class="awoken-count"><input type="checkbox" class="sawoken-check" name="types" value="75" id="search-awoken-75" /><label class="awoken-icon" data-awoken-icon="75" for="search-awoken-75"></label><!--2串木--></li>
<li class="awoken-count"><input type="checkbox" class="sawoken-check" name="types" value="76" id="search-awoken-76" /><label class="awoken-icon" data-awoken-icon="76" for="search-awoken-76"></label><!--2串光--></li>
<li class="awoken-count"><input type="checkbox" class="sawoken-check" name="types" value="77" id="search-awoken-77" /><label class="awoken-icon" data-awoken-icon="77" for="search-awoken-77"></label><!--2串暗--></li>
<li class="awoken-count"><input type="checkbox" class="sawoken-check" name="types" value="78" id="search-awoken-78" /><label class="awoken-icon" data-awoken-icon="78" for="search-awoken-78"></label><!--十字--></li>
</ul>
</div>
<div class="control-div"><!--控制栏-->


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


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


+ 3
- 0
style-monsterimages.css View File

@@ -610,6 +610,9 @@
.awoken-icon[data-awoken-icon='77']{/*2串暗*/
background-position-y:calc(-32px * 77);
}
.awoken-icon[data-awoken-icon='78']{/*十字*/
background-position-y:calc(-32px * 78);
}
/*类型*/
.type-icon{
background-image: url(images/type.png);


+ 5
- 0
triple.html View File

@@ -422,6 +422,7 @@ var formation = new Formation(teamsCount,6);
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="75"></span><span class="count"></span></li><!--2串木-->
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="76"></span><span class="count"></span></li><!--2串光-->
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="77"></span><span class="count"></span></li><!--2串暗-->
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="78"></span><span class="count"></span></li><!--十字-->
</ul>
</div>
</li>
@@ -778,6 +779,7 @@ var formation = new Formation(teamsCount,6);
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="75"></span><span class="count"></span></li><!--2串木-->
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="76"></span><span class="count"></span></li><!--2串光-->
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="77"></span><span class="count"></span></li><!--2串暗-->
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="78"></span><span class="count"></span></li><!--十字-->
</ul>
</div>
</li>
@@ -1134,6 +1136,7 @@ var formation = new Formation(teamsCount,6);
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="75"></span><span class="count"></span></li><!--2串木-->
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="76"></span><span class="count"></span></li><!--2串光-->
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="77"></span><span class="count"></span></li><!--2串暗-->
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="78"></span><span class="count"></span></li><!--十字-->
</ul>
</div>
</li>
@@ -1294,6 +1297,7 @@ var formation = new Formation(teamsCount,6);
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="75"></button><!--2串木--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="76"></button><!--2串光--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="77"></button><!--2串暗--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="78"></button><!--十字--></li>
</ul>
</div>
<div class="sawoken-div"><!--超觉醒-->
@@ -1376,6 +1380,7 @@ var formation = new Formation(teamsCount,6);
<li class="awoken-count"><input type="checkbox" class="sawoken-check" name="types" value="75" id="search-awoken-75" /><label class="awoken-icon" data-awoken-icon="75" for="search-awoken-75"></label><!--2串木--></li>
<li class="awoken-count"><input type="checkbox" class="sawoken-check" name="types" value="76" id="search-awoken-76" /><label class="awoken-icon" data-awoken-icon="76" for="search-awoken-76"></label><!--2串光--></li>
<li class="awoken-count"><input type="checkbox" class="sawoken-check" name="types" value="77" id="search-awoken-77" /><label class="awoken-icon" data-awoken-icon="77" for="search-awoken-77"></label><!--2串暗--></li>
<li class="awoken-count"><input type="checkbox" class="sawoken-check" name="types" value="78" id="search-awoken-78" /><label class="awoken-icon" data-awoken-icon="78" for="search-awoken-78"></label><!--十字--></li>
</ul>
</div>
<div class="control-div"><!--控制栏-->


Write Preview
Loading…
Cancel
Save