From d22f430996b7dba7c44fd7cfa4e9631595692190 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9E=AB=E8=B0=B7=E5=89=91=E4=BB=99?= <mapaler@163.com>
Date: Wed, 25 May 2022 18:08:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E6=94=B9=E5=8F=98=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E3=80=81=E5=A2=9E=E5=8A=A0=E7=B1=BB=E5=9E=8B=E6=96=B0?=
 =?UTF-8?q?=E8=A7=89=E9=86=92=E7=9A=84=E4=BD=9C=E7=94=A8=E8=AE=A1=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 multi.html                   |  8 ++--
 script-universal_function.js | 61 ++++++++++++++++++++----
 script.js                    | 89 +++++++++++++++++++-----------------
 solo.html                    |  8 ++--
 triple.html                  |  8 ++--
 5 files changed, 110 insertions(+), 64 deletions(-)

diff --git a/multi.html b/multi.html
index ed67fe19..540ae853 100644
--- a/multi.html
+++ b/multi.html
@@ -118,8 +118,8 @@ var formation = new Formation(teamsCount,5);
 							--><li><icon class="attr" data-attr-icon="4"><!--暗--></icon></li>
 						</ul>
 						<ul class="tIf-types">
-							<li><icon class="type-icon" data-type-icon="4"><!--龍--></icon></li><!--
-							--><li><icon class="type-icon" data-type-icon="5"><!--神--></icon></li><!--
+							<li><icon class="type-icon" data-type-icon="5"><!--神--></icon></li><!--
+							--><li><icon class="type-icon" data-type-icon="4"><!--龍--></icon></li><!--
 							--><li><icon class="type-icon" data-type-icon="7"><!--惡魔--></icon></li><!--
 							--><li><icon class="type-icon" data-type-icon="8"><!--机械--></icon></li><!--
 							--><li><icon class="type-icon" data-type-icon="1"><!--平衡--></icon></li><!--
@@ -710,8 +710,8 @@ var formation = new Formation(teamsCount,5);
 			</div>
 			<div class="types-div"><!--类型-->
 				<ul class="type-list">
-					<li data-type-icon="4"><input type="checkbox" class="type-check" name="types" value="4" id="search-type-4" /><label class="type-icon" data-type-icon="4" for="search-type-4"><!--龍--></label></li>
 					<li data-type-icon="5"><input type="checkbox" class="type-check" name="types" value="5" id="search-type-5" /><label class="type-icon" data-type-icon="5" for="search-type-5"><!--神--></label></li>
+					<li data-type-icon="4"><input type="checkbox" class="type-check" name="types" value="4" id="search-type-4" /><label class="type-icon" data-type-icon="4" for="search-type-4"><!--龍--></label></li>
 					<li data-type-icon="7"><input type="checkbox" class="type-check" name="types" value="7" id="search-type-7" /><label class="type-icon" data-type-icon="7" for="search-type-7"><!--惡魔--></label></li>
 					<li data-type-icon="8"><input type="checkbox" class="type-check" name="types" value="8" id="search-type-8" /><label class="type-icon" data-type-icon="8" for="search-type-8"><!--机械--></label></li>
 					<li data-type-icon="1"><input type="checkbox" class="type-check" name="types" value="1" id="search-type-1" /><label class="type-icon" data-type-icon="1" for="search-type-1"><!--平衡--></label></li>
@@ -1263,8 +1263,8 @@ var formation = new Formation(teamsCount,5);
 				<li><input type="checkbox" class="attr-check" name="dungeon-attrs" value="4" id="dungeon-attr-4" /><label class="attr" data-attr-icon="4" for="dungeon-attr-4"></label></li><!--暗-->
 			</ul>
 			<ul class="type-list">
