+
-
+
@@ -1509,10 +1519,10 @@ const teamsCount = 2;
-
-
-
-
+
+
+
+
+
@@ -79,7 +87,7 @@ const teamsCount = 2;
999
999
999
999
@@ -107,9 +115,11 @@ const teamsCount = 2;
-
-
-
+
@@ -123,7 +133,7 @@ const teamsCount = 2;
+
+
+
+
-
+
@@ -1241,10 +1251,10 @@ const teamsCount = 2;
@@ -1487,10 +1497,10 @@ const teamsCount = 2;
- - - - - + + + +
@@ -1545,7 +1555,7 @@ const teamsCount = 2;
-
+
-
+
diff --git a/script.js b/script.js
index f69294b8..404205b9 100644
--- a/script.js
+++ b/script.js
@@ -1819,24 +1819,6 @@ class RequirementTree extends EvoTree
};
}
-//清除数据
-function clearData()
-{
- const locationURL = new URL(location);
- locationURL.searchParams.delete('d'); //删除数据
- locationURL.searchParams.delete('l'); //删除语言
- locationURL.searchParams.delete('_id'); //删除PADDB的ID
- location = locationURL.toString();
-}
-//轮换ABC队伍
-function swapABCteam()
-{
- if (formation.teams.length > 1) {
- formation.teams.push(formation.teams.splice(0, 1)[0]); //将队伍1移动到最后
- createNewUrl();
- refreshAll(formation);
- }
-}
function henshinStep(step)
{
if (step == 0) return;
@@ -1873,61 +1855,6 @@ function henshinStep(step)
createNewUrl({replaceState: true});
refreshAll(formation);
}
-//在单人和多人之间转移数据
-function turnPage(toPage, e = null) {
- let pagename = null;
- switch (toPage) {
- case 1:
- if (formation.teams[0][0].length < 6) {
- //把第二支队伍的队长添加到最后方
- formation.teams[0][0].push(formation.teams[1][0][0]);
- formation.teams[0][1].push(formation.teams[1][1][0]);
- }
- //删掉第2支开始的队伍
- formation.teams.splice(1);
- pagename = "solo.html";
- break;
- case 2:
- if (formation.teams.length < 2) { //从1人到2人
- formation.teams[1] = [
- [],
- []
- ];
- //把右边的队长加到第二支队伍最后面
- formation.teams[1][0].splice(0, 0, formation.teams[0][0].splice(5, 1)[0]);
- formation.teams[1][1].splice(0, 0, formation.teams[0][1].splice(5, 1)[0]);
- } else { //从3人到2人，直接删除后面两个队伍
- //删掉第3支开始的队伍
- formation.teams.splice(2);
- //删掉前面两支队伍的战友
- formation.teams[0][0].splice(5);
- formation.teams[0][1].splice(5);
- formation.teams[1][0].splice(5);
- formation.teams[1][1].splice(5);
- }
- formation.badge = 0;
- pagename = "multi.html";
- break;
- case 3:
- if (formation.teams.length < 2) { //从1人到3人
- } else { //从2人到3人
- formation.teams[0][0].push(formation.teams[1][0][0]);
- formation.teams[0][1].push(formation.teams[1][1][0]);
- formation.teams[1][0].push(formation.teams[0][0][0]);
- formation.teams[1][1].push(formation.teams[0][1][0]);
- }
- formation.badge = 0;
- pagename = "triple.html";
- break;
- }
- const newURL = createNewUrl({ url: pagename, onlyReturnUrl: true });
- if (e && e.ctrlKey) {
- window.open(newURL);
- } else {
- location.href = newURL;
- }
-}
-
function loadData(force = false)
{
if (force)
@@ -2747,6 +2674,109 @@ function initialize() {
line.setAttribute("y2", p2.y);
};
+ const btnDataUpdateTime = controlBox.querySelector("#datasource-updatetime");
+ btnDataUpdateTime.onclick = function() {
+ loadData(true); //强制更新数据
+ };
+
+ const btnClearData = controlBox.querySelector("#btn-clear-data");
+ btnClearData.onclick = function() {
+ const locationURL = new URL(location);
+ locationURL.searchParams.delete('d'); //删除数据
+ locationURL.searchParams.delete('l'); //删除语言
+ locationURL.searchParams.delete('_id'); //删除PADDB的ID
+ location = locationURL.toString();
+ };
+
+ const formPlayerNumber = controlBox.querySelector("#player-number");
+ formPlayerNumber.onchange = function(event) {
+ const formData = new FormData(this);
+ const newPlayerNumber = parseInt(formData.get("player-number"), 10);
+ if (newPlayerNumber) {
+ turnPage(newPlayerNumber);
+ }
+ }
+
+ formPlayerNumber.querySelectorAll("input[name=\"player-number\"]")[teamsCount-1].checked = true;
+
+ //在单人和多人之间转移数据
+ function turnPage(toPage, e = null) {
+ let pagename = null;
+ switch (toPage) {
+ case 1:
+ if (formation.teams[0][0].length < 6) {
+ //把第二支队伍的队长添加到最后方
+ formation.teams[0][0].push(formation.teams[1][0][0]);
+ formation.teams[0][1].push(formation.teams[1][1][0]);
+ }
+ //删掉第2支开始的队伍
+ formation.teams.splice(1);
+ pagename = "solo.html";
+ break;
+ case 2:
+ if (formation.teams.length < 2) { //从1人到2人
+ formation.teams[1] = [
+ [],
+ []
+ ];
+ //把右边的队长加到第二支队伍最后面
+ formation.teams[1][0].splice(0, 0, formation.teams[0][0].splice(5, 1)[0]);
+ formation.teams[1][1].splice(0, 0, formation.teams[0][1].splice(5, 1)[0]);
+ } else { //从3人到2人，直接删除后面两个队伍
+ //删掉第3支开始的队伍
+ formation.teams.splice(2);
+ //删掉前面两支队伍的战友
+ formation.teams[0][0].splice(5);
+ formation.teams[0][1].splice(5);
+ formation.teams[1][0].splice(5);
+ formation.teams[1][1].splice(5);
+ }
+ formation.badge = 0;
+ pagename = "multi.html";
+ break;
+ case 3:
+ if (formation.teams.length < 2) { //从1人到3人
+ } else { //从2人到3人
+ formation.teams[0][0].push(formation.teams[1][0][0]);
+ formation.teams[0][1].push(formation.teams[1][1][0]);
+ formation.teams[1][0].push(formation.teams[0][0][0]);
+ formation.teams[1][1].push(formation.teams[0][1][0]);
+ }
+ formation.badge = 0;
+ pagename = "triple.html";
+ break;
+ }
+ const newURL = createNewUrl({ url: pagename, onlyReturnUrl: true });
+ if (e && e.ctrlKey) {
+ window.open(newURL);
+ } else {
+ location.href = newURL;
+ }
+ }
+
+ //轮换ABC队伍
+ const btnSwapTeam = controlBox.querySelector("#btn-swap-team");
+ btnSwapTeam.onclick = function() {
+ if (formation.teams.length > 1) {
+ formation.teams.push(formation.teams.splice(0, 1)[0]); //将队伍1移动到最后
+ createNewUrl();
+ refreshAll(formation);
+ }
+ }
+
+ //变身前进后退
+ const btnHenshinArr = [...controlBox.querySelectorAll(".btn-henshin")];
+ btnHenshinArr.forEach(btn=>btn.onclick = henshinStepButton);
+ function henshinStepButton(event) {
+ return henshinStep(parseInt(this.dataset.step,10));
+ }
+
+ //去除辅助
+ const btnRemoveAssist = controlBox.querySelector("#btn-remove-assist");
+ btnRemoveAssist.onclick = function() {
+ formation.removeAssist();
+ }
+
//初始化所有mask的关闭按钮
const masks = document.body.querySelectorAll(".mask");
masks.forEach(mask=>{
@@ -2761,7 +2791,7 @@ function initialize() {
};
});
const qrCodeFrame = document.body.querySelector("#qr-code-frame");
- const btnQrCode = controlBox.querySelector(`.btn-qrcode`);
+ const btnQrCode = controlBox.querySelector(`#btn-qrcode`);
btnQrCode.onclick = function(){
qrCodeFrame.show();
};
@@ -3131,7 +3161,7 @@ function initialize() {
}
const playerDataFrame = document.body.querySelector("#player-data-frame");
- const btnPlayerData = controlBox.querySelector(`.btn-player-data`);
+ const btnPlayerData = controlBox.querySelector(`#btn-player-data`);
btnPlayerData.onclick = function(){
playerDataFrame.show();
};
@@ -3899,7 +3929,6 @@ function initialize() {
const li = document.createElement("li");
const radio = li.appendChild(document.createElement("input"));
radio.type="radio";
- radio.className = "hide-radio";
radio.value = bgId;
radio.name = badgeChooseName;
radio.id = `${radio.name}-${bgId}`;
diff --git a/service-worker.js b/service-worker.js
index bb96e8ac..a8a9e5b2 100644
--- a/service-worker.js
+++ b/service-worker.js
@@ -32311,11 +32311,11 @@ const cachesMap = new Map([
],
[
"index.html",
- "85fbead60e925bd4ddbeff3c41dc7e4e"
+ "31547a3fb252a10d505813ccc41dff53"
],
[
"multi.html",
- "ef8b77ed22257043aa2feb5011d50711"
+ "9b02c70775a94e796622c12af95040f9"
],
[
"script-custom_elements.js",
@@ -32335,11 +32335,11 @@ const cachesMap = new Map([
],
[
"script.js",
- "669ff567d056349838dd31918ba5d518"
+ "c7c5a6235bf493adc74b6ba2e07e7281"
],
[
"solo.html",
- "c56f8538c50ca10224097ec96487a7ca"
+ "82c349f550027351f61f3c259476192d"
],
[
"style-monsterimages.css",
@@ -32347,7 +32347,7 @@ const cachesMap = new Map([
],
[
"style.css",
- "1a5c25f37b6f053d824f69a95ff2f0ac"
+ "bba2aa9b132683f673c4f1b98160060a"
],
[
"temp.js",
@@ -32355,11 +32355,11 @@ const cachesMap = new Map([
],
[
"triple.html",
- "ee62c5f5155957f3677e91cbe0cf9c42"
+ "3bc2fc342ee70881b6a7053eb6ca9a99"
],
[
"languages/en.css",
- "303c429e4dbff852fa693ee3554d50c7"
+ "5f71a278d07e34177b4a69c7e466310d"
],
[
"languages/en.js",
@@ -32367,7 +32367,7 @@ const cachesMap = new Map([
],
[
"languages/ja.css",
- "cf65de21289e398c959063a2d08c833b"
+ "8c78b0e7b5ba4b336cbe2a8a3e2455e3"
],
[
"languages/ja.js",
@@ -32375,7 +32375,7 @@ const cachesMap = new Map([
],
[
"languages/ko.css",
- "10b25940cb5923fd63b39a9c02b4b957"
+ "28b0871e7c7166f2b0266fed3083c1bb"
],
[
"languages/ko.js",
@@ -32387,7 +32387,7 @@ const cachesMap = new Map([
],
[
"languages/zh-hans.css",
- "4c9116d3e9d22a171271346d8f79a2ae"
+ "dcb1c5708633e0889c9aee23725a32fd"
],
[
"languages/zh-hans.js",
@@ -32395,7 +32395,7 @@ const cachesMap = new Map([
],
[
"languages/zh-hant.css",
- "a7ce01454f8233168f34fa711d35f349"
+ "c041685f375be00e43a5d8b014ff2c70"
],
[
"languages/zh-hant.js",
@@ -32485,6 +32485,10 @@ const cachesMap = new Map([
"images/icon-deep-dark.png",
"67c2cc69a6657fb7cb3d8e2d2bed9c11"
],
+ [
+ "images/icon-dungeon.png",
+ "bc7e880d1de2b6b6a3b8b1dd0a55f8fd"
+ ],
[
"images/icon-evolved-skill-loop.png",
"104ac97dfd9a6558c7cd90cff068572c"
diff --git a/solo.html b/solo.html
index 2751f7a6..49155a58 100644
--- a/solo.html
+++ b/solo.html
@@ -32,22 +32,31 @@ const teamsCount = 1;
+
-
+
@@ -1351,10 +1362,10 @@ const teamsCount = 1;
-
-
-
+
+
+
+
+
@@ -58,7 +67,7 @@ const teamsCount = 1;
999
999
999
999
@@ -86,9 +95,11 @@ const teamsCount = 1;
-
-
-
+
@@ -129,7 +140,7 @@ const teamsCount = 1;
+
+
+
+
-
+
@@ -1246,10 +1257,10 @@ const teamsCount = 1;
-
+
@@ -1282,7 +1293,7 @@ const teamsCount = 1;
-
+
-
+
diff --git a/style.css b/style.css
index fbfe8024..94b55d6e 100644
--- a/style.css
+++ b/style.css
@@ -57,8 +57,8 @@ body{
margin: 0;
background-color: white;
}
-.hide-radio {
- display: none;
+details>summary {
+ cursor: pointer;
}
details>summary:hover {
background-color: #00000044;
@@ -66,51 +66,111 @@ details>summary:hover {
.control-box,
.formation-box
{
- margin: 10px;
+ --margin: 10px;
+}
+.control-box {
+ margin: var(--margin) var(--margin) 0 var(--margin);
+}
+.formation-box {
+ margin: 0 var(--margin) var(--margin) var(--margin);
}
-.control-box{margin-bottom: 0;}
-.formation-box{margin-top: 0;}
.noscript {
color: red;
font-size: 2em;
}
-.display-none{
+.display-none {
display:none !important;
}
-.disabled{
+.disabled {
cursor: not-allowed;
pointer-events: none;
opacity: 0.5;
}
-details>summary {
- cursor: pointer;
-}
+
+/*控制框*/
.control-box :where(
label,
button,
a,
)::before {
font-family: var(--icon-font-family);
+ margin-right: 3px;
}
-
-.help-link {
+.control-box>div
+{
+ margin-bottom: 2px;
+}
+label[for="languages"]::before{
+ content: "\f1ab";
+}
+label[for="languages"]::after{
+ content: "Lanuage:";
+}
+label[for="datasource"]::before{
+ content: "\f11b";
+}
+#datasource-updatetime::before{
+ content: "\f073";
+}
+#help-link {
cursor: help;
}
-.help-link::before{
+#help-link::before{
content: "\f05a";
}
-.help-link::after{
+#help-link::after{
content: "Help & Tips";
}
-.feedback-link::before{
+#feedback-link::before{
content: "\f4ad";
}
-.feedback-link::after{
+#feedback-link::after{
content: "Feedback";
}
-.control-box .btn-qrcode::before {
+
+#btn-clear-data::before{
+ content: "\f2ed";
+}
+#btn-player-data::before,
+#player-data-frame .player-box-title::before
+{
+ content: "\f2bd";
+}
+#player-number {
+ display: inline-flex;
+}
+#player-number input {
+ display: none;
+}
+#player-number .horizontally-radio-list label {
+ padding: 0 3px;
+}
+label[for="player-number-1"]::before{
+ content: "\f183";
+}
+label[for="player-number-2"]::before{
+ content: "\e068";
+}
+label[for="player-number-3"]::before{
+ content: "\e591";
+}
+
+#btn-swap-team::before{
+ content: "\f2f1";
+}
+.solo #btn-swap-team {
+ display: none;
+}
+
+#draw-screenshot::before{
+ content: "\f03e";
+}
+#btn-qrcode::before {
content: "\f029";
}
+label[for="screenshot-transparent"] {
+ margin-right: 10px;
+}
#rich-text-tools {
background-color: rgba(200,200,200,0.5);
@@ -858,6 +918,9 @@ body:not(.show-team-total-info):not(.solo) .formation-box .team-bigbox
grid-gap: 15px;
margin: 10px;
}
+#badge-choose .team-badges input {
+ display: none;
+}
button.badge {
border: none;
background-color: unset;
@@ -1877,6 +1940,7 @@ label[for="search-string"]::before {
}
.horizontally-radio-list {
display: flex;
+ color: white;
}
.horizontally-radio-list>li {
border: 1px solid white;
@@ -3187,26 +3251,6 @@ a.series-search::before {
.detail-box{
margin-top:5px;
}
-/*控制框*/
-.control-box{
- margin-bottom: 10px;
-}
-.control-box>div
-{
- margin-bottom: 2px;
-}
-label[for="languages"]::before{
- content: "\f1ab";
-}
-label[for="languages"]::after{
- content: "Lanuage:";
-}
-label[for="datasource"]::before{
- content: "\f11b";
-}
-#datasource-updatetime::before{
- content: "\f073";
-}
/*
.control-box .btn-show-mon-skill-cd::before{
@@ -3222,9 +3266,17 @@ label[for="datasource"]::before{
content: "🕴️变身";
}
*/
-.control-box .lbl-henshin-change button
-{
- font-size: 1.5em;
+.formation-control {
+ display: flex;
+ align-items: center;
+ gap: 5px;
+}
+.formation-control button {
+ font-size: 1.25em;
+}
+#lbl-henshin-change::before{
+ content: "\e551";
+ font-family: var(--icon-font-family);
}
.control-box .btn-henshin::before{
content: "\f04e";
@@ -3233,26 +3285,27 @@ label[for="datasource"]::before{
.control-box .btn-henshin[data-step^="-"]::before{
content: "\f04a";
}
-#btn-set-dungeon-enchance {
- font-size: 1.2em;
- margin-left: 1em;
+#btn-set-dungeon-enchance,
+#btn-remove-assist {
+ display: inline-flex;
+ align-items: center;
}
-#btn-set-dungeon-enchance::before
+#btn-set-dungeon-enchance::before,
+#btn-remove-assist::before
{
- content: "\f6d9";
- font-family: var(--icon-font-family);
-}
-.control-box .btn-remove-assist{
- vertical-align: bottom;
-}
-.control-box .btn-remove-assist::before{
content: "";
- background-image: url(images/icon-assist-bind.png);
background-repeat: no-repeat;
background-size: contain;
- display: block;
- width: 2em;
- height: 2em;
+ background-position: center;
+ display: inline-block;
+ width: 1em;
+ height: 1em;
+}
+#btn-set-dungeon-enchance::before {
+ background-image: url(images/icon-dungeon.png);
+}
+#btn-remove-assist::before{
+ background-image: url(images/icon-assist-bind.png);
}
#interchange-line{
pointer-events: none;
@@ -3742,7 +3795,11 @@ table .orb-icon
#default-level {
width: 50px;
}
-
+#player-data-frame .brown-button::before,
+#qr-code-frame .brown-button::before {
+ font-family: var(--icon-font-family);
+ margin-right: 3px;
+}
#qr-code-frame .save-qr-img::before
{
content: "\f0c7";
@@ -3872,6 +3929,9 @@ body.external-link-support #external-support{
text-align: center;
font-size: 2em;
}
+#player-data-frame .player-box-title::before {
+ font-family: var(--icon-font-family);
+}
#player-data-frame .upload-data
{
margin-left: 5px;
@@ -3884,10 +3944,6 @@ body.external-link-support #external-support{
margin-left: 15px;
}
-#player-data-frame .player-box-title::before
-{
- content: "\f2bd";
-}
#player-data-frame .how-to-use::before
{
content: "📕";
diff --git a/triple.html b/triple.html
index 5ecd3b03..26e90366 100644
--- a/triple.html
+++ b/triple.html
@@ -42,23 +42,31 @@ const teamsCount = 3;
@@ -2297,10 +2307,10 @@ const teamsCount = 3;
+
+
-
+
-
+
+
+
+
+
+
-
-
-
-
-
-
@@ -69,7 +77,7 @@ const teamsCount = 3;
999
999
999
999
@@ -97,9 +105,11 @@ const teamsCount = 3;
-
-
-
+
@@ -140,7 +150,7 @@ const teamsCount = 3;
+
+
+
+
-
+
@@ -607,7 +617,7 @@ const teamsCount = 3;
@@ -2192,10 +2202,10 @@ const teamsCount = 3;
-
+
@@ -1074,7 +1084,7 @@ const teamsCount = 3;
-
+
@@ -1924,10 +1934,10 @@ const teamsCount = 3;
@@ -2170,10 +2180,10 @@ const teamsCount = 3;
- - - - - + + + +
@@ -2228,7 +2238,7 @@ const teamsCount = 3;
-
+
-
+