diff --git a/images/CARDFRAME2.PNG b/images/CARDFRAME2.PNG
deleted file mode 100644
index 9af69882..00000000
Binary files a/images/CARDFRAME2.PNG and /dev/null differ
diff --git a/images/CARDFRAME2.png b/images/CARDFRAME2.png
new file mode 100644
index 00000000..d55ed400
Binary files /dev/null and b/images/CARDFRAME2.png differ
diff --git a/images/CARDFRAMEW.PNG b/images/CARDFRAMEW.png
similarity index 100%
rename from images/CARDFRAMEW.PNG
rename to images/CARDFRAMEW.png
diff --git a/images/project file/CARDFRAME2.fw.png b/images/project file/CARDFRAME2.fw.png
index 3a406a60..b7da2c09 100644
Binary files a/images/project file/CARDFRAME2.fw.png and b/images/project file/CARDFRAME2.fw.png differ
diff --git a/multi.html b/multi.html
index 47efdd6b..86026db3 100644
--- a/multi.html
+++ b/multi.html
@@ -866,6 +866,7 @@ const teamsCount = 2;
+
diff --git a/script.js b/script.js
index 652fd454..bbb27c96 100644
--- a/script.js
+++ b/script.js
@@ -4496,11 +4496,22 @@ function initialize() {
btnCustomAvatarSave.classList.remove(className_displayNone);
const attrs4 = s_AttrForm.querySelector(".attr-selecter-list .attr-list.display-none");
if (attrs4) {
- Cards.forEach(card=>card.attrs[3] = Math.randomInteger(0,4));
+
attrs4.classList.remove(className_displayNone);
+ [...s_AttrForm.querySelectorAll(".attr-selecter-list .attr-list")].forEach(list=>list.querySelector("li.display-none").classList.remove(className_displayNone));
}
editBox.changeMonId(monstersID.value);
- alert("恶搞功能:所有角色全部随机设定了第四属性,请勿当真。你可以上传你的自定义图片以制作卡片头像。\n\nSpoof function: All Cards have a random 4th attribute, don't take it seriously. You can upload your custom image to make a card avatar.");
+ const spoof = confirm("你可以上传你的自定义图片以制作卡片头像。\nYou can upload your custom image to make a card avatar.\n\n是否启用恶搞功能?\n所有角色全部随机设定四种属性。\nEnable Spoof function ?\nAll Cards set 4 random attrs. ");
+ if (spoof) {
+ Cards.forEach(card=>{
+ if (!card.enabled) return;
+ for (let i = 0; i < 4; i++) {
+ const maxAttr = (i === 1 && card.attrs[0] === 6) ? 5 : 6; //如果第一属性是无属性,第二属性就不可以是无属性
+ card.attrs[i] = Math.randomInteger(0, maxAttr);
+ if (i >= 1 && card.attrs[i] === 6) break; //如果第2属性开始出现了无属性,就不需要再继续了
+ }
+ });
+ }
}
avatarSelect.addEventListener("click", set_4th_attrs, {once: true});
diff --git a/service-worker.js b/service-worker.js
index e9409123..ff731d1b 100644
--- a/service-worker.js
+++ b/service-worker.js
@@ -30223,7 +30223,7 @@ const cachesMap = new Map([
],
[
"multi.html",
- "7f22a32b21a75c67f3a87c00b6b10d29"
+ "102b91cfe7df45e3cfd55c19620214c9"
],
[
"script-custom_elements.js",
@@ -30231,7 +30231,7 @@ const cachesMap = new Map([
],
[
"script-json_data.js",
- "37f21417e9c5c4be0685546aa6f280e0"
+ "e6ed32d5988d693a323f2b3447d3debd"
],
[
"script-skill-parser.js",
@@ -30243,19 +30243,19 @@ const cachesMap = new Map([
],
[
"script.js",
- "c5a1df2c76abb1d5c99468c92c68e200"
+ "9ec1b0af5a159d8455fb60a9aea0fd31"
],
[
"solo.html",
- "402560775ce1f80ec5b54375d916b53a"
+ "aa016cec6738e5ff72f9e0c8e1aaa507"
],
[
"style-monsterimages.css",
- "94d948c4a0d72636d243e05a9bdacdfa"
+ "01af9fbac81c5c7fa2eac76354bc89a1"
],
[
"style.css",
- "555858755143ef7c727faea0c611834e"
+ "03a65edfb1df79c90af209931a321469"
],
[
"temp.js",
@@ -30263,7 +30263,7 @@ const cachesMap = new Map([
],
[
"triple.html",
- "ff23d534ebe824b2926dd5f1a46628e5"
+ "49c87f094ad7dc38a9d31ec61f1a653f"
],
[
"languages/en.css",
@@ -30295,7 +30295,7 @@ const cachesMap = new Map([
],
[
"languages/zh-hans.css",
- "49081d87502177cf042475908a7e0141"
+ "2983021b08b7537b48fc4d1aeb556321"
],
[
"languages/zh-hans.js",
@@ -30303,7 +30303,7 @@ const cachesMap = new Map([
],
[
"languages/zh-hant.css",
- "7ef1f9d1e3cce4af1eef45fed616a693"
+ "12e90b96170f015450c40e49b3921098"
],
[
"languages/zh-hant.js",
@@ -30342,11 +30342,11 @@ const cachesMap = new Map([
"6138155bddb716d91ba0df6b17a8e876"
],
[
- "images/CARDFRAME2.PNG",
- "c28d99259c0c7db5dcc2824286b93ba6"
+ "images/CARDFRAME2.png",
+ "13006618d031ec6f749b1cc1f429d42e"
],
[
- "images/CARDFRAMEW.PNG",
+ "images/CARDFRAMEW.png",
"54d696bcecec70de291995be2b0acb90"
],
[
diff --git a/solo.html b/solo.html
index 2b93296d..4a5d7f89 100644
--- a/solo.html
+++ b/solo.html
@@ -604,6 +604,7 @@ const teamsCount = 1;
+
@@ -1216,7 +1220,7 @@ const teamsCount = 1;
-
+