增加新的负SB和去除武器绑定潜觉

This commit is contained in:
枫谷剑仙 2022-12-15 20:24:33 +08:00
parent d5bcdb27cb
commit e231f4a22d
14 changed files with 64 additions and 17 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 194 KiB

After

Width:  |  Height:  |  Size: 195 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 74 KiB

After

Width:  |  Height:  |  Size: 76 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 491 KiB

After

Width:  |  Height:  |  Size: 492 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 308 KiB

After

Width:  |  Height:  |  Size: 314 KiB

View File

@ -291,7 +291,7 @@
[18]: tp`${'icon'}暗+`,
[19]: tp`${'icon'}手指`,
[20]: tp`${'icon'}心解`,
[21]: tp`${'icon'}SB`,
[21]: tp`${'icon'}S+`,
[22]: tp`${'icon'}火橫`,
[23]: tp`${'icon'}水橫`,
[24]: tp`${'icon'}木橫`,
@ -326,7 +326,7 @@
[53]: tp`${'icon'}大手指`,
[54]: tp`${'icon'}防雲`,
[55]: tp`${'icon'}防封條`,
[56]: tp`${'icon'}大SB`,
[56]: tp`${'icon'}大S+`,
[57]: tp`${'icon'}上血`,
[58]: tp`${'icon'}下血`,
[59]: tp`${'icon'}L盾`,
@ -375,6 +375,7 @@
[102]: tp`${'icon'}大光+`,
[103]: tp`${'icon'}大暗+`,
[104]: tp`${'icon'}大心+`,
[105]: tp`${'icon'}S-`,
}
},
};

View File

@ -293,7 +293,7 @@
[18]: tp`${'icon'}暗+`,
[19]: tp`${'icon'}手指`,
[20]: tp`${'icon'}心解`,
[21]: tp`${'icon'}SB`,
[21]: tp`${'icon'}S+`,
[22]: tp`${'icon'}火横`,
[23]: tp`${'icon'}水横`,
[24]: tp`${'icon'}木横`,
@ -328,7 +328,7 @@
[53]: tp`${'icon'}大手指`,
[54]: tp`${'icon'}防云`,
[55]: tp`${'icon'}防封条`,
[56]: tp`${'icon'}大SB`,
[56]: tp`${'icon'}大S+`,
[57]: tp`${'icon'}上血`,
[58]: tp`${'icon'}下血`,
[59]: tp`${'icon'}L盾`,
@ -377,6 +377,7 @@
[102]: tp`${'icon'}大光+`,
[103]: tp`${'icon'}大暗+`,
[104]: tp`${'icon'}大心+`,
[105]: tp`${'icon'}S-`,
}
},
};

View File

@ -741,7 +741,8 @@ var formation = new Formation(teamsCount,5);
<div class="formation-awoken">
<!--怪物觉醒-->
<ul class="awoken-ul">
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="21"></span><span class="count"></span></li><!--SB-->
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="21"></span><span class="count"></span></li><!--S+ -->
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="105"></span><span class="count"></span></li><!--S- -->
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="28"></span><span class="count"></span></li><!--SX-->
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="11"></span><span class="count"></span></li><!--防暗-->
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="12"></span><span class="count"></span></li><!--防废-->
@ -951,6 +952,7 @@ var formation = new Formation(teamsCount,5);
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="102"></button><!--大光+--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="103"></button><!--大暗+--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="104"></button><!--大心+--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="105"></button><!--S- --></li>
</ul>
</div>
<details class="sawoken-detail"><!--超觉醒列表-->
@ -1060,6 +1062,7 @@ var formation = new Formation(teamsCount,5);
<li class="awoken-count"><input type="checkbox" class="sawoken-check" name="types" value="102" id="search-awoken-102" /><label class="awoken-icon" data-awoken-icon="102" for="search-awoken-102"></label><!--大光+--></li>
<li class="awoken-count"><input type="checkbox" class="sawoken-check" name="types" value="103" id="search-awoken-103" /><label class="awoken-icon" data-awoken-icon="103" for="search-awoken-103"></label><!--大暗+--></li>
<li class="awoken-count"><input type="checkbox" class="sawoken-check" name="types" value="104" id="search-awoken-104" /><label class="awoken-icon" data-awoken-icon="104" for="search-awoken-104"></label><!--大心+--></li>
<li class="awoken-count"><input type="checkbox" class="sawoken-check" name="types" value="105" id="search-awoken-105" /><label class="awoken-icon" data-awoken-icon="105" for="search-awoken-105"></label><!--S- --></li>
</ul>
</details>
</div>
@ -1254,6 +1257,7 @@ var formation = new Formation(teamsCount,5);
<li class="latent-icon" data-latent-icon="41"></li><!--U解禁消-->
<li class="latent-icon" data-latent-icon="46"></li><!--心追解云封-->
<li class="latent-icon" data-latent-icon="47"></li><!--心L大SB-->
<li class="latent-icon" data-latent-icon="48"></li><!--L解禁武器-->
</ul>
</details>
</div>

