-
+
diff --git a/style-monsterimages.css b/style-monsterimages.css
index ecab0d6a..acbc35cb 100644
--- a/style-monsterimages.css
+++ b/style-monsterimages.css
@@ -769,19 +769,21 @@ icon.type
}
/*潜在觉醒*/
.latent-icon{
- display:inline-block;
- text-align: center;
background: rgba(33,28,21,0.5);
border: 2px ridge rgba(82,82,60,0.5);
+ box-shadow:inset 0 2px 1px -1px rgba(0,0,0,0.5);
border-radius: 5px;
box-sizing: border-box;
- box-shadow:inset 0 2px 1px -1px rgba(0,0,0,0.5);
+ display: flex;
+ flex-direction: row;
+ justify-content: center; /*从下往上*/
+ align-items: center; /*靠右*/
}
.latent-icon::before,
.latent-icon::after /*目前x1.5暂时只有日服支持,美服支持后删除.ds-ja*/
{
- display: inline-block;
margin: -2px;
+ display: inline-block;
width: 32px;
height: 32px;
background-image: url(images/icon-latent.png);
@@ -790,67 +792,18 @@ icon.type
.latent-icon::before{
content: "";
}
-.latent-icon.latent-lock::before{
+/*7格开始没有id的,显示锁*/
+.latent-ul>.latent-icon:nth-of-type(n+7):not([data-latent-icon]):before {
background-position-x: -32px;
}
.latent-icon[data-latent-icon]{
background: linear-gradient(#4499EE 33%, #2277EE 80%);
border-color: #CCEEFF;
- box-shadow: black 1px 1px 1px;
+ box-shadow: black 1px 1px 1px,black 0px 1px 2px inset;
}
.latent-icon[data-latent-icon]::before{
background-position-x: 0;
}
-/* 2格的 潜觉 */
-.m-latent-ul .latent-icon[data-latent-icon='12'],
-.m-latent-ul .latent-icon[data-latent-icon='16'],
-.m-latent-ul .latent-icon[data-latent-icon='17'],
-.m-latent-ul .latent-icon[data-latent-icon='18'],
-.m-latent-ul .latent-icon[data-latent-icon='19'],
-.m-latent-ul .latent-icon[data-latent-icon='20'],
-.m-latent-ul .latent-icon[data-latent-icon='21'],
-.m-latent-ul .latent-icon[data-latent-icon='22'],
-.m-latent-ul .latent-icon[data-latent-icon='23'],
-.m-latent-ul .latent-icon[data-latent-icon='24'],
-.m-latent-ul .latent-icon[data-latent-icon='25'],
-.m-latent-ul .latent-icon[data-latent-icon='26'],
-.m-latent-ul .latent-icon[data-latent-icon='27'],
-.m-latent-ul .latent-icon[data-latent-icon='28'],
-.m-latent-ul .latent-icon[data-latent-icon='29'],
-.m-latent-ul .latent-icon[data-latent-icon='30'],
-.m-latent-ul .latent-icon[data-latent-icon='31'],
-.m-latent-ul .latent-icon[data-latent-icon='32'],
-.m-latent-ul .latent-icon[data-latent-icon='33'],
-.m-latent-ul .latent-icon[data-latent-icon='34'],
-.m-latent-ul .latent-icon[data-latent-icon='35'],
-.m-latent-ul .latent-icon[data-latent-icon='36'],
-.m-latent-ul .latent-icon[data-latent-icon='43'],
-.m-latent-ul .latent-icon[data-latent-icon='44'],
-.m-latent-ul .latent-icon[data-latent-icon='45']
-{
- width: 76px;
-}
-/* 特殊的 三维潜觉 */
-.m-latent-ul .latent-icon[data-latent-icon='12']::before
-{
- width: 76px;
- background-position-x: -32px;
-}
-/* 6格的 潜觉宽度 */
-.m-latent-ul .latent-icon[data-latent-icon='13'],
-.m-latent-ul .latent-icon[data-latent-icon='14'],
-.m-latent-ul .latent-icon[data-latent-icon='15'],
-.m-latent-ul .latent-icon[data-latent-icon='37'],
-.m-latent-ul .latent-icon[data-latent-icon='38'],
-.m-latent-ul .latent-icon[data-latent-icon='39'],
-.m-latent-ul .latent-icon[data-latent-icon='40'],
-.m-latent-ul .latent-icon[data-latent-icon='41'],
-.m-latent-ul .latent-icon[data-latent-icon='42'],
-.m-latent-ul .latent-icon[data-latent-icon='46'],
-.m-latent-ul .latent-icon[data-latent-icon='47']
-{
- width: 252px;
-}
.latent-icon[data-latent-icon='1']::before{ /*HP*/
background-position-y: calc(-32px * 1);
}
@@ -992,147 +945,14 @@ icon.type
.latent-icon[data-latent-icon='47']::before{ /*心L大SB*/
background-position-y: calc(-32px * 47);
}
-/* 队伍界面2格的 潜觉 */
-.team-latents .latent-ul .latent-icon[data-latent-icon='12'],
-.team-latents .latent-ul .latent-icon[data-latent-icon='16'],
-.team-latents .latent-ul .latent-icon[data-latent-icon='17'],
-.team-latents .latent-ul .latent-icon[data-latent-icon='18'],
-.team-latents .latent-ul .latent-icon[data-latent-icon='19'],
-.team-latents .latent-ul .latent-icon[data-latent-icon='20'],
-.team-latents .latent-ul .latent-icon[data-latent-icon='21'],
-.team-latents .latent-ul .latent-icon[data-latent-icon='22'],
-.team-latents .latent-ul .latent-icon[data-latent-icon='23'],
-.team-latents .latent-ul .latent-icon[data-latent-icon='24'],
-.team-latents .latent-ul .latent-icon[data-latent-icon='25'],
-.team-latents .latent-ul .latent-icon[data-latent-icon='26'],
-.team-latents .latent-ul .latent-icon[data-latent-icon='27'],
-.team-latents .latent-ul .latent-icon[data-latent-icon='28'],
-.team-latents .latent-ul .latent-icon[data-latent-icon='29'],
-.team-latents .latent-ul .latent-icon[data-latent-icon='30'],
-.team-latents .latent-ul .latent-icon[data-latent-icon='31'],
-.team-latents .latent-ul .latent-icon[data-latent-icon='32'],
-.team-latents .latent-ul .latent-icon[data-latent-icon='33'],
-.team-latents .latent-ul .latent-icon[data-latent-icon='34'],
-.team-latents .latent-ul .latent-icon[data-latent-icon='35'],
-.team-latents .latent-ul .latent-icon[data-latent-icon='36'],
-.team-latents .latent-ul .latent-icon[data-latent-icon='43'],
-.team-latents .latent-ul .latent-icon[data-latent-icon='44'],
-.team-latents .latent-ul .latent-icon[data-latent-icon='45']
-{
- width: 70px;
-}
/* 队伍界面特殊的 三维潜觉 */
-.team-latents .latent-ul .latent-icon[data-latent-icon='12']::before
+.latent-ul-div .latent-ul .latent-icon[data-latent-icon='12']::before
{
- transform: scale(0.9);
margin-left: -5px;
width: 76px;
background-position-x: -32px;
}
-/* 队伍界面,6格的潜觉宽度 */
-.team-latents .latent-ul .latent-icon[data-latent-icon='13'],
-.team-latents .latent-ul .latent-icon[data-latent-icon='14'],
-.team-latents .latent-ul .latent-icon[data-latent-icon='15'],
-.team-latents .latent-ul .latent-icon[data-latent-icon='37'],
-.team-latents .latent-ul .latent-icon[data-latent-icon='38'],
-.team-latents .latent-ul .latent-icon[data-latent-icon='39'],
-.team-latents .latent-ul .latent-icon[data-latent-icon='40'],
-.team-latents .latent-ul .latent-icon[data-latent-icon='41'],
-.team-latents .latent-ul .latent-icon[data-latent-icon='42'],
-.team-latents .latent-ul .latent-icon[data-latent-icon='46'],
-.team-latents .latent-ul .latent-icon[data-latent-icon='47']
-{
- width: 146px;
- margin-left: 0px;
- border-radius: 5px 5px 5px 0;
-}
-/*6格大觉醒,队伍界面显示行为改造*/
-.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='42']::before,
-.team-latents .latent-ul .latent-icon[data-latent-icon='46']::before,
-.team-latents .latent-ul .latent-icon[data-latent-icon='47']::before
-{
- background: none;
-}
-.team-latents .latent-icon[data-latent-icon='13']+.latent-icon,
-.team-latents .latent-icon[data-latent-icon='14']+.latent-icon,
-.team-latents .latent-icon[data-latent-icon='15']+.latent-icon,
-.team-latents .latent-icon[data-latent-icon='37']+.latent-icon,
-.team-latents .latent-icon[data-latent-icon='38']+.latent-icon,
-.team-latents .latent-icon[data-latent-icon='39']+.latent-icon,
-.team-latents .latent-icon[data-latent-icon='40']+.latent-icon,
-.team-latents .latent-icon[data-latent-icon='41']+.latent-icon,
-.team-latents .latent-icon[data-latent-icon='42']+.latent-icon,
-.team-latents .latent-icon[data-latent-icon='46']+.latent-icon,
-.team-latents .latent-icon[data-latent-icon='47']+.latent-icon
-{
- width: 70px;
- height: 39px;
- margin-left: 0;
- margin-right: 6px;
- margin-bottom: -9px;
- display: inline-block !important;
- background: linear-gradient(#2277EE , #1155AA 80%);
- border-color: #CCEEFF;
- box-shadow: black 1px 1px 1px;
- border-radius: 0 0 5px 5px;
- border-top: none;
- transform: translatey(-9px);
-}
-.team-latents .latent-icon[data-latent-icon='13']+.latent-icon::before,
-.team-latents .latent-icon[data-latent-icon='14']+.latent-icon::before,
-.team-latents .latent-icon[data-latent-icon='15']+.latent-icon::before,
-.team-latents .latent-icon[data-latent-icon='37']+.latent-icon::before,
-.team-latents .latent-icon[data-latent-icon='38']+.latent-icon::before,
-.team-latents .latent-icon[data-latent-icon='39']+.latent-icon::before,
-.team-latents .latent-icon[data-latent-icon='40']+.latent-icon::before,
-.team-latents .latent-icon[data-latent-icon='41']+.latent-icon::before,
-.team-latents .latent-icon[data-latent-icon='42']+.latent-icon::before,
-.team-latents .latent-icon[data-latent-icon='46']+.latent-icon::before,
-.team-latents .latent-icon[data-latent-icon='47']+.latent-icon::before
-{
- transform: scale(1.54) translateY(-7px);
-}
-.team-latents .latent-icon[data-latent-icon='13']+.latent-icon::before{
- background-position-y: calc(-32px * 13);
-}
-.team-latents .latent-icon[data-latent-icon='14']+.latent-icon::before{
- background-position-y: calc(-32px * 14);
-}
-.team-latents .latent-icon[data-latent-icon='15']+.latent-icon::before{
- background-position-y: calc(-32px * 15);
-}
-.team-latents .latent-icon[data-latent-icon='37']+.latent-icon::before{
- background-position-y: calc(-32px * 37);
-}
-.team-latents .latent-icon[data-latent-icon='38']+.latent-icon::before{
- background-position-y: calc(-32px * 38);
-}
-.team-latents .latent-icon[data-latent-icon='39']+.latent-icon::before{
- background-position-y: calc(-32px * 39);
-}
-.team-latents .latent-icon[data-latent-icon='40']+.latent-icon::before{
- background-position-y: calc(-32px * 40);
-}
-.team-latents .latent-icon[data-latent-icon='41']+.latent-icon::before{
- background-position-y: calc(-32px * 41);
-}
-.team-latents .latent-icon[data-latent-icon='42']+.latent-icon::before{
- background-position-y: calc(-32px * 42);
-}
-.team-latents .latent-icon[data-latent-icon='46']+.latent-icon::before{
- background-position-y: calc(-32px * 46);
-}
-.team-latents .latent-icon[data-latent-icon='47']+.latent-icon::before{
- background-position-y: calc(-32px * 47);
-}
+
/* 额外有 x1.5 的 6格觉醒 */
.level-super-break .latent-icon[data-latent-icon='13']::after,
.level-super-break .latent-icon[data-latent-icon='37']::after,
diff --git a/style.css b/style.css
index 5ba6a82f..37902bdc 100644
--- a/style.css
+++ b/style.css
@@ -1067,7 +1067,6 @@ icon.inflicts::after
vertical-align: top;
}
.team-latents .latent-ul{
- font-size: 0;
width: 152px;
transform: scale(0.65);
transform-origin: left top;
@@ -1076,11 +1075,28 @@ icon.inflicts::after
/*margin: calc(-64px * (1 - 0.63) / 2 + 3px) calc((108px - 152px) / 2);*/
/*-152 * (1 - 0.63) + 108 - 152 * 0.63,化简为108 - 152*/
min-height: 47px; /* 为了防止只有一层6格大潜觉的时候,被缩减太多的问题*/
+ /*潜在觉醒布局,使用 gird*/
+ display: inline-grid;
+ grid-template-columns: repeat(4, 32px);
+ grid-auto-rows: 32px;
+ grid-gap: 3px 6px;
}
-.team-latents .latent-icon
+.team-latents .latent-icon[data-latent-hole="1"] {
+ grid-column: span 1;
+}
+.team-latents .latent-icon[data-latent-hole="2"] {
+ grid-column: span 1;
+ grid-row: span 2;
+}
+.team-latents .latent-icon[data-latent-hole="6"] {
+ grid-column: span 3;
+ grid-row: span 2;
+}
+.team-latents .latent-icon[data-latent-hole="6"]::before,
+.team-latents .latent-icon[data-latent-hole="6"]::after
{
- margin-top: 3px;
- margin-right: 6px;
+ transform: scale(1.54);
+ margin: calc(32px / 4);
}
/*队长的边框*/
@@ -2293,42 +2309,66 @@ icon.inflicts::after
}
/*.edit-box .setting-box .row-mon-latent::before{
content: "▼潜在觉醒";
-}*/
-.m-latent-ul-div{
+}
+*/
+.row-mon-latent .latent-ul-div{
text-align: center;
}
-.m-latent-ul{
- font-size: 0;
- display: inline-block;
+.row-mon-latent .latent-ul{
background: rgba(88,75,56,154);
border: 2px ridge #94733f;
border-radius: 7px;
- padding: 2px;
+ padding: 3px;
+ /*潜在觉醒布局,使用 gird*/
+ display: inline-grid;
+ grid-template-columns: repeat(6, 32px);
+ grid-auto-rows: 32px;
+ grid-gap: 12px;
+}
+.row-mon-latent .latent-ul.block-8 {
+ grid-template-columns: repeat(8, 32px);
+}
+/*没有block-8的,7格开始不显示*/
+.latent-ul:not(.block-8)>.latent-icon:nth-of-type(n+7) {
+ display: none;
}
-.m-latent-ul .latent-icon{
- margin-left: 12px;
+.row-mon-latent .latent-icon[data-latent-hole="1"] {
+ grid-column: span 1;
}
-.m-latent-ul .latent-icon:first-of-type{
- margin-left: 0;
+.row-mon-latent .latent-icon[data-latent-hole="2"] {
+ grid-column: span 2;
}
+.row-mon-latent .latent-icon[data-latent-hole="6"] {
+ grid-column: span 6;
+}
+.latent-icon[data-latent-hole="2"]+.latent-icon,
+.latent-icon[data-latent-hole="6"]+.latent-icon,
+.latent-icon[data-latent-hole="6"]+.latent-icon+.latent-icon,
+.latent-icon[data-latent-hole="6"]+.latent-icon+.latent-icon+.latent-icon,
+.latent-icon[data-latent-hole="6"]+.latent-icon+.latent-icon+.latent-icon+.latent-icon,
+.latent-icon[data-latent-hole="6"]+.latent-icon+.latent-icon+.latent-icon+.latent-icon+.latent-icon
+{
+ display: none;
+}
+
.m-latent-allowable-ul{
- margin-top: 5px;
- font-size: 0;
+ margin-bottom: 5px;
+ display: grid;
+ grid-template-columns: repeat(auto-fill, 32px);
+ grid-auto-rows: 32px;
+ grid-gap: 4px;
}
.m-latent-allowable-ul .latent-icon{
- margin-right: 4px;
- margin-bottom: 4px;
+ grid-column: span 1;
+ grid-row: span 1;
}
.m-latent-allowable-ul .latent-icon:last-of-type{
margin-right: unset;
}
/*没有打觉醒的空格,没有手指*/
-.m-latent-ul .latent-icon{
- cursor: default;
-}
.m-latent-allowable-ul .latent-icon,
-.m-latent-ul .latent-icon[data-latent-icon]{
+.latent-ul .latent-icon[data-latent-icon]{
cursor: pointer;
}
/*不允许使用的潜觉,不是手指,半透明,灰度*/
diff --git a/triple.html b/triple.html
index d1cff81d..49ec223e 100644
--- a/triple.html
+++ b/triple.html
@@ -250,8 +250,8 @@ var formation = new Formation(teamsCount,6);
-
-
+
+
@@ -262,8 +262,8 @@ var formation = new Formation(teamsCount,6);
-
-
+
+
@@ -274,8 +274,8 @@ var formation = new Formation(teamsCount,6);
-
-
+
+
@@ -286,8 +286,8 @@ var formation = new Formation(teamsCount,6);
-
-
+
+
@@ -298,8 +298,8 @@ var formation = new Formation(teamsCount,6);
-
-
+
+
@@ -310,8 +310,8 @@ var formation = new Formation(teamsCount,6);
-
-
+
+
@@ -729,8 +729,8 @@ var formation = new Formation(teamsCount,6);
-
-
+
+
@@ -741,8 +741,8 @@ var formation = new Formation(teamsCount,6);
-
-
+
+
@@ -753,8 +753,8 @@ var formation = new Formation(teamsCount,6);
-
-
+
+
@@ -765,8 +765,8 @@ var formation = new Formation(teamsCount,6);
-
-
+
+
@@ -777,8 +777,8 @@ var formation = new Formation(teamsCount,6);
-
-
+
+
@@ -789,8 +789,8 @@ var formation = new Formation(teamsCount,6);
-
-
+
+
@@ -1208,8 +1208,8 @@ var formation = new Formation(teamsCount,6);
-
-
+
+
@@ -1220,8 +1220,8 @@ var formation = new Formation(teamsCount,6);
-
-
+
+
@@ -1232,8 +1232,8 @@ var formation = new Formation(teamsCount,6);
-
-
+
+
@@ -1244,8 +1244,8 @@ var formation = new Formation(teamsCount,6);
-
-
+
+
@@ -1256,8 +1256,8 @@ var formation = new Formation(teamsCount,6);
-
-
+
+
@@ -1268,8 +1268,8 @@ var formation = new Formation(teamsCount,6);
-
-
+
+
@@ -1967,16 +1967,16 @@ var formation = new Formation(teamsCount,6);