-				<li><input type="checkbox" class="type-check" name="dungeon-types" value="4" id="dungeon-type-4" /><label class="type-icon" data-type-icon="4" for="dungeon-type-4"><!--龍--></label></li>
 				<li><input type="checkbox" class="type-check" name="dungeon-types" value="5" id="dungeon-type-5" /><label class="type-icon" data-type-icon="5" for="dungeon-type-5"><!--神--></label></li>
+				<li><input type="checkbox" class="type-check" name="dungeon-types" value="4" id="dungeon-type-4" /><label class="type-icon" data-type-icon="4" for="dungeon-type-4"><!--龍--></label></li>
 				<li><input type="checkbox" class="type-check" name="dungeon-types" value="7" id="dungeon-type-7" /><label class="type-icon" data-type-icon="7" for="dungeon-type-7"><!--惡魔--></label></li>
 				<li><input type="checkbox" class="type-check" name="dungeon-types" value="8" id="dungeon-type-8" /><label class="type-icon" data-type-icon="8" for="dungeon-type-8"><!--机械--></label></li>
 				<li><input type="checkbox" class="type-check" name="dungeon-types" value="1" id="dungeon-type-1" /><label class="type-icon" data-type-icon="1" for="dungeon-type-1"><!--平衡--></label></li>
diff --git a/script-universal_function.js b/script-universal_function.js
index 1762ba56..de147f8e 100644
--- a/script-universal_function.js
+++ b/script-universal_function.js
@@ -931,7 +931,8 @@ function getAllowLatent(card) {
 	return Array.from(latentSet);
 }
 //计算队伍中有多少血量
