增加无法交换的动画

monsters-info/ckey.json

@@ -1 +1 @@
-[{"code":"ja","ckey":{"card":"0cfd4586c27b680c3cf42aa5713afb86","skill":"5c4d3fb08b175cb46dc216970301b374"},"updateTime":1669988331429},{"code":"en","ckey":{"card":"c2ec4c0e7faecb8be14b94d60a534428","skill":"2425a39c24c0f51e5865738de1c7deb9"},"updateTime":1669988331429},{"code":"ko","ckey":{"card":"4608e27896974cc10f39364c8ed2742f","skill":"b29e7d9eaf7929859188daf6b9c18f58"},"updateTime":1669988331429}]
+[{"code":"ja","ckey":{"card":"6586c8baa0ff9e0b3d8d7add1cda322f","skill":"5c4d3fb08b175cb46dc216970301b374"},"updateTime":1670253171760},{"code":"en","ckey":{"card":"c2ec4c0e7faecb8be14b94d60a534428","skill":"2425a39c24c0f51e5865738de1c7deb9"},"updateTime":1669988331429},{"code":"ko","ckey":{"card":"4608e27896974cc10f39364c8ed2742f","skill":"b29e7d9eaf7929859188daf6b9c18f58"},"updateTime":1669988331429}]

script-json_data.js

