From 736d7a778763c261436a514327fe08dc6a98f7d6 Mon Sep 17 00:00:00 2001
From: leiyilu <1509167646@qq.com>
Date: Wed, 29 Jun 2022 22:11:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=83=A8=E5=88=86=E5=88=AB?=
 =?UTF-8?q?=E5=90=8D=E9=97=AE=E9=A2=98=E4=BB=A5=E5=8F=8A=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=BD=93=E5=8A=9B=E6=B4=BE=E9=81=A3bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/Note.js                            | 12 +++++++++++-
 resources/Atlas_alias/shiwu_tujian.json | 20 ++++++++++++++++++--
 resources/dailyNote/xiaoyao_Note.css    | 16 +++++++++++++---
 resources/dailyNote/xiaoyao_Note.html   |  8 +++++---
 4 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/apps/Note.js b/apps/Note.js
index 3dcc8d1..9150ca1 100644
--- a/apps/Note.js
+++ b/apps/Note.js
@@ -150,8 +150,18 @@ export async function Note(e, {
 				val.remained_mb2 = "今天" + Time_day + moment(remainedDate).format("hh:mm");
 				val.remained_time = ` ${val.remained_time}`;
 			}
+			val.mb2_icon=val.avatar_side_icon
 		}
 	}
+	for (var i = 0; i < 5-data.expeditions.length; i++) {
+		data.expeditions.push({
+			remained_time:0,
+			remained_mb2:0,
+			percentage:0,
+			mb2_icon:""
+		})
+	}
+	
 	let remained_time = "";
 	if (data.expeditions && data.expeditions.length >= 1) {
 		remained_time = lodash.map(data.expeditions, "remained_time");
@@ -171,7 +181,7 @@ export async function Note(e, {
 	let coinTime_mb2 = "";
 	let coinTime_mb2Day = "";
 	let coinTime = "";
-	var chnNumChar = ["零", "一", "后", "三", "四", "五", "六", "七", "八", "九"];
+	var chnNumChar = ["零", "明", "后", "三", "四", "五", "六", "七", "八", "九"];
 	if (data.home_coin_recovery_time > 0) {
 		let coinDate = new Date(new Date().getTime() + data.home_coin_recovery_time * 1000);
 		let coinDay = Math.floor(data.home_coin_recovery_time / 3600 / 24);
diff --git a/resources/Atlas_alias/shiwu_tujian.json b/resources/Atlas_alias/shiwu_tujian.json
index ae291a7..f3db54c 100644
--- a/resources/Atlas_alias/shiwu_tujian.json
+++ b/resources/Atlas_alias/shiwu_tujian.json
@@ -96,6 +96,22 @@
 	"市井杂煮": ["市井杂煮"],
 	"丰年有余": ["丰年有余", "年年有余"],
 	"香浓土豆泥": ["香浓土豆泥", "土豆泥"],
-	"应急食物": ["应急食物", "派蒙", "应急食品"],
-	"甜甜花酿鸡": ["甜甜花酿鸡", "甜甜鸡", "吃鸡"]
+	"派蒙": ["应急食物", "派蒙", "应急食品"],
+	"甜甜花酿鸡": ["甜甜花酿鸡", "甜甜鸡", "吃鸡"],
+	"大碗茶":["大碗茶"],
+	"苹果酿":["苹果酿"],
+	"野菇鸡肉串":["野菇鸡肉串"],
+	"萝卜时蔬汤":["萝卜时蔬汤"],
+	"刺身拼盘":["刺身拼盘"],
+	"紫苑云霓":["紫苑云霓"],
+	"风神杂烩菜":["风神杂烩菜","温迪"],
+	"冰钩钩果汁":["冰钩钩果汁"],
+	"炸萝卜丸子":["炸萝卜丸子"],
+	"市井杂煮":["市井杂煮","市杂煮"],
+	"满足沙拉":["满足沙拉","莫娜"],
+	"渔人吐司":["渔人吐司","可莉"],
+	"树莓薄荷饮":["树莓薄荷饮"],
+	"烤肉排":["烤肉排","安柏"],
+	"蒙德烤鱼":["蒙德烤鱼","迪奥娜"],
+	"提瓦特煎蛋":["提瓦特煎蛋","班尼特"]
 }
diff --git a/resources/dailyNote/xiaoyao_Note.css b/resources/dailyNote/xiaoyao_Note.css
index 97d6986..4c725d7 100644
--- a/resources/dailyNote/xiaoyao_Note.css
+++ b/resources/dailyNote/xiaoyao_Note.css
@@ -253,6 +253,16 @@
 .jdt {
 	display: inline-flex;
 }
-.red{
-	color: red;
-}
\ No newline at end of file
+
+.red {
+	color: #d9766c;
+}
+
+.user_null {
+	vertical-align: middle;
+	display: inline-block;
+	position: absolute;
+	margin-left: -5px;
+	top: -3px;
+	left: 7px;
+}
diff --git a/resources/dailyNote/xiaoyao_Note.html b/resources/dailyNote/xiaoyao_Note.html
index 1982ab0..718653f 100644
--- a/resources/dailyNote/xiaoyao_Note.html
+++ b/resources/dailyNote/xiaoyao_Note.html
@@ -109,10 +109,12 @@
 							</div>
 						</div> -->
 						<div class="jdt">
-							<img src="{{_res_path}}/dailyNote/speed/{{list.percentage}}.png"/>
+							<img src="{{_res_path}}/dailyNote/speed/{{100-list.percentage}}.png"/>
 						</div>
-						<div class="icon">
-							<img src="{{list.avatar_side_icon}}" alt="">
+						<div class="icon {{list.mb2_icon==''?'user_null':''}}" >
+							{{if list.mb2_icon==''}}
+							<img src="{{_res_path}}/dailyNote/icon/角色.png" style="width: 60px;height: 60px;" alt=""/>{{else}}
+							<img src="{{list.avatar_side_icon}}" alt="">{{/if}}
 						</div>
 						<div class="text" style="top:{{list.remained_time==0?'30%':'20%'}}">
 							<span>{{if list.remained_time==0}}已完成