增加v20.5的“浮游”觉醒

This commit is contained in:
枫谷剑仙 2023-02-14 16:45:58 +08:00
parent 9320e5105e
commit eb1e33c558
13 changed files with 51 additions and 30 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 195 KiB

After

Width:  |  Height:  |  Size: 197 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 492 KiB

After

Width:  |  Height:  |  Size: 496 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

View File

@ -384,11 +384,11 @@
[88]: tp`${'icon'}附加攻擊類型`,
[89]: tp`${'icon'}附加體力類型`,
[90]: tp`${'icon'}附加回復類型`,
[91]: tp`${'icon'}附加火屬性`,
[92]: tp`${'icon'}附加水屬性`,
[93]: tp`${'icon'}附加木屬性`,
[94]: tp`${'icon'}附加光屬性`,
[95]: tp`${'icon'}附加暗屬性`,
[91]: tp`${'icon'}副屬性變火`,
[92]: tp`${'icon'}副屬性變水`,
[93]: tp`${'icon'}副屬性變木`,
[94]: tp`${'icon'}副屬性變光`,
[95]: tp`${'icon'}副屬性變暗`,
[96]: tp`${'icon'}大U`,
[97]: tp`${'icon'}大5色溜`,
[98]: tp`${'icon'}大自回`,
@ -399,6 +399,7 @@
[103]: tp`${'icon'}大暗+`,
[104]: tp`${'icon'}大心+`,
[105]: tp`${'icon'}S-`,
[106]: tp`${'icon'}浮游`,
}
},
};

View File

@ -384,11 +384,11 @@
[88]: tp`${'icon'}附加攻击类型`,
[89]: tp`${'icon'}附加体力类型`,
[90]: tp`${'icon'}附加回复类型`,
[91]: tp`${'icon'}附加火属性`,
[92]: tp`${'icon'}附加水属性`,
[93]: tp`${'icon'}附加木属性`,
[94]: tp`${'icon'}附加光属性`,
[95]: tp`${'icon'}附加暗属性`,
[91]: tp`${'icon'}副属性变火`,
[92]: tp`${'icon'}副属性变水`,
[93]: tp`${'icon'}副属性变木`,
[94]: tp`${'icon'}副属性变光`,
[95]: tp`${'icon'}副属性变暗`,
[96]: tp`${'icon'}大U`,
[97]: tp`${'icon'}大5色溜`,
[98]: tp`${'icon'}大自回`,
@ -399,6 +399,7 @@
[103]: tp`${'icon'}大暗+`,
[104]: tp`${'icon'}大心+`,
[105]: tp`${'icon'}S-`,
[106]: tp`${'icon'}浮游`,
}
},
};

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -954,6 +954,7 @@ var formation = new Formation(teamsCount,5);
<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>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="106" data-max-count="1"></button><!--浮游--></li>
</ul>
</div>
<details class="sawoken-detail"><!--超觉醒列表-->
@ -1063,7 +1064,8 @@ 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>
<li class="awoken-count"><input type="checkbox" class="sawoken-check" name="types" value="105" id="search-awoken-105" /><label class="awoken-icon unallowable-awoken" data-awoken-icon="105" for="search-awoken-105"></label><!--S- --></li>
<li class="awoken-count"><input type="checkbox" class="sawoken-check" name="types" value="106" id="search-awoken-106" /><label class="awoken-icon" data-awoken-icon="106" for="search-awoken-106"></label><!--浮游--></li>
</ul>
</details>
</div>

View File

@ -392,19 +392,19 @@ let localTranslating = {
[80]: tp`${'icon'}4 Att. Enhanced Attack`,
[81]: tp`${'icon'}5 Att. Enhanced Attack`,
[82]: tp`${'icon'}Super Enhanced Matching`,
[83]: tp`${'icon'}Append Dragon Type`,
[84]: tp`${'icon'}Append God Type`,
[85]: tp`${'icon'}Append Devil Type`,
[86]: tp`${'icon'}Append Machine Type`,
[87]: tp`${'icon'}Append Balanced Type`,
[88]: tp`${'icon'}Append Attacker Type`,
[89]: tp`${'icon'}Append Physical Type`,
[90]: tp`${'icon'}Append Healer Type`,
[91]: tp`${'icon'}Append Fire Attr.`,
[92]: tp`${'icon'}Append Water Attr.`,
[93]: tp`${'icon'}Append Wood Attr.`,
[94]: tp`${'icon'}Append Water Attr.`,
[95]: tp`${'icon'}Append Dark Attr.`,
[83]: tp`${'icon'}Add Dragon Type`,
[84]: tp`${'icon'}Add God Type`,
[85]: tp`${'icon'}Add Devil Type`,
[86]: tp`${'icon'}Add Machine Type`,
[87]: tp`${'icon'}Add Balanced Type`,
[88]: tp`${'icon'}Add Attacker Type`,
[89]: tp`${'icon'}Add Physical Type`,
[90]: tp`${'icon'}Add Healer Type`,
[91]: tp`${'icon'}Change Sub Attribute: Fire`,
[92]: tp`${'icon'}Change Sub Attribute: Water`,
[93]: tp`${'icon'}Change Sub Attribute: Wood`,
[94]: tp`${'icon'}Change Sub Attribute: Water`,
[95]: tp`${'icon'}Change Sub Attribute: Dark`,
[96]: tp`${'icon'}Two-Pronged Attack+`,
[97]: tp`${'icon'}Skill Charge+`,
[98]: tp`${'icon'}Auto-Recover+`,
@ -415,6 +415,7 @@ let localTranslating = {
[103]: tp`${'icon'}Enhanced Dark Orbs+`,
[104]: tp`${'icon'}Enhanced Heal Orbs+`,
[105]: tp`${'icon'}Skill Boost Minus`,
[106]: tp`${'icon'}Floating`,
}
},
};
@ -491,7 +492,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, 105,
91, 92, 93, 94, 95,105,106,
];
//pdc的徽章对应数字

