diff --git a/images/awoken.png b/images/awoken.png
index d3106243..4298ec8a 100644
Binary files a/images/awoken.png and b/images/awoken.png differ
diff --git a/images/icon-latent.png b/images/icon-latent.png
index 859b3efe..426a5240 100644
Binary files a/images/icon-latent.png and b/images/icon-latent.png differ
diff --git a/images/project file/awoken.fw.png b/images/project file/awoken.fw.png
index 8a1ef61f..83c629a4 100644
Binary files a/images/project file/awoken.fw.png and b/images/project file/awoken.fw.png differ
diff --git a/images/project file/icon-latent.fw.png b/images/project file/icon-latent.fw.png
index 0a9a6665..18455af0 100644
Binary files a/images/project file/icon-latent.fw.png and b/images/project file/icon-latent.fw.png differ
diff --git a/script-json_data.js b/script-json_data.js
index 72ee32b2..2c2c7629 100644
--- a/script-json_data.js
+++ b/script-json_data.js
@@ -401,7 +401,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 //需要拥有觉醒的才能打,但是有武器
+ 39,40,41,46,47 //需要拥有觉醒的才能打,但是有武器
];
//120级才能打的潜觉
const v120_allowable_latent = [
@@ -415,20 +415,30 @@ const equivalent_awoken = [
{small:13,big:70,times:5}, //防毒
{small:19,big:53,times:2}, //手指
{small:21,big:56,times:2}, //SB
+ {small:27,big:96,times:2}, //U
+ {small:51,big:97,times:2}, //5色溜
+ {small:9,big:98,times:2}, //自回
+ {small:14,big:99,times:2}, //火+
+ {small:15,big:100,times:2},//水+
+ {small:16,big:101,times:2},//木+
+ {small:17,big:102,times:2},//光+
+ {small:18,big:103,times:2},//暗+
+ {small:29,big:104,times:2},//心+
];
//官方的觉醒排列顺序
const official_awoken_sorting = [
- 21, 19, 43, 45, 10, 11, 12, 13, 49,
- 56, 53, 61, 50, 52, 68, 69, 70, 28,
- 27, 48, 62, 57, 58, 60, 59, 54, 55,
- 14, 15, 16, 17, 18, 29, 20, 44, 51,
- 22, 23, 24, 25, 26, 32, 31, 33, 34,
- 4, 5, 6, 7, 8, 35, 36, 37, 38,
- 1, 2, 3, 46, 47, 39, 40, 41, 42,
- 65, 66, 67, 9, 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, 96
+ 21, 19, 43, 45, 10, 11, 12, 13, 49,
+ 56, 53, 61, 50, 52, 68, 69, 70, 28,
+ 27, 48, 62, 57, 58, 60, 59, 54, 55,
+ 14, 15, 16, 17, 18, 29, 20, 44, 51,
+ 22, 23, 24, 25, 26, 32, 31, 33, 34,
+ 4, 5, 6, 7, 8, 35, 36, 37, 38,
+ 1, 2, 3, 46, 47, 39, 40, 41, 42,
+ 65, 66, 67, 9, 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, 96, 97, 98, 99,
+ 100,101,102,103,104
];
//pdc的徽章对应数字
@@ -509,6 +519,8 @@ const pdcLatentMap = [
{pdf:45,pdc:44}, //回复++
{pdf:46,pdc:51}, //心追解云封
{pdf:46,pdc:52}, //心追解云封 ×1.5
+ {pdf:47,pdc:53}, //心L大SB
+ {pdf:47,pdc:54}, //心L大SB ×1.5
];
//排序程序列表
const sort_function_list = [
diff --git a/script-universal_function.js b/script-universal_function.js
index 8abfb17c..d06c36da 100644
--- a/script-universal_function.js
+++ b/script-universal_function.js
@@ -467,7 +467,7 @@ function latentUseHole(latentId) {
}
case (latentId >= 13 && latentId <= 15):
case (latentId >= 37 && latentId <= 42):
- case (latentId == 46):
+ case (latentId >= 46):
{
return 6;
}
diff --git a/service-worker.js b/service-worker.js
index 38d880a8..2b8e36f2 100644
--- a/service-worker.js
+++ b/service-worker.js
@@ -5975,7 +5975,7 @@ const cachesMap = new Map([
],
[
"script-json_data.js",
- "708e0b6411abd832b339fdff8bbaaa13"
+ "c07f449c1e8a13d43325e130f352ef54"
],
[
"script-skill-parser.js",
@@ -5983,7 +5983,7 @@ const cachesMap = new Map([
],
[
"script-universal_function.js",
- "10eabc7ba4b17d6be72ec997f8ddb682"
+ "6a902b84f2b38bec51974ffad7d92e34"
],
[
"script.js",
@@ -5991,7 +5991,7 @@ const cachesMap = new Map([
],
[
"solo.html",
- "b9d613f19ea799bcb0a77c7cd39f726a"
+ "a68f217544e2a9c49ad65821cd3fcb29"
],
[
"style-card.css",
@@ -5999,11 +5999,11 @@ const cachesMap = new Map([
],
[
"style-monsterimages.css",
- "4b0e7ceb6e209ce52d9e460c40313874"
+ "98897b24652c22acd257c7b9e3fe2c25"
],
[
"style.css",
- "9e22c4876be31d31837b2cda324bf4d9"
+ "bc468913a73719031da40692b1cb81e5"
],
[
"temp.js",
@@ -6083,7 +6083,7 @@ const cachesMap = new Map([
],
[
"images/awoken.png",
- "da166377b0a6215e8eab000a7b4e9a7e"
+ "4742a550d48eec5f1efba54d48297720"
],
[
"images/badge-bg.png",
@@ -6131,7 +6131,7 @@ const cachesMap = new Map([
],
[
"images/icon-latent.png",
- "9c9cba14dee24e92bb8b921e39b813dc"
+ "e7040896c8d6607bf65696e7175b7b5d"
],
[
"images/icon-MP.png",
diff --git a/solo.html b/solo.html
index 99216197..585bb066 100644
--- a/solo.html
+++ b/solo.html
@@ -732,6 +732,15 @@ var formation = new Formation(teamsCount,6);
+
+
+
+
+
+
+
+
+
@@ -832,6 +841,15 @@ var formation = new Formation(teamsCount,6);
+
+
+
+
+
+
+
+
+
@@ -1030,6 +1048,7 @@ var formation = new Formation(teamsCount,6);
+
diff --git a/style-monsterimages.css b/style-monsterimages.css
index c4140db3..601c6c3c 100644
--- a/style-monsterimages.css
+++ b/style-monsterimages.css
@@ -667,6 +667,33 @@ icon.type
.awoken-icon[data-awoken-icon='95']{/*附加暗属性*/
background-position-y:calc(-32px * 95);
}
+.awoken-icon[data-awoken-icon='96']{/*大U*/
+ background-position-y:calc(-32px * 96);
+}
+.awoken-icon[data-awoken-icon='97']{/*大5色溜*/
+ background-position-y:calc(-32px * 97);
+}
+.awoken-icon[data-awoken-icon='98']{/*大自回*/
+ background-position-y:calc(-32px * 98);
+}
+.awoken-icon[data-awoken-icon='99']{/*大火+*/
+ background-position-y:calc(-32px * 99);
+}
+.awoken-icon[data-awoken-icon='100']{/*大水+*/
+ background-position-y:calc(-32px * 100);
+}
+.awoken-icon[data-awoken-icon='101']{/*大木+*/
+ background-position-y:calc(-32px * 101);
+}
+.awoken-icon[data-awoken-icon='102']{/*大光+*/
+ background-position-y:calc(-32px * 102);
+}
+.awoken-icon[data-awoken-icon='103']{/*大暗+*/
+ background-position-y:calc(-32px * 103);
+}
+.awoken-icon[data-awoken-icon='104']{/*大心+*/
+ background-position-y:calc(-32px * 104);
+}
/*类型*/
.type-icon,
icon.type
@@ -809,7 +836,7 @@ icon.type
width: 76px;
background-position-x: -32px;
}
-/* 6格的 潜觉 */
+/* 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'],
@@ -819,7 +846,8 @@ icon.type
.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='46'],
+.m-latent-ul .latent-icon[data-latent-icon='47']
{
width: 252px;
}
@@ -961,6 +989,9 @@ icon.type
.latent-icon[data-latent-icon='46']::before{ /*心追解云封*/
background-position-y: calc(-32px * 46);
}
+.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'],
@@ -998,7 +1029,7 @@ icon.type
width: 76px;
background-position-x: -32px;
}
-/* 队伍界面6格的潜觉 */
+/* 队伍界面,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'],
@@ -1008,12 +1039,14 @@ icon.type
.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='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,
@@ -1023,7 +1056,8 @@ icon.type
.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='46']::before,
+.team-latents .latent-ul .latent-icon[data-latent-icon='47']::before
{
background: none;
}
@@ -1036,7 +1070,8 @@ icon.type
.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='46']+.latent-icon,
+.team-latents .latent-icon[data-latent-icon='47']+.latent-icon
{
width: 70px;
height: 39px;
@@ -1060,7 +1095,8 @@ icon.type
.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='46']+.latent-icon::before,
+.team-latents .latent-icon[data-latent-icon='47']+.latent-icon::before
{
transform: scale(1.54) translateY(-7px);
}
@@ -1088,14 +1124,15 @@ icon.type
.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
-{
+.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
-{
+.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,
@@ -1103,7 +1140,8 @@ icon.type
.level-super-break .latent-icon[data-latent-icon='39']::after,
.level-super-break .latent-icon[data-latent-icon='40']::after,
.level-super-break .latent-icon[data-latent-icon='41']::after,
-.level-super-break .latent-icon[data-latent-icon='46']::after
+.level-super-break .latent-icon[data-latent-icon='46']::after,
+.level-super-break .latent-icon[data-latent-icon='47']::after
{
content: "";
background-position-x: -32px;
diff --git a/style.css b/style.css
index 27cfa3cb..bccb6966 100644
--- a/style.css
+++ b/style.css
@@ -2302,6 +2302,7 @@ icon.inflicts::after
.m-latent-allowable-ul.hide-less-use-latent .latent-icon{
display: none;
}
+/*“隐藏少用潜觉”时不会隐藏的潜觉*/
.m-latent-allowable-ul.hide-less-use-latent .latent-icon[data-latent-icon="11"],
.m-latent-allowable-ul.hide-less-use-latent .latent-icon[data-latent-icon="20"],
.m-latent-allowable-ul.hide-less-use-latent .latent-icon[data-latent-icon="21"],
@@ -2320,7 +2321,8 @@ icon.inflicts::after
.m-latent-allowable-ul.hide-less-use-latent .latent-icon[data-latent-icon="40"],
.m-latent-allowable-ul.hide-less-use-latent .latent-icon[data-latent-icon="41"],
.m-latent-allowable-ul.hide-less-use-latent .latent-icon[data-latent-icon="42"],
-.m-latent-allowable-ul.hide-less-use-latent .latent-icon[data-latent-icon="46"]
+.m-latent-allowable-ul.hide-less-use-latent .latent-icon[data-latent-icon="46"],
+.m-latent-allowable-ul.hide-less-use-latent .latent-icon[data-latent-icon="47"]
{
display: inline-block;
}