diff --git a/images/cards_ja/CARDS_060.PNG b/images/cards_ja/CARDS_060.PNG
index 0fa84d76..0bf15fb1 100644
Binary files a/images/cards_ja/CARDS_060.PNG and b/images/cards_ja/CARDS_060.PNG differ
diff --git a/images/cards_ja/CARDS_061.PNG b/images/cards_ja/CARDS_061.PNG
index 1e39649c..89d13b14 100644
Binary files a/images/cards_ja/CARDS_061.PNG and b/images/cards_ja/CARDS_061.PNG differ
diff --git a/images/cards_ja/CARDS_062.PNG b/images/cards_ja/CARDS_062.PNG
index 7b817bca..84dd4e08 100644
Binary files a/images/cards_ja/CARDS_062.PNG and b/images/cards_ja/CARDS_062.PNG differ
diff --git a/images/latent.png b/images/latent.png
index ba42300e..3c121806 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 6f107201..a6d92755 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 6603ed27..ae7f5ab0 100644
--- a/multi.html
+++ b/multi.html
@@ -780,7 +780,9 @@ var formation = new Formation(teamsCount,5);
-
+
+
+
@@ -802,11 +804,8 @@ var formation = new Formation(teamsCount,5);
-
-
-
-
-
+
+
diff --git a/script-universal_function.js b/script-universal_function.js
index b5dd3581..af31d4cb 100644
--- a/script-universal_function.js
+++ b/script-universal_function.js
@@ -158,8 +158,19 @@ fetch("library/jy4340132-aaa/adpcm.wasm").then((response) => response.arrayBuffe
//▲ADPCM播放相关
function latentUseHole(latentId)
{
- //12号以后都是2格的潜觉，37号后是6格的潜觉
- return latentId >= 37 ? 6 : (latentId>= 12 ? 2 : 1);
+ if (latentId < 12)
+ {
+ return 1;
+ }else if (latentId === 12 || latentId >= 16 && latentId <= 36)
+ {
+ return 2;
+ }else if (latentId >= 13 && latentId <= 15 || latentId >= 37 && latentId <= 38)
+ {
+ return 6;
+ }else
+ {
+ return 1;
+ }
}
//计算用了多少潜觉格子
function usedHole(latents)
diff --git a/solo.html b/solo.html
index 97a306b8..bc3cb5a2 100644
--- a/solo.html
+++ b/solo.html
@@ -732,7 +732,9 @@ var formation = new Formation(teamsCount,6);
-
+
+
+
@@ -754,11 +756,8 @@ var formation = new Formation(teamsCount,6);
-
-
-
-
-
+
+
diff --git a/style-monsterimages.css b/style-monsterimages.css
index d7dabb48..681d82ab 100644
--- a/style-monsterimages.css
+++ b/style-monsterimages.css
@@ -671,9 +671,6 @@
background-position-x: 0;
}
.latent-icon[data-latent-icon='12']::before,
-.latent-icon[data-latent-icon='13']::before,
-.latent-icon[data-latent-icon='14']::before,
-.latent-icon[data-latent-icon='15']::before,
.latent-icon[data-latent-icon='16']::before,
.latent-icon[data-latent-icon='17']::before,
.latent-icon[data-latent-icon='18']::before,
@@ -698,11 +695,11 @@
{
width: 76px;
}
+.latent-icon[data-latent-icon='13']::before,
+.latent-icon[data-latent-icon='14']::before,
+.latent-icon[data-latent-icon='15']::before,
.latent-icon[data-latent-icon='37']::before,
-.latent-icon[data-latent-icon='38']::before,
-.latent-icon[data-latent-icon='39']::before,
-.latent-icon[data-latent-icon='40']::before,
-.latent-icon[data-latent-icon='41']::before
+.latent-icon[data-latent-icon='38']::before
{
width: 252px;
}
@@ -742,17 +739,15 @@
.latent-icon[data-latent-icon='12']::before{ /*三维*/
background-position-y: calc(-32px * 12);
}
-/* 目前暂未启用的潜觉
-.latent-icon[data-latent-icon='13']::before{
+.latent-icon[data-latent-icon='13']::before{ /*不被换队长*/
background-position-y: calc(-32px * 13);
}
-.latent-icon[data-latent-icon='14']::before{
+.latent-icon[data-latent-icon='14']::before{ /*不掉废*/
background-position-y: calc(-32px * 14);
}
-.latent-icon[data-latent-icon='15']::before{
+.latent-icon[data-latent-icon='15']::before{ /*不掉毒*/
background-position-y: calc(-32px * 15);
}
-*/
.latent-icon[data-latent-icon='16']::before{ /*进化杀*/
background-position-y: calc(-32px * 16);
}
@@ -816,21 +811,12 @@
.latent-icon[data-latent-icon='36']::before{ /*大暗盾*/
background-position-y: calc(-32px * 36);
}
-.latent-icon[data-latent-icon='37']::before{ /*6色破属吸*/
+.latent-icon[data-latent-icon='37']::before{ /*6色破无效*/
background-position-y: calc(-32px * 37);
}
-.latent-icon[data-latent-icon='38']::before{ /*6色破无效*/
+.latent-icon[data-latent-icon='38']::before{ /*6色破属吸*/
background-position-y: calc(-32px * 38);
}
-.latent-icon[data-latent-icon='39']::before{ /*不掉毒*/
- background-position-y: calc(-32px * 39);
-}
-.latent-icon[data-latent-icon='40']::before{ /*不掉废*/
- background-position-y: calc(-32px * 40);
-}
-.latent-icon[data-latent-icon='41']::before{ /*不被换队长*/
- background-position-y: calc(-32px * 41);
-}
/* 徽章背景 */
.badge{
diff --git a/style.css b/style.css
index aaf26efb..7b2dd388 100644
--- a/style.css
+++ b/style.css
@@ -597,18 +597,16 @@ ul{
.team-latents .latent-icon[data-latent-icon='36'],
.team-latents .latent-icon[data-latent-icon='37'],
.team-latents .latent-icon[data-latent-icon='38'],
-.team-latents .latent-icon[data-latent-icon='39'],
-.team-latents .latent-icon[data-latent-icon='40'],
-.team-latents .latent-icon[data-latent-icon='41']
+.team-latents .latent-icon[data-latent-icon='39']
{
margin-left: 0;
margin-right: 0;
}
+.team-latents .latent-ul .latent-icon[data-latent-icon='13']::before,
+.team-latents .latent-ul .latent-icon[data-latent-icon='14']::before,
+.team-latents .latent-ul .latent-icon[data-latent-icon='15']::before,
.team-latents .latent-ul .latent-icon[data-latent-icon='37']::before,
-.team-latents .latent-ul .latent-icon[data-latent-icon='38']::before,
-.team-latents .latent-ul .latent-icon[data-latent-icon='39']::before,
-.team-latents .latent-ul .latent-icon[data-latent-icon='40']::before,
-.team-latents .latent-ul .latent-icon[data-latent-icon='41']::before
+.team-latents .latent-ul .latent-icon[data-latent-icon='38']::before
{ /*6格的潜觉*/
width: 152px;
margin-left: -50px;
@@ -1377,7 +1375,7 @@ ul{
font-size: 0;
}
.m-latent-allowable-ul .latent-icon{
- margin-right: 4.66px;
+ margin-right: 4px;
margin-bottom: 4px;
}
.m-latent-allowable-ul .latent-icon:last-of-type{
diff --git a/triple.html b/triple.html
index 4ec3f718..1cfb212e 100644
--- a/triple.html
+++ b/triple.html
@@ -1427,7 +1427,9 @@ var formation = new Formation(teamsCount,6);
-
+
+
+
@@ -1449,11 +1451,8 @@ var formation = new Formation(teamsCount,6);
-
-
-
-
-
+
+