diff --git a/script.js b/script.js
index 60db3276..8b9c883a 100644
--- a/script.js
+++ b/script.js
@@ -740,7 +740,6 @@ function initialize()
//编辑框
editBox.mid = null; //储存怪物id
- editBox.awokenCount = 0; //储存怪物潜觉数量
editBox.latent = []; //储存潜在觉醒
editBox.isAssist = false; //储存是否为辅助宠物
editBox.monsterHead = null;
@@ -1061,52 +1060,37 @@ function initialize()
};
monstersID.oninput = monstersID.onchange;
//觉醒
- const monEditAwokens = Array.from(settingBox.querySelectorAll(".row-mon-awoken .awoken-ul .awoken-icon"));
- monEditAwokens.forEach((akDom,idx)=>{
- akDom.onclick = function(){
- editBox.awokenCount = idx;
- editBox.reCalculateAbility();
- editBox.refreshAwokens();
- };
- });
- //刷新觉醒
- editBox.refreshAwokens = ()=>{
- monEditAwokens[0].innerHTML = editBox.awokenCount;
- if (editBox.awokenCount>0 && editBox.awokenCount==(Cards[editBox.mid].awakenings.length))
- monEditAwokens[0].classList.add("full-awoken");
+ const monEditAwokensRow = settingBox.querySelector(".row-mon-awoken");
+ const awokenCountLabel = monEditAwokensRow.querySelector(".awoken-count");
+ const monEditAwokens = Array.from(monEditAwokensRow.querySelectorAll(".awoken-ul input[name='awoken-number']"));
+ function checkAwoken(){
+ const value = parseInt(this.value,10);
+ awokenCountLabel.innerHTML = value;
+ if (value>0 && value==(Cards[editBox.mid].awakenings.length))
+ awokenCountLabel.classList.add("full-awoken");
else
- monEditAwokens[0].classList.remove("full-awoken");
- for(let ai=1;ai
akDom.onclick = checkAwoken);
//超觉醒
- let monEditSAwokens = Array.from(settingBox.querySelectorAll(".row-mon-super-awoken .awoken-ul .awoken-icon"));
- monEditSAwokens.forEach((akDom,idx,domArr)=>{
- akDom.onclick = function(){
- for(var ai=0;ai=0 && monEditSAwokensRow.swaokenIndex === value)
+ {
+ monEditSAwokens[0].click();
+ }else
+ {
+ monEditSAwokensRow.swaokenIndex = value;
+ }
+ }
+ monEditSAwokens.forEach(akDom=>{
+ akDom.onclick = notCheckMyself;
});
-
//3个快速设置this.ipt为自己的value
function setIptToMyValue()
{
@@ -1258,7 +1242,9 @@ function initialize()
function reCalculateAbility(){
const monid = parseInt(monstersID.value || 0, 10);
const level = parseInt(monEditLv.value || 0, 10);
- const awoken = editBox.awokenCount;
+
+ const mAwokenNumIpt = monEditAwokensRow.querySelector("input[name='awoken-number']:checked");
+ const awoken = mAwokenNumIpt ? parseInt(mAwokenNumIpt.value,10) : 0;
const plus = [
parseInt(monEditAddHp.value || 0, 10),
parseInt(monEditAddAtk.value || 0, 10),
@@ -1308,21 +1294,13 @@ function initialize()
const skill = Skills[card.activeSkillId];
mon.level = parseInt(monEditLv.value,10);
- mon.awoken = editBox.awokenCount;
+
+ const mAwokenNumIpt = monEditAwokensRow.querySelector("input[name='awoken-number']:checked");
+ mon.awoken = mAwokenNumIpt ? parseInt(mAwokenNumIpt.value,10) : 0;
if (card.superAwakenings.length) //如果支持超觉醒
{
- mon.sawoken = -1;
- for (var sai = 0;sai{return t == 0 || t == 12 || t == 14 || t == 15;}) &&
@@ -1803,7 +1781,7 @@ function editMon(teamNum,isAssist,indexInTeam)
monstersID.onchange();
//觉醒
const monEditAwokens = settingBox.querySelectorAll(".row-mon-awoken .awoken-ul .awoken-icon");
- if (mon.awoken > 0 && monEditAwokens[mon.awoken]) monEditAwokens[mon.awoken].onclick();
+ if (mon.awoken > 0 && monEditAwokens[mon.awoken]) monEditAwokens[mon.awoken].click();
//超觉醒
const monEditSAwokens = settingBox.querySelectorAll(".row-mon-super-awoken .awoken-ul .awoken-icon");
if (mon.sawoken >= 0 && monEditSAwokens[mon.sawoken] && monEditSAwokens[mon.sawoken].classList.contains("unselected-awoken")) monEditSAwokens[mon.sawoken].onclick();
@@ -1941,41 +1919,46 @@ function editBoxChangeMonId(id)
}
}
- const mAwoken = settingBox.querySelectorAll(".row-mon-awoken .awoken-ul li");
- editBox.awokenCount = card.awakenings.length;
- mAwoken[0].innerHTML = editBox.awokenCount ? "★" : "0";
+ const monEditAwokensRow = settingBox.querySelector(".row-mon-awoken");
+ const mAwoken = monEditAwokensRow.querySelectorAll(".awoken-ul .awoken-icon");
+ mAwoken[0].innerHTML = card.awakenings.length;
for (let ai=1;ai0)
- if (card.superAwakenings.length>0) //武器上也还是加入超觉醒吧
+ if (card.superAwakenings.length>0) //辅助时也还是加入超觉醒吧
{
for (let ai=0;ai
diff --git a/style.css b/style.css
index 60f60a2f..76b3537a 100644
--- a/style.css
+++ b/style.css
@@ -637,6 +637,7 @@ ul{
font-size: 2em;
font-weight: bold;
}
+
/*.edit-box .edit-box-title::before{
content: "修改队员";
}
@@ -835,6 +836,25 @@ ul{
padding: 0;
float: right;
}
+.awoken-ul .awoken-count
+{
+ font-size: 16px;
+ line-height: 32px;
+ font-family: var(--game-font-family);
+
+ display: inline-block;
+ margin-right: 3px;
+}
+.awoken-ul .count
+{
+ height: 32px;
+ width: 37px;
+ display: inline-block;
+ vertical-align: middle;
+}
+.awoken-ul .count::before{
+ content: "×";
+}
.search-box .awoken-ul button{
border: none;
background-color: unset;
@@ -992,20 +1012,11 @@ ul{
font-size: 0;
height: 32px;
}
-.awoken-ul li{
- margin-right: 5px;
-}
-.awoken-ul li:last-of-type{
- margin-right: 0;
-}
.edit-box .awoken-ul .awoken-icon{
cursor: pointer;
}
-.awoken-ul .awoken-icon.unselected-awoken{
- opacity: var(--search-icon-unchecked);
-}
-.row-mon-awoken .awoken-icon.awoken-count,
-.row-mon-awoken .awoken-icon.awoken-count.full-awoken::before
+.row-mon-awoken .awoken-count,
+.row-mon-awoken .awoken-count.full-awoken::before
{
color: yellow;
font-size: 22px;
@@ -1014,15 +1025,19 @@ ul{
text-shadow: black 0 0 4px;
text-align: center;
}
-.row-mon-awoken .awoken-icon.awoken-count.full-awoken{
+.row-mon-awoken .awoken-count.full-awoken{
font-size: 0;
}
-.row-mon-awoken .awoken-icon.awoken-count.full-awoken::before{
+.row-mon-awoken .awoken-count.full-awoken::before{
content: "★";
}
-.row-mon-awoken .m-super-awoken-ul{
- margin-top: 5px;
+/*选中的觉醒后面部分半透明，前面的不透明*/
+.row-mon-awoken .awoken-number{display:none;}
+.row-mon-awoken .awoken-number:checked~label
+{
+ opacity: var(--search-icon-unchecked);
}
+
/*.edit-box .setting-box .row-mon-super-awoken::before{
content: "▼超觉醒";
}*/
@@ -1034,7 +1049,26 @@ ul{
box-sizing: border-box;
vertical-align: top;
}
-
+.row-mon-awoken .awoken-icon,
+.row-mon-super-awoken .awoken-icon
+{
+ margin-left: 5px;
+}
+.row-mon-awoken .awoken-icon:first-of-type,
+.row-mon-super-awoken .awoken-icon:first-of-type
+{
+ margin-left: unset;
+}
+/*未选中的超觉醒半透明，选中的不透明*/
+.row-mon-super-awoken .sawoken-choice{display:none;}
+.row-mon-super-awoken .sawoken-choice+label
+{
+ opacity: var(--search-icon-unchecked);
+}
+.row-mon-super-awoken .sawoken-choice:checked+label
+{
+ opacity: unset;
+}
/*怪物能力横条*/
/*.row-ability{
border-color: #D5AF5B;
@@ -1224,14 +1258,24 @@ ul{
}
.m-latent-allowable-ul{
margin-top: 5px;
+ font-size: 0;
+}
+.m-latent-allowable-ul .latent-icon{
+ margin-right: 4.66px;
}
+.m-latent-allowable-ul .latent-icon:last-of-type{
+ margin-right: unset;
+}
+
.m-latent-allowable-ul .latent-icon,
.m-latent-ul .latent-icon{
cursor: pointer;
}
+/*没有打觉醒的空格，没有手指*/
.m-latent-ul .latent-icon[class="latent-icon"]{
cursor: default;
}
+/*不允许使用的潜觉，不是手指，半透明，灰度*/
.m-latent-allowable-ul .latent-icon.unselected-latent{
cursor: default;
opacity: var(--search-icon-unchecked);
@@ -1396,25 +1440,6 @@ ul{
.detail-box{
margin-top:5px;
}
-.awoken-ul .awoken-count
-{
- font-size: 16px;
- line-height: 32px;
- font-family: var(--game-font-family);
-
- display: inline-block;
- margin-right: 3px;
-}
-.awoken-ul .count
-{
- height: 32px;
- width: 37px;
- display: inline-block;
- vertical-align: middle;
-}
-.awoken-ul .count::before{
- content: "×";
-}
/*控制框*/
.control-box{
margin-bottom: 10px;
diff --git a/triple.html b/triple.html
index 8d038232..c8ee6928 100644
--- a/triple.html
+++ b/triple.html
@@ -1272,32 +1272,33 @@ var formation = new Formation(teamsCount,6);
diff --git a/universal_function.js b/universal_function.js
index f1833c23..04a39cb8 100644
--- a/universal_function.js
+++ b/universal_function.js
@@ -184,21 +184,10 @@ function calculateExp(member)
return [Math.round(v99Exp),v110Exp];
}
//计算怪物的能力
-//function calculateAbility(monid = 0, level = 1, plus = [0,0,0], awoken = 0, latent = [], weaponId = null, weaponAwoken = null, solo = true)
function calculateAbility(member = null, assist = null, solo = true)
{
if (!member) return null;
- /*
- const monid = member.id || 0;
- const level = member.level || 1;
- const plus = member.plus || [0,0,0];
- const awoken = member.awoken || 0;
- const latent = member.latent || [];
- const sawoken = member.sawoken;
- const weaponId = assist ? assist.id : null;
- const weaponAwoken = assist ? assist.awoken : null;
- const card = Cards[monid]; //怪物数据
-*/
+
const memberCard = Cards[member.id];
const assistCard = assist ? Cards[assist.id] : null;
if (!memberCard || memberCard.id == 0 || !memberCard.enabled) return null;
@@ -407,7 +396,7 @@ function descriptionToHTML(str)
str = str.replace(/\%\{m([0-9]{1,4})\}/g,function (str, p1, offset, s){return cardN(parseInt(p1,10));}); //怪物头像
return str;
}
-//返回怪物名
+//返回怪物Card的纯HTML
function cardN(id){
let card = Cards[id || 0];
if (!card)
@@ -431,12 +420,5 @@ function parseSkillDescription(skill)
//大数字缩短长度，默认返回本地定义字符串
function parseBigNumber(number)
{
- /* //千位分隔符
- const res=number.toString().replace(/\d+/, function(n){ // 先提取整数部分
- return n.replace(/(\d)(?=(\d{3})+$)/g,function($1){
- return $1+",";
- });
- })
- */
return number.toLocaleString();
}
\ No newline at end of file