From 3fd359eb148b56428bbf4bcdbe81f17b2febe818 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: Sat, 11 Jan 2020 15:32:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E5=B1=9E=E6=80=A7?=
 =?UTF-8?q?=E5=92=8C=E7=B1=BB=E5=9E=8B=E7=9A=84UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 languages/zh.css |  9 +++++++--
 solo.html        | 43 ++++++++++++++++++++++++++++++++++++++-----
 style.css        | 30 ++++++++++++++++++++++++++++++
 3 files changed, 75 insertions(+), 7 deletions(-)

diff --git a/languages/zh.css b/languages/zh.css
index 82d3a751..f8c4380b 100644
--- a/languages/zh.css
+++ b/languages/zh.css
@@ -161,11 +161,16 @@
 .team-info .tIf-total-rcv::before{
 	content: "总回复(队伍觉醒和徽章)：";
 }
-/*
+
 .search-box .open-search::before{
 	content: "搜索怪物";
 }
-*/
+.attrs .attr-all::before{
+	content: "不限";
+}
+.attrs .attr-none::before{
+	content: "无";
+}
 
 /*Some icons, style different from the Japanese version*/
 .awoken-46,
diff --git a/solo.html b/solo.html
index 2f801510..c81020db 100644
--- a/solo.html
+++ b/solo.html
@@ -359,7 +359,7 @@ var formation = new Formation(1,6);
 		</div>
 		<div class="detail-box"><textarea class="detail" placeholder="输入说明"></textarea></div>
 	</div>
-	<div class="edit-box display-none">
+	<div class="edit-box"><!--display-none-->
 		<div class="edit-box-title"><!--修改怪物--></div>
 		<div class="monsterinfo-box">
 			<div class="monster-head">
@@ -378,14 +378,47 @@ var formation = new Formation(1,6);
 			</ul>
 		</div>
 		<div class="search-box">
-			<a class="open-search"></a><!--搜索怪物-->
+			<a class="open-search"></a><!--搜索怪物按钮-->
 			<div class="search-mon-control-box">
