From 03c9b6a3c0ba9071939b4505cfe7bf62a90e36bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=AB=E8=B0=B7=E5=89=91=E4=BB=99?= Date: Sun, 16 Jun 2019 00:20:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B6=85=E8=A7=89=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + index.html | 19 ++++++-- monsters-info/extractByNode.js | 7 ++- monsters-info/test.html | 72 ++++++++++++++++++++++++++++++ script.js | 81 ++++++++++++++++++++++++++++------ style.css | 27 +++++++++--- 6 files changed, 183 insertions(+), 24 deletions(-) create mode 100644 .gitignore create mode 100644 monsters-info/test.html diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..629b2932 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +monsters-info/Download-pad.skyozora.com \ No newline at end of file diff --git a/index.html b/index.html index 58482973..4f4ff0ba 100644 --- a/index.html +++ b/index.html @@ -319,7 +319,7 @@
-
- -
    + +
    • @@ -368,6 +368,19 @@
+
+
    +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
+
diff --git a/monsters-info/extractByNode.js b/monsters-info/extractByNode.js index c1828247..8f9ddfcd 100644 --- a/monsters-info/extractByNode.js +++ b/monsters-info/extractByNode.js @@ -45,6 +45,7 @@ for (var mi=0;mi0?110:m[10], + maxLv: m[m.length-3]>0?110:m[10], assist: (m[m.length-5]>2 && [303,305,307,600,602].indexOf(m[0])<0)?1:0, //但是5种小企鹅是特殊情况 } + if (mon.maxLv>99 && superAwoken) + { + mon.sAwoken = superAwoken; + } mArr.push(mon); } } diff --git a/monsters-info/test.html b/monsters-info/test.html new file mode 100644 index 00000000..30837eb3 --- /dev/null +++ b/monsters-info/test.html @@ -0,0 +1,72 @@ + + + + +代码测试 + + + + + + + + diff --git a/script.js b/script.js index 42222467..359a1b97 100644 --- a/script.js +++ b/script.js @@ -1,7 +1,7 @@ var ms = null; var language = null; var memberTeamObj = function(){ - return {id:0,level:0,awoken:0,plus:[0,0,0],latent:[]}; + return {id:0,level:0,awoken:0,plus:[0,0,0],latent:[]}; //sawoken作为可选项目，默认不在内 } var memberAssistObj = function(){ return {id:0,level:0,awoken:0,plus:[0,0,0]}; @@ -185,7 +185,7 @@ function initialize() } monstersSearch.oninput = monstersSearch.onchange; //觉醒 - var monEditAwokens = Array.prototype.slice.call(settingBox.querySelectorAll(".m-awoken-ul>.awoken-icon")); + var monEditAwokens = Array.prototype.slice.call(settingBox.querySelectorAll(".row-mon-awoken .awoken-ul .awoken-icon")); monEditAwokens.forEach(function(akDom,idx,domArr){ akDom.onclick = function(){ if (idx>0 && idx>=domArr.filter(function(d){return !d.classList.contains("display-none")}).length-1) @@ -196,17 +196,33 @@ function initialize() { if(ai<=idx) { - if(domArr[ai].classList.contains("unselected-awoken")) - domArr[ai].classList.remove("unselected-awoken"); + domArr[ai].classList.remove("unselected-awoken"); } else { - if(!domArr[ai].classList.contains("unselected-awoken")) - domArr[ai].classList.add("unselected-awoken"); + domArr[ai].classList.add("unselected-awoken"); } } } }) + //超觉醒 + var monEditSAwokens = Array.prototype.slice.call(settingBox.querySelectorAll(".row-mon-super-awoken .awoken-ul .awoken-icon")); + monEditSAwokens.forEach(function(akDom,idx,domArr){ + akDom.onclick = function(){ + for(var ai=0;ai= md.maxLevel && md.maxLevel <=99)) + if (mon.level == 99 || (mon.level >= md.maxLv && md.maxLv <=99)) { levelDom.classList.add("max"); }else { levelDom.classList.remove("max"); } - if (md.maxLevel>99 && mon.level>=99) + if (md.maxLv>99 && mon.level>=99) levelDom.classList.add("_110"); else levelDom.classList.remove("_110"); @@ -494,8 +527,12 @@ function editMon(AorB,isAssist,tempIdx) monstersSearch.value = mD.id>0?mD.id:0; monstersSearch.onchange(); var settingBox = editBox.querySelector(".setting-box"); - var monEditAwokens = settingBox.querySelectorAll(".m-awoken-ul .awoken-icon"); + //觉醒 + var monEditAwokens = settingBox.querySelectorAll(".row-mon-awoken .awoken-ul .awoken-icon"); if (mD.awoken>0) monEditAwokens[mD.awoken].onclick(); + //超觉醒 + var monEditSAwokens = settingBox.querySelectorAll(".row-mon-super-awoken .awoken-ul .awoken-icon"); + if (mD.sawoken>=0) monEditSAwokens[mD.sawoken].onclick(); var monEditLv = settingBox.querySelector(".m-level"); monEditLv.value = mD.level || 1; var monEditAddHp = settingBox.querySelector(".m-plus-hp"); @@ -554,7 +591,7 @@ function editBoxChangeMonId(id) } var settingBox = editBox.querySelector(".setting-box"); - var mAwoken = settingBox.querySelectorAll(".m-awoken-ul li"); + var mAwoken = settingBox.querySelectorAll(".row-mon-awoken .awoken-ul li"); mAwoken[0].innerHTML = md.awoken.length?"★":"0"; for (var ai=1;ai99?99:md.maxLevel; + monEditLv.value = md.maxLv>99?99:md.maxLv; var rowPlus = settingBox.querySelector(".row-mon-plus"); var rowLatent = settingBox.querySelector(".row-mon-latent"); @@ -646,7 +701,7 @@ function refreshAll(fmt){ } //刷新觉醒总计 function refreshAwokenCount(team){ - var awokenUL = document.querySelector(".awoken-total-box .m-awoken-ul"); + var awokenUL = document.querySelector(".awoken-total-box .awoken-ul"); function setCount(idx,number){ var ali = awokenUL.querySelector(".a-c-" + idx); ali.querySelector(".count").innerHTML = number; diff --git a/style.css b/style.css index a4b0e549..3c1c2c30 100644 --- a/style.css +++ b/style.css @@ -432,16 +432,23 @@ ul{ .edit-box .setting-box .row-mon-awoken::before{ content: "▼怪物觉醒"; }*/ -.row-mon-awoken .m-awoken-ul{ +.row-mon-awoken .awoken-ul, .row-mon-super-awoken .awoken-ul{ + font-size: 0; height: 32px; } -.m-awoken-ul .awoken-icon{ +.awoken-ul li{ + margin-left: 5px; +} +.awoken-ul li:first-of-type{ + margin-left: 0; +} +.awoken-ul .awoken-icon{ cursor: pointer; } -.m-awoken-ul .awoken-icon.unselected-awoken{ +.awoken-ul .awoken-icon.unselected-awoken{ opacity: 0.3; } -.awoken-icon.awoken-count{ +.row-mon-awoken .awoken-icon.awoken-count{ color: yellow; font-size: 22px; line-height: 28px; @@ -449,6 +456,12 @@ ul{ text-shadow: black 0 0 4px; text-align: center; } +.row-mon-awoken .m-super-awoken-ul{ + margin-top: 5px; +} +.edit-box .setting-box .row-mon-super-awoken::before{ + content: "▼超觉醒"; +} .edit-box .setting-box .row-mon-plus::before{ /*content: "▼怪物加值";*/ display: block; @@ -570,18 +583,18 @@ ul{ .detail-box{ margin-top:5px; } -.awoken-total-box .m-awoken-ul .awoken-count{ +.awoken-total-box .awoken-ul .awoken-count{ font-size: 20px; line-height: 32px; font-family: 'FOT-KurokaneStd-EB'; float: left; margin-right: 5px; } -.awoken-total-box .m-awoken-ul .count{ +.awoken-total-box .awoken-ul .count{ height: 32px; vertical-align: middle; } -.awoken-total-box .m-awoken-ul .count::before{ +.awoken-total-box .awoken-ul .count::before{ content: "×"; }