View File

@ -627,9 +627,14 @@ function calculateAbility(member, assist = null, solo = true, teamsCount = 1) {
reValue = reValue * latterAwokenScale[idx].reduce(calculateAwokenScale, 1);
//都要做四舍五入
if (isDge && dgeRate[idx] != 1)
if (isDge && dgeRate[idx] !== 1)
{
let rate = dgeRate[idx];
//计算攻击力有浮游觉醒且比例小于1时
if (idx === 1 && rate < 1 && awokenList.includes(106)) {
//比例乘以20但是不得大于1
rate = Math.min(1, rate * 20);
}
reValue = Math.round(reValue * rate);
reValueNoAwoken = Math.round(reValueNoAwoken * rate);
}else

View File

@ -590,6 +590,7 @@ var formation = new Formation(teamsCount,6);
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="93"></span><span class="count"></span></li><!--附加木属性-->
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="94"></span><span class="count"></span></li><!--附加光属性-->
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="95"></span><span class="count"></span></li><!--附加暗属性-->
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="106"></span><span class="count"></span></li><!--浮游-->
</ul>
</div>
</li>
@ -796,6 +797,7 @@ var formation = new Formation(teamsCount,6);
<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>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="106" data-max-count="1"></button><!--浮游--></li>
</ul>
</div>
<details class="sawoken-detail"><!--超觉醒列表-->
@ -905,7 +907,8 @@ 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>
<li class="awoken-count"><input type="checkbox" class="sawoken-check" name="types" value="105" id="search-awoken-105" /><label class="awoken-icon unallowable-awoken" data-awoken-icon="105" for="search-awoken-105"></label><!--S- --></li>
<li class="awoken-count"><input type="checkbox" class="sawoken-check" name="types" value="106" id="search-awoken-106" /><label class="awoken-icon" data-awoken-icon="106" for="search-awoken-106"></label><!--浮游--></li>
</ul>
</details>
</div>

View File

@ -983,6 +983,9 @@
.awoken-icon[data-awoken-icon='105']{/*S-*/
background-position-y:calc(-32px * 105);
}
.awoken-icon[data-awoken-icon='106']{/*浮游*/
background-position-y:calc(-32px * 106);
}
:lang(zh) .awoken-icon:where(
[data-awoken-icon='46'],
[data-awoken-icon='47'],

View File

@ -602,6 +602,7 @@ var formation = new Formation(teamsCount,6);
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="93"></span><span class="count"></span></li><!--附加木属性-->
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="94"></span><span class="count"></span></li><!--附加光属性-->
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="95"></span><span class="count"></span></li><!--附加暗属性-->
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="106"></span><span class="count"></span></li><!--浮游-->
</ul>
</div>
</li>
@ -1126,6 +1127,7 @@ var formation = new Formation(teamsCount,6);
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="93"></span><span class="count"></span></li><!--附加木属性-->
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="94"></span><span class="count"></span></li><!--附加光属性-->
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="95"></span><span class="count"></span></li><!--附加暗属性-->
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="106"></span><span class="count"></span></li><!--浮游-->
</ul>
</div>
</li>
@ -1650,6 +1652,7 @@ var formation = new Formation(teamsCount,6);
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="93"></span><span class="count"></span></li><!--附加木属性-->
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="94"></span><span class="count"></span></li><!--附加光属性-->
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="95"></span><span class="count"></span></li><!--附加暗属性-->
<li class="awoken-count display-none"><span class="awoken-icon" data-awoken-icon="106"></span><span class="count"></span></li><!--浮游-->
</ul>
</div>
</li>
@ -1856,6 +1859,7 @@ var formation = new Formation(teamsCount,6);
<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>
<li class="awoken-count"><button class="awoken-icon" data-awoken-icon="106" data-max-count="1"></button><!--浮游--></li>
</ul>
</div>
<details class="sawoken-detail"><!--超觉醒列表-->
@ -1965,7 +1969,8 @@ 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>
<li class="awoken-count"><input type="checkbox" class="sawoken-check" name="types" value="105" id="search-awoken-105" /><label class="awoken-icon unallowable-awoken" data-awoken-icon="105" for="search-awoken-105"></label><!--S- --></li>
<li class="awoken-count"><input type="checkbox" class="sawoken-check" name="types" value="106" id="search-awoken-106" /><label class="awoken-icon" data-awoken-icon="106" for="search-awoken-106"></label><!--浮游--></li>
</ul>
</details>
</div>