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 @@ -->