@@ -469,6 +469,7 @@ const official_awoken_sorting = [
 
 //pdc的徽章对应数字
 const pdcBadgeMap = [
+	{pdf:undefined,pdc:0}, //什么都没有
 	{pdf:1,pdc:10}, //无限cost
 	{pdf:2,pdc:12}, //小手指
 	{pdf:3,pdc:9}, //全体攻击

script.js

@@ -485,7 +485,7 @@ Formation.prototype.getPdcQrStr = function()
 
 	let pdcTeamsStr = this.teams.map((t,idx,arr)=>{
 		let teamArr = [
-			pdcBadgeMap.find(badge=>badge.pdf === t[2]).pdc //徽章
+			pdcBadgeMap.find(badge=>badge.pdf === t[2])?.pdc || 0 //徽章
 		];
 		const membersArr = t[0];
 		const assistArr = t[1];
@@ -2247,8 +2247,8 @@ function initialize() {
 		e.preventDefault();
 	}
 	//编辑界面每个怪物的头像的放下
-	function dropMonHead(e) {
-		const dataFrom = JSON.parse(e.dataTransfer.getData('from'));
+	function dropMonHead(event) {
+		const dataFrom = JSON.parse(event.dataTransfer.getData('from'));
 		const dataTo = getMemberArrayIndexFromMonHead(this);
 
 		if ((dataTo[0] !== dataFrom[0]) ||
@@ -2319,6 +2319,9 @@ function initialize() {
 		console.log("移动取消", e, this);
 	}
 	function interchangeCard(formArr, toArr) {
+		const [fromTeamNum, fromIsAssist, fromIndexInTeam] = formArr;
+		const [toTeamNum, toIsAssist, toIndexInTeam] = toArr;
+
 		function changeType(member, isAssist) {
 			if (member.id == 0 || (isAssist && member.id == -1)) {
 				return new Member();
@@ -2330,24 +2333,44 @@ function initialize() {
 		}
 		const changeSwapToCopy = controlBox.querySelector("#change-swap-to-copy"); //储存交换“复制”和“替换”
 		const isCopy = changeSwapToCopy.checked;
-		let from = formation.teams[formArr[0]][formArr[1]][formArr[2]];
-		let to = formation.teams[toArr[0]][toArr[1]][toArr[2]];
+		let from = formation.teams[fromTeamNum][fromIsAssist][fromIndexInTeam];
+		let to = formation.teams[toTeamNum][toIsAssist][toIndexInTeam];
 		let fromCard = from.card, toCard = to.card;
-		if (toArr[1] && !fromCard?.canAssist && fromCard?.id > 0 || formArr[1] && !toCard?.canAssist && toCard?.id > 0) {
-			console.warn("该角色不能作为辅助");
+		if (toIsAssist && !fromCard?.canAssist && from.id > 0 ||
+			fromIsAssist && !toCard?.canAssist && to.id > 0) {
+			[formArr, toArr].filter(([teamNum, isAssist, indexInTeam])=>{
+				const member = formation.teams[teamNum][isAssist][indexInTeam];
+				const card = member.card;
+				if (member.id>0 && !card?.canAssist) {
+					const teamBigBox = teamBigBoxs[teamNum];
+					const teamBox = teamBigBox.querySelector(".team-box");
+					const memberBox = teamBox.querySelector(isAssist ? ".team-assist" : ".team-members");
+					const memberLi = memberBox.querySelector(`.member-${indexInTeam+1}`);
+					const monsterHead = memberLi.querySelector(".monster");
+					monsterHead.classList.add("show-disabled-action");
+					monsterHead.onanimationend = function() {
+						this.classList.remove("show-disabled-action");
+						this.onanimationend = null;
+					}
+					console.warn("该角色不能作为辅助 %o", card);
+				} else {
+					return false;
+				}
+			})
+
 			return;
 		}
-		if (formArr[1] != toArr[1]) //从武器拖到非武器才改变类型
+		if (fromIsAssist != toIsAssist) //从武器拖到非武器才改变类型
 		{
-			from = changeType(from, formArr[1]);
-			if (!isCopy) to = changeType(to, toArr[1]);
+			from = changeType(from, fromIsAssist);
+			if (!isCopy) to = changeType(to, toIsAssist);
 		} else if (isCopy) {
 			const newFrom = new from.constructor();
 			newFrom.loadFromMember(from);
 			from = newFrom;
 		}
-		formation.teams[toArr[0]][toArr[1]][toArr[2]] = from;
-		if (!isCopy) formation.teams[formArr[0]][formArr[1]][formArr[2]] = to;
+		formation.teams[toTeamNum][toIsAssist][toIndexInTeam] = from;
+		if (!isCopy) formation.teams[fromTeamNum][fromIsAssist][fromIndexInTeam] = to;
 	
 		creatNewUrl(); //刷新URL
 		refreshAll(formation); //刷新全部

service-worker.js

@@ -6859,7 +6859,7 @@ const cachesMap = new Map([
 	],
 	[
 		"script-json_data.js",
-		"b81f130e5ea2d3ee427b77ac6d2b2127"
+		"01596c694df663b898a5c1e0977c9aa4"
 	],
 	[
 		"script-skill-parser.js",
@@ -6871,7 +6871,7 @@ const cachesMap = new Map([
 	],
 	[
 		"script.js",
-		"12313a4a6912d1ea9f4df7804c4d41d1"
+		"57da3e4e932899f0c6f247f81e1427fc"
 	],
 	[
 		"solo.html",
@@ -7115,7 +7115,7 @@ const cachesMap = new Map([
 	],
 	[
 		"monsters-info/ckey.json",
-		"487b44d348236cd7875a00f646fbfac2"
+		"82e4485a25213932528bb6452271aa96"
 	],
 	[
 		"monsters-info/mon_en.json",
@@ -7123,7 +7123,7 @@ const cachesMap = new Map([
 	],
 	[
 		"monsters-info/mon_ja.json",
-		"0cfd4586c27b680c3cf42aa5713afb86"
+		"6586c8baa0ff9e0b3d8d7add1cda322f"
 	],
 	[
 		"monsters-info/mon_ko.json",

style.css

@@ -1759,6 +1759,27 @@ icon.inflicts::after
 		transform: scale(1);
 	}
 }
+@keyframes show-disabled-action {
+	0% {
+		box-shadow: red 0 0 0;
+	}
+	25% {
+		transform: skewX(5deg);
+	}
+	50% {
+		box-shadow: red 0 0 7px;
+	}
+	75% {
+		transform: skewX(-5deg);
+	}
+	100% {
+		box-shadow: red 0 0 0;
+	}
+}
+.show-disabled-action {
+	animation: show-disabled-action 0.3s;
+	animation-iteration-count: 2;
+}
 .types-div .type-icon:active,
 .rare-div .rare-icon:active,
 .selected-awokens .awoken-icon:active,