diff --git a/images/cards/CARDS_054.PNG b/images/cards/CARDS_054.PNG index 510977e3..c5beb0e3 100644 Binary files a/images/cards/CARDS_054.PNG and b/images/cards/CARDS_054.PNG differ diff --git a/monsters-info/README.md b/monsters-info/README.md index cd82ef69..49f661db 100644 --- a/monsters-info/README.md +++ b/monsters-info/README.md @@ -6,7 +6,7 @@ The current acquisition time is | 语言 | 时间 | API | | --- | --- | --- | -| 日语(ja) | 2019-6-14 15:20 | https://api-adrv2.padsv.gungho.jp/api.php?action=download_card_data | +| 日语(ja) | 2019-6-14 17:40 | https://api-adrv2.padsv.gungho.jp/api.php?action=download_card_data | | 英语(en) | 2019-6-14 15:20 | https://api-na-adrv2.padsv.gungho.jp/api.php?action=download_card_data | | 韩语(ko) | 2019-6-14 15:20 | https://api-kr-adrv2.padsv.gungho.jp/api.php?action=download_card_data | diff --git a/monsters-info/extractByNode.js b/monsters-info/extractByNode.js index 7a0335bc..881a8221 100644 --- a/monsters-info/extractByNode.js +++ b/monsters-info/extractByNode.js @@ -63,7 +63,7 @@ fs.readFile('./ja.json',function(err,data){ rare: m[7], awoken: awoken, maxLevel: m[m.length-3]>0?110:m[10], - assist: m[m.length-5]>2?1:0, + assist: (m[m.length-5]>2 && [303,305,307,600,602].indexOf(m[0])<0)?1:0, //但是5种小企鹅是特殊情况 } mArr.push(mon); } diff --git a/script.js b/script.js index 616d9e41..221c0047 100644 --- a/script.js +++ b/script.js @@ -298,12 +298,18 @@ function initialize() mD.awoken = monEditAwokens.filter(function(akDom){ return !akDom.classList.contains("unselected-awoken") && !akDom.classList.contains("display-none") }).length - 1; - mD.plus[0] = parseInt(monEditAddHp.value) || 0; - mD.plus[1] = parseInt(monEditAddAtk.value) || 0; - mD.plus[2] = parseInt(monEditAddRcv.value) || 0; - if (!editBox.assist) + if (ms[mD.id].type.some(function(t){return t == 0 || t == 12 || t == 14 || t == 15;}) && [303,305,307,600,602].indexOf(mD.id)<0) + { //当4种特殊type的时候是无法297和打觉醒的,但是5种小企鹅可以 + mD.plus = [0,0,0]; + }else { - mD.latent = editBox.latent.concat(); + mD.plus[0] = parseInt(monEditAddHp.value) || 0; + mD.plus[1] = parseInt(monEditAddAtk.value) || 0; + mD.plus[2] = parseInt(monEditAddRcv.value) || 0; + if (!editBox.assist) + { //如果不是辅助,则可以设定潜觉 + mD.latent = editBox.latent.concat(); + } } changeid(mD,editBox.monsterBox,editBox.latentBox); @@ -566,7 +572,18 @@ function editBoxChangeMonId(id) var monEditLv = settingBox.querySelector(".m-level"); monEditLv.value = md.maxLevel>99?99:md.maxLevel; - var monLatentAllowUl = settingBox.querySelector(".m-latent-allowable-ul"); + var rowPlus = settingBox.querySelector(".row-mon-plus"); + var rowLatent = settingBox.querySelector(".row-mon-latent"); + if (ms[id].type.some(function(t){return t == 0 || t == 12 || t == 14 || t == 15;}) && [303,305,307,600,602].indexOf(id)<0) + { //当4种特殊type的时候是无法297和打觉醒的,但是5种小企鹅可以 + rowPlus.classList.add("disabled"); + rowLatent.classList.add("disabled"); + }else + { + rowPlus.classList.remove("disabled"); + rowLatent.classList.remove("disabled"); + } + var monLatentAllowUl = rowLatent.querySelector(".m-latent-allowable-ul"); //该宠Type允许的杀 var allowLatent = uniq(md.type.reduce(function (previous, t, index, array) { return previous.concat(type_allowable_latent[t]); diff --git a/style.css b/style.css index 864ef23e..f6ed9b14 100644 --- a/style.css +++ b/style.css @@ -16,6 +16,11 @@ body{ .display-none{ display:none; } +.disabled{ + cursor: not-allowed; + pointer-events: none; + opacity: 0.5; +} .title{ font-size: 2em; font-weight: bold;