View File

@ -393,6 +393,7 @@ let localTranslating = {
[102]: tp`${'icon'}Enhanced Water Orbs+`,
[103]: tp`${'icon'}Enhanced Dark Orbs+`,
[104]: tp`${'icon'}Enhanced Heal Orbs+`,
[105]: tp`${'icon'}Skill Boost Minus`,
}
},
};
@ -428,7 +429,7 @@ typekiller_for_type.forEach(t=>
const common_allowable_latent = [
1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,
28,29,30,31,32,33,34,35,36,37,38,
39,40,41,46,47 //需要拥有觉醒的才能打,但是有武器
39,40,41,46,47,48 //需要拥有觉醒的才能打,但是有武器
];
//120级才能打的潜觉
const v120_allowable_latent = [
@ -465,7 +466,7 @@ const official_awoken_sorting = [
65, 66, 67, 20, 71, 72, 30, 64, 63,
73, 74, 75, 76, 77, 78, 79, 80, 81,
82, 84, 83, 85, 86, 87, 88, 89, 90,
91, 92, 93, 94, 95,
91, 92, 93, 94, 95, 105,
];
//pdc的徽章对应数字
@ -549,6 +550,8 @@ const pdcLatentMap = [
{pdf:46,pdc:52}, //心追解云封 ×1.5
{pdf:47,pdc:53}, //心L大SB
{pdf:47,pdc:54}, //心L大SB ×1.5
{pdf:48,pdc:55}, //L解禁武器
{pdf:48,pdc:56}, //L解禁武器 ×1.8
];
//排序程序列表
const sort_function_list = [

View File

@ -400,7 +400,7 @@ function latentUseHole(latentId) {
}
case 13: case 14: case 15: case 37: case 38:
case 39: case 40: case 41: case 42: case 46:
case 47:
case 47: case 48:
{
return 6;
}
@ -1306,6 +1306,8 @@ function countTeamSB(team, solo) {
//大SB 56小SB 21
sbn += enableAwoken.filter(n=>n===21).length;
sbn += enableAwoken.filter(n=>n===56).length * 2;
//负sb 105
sbn -= enableAwoken.filter(n=>n===105).length;
//心L 59心L大SB潜觉 47
sbn += enableAwoken.filter(n=>n===59).length ? member.latent.filter(n=>n===47).length * 3 : 0;
}

View File

@ -493,7 +493,8 @@ var formation = new Formation(teamsCount,6);
<div class="team-awoken">
<!--怪物觉醒-->
<ul class="awoken-ul">
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="21"></span><span class="count"></span></li><!--SB-->
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="21"></span><span class="count"></span></li><!--S+ -->
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="105"></span><span class="count"></span></li><!--S- -->
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="28"></span><span class="count"></span></li><!--SX-->
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="11"></span><span class="count"></span></li><!--防暗-->
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="12"></span><span class="count"></span></li><!--防废-->
@ -793,6 +794,7 @@ var formation = new Formation(teamsCount,6);
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="102"></button><!--大光+--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="103"></button><!--大暗+--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="104"></button><!--大心+--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="105"></button><!--S- --></li>
</ul>
</div>
<details class="sawoken-detail"><!--超觉醒列表-->
@ -902,6 +904,7 @@ var formation = new Formation(teamsCount,6);
<li class="awoken-count"><input type="checkbox" class="sawoken-check" name="types" value="102" id="search-awoken-102" /><label class="awoken-icon" data-awoken-icon="102" for="search-awoken-102"></label><!--大光+--></li>
<li class="awoken-count"><input type="checkbox" class="sawoken-check" name="types" value="103" id="search-awoken-103" /><label class="awoken-icon" data-awoken-icon="103" for="search-awoken-103"></label><!--大暗+--></li>
<li class="awoken-count"><input type="checkbox" class="sawoken-check" name="types" value="104" id="search-awoken-104" /><label class="awoken-icon" data-awoken-icon="104" for="search-awoken-104"></label><!--大心+--></li>
<li class="awoken-count"><input type="checkbox" class="sawoken-check" name="types" value="105" id="search-awoken-105" /><label class="awoken-icon" data-awoken-icon="105" for="search-awoken-105"></label><!--S- --></li>
</ul>
</details>
</div>
@ -1096,6 +1099,7 @@ var formation = new Formation(teamsCount,6);
<li class="latent-icon" data-latent-icon="41"></li><!--U解禁消-->
<li class="latent-icon" data-latent-icon="46"></li><!--心追解云封-->
<li class="latent-icon" data-latent-icon="47"></li><!--心L大SB-->
<li class="latent-icon" data-latent-icon="48"></li><!--L解禁武器-->
</ul>
</details>
</div>

View File

@ -980,6 +980,9 @@
.awoken-icon[data-awoken-icon='104']{/*大心+*/
background-position-y:calc(-32px * 104);
}
.awoken-icon[data-awoken-icon='105']{/*S-*/
background-position-y:calc(-32px * 105);
}
:lang(zh) .awoken-icon:where(
[data-awoken-icon='46'],
[data-awoken-icon='47'],
@ -1237,6 +1240,9 @@
.latent-icon[data-latent-icon='47']::before{ /*心L大SB*/
background-position-y: calc(-32px * 47);
}
.latent-icon[data-latent-icon='48']::before{ /*L解禁武器*/
background-position-y: calc(-32px * 48);
}
:is(:lang(en), :lang(ko)) .latent-icon:where(
[data-latent-icon='17'],
[data-latent-icon='37'],
@ -1258,7 +1264,8 @@
[data-latent-icon='41'],
[data-latent-icon='46'],
[data-latent-icon='47'],
){ /*占两格*/
[data-latent-icon='48'],
){ /*所以横向占两格*/
grid-column: span 2;
}
.edit-box .m-latent-allowable-ul .latent-icon:where(
@ -1267,6 +1274,7 @@
[data-latent-icon='41'],
[data-latent-icon='46'],
[data-latent-icon='47'],
[data-latent-icon='48'],
)::after /*赋予他们的after觉醒图片*/
{
content: "";
@ -1289,6 +1297,9 @@
.m-latent-allowable-ul .latent-icon[data-latent-icon='47']::after{ /*心L大SB*/
background-position-y: calc(-32px * 59);
}
.m-latent-allowable-ul .latent-icon[data-latent-icon='48']::after{ /*心L大SB*/
background-position-y: calc(-32px * 60);
}
/* 额外有 x1.5 的 6格觉醒 */
.level-super-break .latent-icon:where(
@ -1300,12 +1311,26 @@
[data-latent-icon='41'],
[data-latent-icon='46'],
[data-latent-icon='47'],
[data-latent-icon='48'],
)::after
{
content: "";
background-position-x: -32px;
font-family: var(--game-font-family);
font-size: 10px;
text-shadow: black -1px -1px 1px,black 1px -1px 1px,black -1px 1px 1px,black 1px 1px 1px;
text-align: center;
color: orange;
content: "x1.5";
margin-left: 3px;
background-position-x: -64px;
background-position-y: calc(-32px * 42);
}
/* 额外有 x1.5 的 6格觉醒 */
.level-super-break .latent-icon:where(
[data-latent-icon='48'],
)::after
{
content: "x1.8";
}
/* 徽章背景 */
.badge{

View File

@ -1465,11 +1465,12 @@ icon.inflicts::after
margin: calc(-100px * (1 - 0.5) / 2);
}
.rich-text .detail-mon .monster .id{
font-weight: bold;
background-color: rgba(0,0,0,0.8);
padding: 2px;
font-size: 23px;
}
.rich-text .detail-mon .monster .id::before {
font-size: 15px;
display: none;
}
.rich-text .latent-icon {
width: 32px;

View File

@ -505,7 +505,8 @@ var formation = new Formation(teamsCount,6);
<div class="team-awoken">
<!--怪物觉醒-->
<ul class="awoken-ul">
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="21"></span><span class="count"></span></li><!--SB-->
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="21"></span><span class="count"></span></li><!--S+ -->
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="105"></span><span class="count"></span></li><!--S- -->
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="28"></span><span class="count"></span></li><!--SX-->
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="11"></span><span class="count"></span></li><!--防暗-->
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="12"></span><span class="count"></span></li><!--防废-->
@ -1025,7 +1026,8 @@ var formation = new Formation(teamsCount,6);
<div class="team-awoken">
<!--怪物觉醒-->
<ul class="awoken-ul">
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="21"></span><span class="count"></span></li><!--SB-->
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="21"></span><span class="count"></span></li><!--S+ -->
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="105"></span><span class="count"></span></li><!--S- -->
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="28"></span><span class="count"></span></li><!--SX-->
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="11"></span><span class="count"></span></li><!--防暗-->
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="12"></span><span class="count"></span></li><!--防废-->
@ -1545,7 +1547,8 @@ var formation = new Formation(teamsCount,6);
<div class="team-awoken">
<!--怪物觉醒-->
<ul class="awoken-ul">
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="21"></span><span class="count"></span></li><!--SB-->
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="21"></span><span class="count"></span></li><!--S+ -->
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="105"></span><span class="count"></span></li><!--S- -->
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="28"></span><span class="count"></span></li><!--SX-->
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="11"></span><span class="count"></span></li><!--防暗-->
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="12"></span><span class="count"></span></li><!--防废-->
@ -1845,6 +1848,7 @@ var formation = new Formation(teamsCount,6);
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="102"></button><!--大光+--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="103"></button><!--大暗+--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="104"></button><!--大心+--></li>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="105"></button><!--S- --></li>
</ul>
</div>
<details class="sawoken-detail"><!--超觉醒列表-->
@ -1954,6 +1958,7 @@ var formation = new Formation(teamsCount,6);
<li class="awoken-count"><input type="checkbox" class="sawoken-check" name="types" value="102" id="search-awoken-102" /><label class="awoken-icon" data-awoken-icon="102" for="search-awoken-102"></label><!--大光+--></li>
<li class="awoken-count"><input type="checkbox" class="sawoken-check" name="types" value="103" id="search-awoken-103" /><label class="awoken-icon" data-awoken-icon="103" for="search-awoken-103"></label><!--大暗+--></li>
<li class="awoken-count"><input type="checkbox" class="sawoken-check" name="types" value="104" id="search-awoken-104" /><label class="awoken-icon" data-awoken-icon="104" for="search-awoken-104"></label><!--大心+--></li>
<li class="awoken-count"><input type="checkbox" class="sawoken-check" name="types" value="105" id="search-awoken-105" /><label class="awoken-icon" data-awoken-icon="105" for="search-awoken-105"></label><!--S- --></li>
</ul>
</details>
</div>
@ -2148,6 +2153,7 @@ var formation = new Formation(teamsCount,6);
<li class="latent-icon" data-latent-icon="41"></li><!--U解禁消-->
<li class="latent-icon" data-latent-icon="46"></li><!--心追解云封-->
<li class="latent-icon" data-latent-icon="47"></li><!--心L大SB-->
<li class="latent-icon" data-latent-icon="48"></li><!--L解禁武器-->
</ul>
</details>
</div>