Browse Source

修复部分技能解析错误的问题

tags/v23.3
枫谷剑仙 4 years ago
parent
commit
f95202fd66
13 changed files with 50 additions and 47 deletions
  1. +1
    -0
      languages/zh-TW.js
  2. +1
    -0
      languages/zh.js
  3. +1
    -1
      monsters-info/ckey.json
  4. +1
    -1
      monsters-info/custom/chs.json
  5. +1
    -1
      monsters-info/custom/cht.json
  6. +1
    -1
      monsters-info/mon_en.json
  7. +1
    -1
      monsters-info/mon_ja.json
  8. +1
    -1
      monsters-info/mon_ko.json
  9. +13
    -13
      multi.html
  10. +1
    -0
      script-json_data.js
  11. +2
    -2
      script-skill-parser.js
  12. +13
    -13
      solo.html
  13. +13
    -13
      triple.html

+ 1
- 0
languages/zh-TW.js View File

@@ -168,6 +168,7 @@
enemy_all: tp`敵方全體`,
enemy_one: tp`敵方1體`,
enemy_attr: tp`${'attr'}敵人`,
the_attr: tp`該組寶珠屬性`,
},
stats: {
unknown: tp`[ 未知狀態: ${'type'}]`, //type


+ 1
- 0
languages/zh.js View File

@@ -171,6 +171,7 @@
enemy_all: tp`敌方全体`,
enemy_one: tp`敌方1体`,
enemy_attr: tp`${'attr'}敌人`,
the_attr: tp`该组宝珠属性`,
},
stats: {
unknown: tp`[ 未知状态: ${'type'}]`, //type


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

@@ -1 +1 @@
[{"code":"ja","ckey":{"card":"19c961137c30cdcc2f03f56689a4fd02","skill":"baf9fd1cd3ecf810f3fcb71d7b577b78"},"updateTime":1654000801473},{"code":"en","ckey":{"card":"67e7f2862760cdf4123a8b120c962a5a","skill":"2cdd511d8d6e5170a331bc24aca7f6df"},"updateTime":1654000801473},{"code":"ko","ckey":{"card":"c182234272fcb40db8e4f78e65e9508e","skill":"3e51c4ace725e653237b93fa4773958a"},"updateTime":1654000801473}]
[{"code":"ja","ckey":{"card":"c545cb9c86e8096ee3f85340aa9bf610","skill":"baf9fd1cd3ecf810f3fcb71d7b577b78"},"updateTime":1654068453245},{"code":"en","ckey":{"card":"7a249358105a65f3682475d98075019b","skill":"2cdd511d8d6e5170a331bc24aca7f6df"},"updateTime":1654068453245},{"code":"ko","ckey":{"card":"a2364bf6faa795af52cc57761f7a25b3","skill":"3e51c4ace725e653237b93fa4773958a"},"updateTime":1654068453245}]

+ 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


+ 13
- 13
multi.html View File

@@ -850,19 +850,19 @@ var formation = new Formation(teamsCount,5);
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="80"></button><!--4色--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="81"></button><!--5色--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="82"></button><!--12珠--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="83"></button><!--附加神类型--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="84"></button><!--附加龙类型--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="85"></button><!--附加恶魔类型--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="86"></button><!--附加机械类型--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="87"></button><!--附加平衡类型--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="88"></button><!--附加攻击类型--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="89"></button><!--附加体力类型--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="90"></button><!--附加回复类型--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="91"></button><!--附加火属性--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="92"></button><!--附加水属性--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="93"></button><!--附加木属性--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="94"></button><!--附加光属性--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="95"></button><!--附加暗属性--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="83" data-max-count="1"></button><!--附加神类型--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="84" data-max-count="1"></button><!--附加龙类型--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="85" data-max-count="1"></button><!--附加恶魔类型--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="86" data-max-count="1"></button><!--附加机械类型--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="87" data-max-count="1"></button><!--附加平衡类型--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="88" data-max-count="1"></button><!--附加攻击类型--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="89" data-max-count="1"></button><!--附加体力类型--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="90" data-max-count="1"></button><!--附加回复类型--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="91" data-max-count="1"></button><!--附加火属性--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="92" data-max-count="1"></button><!--附加水属性--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="93" data-max-count="1"></button><!--附加木属性--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="94" data-max-count="1"></button><!--附加光属性--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="95" data-max-count="1"></button><!--附加暗属性--></li>
</ul>
</div>
<div class="sawoken-div"><!--超觉醒-->


+ 1
- 0
script-json_data.js View File

@@ -187,6 +187,7 @@ let localTranslating = {
enemy_all: tp`all enemys`,
enemy_one: tp`1 enemy`,
enemy_attr: tp`${'attr'} enemy`,
the_attr: tp`attr of the matched Orbs`,
},
stats: {
unknown: tp`[ Unknown: ${'type'}]`, //type


+ 2
- 2
script-skill-parser.js View File

@@ -1159,7 +1159,7 @@ const parsers = {
[148](percent) { return rateMultiply(v.percent(percent), 'exp'); },
[149](mul) { return powerUp(null, null, p.mul({ rcv: mul }), c.exact('match-length', 4, [Attributes.Heart])); },
[150](_, mul) { return powerUp(null, null, p.mul({ atk: mul }), c.exact('match-length', 5, 'enhanced')); },
[150](_, mul) { return powerUp({targets: ['the-attr']}, null, p.mul({ atk: mul }), c.exact('match-length', 5, 'enhanced')); },
[151](mul1, mul2, percent) {
return powerUp(null, null, p.scaleCross([{ single: true, attr: [Attributes.Heart], atk: mul1 || 100, rcv: mul2 || 100 }]), null, v.percent(percent));
},
@@ -1414,7 +1414,7 @@ const parsers = {
);
},
[229](attrs, types, hp, atk, rcv) {
return powerUp(null, null, p.scaleStateKindCount(null, flags(attrs), flags(types), p.mul({hp: hp, atk: atk, rcv: rcv})));
return powerUp(null, null, p.scaleStateKindCount(null, flags(attrs), flags(types), p.mul({hp: hp || 0, atk: atk || 0, rcv: rcv || 0})));
},
[230](turns, target, mul) {
/*const targetType = {


+ 13
- 13
solo.html View File

@@ -718,19 +718,19 @@ var formation = new Formation(teamsCount,6);
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="80"></button><!--4色--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="81"></button><!--5色--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="82"></button><!--12珠--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="83"></button><!--附加神类型--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="84"></button><!--附加龙类型--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="85"></button><!--附加恶魔类型--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="86"></button><!--附加机械类型--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="87"></button><!--附加平衡类型--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="88"></button><!--附加攻击类型--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="89"></button><!--附加体力类型--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="90"></button><!--附加回复类型--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="91"></button><!--附加火属性--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="92"></button><!--附加水属性--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="93"></button><!--附加木属性--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="94"></button><!--附加光属性--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="95"></button><!--附加暗属性--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="83" data-max-count="1"></button><!--附加神类型--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="84" data-max-count="1"></button><!--附加龙类型--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="85" data-max-count="1"></button><!--附加恶魔类型--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="86" data-max-count="1"></button><!--附加机械类型--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="87" data-max-count="1"></button><!--附加平衡类型--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="88" data-max-count="1"></button><!--附加攻击类型--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="89" data-max-count="1"></button><!--附加体力类型--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="90" data-max-count="1"></button><!--附加回复类型--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="91" data-max-count="1"></button><!--附加火属性--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="92" data-max-count="1"></button><!--附加水属性--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="93" data-max-count="1"></button><!--附加木属性--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="94" data-max-count="1"></button><!--附加光属性--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="95" data-max-count="1"></button><!--附加暗属性--></li>
</ul>
</div>
<div class="sawoken-div"><!--超觉醒-->


+ 13
- 13
triple.html View File

@@ -1685,19 +1685,19 @@ var formation = new Formation(teamsCount,6);
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="80"></button><!--4色--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="81"></button><!--5色--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="82"></button><!--12珠--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="83"></button><!--附加神类型--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="84"></button><!--附加龙类型--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="85"></button><!--附加恶魔类型--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="86"></button><!--附加机械类型--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="87"></button><!--附加平衡类型--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="88"></button><!--附加攻击类型--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="89"></button><!--附加体力类型--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="90"></button><!--附加回复类型--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="91"></button><!--附加火属性--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="92"></button><!--附加水属性--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="93"></button><!--附加木属性--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="94"></button><!--附加光属性--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="95"></button><!--附加暗属性--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="83" data-max-count="1"></button><!--附加神类型--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="84" data-max-count="1"></button><!--附加龙类型--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="85" data-max-count="1"></button><!--附加恶魔类型--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="86" data-max-count="1"></button><!--附加机械类型--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="87" data-max-count="1"></button><!--附加平衡类型--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="88" data-max-count="1"></button><!--附加攻击类型--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="89" data-max-count="1"></button><!--附加体力类型--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="90" data-max-count="1"></button><!--附加回复类型--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="91" data-max-count="1"></button><!--附加火属性--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="92" data-max-count="1"></button><!--附加水属性--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="93" data-max-count="1"></button><!--附加木属性--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="94" data-max-count="1"></button><!--附加光属性--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="95" data-max-count="1"></button><!--附加暗属性--></li>
</ul>
</div>
<div class="sawoken-div"><!--超觉醒-->


Loading…
Cancel
Save