diff --git a/images/latent.png b/images/latent.png index ae490699..475a9de7 100644 Binary files a/images/latent.png and b/images/latent.png differ diff --git a/images/project file/latent.fw.png b/images/project file/latent.fw.png index 39e33a53..99481870 100644 Binary files a/images/project file/latent.fw.png and b/images/project file/latent.fw.png differ diff --git a/multi.html b/multi.html index 6bce586f..372b7f23 100644 --- a/multi.html +++ b/multi.html @@ -798,6 +798,7 @@ var formation = new Formation(teamsCount,5);
  • +
  • diff --git a/script-universal_function.js b/script-universal_function.js index dd838489..ffbbb567 100644 --- a/script-universal_function.js +++ b/script-universal_function.js @@ -160,7 +160,9 @@ fetch("library/jy4340132-aaa/adpcm.wasm").then((response) => response.arrayBuffe //计算用了多少潜觉格子 function usedHole(latents) { - return latents.reduce((usedHole, latentId) => usedHole + (latentId>= 12 ? 2 : 1), 0); //12号以后都是2格的潜觉 + return latents.reduce((usedHole, latentId) => usedHole + + (latentId == 37 ? 6 : (latentId>= 12 ? 2 : 1)) //12号以后都是2格的潜觉 + , 0); } //计算所有队伍中有多少个该觉醒 function awokenCountInFormation(formationTeams,awokenIndex,solo,teamsCount) diff --git a/script.js b/script.js index ade7514e..762260e0 100644 --- a/script.js +++ b/script.js @@ -1231,7 +1231,9 @@ function initialize() const lIdx = parseInt(this.getAttribute("data-latent-icon"),10); //潜觉的序号 const usedHoleN = usedHole(editBox.latent); //使用了的格子 const maxLatentCount = getMaxLatentCount(editBox.mid); //最大潜觉数量 - if (lIdx >= 12 && usedHoleN<=(maxLatentCount-2) || //如果能添加2格的觉醒 + console.log(lIdx,usedHoleN<=(maxLatentCount-6)) + if (lIdx == 37 && usedHoleN<=(maxLatentCount-6) || //如果能添加6格的觉醒 + lIdx >= 12 && usedHoleN<=(maxLatentCount-2) || //如果能添加2格的觉醒 lIdx < 12 && usedHoleN<=(maxLatentCount-1)) //如果能添加1格的觉醒 {editBox.latent.push(lIdx);} else {return;} diff --git a/solo.html b/solo.html index 778c5e9f..d757d308 100644 --- a/solo.html +++ b/solo.html @@ -750,6 +750,7 @@ var formation = new Formation(teamsCount,6);
  • +
  • diff --git a/style-monsterimages.css b/style-monsterimages.css index dcbd9c28..8407d38f 100644 --- a/style-monsterimages.css +++ b/style-monsterimages.css @@ -663,6 +663,10 @@ { width: 32px; } +.latent-icon[data-latent-icon='37'] +{ + width: 252px; +} .latent-icon[data-latent-icon='1']{ /*HP*/ background-position-y: calc(-32px * 1); } @@ -773,47 +777,10 @@ .latent-icon[data-latent-icon='36']{ /*大暗盾*/ background-position-y: calc(-32px * 36); } +.latent-icon[data-latent-icon='37']{ /*6色破无效*/ + background-position-y: calc(-32px * 37); +} -/* -var sawokens = [ - "HP", - "攻击", - "回复", - "手指", - "自回", - "火盾", - "水盾", - "木盾", - "光盾", - "暗盾", - "防坐", - "三维", - null, - null, - null, - "进化杀", - "觉醒杀", - "强化杀", - "卖钱杀", - "神杀", - "龙杀", - "恶魔杀", - "机械杀", - "平衡杀", - "攻击杀", - "体力杀", - "回复杀", - "大HP", - "大攻击", - "大回复", - "大手指", - "大火盾", - "大水盾", - "大木盾", - "大光盾", - "大暗盾", -]; -*/ /* 徽章背景 */ .badge{ background-image: url(images/badge-bg.png); diff --git a/triple.html b/triple.html index 30bb2f4f..2e3cdc27 100644 --- a/triple.html +++ b/triple.html @@ -1445,6 +1445,7 @@ var formation = new Formation(teamsCount,6);
  • +