-				<div></div><!--属性-->
-				<div></div><!--类型-->
+				<div class="attrs"><!--属性-->
+					<ul class="attr-list attr-list-1">
+						<li><input type="radio" name="attr-1" class="attr-radio" value="all" id="search-attr-1-all" /><label class="attr-all" for="search-attr-1-all"><!--全部--></label></li>
+						<li><input type="radio" name="attr-1" class="attr-radio" value="0" id="search-attr-1-0" /><label class="attr-t0" for="search-attr-1-0"><!--火--></label></li>
+						<li><input type="radio" name="attr-1" class="attr-radio" value="1" id="search-attr-1-1" /><label class="attr-t1" for="search-attr-1-1"><!--水--></label></li>
+						<li><input type="radio" name="attr-1" class="attr-radio" value="2" id="search-attr-1-2" /><label class="attr-t2" for="search-attr-1-2"><!--木--></label></li>
+						<li><input type="radio" name="attr-1" class="attr-radio" value="3" id="search-attr-1-3" /><label class="attr-t3" for="search-attr-1-3"><!--光--></label></li>
+						<li><input type="radio" name="attr-1" class="attr-radio" value="4" id="search-attr-1-4" /><label class="attr-t4" for="search-attr-1-4"><!--暗--></label></li>
+					</ul>
+					<ul class="attr-list attr-list-2">
+						<li><input type="radio" name="attr-2" class="attr-radio" value="all" id="search-attr-2-all" /><label class="attr-all" for="search-attr-2-all"><!--全部--></label></li>
+						<li><input type="radio" name="attr-2" class="attr-radio" value="0" id="search-attr-2-0" /><label class="attr-t0" for="search-attr-2-0"><!--火--></label></li>
+						<li><input type="radio" name="attr-2" class="attr-radio" value="1" id="search-attr-2-1" /><label class="attr-t1" for="search-attr-2-1"><!--水--></label></li>
+						<li><input type="radio" name="attr-2" class="attr-radio" value="2" id="search-attr-2-2" /><label class="attr-t2" for="search-attr-2-2"><!--木--></label></li>
+						<li><input type="radio" name="attr-2" class="attr-radio" value="3" id="search-attr-2-3" /><label class="attr-t3" for="search-attr-2-3"><!--光--></label></li>
+						<li><input type="radio" name="attr-2" class="attr-radio" value="4" id="search-attr-2-4" /><label class="attr-t4" for="search-attr-2-4"><!--暗--></label></li>
+						<li><input type="radio" name="attr-2" class="attr-radio" value="-1" id="search-attr-2-none" /><label class="attr-none" for="search-attr-2-none"><!--无--></label></li>
+					</ul>
+				</div>
+				<div class="types"><!--类型-->
+					<ul class="type-list">
+						<li><input type="checkbox" name="types" class="type-check" value="4" id="search-type-4" /><label class="type-icon type-icon-4" for="search-type-4"><!--龍--></label></li>
+						<li><input type="checkbox" name="types" class="type-check" value="5" id="search-type-5" /><label class="type-icon type-icon-5" for="search-type-5"><!--神--></label></li>
+						<li><input type="checkbox" name="types" class="type-check" value="7" id="search-type-7" /><label class="type-icon type-icon-7" for="search-type-7"><!--惡魔--></label></li>
+						<li><input type="checkbox" name="types" class="type-check" value="8" id="search-type-8" /><label class="type-icon type-icon-8" for="search-type-8"><!--机械--></label></li>
+						<li><input type="checkbox" name="types" class="type-check" value="1" id="search-type-1" /><label class="type-icon type-icon-1" for="search-type-1"><!--平衡--></label></li>
+						<li><input type="checkbox" name="types" class="type-check" value="6" id="search-type-6" /><label class="type-icon type-icon-6" for="search-type-6"><!--攻撃--></label></li>
+						<li><input type="checkbox" name="types" class="type-check" value="2" id="search-type-2" /><label class="type-icon type-icon-2" for="search-type-2"><!--体力--></label></li>
+						<li><input type="checkbox" name="types" class="type-check" value="3" id="search-type-3" /><label class="type-icon type-icon-3" for="search-type-3"><!--回復--></label></li>
+						<li><input type="checkbox" name="types" class="type-check" value="0" id="search-type-0" /><label class="type-icon type-icon-0" for="search-type-0"><!--進化用--></label></li>
+						<li><input type="checkbox" name="types" class="type-check" value="12" id="search-type-12" /><label class="type-icon type-icon-12" for="search-type-12"><!--能力覺醒用--></label></li>
+						<li><input type="checkbox" name="types" class="type-check" value="14" id="search-type-14" /><label class="type-icon type-icon-14" for="search-type-14"><!--強化合成用--></label></li>
+						<li><input type="checkbox" name="types" class="type-check" value="15" id="search-type-15" /><label class="type-icon type-icon-15" for="search-type-15"><!--販賣用--></label></li>
+					</ul>
+				</div>
 				<div></div><!--觉醒-->
 				<div></div><!--超觉醒-->
 				<div></div><!--控制栏，开始搜索，清空搜索条件，排序方式，关闭搜索-->
-				<ul class="search-mon-list"></ul>
+				<ul class="search-mon-list"></ul><!--搜索结果的显示列表-->
 			</div>
 			<input type="search" class="m-id" list="monsters-list"/>
 			<datalist id="monsters-list"></datalist>
diff --git a/style.css b/style.css
index 862f6d1c..a7c37eef 100644
--- a/style.css
+++ b/style.css
@@ -462,6 +462,36 @@ ul{
 	bottom: 5px;
 	font-size: 20px;
 }
+/*
+.attr-radio{
+	display: none;
+}
+.attrs .attr-list li{
+	display: inline-block;
+}*/
+/*.attrs .attr-all::after{
+	content: "不限";
+}
+.attrs .attr-none::after{
+	content: "无";
+}*/
+.attrs .attr-t0::before{
+	content: url(images/orb-small-fire.png);
+}
+.attrs .attr-t1::before{
+	content: url(images/orb-small-water.png);
+}
+.attrs .attr-t2::before{
+	content: url(images/orb-small-wood.png);
+}
+.attrs .attr-t3::before{
+	content: url(images/orb-small-light.png);
+}
+.attrs .attr-t4::before{
+	content: url(images/orb-small-dark.png);
+}
+
+
 .edit-box .setting-row{
 	width: 100%;
 }