-function countTeamHp(memberArr, leader1id, leader2id, solo, noAwoken = false) {
+function countTeamHp(team, leader1id, leader2id, solo, noAwoken = false) {
+	let memberArr = team[0], assistArr = team[1];
 	const ls1 = Skills[(Cards[leader1id] || Cards[0]).leaderSkillId];
 	const ls2 = Skills[(Cards[leader2id] || Cards[0]).leaderSkillId];
 	const mHpArr = memberArr.map(m => {
@@ -1049,14 +1050,14 @@ function countTeamHp(memberArr, leader1id, leader2id, solo, noAwoken = false) {
 				break;
 			}
 			case 229:{ //队员中存在每个属性或Type都算一次
-				let cardsArr = memberArr.filter(m => m.id > 0).map(m => Cards[m.id]); //所有的卡片
-				let attrsArr = cardsArr.flatMap(card => card.attr); //所有卡片的属性
-				let typesArr = cardsArr.flatMap(card => card.types); //所有卡片的类型
-				let correspondingAttrs = flags(sk[0]); //符合的属性
-				let correspondingTypes = flags(sk[1]); //符合的类型
-				let correspondingTimes = attrsArr.filter(a=>correspondingAttrs.includes(a)).length + typesArr.filter(t=>correspondingTypes.includes(t)).length; //符合的次数
-				scale = sk[2] * correspondingTimes / 100 + 1;
-				//console.log('属性、类型个数动态倍率，当前队长HP倍率为 %s',scale);
+				const atCount = countTeamTotalAttrsTypes(memberArr, assistArr);
+
+				let correAttrs = flags(sk[0]), correTypes = flags(sk[1]); //符合的属性/类型
+				 //符合的次数
+				let correTimes = correAttrs.reduce((pre,attr)=>pre + (atCount.attrs.get(attr) || 0),0) +
+								 correTypes.reduce((pre,type)=>pre + (atCount.types.get(type) || 0),0);
+				scale = sk[2] * correTimes / 100 + 1;
+				console.debug('属性、类型个数动态倍率，当前队长HP倍率为 %s (匹配 %d 次)', scale, correTimes);
 				break;
 			}
 			case 138: //调用其他队长技
@@ -1069,6 +1070,48 @@ function countTeamHp(memberArr, leader1id, leader2id, solo, noAwoken = false) {
 	return mHpArr;
 }
 
+//由于有了更改属性和类型的武器，所以需要更改计算方法
+function countTeamTotalAttrsTypes(memberArr, assistArr) {
+	let attrsCount = new Map();
+	let typesCount = new Map();
+	for (let idx = 0; idx < memberArr.length; idx++) {
+		const member = memberArr[idx], assist = assistArr[idx];
+		if (member.id <= 0) continue; //跳过 id 0
+		const memberCard = member.card, assistCard = assist.card;
+		if (!memberCard) continue; //跳过没有的 id
+		let attrs = [...memberCard.attrs]; //属性只有两个，因此用固定的数组
+		let types = new Set(memberCard.types); //Type 用Set，确保不会重复
+		if (assistCard?.awakenings?.includes(49)) { //如果有武器
+			//更改副属性
+			let changeAttr = assistCard.awakenings.find(ak=>ak >= 91 && ak <= 95);
+			if (changeAttr) attrs[1] = changeAttr - 91;
+			//添加类型
+			let appendTypes = assistCard.awakenings.filter(ak=>ak >= 83 && ak <= 90);
+			appendTypes = appendTypes.map(type=>{
+				switch (type) {
+					case 83: {return 5;}
+					case 84: {return 4;}
+					case 85: {return 7;}
+					case 86: {return 8;}
+					case 87: {return 1;}
+					case 88: {return 6;}
+					case 89: {return 2;}
+					case 90: {return 3;}
+				}
+			});
+			for (let appendType of appendTypes) {
+				types.add(appendType);
+			}
+		}
+		for (let attr of attrs) {
+			attrsCount.set(attr, (attrsCount.get(attr) || 0) + 1);
+		}
+		for (let type of types) {
+			typesCount.set(type, (typesCount.get(type) || 0) + 1);
+		}
+	}
+	return {attrs: attrsCount, types: typesCount};
+}
 //返回卡片的队长技能
 function getCardLeaderSkills(card, skillTypes) {
 	if (!card) return [];
diff --git a/script.js b/script.js
index 7e8f4fdd..54b23ec8 100644
--- a/script.js
+++ b/script.js
@@ -136,6 +136,11 @@ var Member = function() {
 	this.ability = [0, 0, 0];
 	this.abilityNoAwoken = [0, 0, 0];
 };
+//让 Member 能直接获取 card
+Object.defineProperty(Member.prototype, "card", {
+	get() { return Cards[this.id]; }
+})
+
 Member.prototype.outObj = function() {
 	const m = this;
 	if (m.id == 0) return null;
@@ -3776,7 +3781,7 @@ function buildEvoTreeIdsArray(card, includeHenshin = true) {
 }
 
 //改变一个怪物头像
-function changeid(mon, monDom, latentDom) {
+function changeid(mon, monDom, latentDom, assist) {
 	let fragment = document.createDocumentFragment(); //创建节点用的临时空间
 	const parentNode = monDom.parentNode;
 	fragment.appendChild(monDom);
@@ -3812,7 +3817,13 @@ function changeid(mon, monDom, latentDom) {
 		monDom.setAttribute("data-cards-pic-y", Math.floor(idxInPage / 10)); //添加Y方向序号
 
 		monDom.querySelector(".property").setAttribute("data-property", card.attrs[0]); //主属性
-		monDom.querySelector(".subproperty").setAttribute("data-property", card.attrs[1]); //副属性
+		let subAttribute = card.attrs[1]; //正常的副属性
+		let assistCard = Cards[assist?.id];
+		if (assistCard && assistCard.awakenings.includes(49)) {  //如果传入了辅助武器
+			let changeAttr = assistCard.awakenings.find(ak=>ak >= 91 && ak <= 95); //搜索改副属性的觉醒
+			if (changeAttr) subAttribute = changeAttr - 91; //更改副属性
+		}
+		monDom.querySelector(".subproperty").setAttribute("data-property", subAttribute); //副属性
 
 		monDom.title = "No." + monId + " " + (card.otLangName ? (card.otLangName[currentLanguage.searchlist[0]] || card.name) : card.name);
 		monDom.href = currentLanguage.guideURL(monId, card.name);
@@ -4368,26 +4379,27 @@ function refreshAll(formationData) {
 				}
 			});
 			//修改显示内容
-			const member = memberLi.querySelector(`.monster`);
-			const assist = assistsLi.querySelector(`.monster`);
-			const latent = latentLi.querySelector(`.latent-ul`);
-			changeid(teamData[0][ti], member, latent); //队员
-			changeid(teamData[1][ti], assist); //辅助
+			const memberDom = memberLi.querySelector(`.monster`);
+			const assistDom = assistsLi.querySelector(`.monster`);
+			const latentDom = latentLi.querySelector(`.latent-ul`);
+			let member = teamData[0][ti], assist = teamData[1][ti];
+			changeid(member, memberDom, latentDom, assist); //队员
+			changeid(assist, assistDom); //辅助
 			//隐藏队长的自身换为换队长的技能
 			if (ti == 5 || //好友队长永远隐藏
 				leaderIdx == 0 && ti == 0 ) //当没换队长时，自身队长的欢队长技能隐藏
 			{
-				const card_m = Cards[teamData[0][ti].id] || Cards[0];
-				const card_a = Cards[teamData[1][ti].id] || Cards[0];
+				const card_m = Cards[member.id] || Cards[0];
+				const card_a = Cards[assist.id] || Cards[0];
 				const skills_m = getCardActiveSkills(card_m, [93, 227]); //更换队长的技能
 				const skills_a = getCardActiveSkills(card_a, [93, 227]); //更换队长的技能
 				if (skills_m.length == 0 || skills_m[0].type != 227)
 				{
-					member.querySelector(".switch-leader").classList.add(className_displayNone);
+					memberDom.querySelector(".switch-leader").classList.add(className_displayNone);
 				}
 				if (skills_a.length == 0 || skills_a[0].type != 227)
 				{
-					assist.querySelector(".switch-leader").classList.add(className_displayNone);
+					assistDom.querySelector(".switch-leader").classList.add(className_displayNone);
 				}
 			}
 			refreshMemberSkillCD(teamBox, teamData, ti); //技能CD
@@ -4650,7 +4662,9 @@ function refreshTeamTotalHP(totalDom, team, teamIdx) {
 	const leader1id = team[0][team[3] || 0].id;
 	const leader2id = teamsCount===2 ? (teamIdx === 1 ? teams[0][0][teams[0][3] || 0].id : teams[1][0][teams[1][3] || 0].id) : team[0][5].id;
 
+	//计算当前队伍，2P时则是需要特殊处理
 	const team_2p = teamsCount===2 ? team[0].concat((teamIdx === 1 ? teams[0][0][0] : teams[1][0][0])) : team[0];
+	const assistTeam_2p = teamsCount===2 ? team[1].concat((teamIdx === 1 ? teams[0][1][0] : teams[1][1][0])) : team[1];
 
 	if (tHpDom) {
 		const reduceScales1 = getReduceScales(leader1id);
@@ -4672,8 +4686,8 @@ function refreshTeamTotalHP(totalDom, team, teamIdx) {
 
 		const totalReduce = leastScale.scale;
 
-		const teamHPArr = countTeamHp(team[0], leader1id, leader2id, solo);
-		const teamHPNoAwokenArr = countTeamHp(team[0], leader1id, leader2id, solo, true);
+		const teamHPArr = countTeamHp(team, leader1id, leader2id, solo);
+		const teamHPNoAwokenArr = countTeamHp(team, leader1id, leader2id, solo, true);
 
 
 		let tHP = teamHPArr.reduce((pv, v) => pv + v); //队伍计算的总HP
@@ -4748,35 +4762,24 @@ function refreshTeamTotalHP(totalDom, team, teamIdx) {
 		},0);
 		rarityDoms.setAttribute(dataAttrName, rarityCount);
 	}
-	//统计队伍颜色个数
-	if (tAttrsDom)
-	{
-		const attrDoms = Array.from(tAttrsDom.querySelectorAll(".attr"));
-		attrDoms.forEach(attrDom=>{
-			const attrId = parseInt(attrDom.getAttribute("data-attr-icon"));
-			const attrCount = team_2p.reduce((pre,member)=>{
-				if (member.id <= 0) return pre;
-				const card = Cards[member.id] || Cards[0];
-				const attrNum = card.attrs.filter(a=>a==attrId).length;
-				return pre + attrNum;
-			},0);
-			attrDom.setAttribute(dataAttrName, attrCount);
-		});
-	}
-	//统计队伍类型个数
-	if (tTypesDom)
+	//统计队伍属性/类型个数
+	if (tAttrsDom || tTypesDom)
 	{
-		const typeDoms = Array.from(tTypesDom.querySelectorAll(".type-icon"));
-		typeDoms.forEach(typeDom=>{
-			const typeId = parseInt(typeDom.getAttribute("data-type-icon"));
-			const typeCount = team_2p.reduce((pre,member)=>{
-				if (member.id <= 0) return pre;
-				const card = Cards[member.id] || Cards[0];
-				const typeNum = card.types.filter(a=>a==typeId).length;
-				return pre + typeNum;
-			},0);
-			typeDom.setAttribute(dataAttrName, typeCount);
-		});
+		const atCount = countTeamTotalAttrsTypes(team_2p, assistTeam_2p);
+		if (tAttrsDom) {
+			const attrDoms = Array.from(tAttrsDom.querySelectorAll(".attr"));
+			attrDoms.forEach(attrDom=>{
+				const attrId = parseInt(attrDom.getAttribute("data-attr-icon"));
+				attrDom.setAttribute(dataAttrName, atCount.attrs.get(attrId) || 0);
+			});
+		}
+		if (tTypesDom) {
+			const typeDoms = Array.from(tTypesDom.querySelectorAll(".type-icon"));
+			typeDoms.forEach(typeDom=>{
+				const typeId = parseInt(typeDom.getAttribute("data-type-icon"));
+				typeDom.setAttribute(dataAttrName, atCount.types.get(typeId) || 0);
+			});
+		}
 	}
 
 	if (tEffectDom)	{
@@ -4862,7 +4865,7 @@ function refreshFormationTotalHP(totalDom, teams) {
 		const totalReduce = leastScale.scale;
 
 		const tHPArr = teams.map(function(team) {
-			const teamHPArr = countTeamHp(team[0], leader1id, leader2id, solo);
+			const teamHPArr = countTeamHp(team, leader1id, leader2id, solo);
 
 
 			const teamTHP = teamHPArr.reduce((pv, v) => pv + v); //队伍计算的总HP
@@ -4871,7 +4874,7 @@ function refreshFormationTotalHP(totalDom, teams) {
 			return Math.round(teamTHP * (1 + 0.05 * teamHPAwoken));
 		});
 		const tHPNoAwokenArr = teams.map(function(team) {
-			const teamHPArr = countTeamHp(team[0], leader1id, leader2id, solo, true);
+			const teamHPArr = countTeamHp(team, leader1id, leader2id, solo, true);
 
 			const teamTHP = teamHPArr.reduce((pv, v) => pv + v); //队伍计算的总HP
 			return Math.round(teamTHP);
diff --git a/solo.html b/solo.html
index 2d3af71b..3e6e245c 100644
--- a/solo.html
+++ b/solo.html
@@ -103,8 +103,8 @@ var formation = new Formation(teamsCount,6);
 							--><li><icon class="attr" data-attr-icon="4"><!--暗--></icon></li>
 						</ul>
 						<ul class="tIf-types">
-							<li><icon class="type-icon" data-type-icon="4"><!--龍--></icon></li><!--
-							--><li><icon class="type-icon" data-type-icon="5"><!--神--></icon></li><!--
+							<li><icon class="type-icon" data-type-icon="5"><!--神--></icon></li><!--
+							--><li><icon class="type-icon" data-type-icon="4"><!--龍--></icon></li><!--
 							--><li><icon class="type-icon" data-type-icon="7"><!--惡魔--></icon></li><!--
 							--><li><icon class="type-icon" data-type-icon="8"><!--机械--></icon></li><!--
 							--><li><icon class="type-icon" data-type-icon="1"><!--平衡--></icon></li><!--
@@ -578,8 +578,8 @@ var formation = new Formation(teamsCount,6);
 			</div>
 			<div class="types-div"><!--类型-->
 				<ul class="type-list">
-					<li data-type-icon="4"><input type="checkbox" class="type-check" name="types" value="4" id="search-type-4" /><label class="type-icon" data-type-icon="4" for="search-type-4"><!--龍--></label></li>
 					<li data-type-icon="5"><input type="checkbox" class="type-check" name="types" value="5" id="search-type-5" /><label class="type-icon" data-type-icon="5" for="search-type-5"><!--神--></label></li>
+					<li data-type-icon="4"><input type="checkbox" class="type-check" name="types" value="4" id="search-type-4" /><label class="type-icon" data-type-icon="4" for="search-type-4"><!--龍--></label></li>
 					<li data-type-icon="7"><input type="checkbox" class="type-check" name="types" value="7" id="search-type-7" /><label class="type-icon" data-type-icon="7" for="search-type-7"><!--惡魔--></label></li>
 					<li data-type-icon="8"><input type="checkbox" class="type-check" name="types" value="8" id="search-type-8" /><label class="type-icon" data-type-icon="8" for="search-type-8"><!--机械--></label></li>
 					<li data-type-icon="1"><input type="checkbox" class="type-check" name="types" value="1" id="search-type-1" /><label class="type-icon" data-type-icon="1" for="search-type-1"><!--平衡--></label></li>
@@ -1131,8 +1131,8 @@ var formation = new Formation(teamsCount,6);
 				<li><input type="checkbox" class="attr-check" name="dungeon-attrs" value="4" id="dungeon-attr-4" /><label class="attr" data-attr-icon="4" for="dungeon-attr-4"></label></li><!--暗-->
 			</ul>
 			<ul class="type-list">
-				<li><input type="checkbox" class="type-check" name="dungeon-types" value="4" id="dungeon-type-4" /><label class="type-icon" data-type-icon="4" for="dungeon-type-4"><!--龍--></label></li>
 				<li><input type="checkbox" class="type-check" name="dungeon-types" value="5" id="dungeon-type-5" /><label class="type-icon" data-type-icon="5" for="dungeon-type-5"><!--神--></label></li>
+				<li><input type="checkbox" class="type-check" name="dungeon-types" value="4" id="dungeon-type-4" /><label class="type-icon" data-type-icon="4" for="dungeon-type-4"><!--龍--></label></li>
 				<li><input type="checkbox" class="type-check" name="dungeon-types" value="7" id="dungeon-type-7" /><label class="type-icon" data-type-icon="7" for="dungeon-type-7"><!--惡魔--></label></li>
 				<li><input type="checkbox" class="type-check" name="dungeon-types" value="8" id="dungeon-type-8" /><label class="type-icon" data-type-icon="8" for="dungeon-type-8"><!--机械--></label></li>
 				<li><input type="checkbox" class="type-check" name="dungeon-types" value="1" id="dungeon-type-1" /><label class="type-icon" data-type-icon="1" for="dungeon-type-1"><!--平衡--></label></li>
diff --git a/triple.html b/triple.html
index 70b317f7..103c223c 100644
--- a/triple.html
+++ b/triple.html
@@ -118,8 +118,8 @@ var formation = new Formation(teamsCount,6);
 							--><li><icon class="attr" data-attr-icon="4"><!--暗--></icon></li>
 						</ul>
 						<ul class="tIf-types">
-							<li><icon class="type-icon" data-type-icon="4"><!--龍--></icon></li><!--
-							--><li><icon class="type-icon" data-type-icon="5"><!--神--></icon></li><!--
+							<li><icon class="type-icon" data-type-icon="5"><!--神--></icon></li><!--
+							--><li><icon class="type-icon" data-type-icon="4"><!--龍--></icon></li><!--
 							--><li><icon class="type-icon" data-type-icon="7"><!--惡魔--></icon></li><!--
 							--><li><icon class="type-icon" data-type-icon="8"><!--机械--></icon></li><!--
 							--><li><icon class="type-icon" data-type-icon="1"><!--平衡--></icon></li><!--
@@ -1545,8 +1545,8 @@ var formation = new Formation(teamsCount,6);
 			</div>
 			<div class="types-div"><!--类型-->
 				<ul class="type-list">
-					<li data-type-icon="4"><input type="checkbox" class="type-check" name="types" value="4" id="search-type-4" /><label class="type-icon" data-type-icon="4" for="search-type-4"><!--龍--></label></li>
 					<li data-type-icon="5"><input type="checkbox" class="type-check" name="types" value="5" id="search-type-5" /><label class="type-icon" data-type-icon="5" for="search-type-5"><!--神--></label></li>
+					<li data-type-icon="4"><input type="checkbox" class="type-check" name="types" value="4" id="search-type-4" /><label class="type-icon" data-type-icon="4" for="search-type-4"><!--龍--></label></li>
 					<li data-type-icon="7"><input type="checkbox" class="type-check" name="types" value="7" id="search-type-7" /><label class="type-icon" data-type-icon="7" for="search-type-7"><!--惡魔--></label></li>
 					<li data-type-icon="8"><input type="checkbox" class="type-check" name="types" value="8" id="search-type-8" /><label class="type-icon" data-type-icon="8" for="search-type-8"><!--机械--></label></li>
 					<li data-type-icon="1"><input type="checkbox" class="type-check" name="types" value="1" id="search-type-1" /><label class="type-icon" data-type-icon="1" for="search-type-1"><!--平衡--></label></li>
@@ -2098,8 +2098,8 @@ var formation = new Formation(teamsCount,6);
 				<li><input type="checkbox" class="attr-check" name="dungeon-attrs" value="4" id="dungeon-attr-4" /><label class="attr" data-attr-icon="4" for="dungeon-attr-4"></label></li><!--暗-->
 			</ul>
 			<ul class="type-list">
-				<li><input type="checkbox" class="type-check" name="dungeon-types" value="4" id="dungeon-type-4" /><label class="type-icon" data-type-icon="4" for="dungeon-type-4"><!--龍--></label></li>
 				<li><input type="checkbox" class="type-check" name="dungeon-types" value="5" id="dungeon-type-5" /><label class="type-icon" data-type-icon="5" for="dungeon-type-5"><!--神--></label></li>
+				<li><input type="checkbox" class="type-check" name="dungeon-types" value="4" id="dungeon-type-4" /><label class="type-icon" data-type-icon="4" for="dungeon-type-4"><!--龍--></label></li>
 				<li><input type="checkbox" class="type-check" name="dungeon-types" value="7" id="dungeon-type-7" /><label class="type-icon" data-type-icon="7" for="dungeon-type-7"><!--惡魔--></label></li>
 				<li><input type="checkbox" class="type-check" name="dungeon-types" value="8" id="dungeon-type-8" /><label class="type-icon" data-type-icon="8" for="dungeon-type-8"><!--机械--></label></li>
 				<li><input type="checkbox" class="type-check" name="dungeon-types" value="1" id="dungeon-type-1" /><label class="type-icon" data-type-icon="1" for="dungeon-type-1"><!--平衡--></label></li>