ctrlcvs/xiaoyao-cvs-plugin
2
0
Fork 0
mirror of https://github.com/ctrlcvs/xiaoyao-cvs-plugin.git synced 2024-12-23 11:40:51 +08:00
Code

更新部分别名问题以及修复体力派遣bug

Browse Source
This commit is contained in:
leiyilu 2022-06-29 22:11:12 +08:00
parent 0402e5b1d7
commit 736d7a7787
4 changed files with 47 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/Note.js
View File

@ -150,8 +150,18 @@ export async function Note(e, {
val.remained_mb2 = "今天" + Time_day + moment(remainedDate).format("hh:mm"); val.remained_mb2 = "今天" + Time_day + moment(remainedDate).format("hh:mm");
val.remained_time = ` ${val.remained_time}`; 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 = ""; let remained_time = "";
if (data.expeditions && data.expeditions.length >= 1) { if (data.expeditions && data.expeditions.length >= 1) {
remained_time = lodash.map(data.expeditions, "remained_time"); remained_time = lodash.map(data.expeditions, "remained_time");
@ -171,7 +181,7 @@ export async function Note(e, {
let coinTime_mb2 = ""; let coinTime_mb2 = "";
let coinTime_mb2Day = ""; let coinTime_mb2Day = "";
let coinTime = ""; let coinTime = "";
var chnNumChar = ["零", "一", "后", "三", "四", "五", "六", "七", "八", "九"]; var chnNumChar = ["零", "明", "后", "三", "四", "五", "六", "七", "八", "九"];
if (data.home_coin_recovery_time > 0) { if (data.home_coin_recovery_time > 0) {
let coinDate = new Date(new Date().getTime() + data.home_coin_recovery_time * 1000); let coinDate = new Date(new Date().getTime() + data.home_coin_recovery_time * 1000);
let coinDay = Math.floor(data.home_coin_recovery_time / 3600 / 24); let coinDay = Math.floor(data.home_coin_recovery_time / 3600 / 24);

20
resources/Atlas_alias/shiwu_tujian.json
View File

@ -96,6 +96,22 @@
"市井杂煮": ["市井杂煮"], "市井杂煮": ["市井杂煮"],
"丰年有余": ["丰年有余", "年年有余"], "丰年有余": ["丰年有余", "年年有余"],
"香浓土豆泥": ["香浓土豆泥", "土豆泥"], "香浓土豆泥": ["香浓土豆泥", "土豆泥"],
"应急食物": ["应急食物", "派蒙", "应急食品"], "派蒙": ["应急食物", "派蒙", "应急食品"],
"甜甜花酿鸡": ["甜甜花酿鸡", "甜甜鸡", "吃鸡"] "甜甜花酿鸡": ["甜甜花酿鸡", "甜甜鸡", "吃鸡"],
"大碗茶":["大碗茶"],
"苹果酿":["苹果酿"],
"野菇鸡肉串":["野菇鸡肉串"],
"萝卜时蔬汤":["萝卜时蔬汤"],
"刺身拼盘":["刺身拼盘"],
"紫苑云霓":["紫苑云霓"],
"风神杂烩菜":["风神杂烩菜","温迪"],
"冰钩钩果汁":["冰钩钩果汁"],
"炸萝卜丸子":["炸萝卜丸子"],
"市井杂煮":["市井杂煮","市杂煮"],
"满足沙拉":["满足沙拉","莫娜"],
"渔人吐司":["渔人吐司","可莉"],
"树莓薄荷饮":["树莓薄荷饮"],
"烤肉排":["烤肉排","安柏"],
"蒙德烤鱼":["蒙德烤鱼","迪奥娜"],
"提瓦特煎蛋":["提瓦特煎蛋","班尼特"]
} }

14
resources/dailyNote/xiaoyao_Note.css
View File

@ -253,6 +253,16 @@
.jdt { .jdt {
display: inline-flex; display: inline-flex;
} }
.red{
color: red; .red {
color: #d9766c;
}
.user_null {
vertical-align: middle;
display: inline-block;
position: absolute;
margin-left: -5px;
top: -3px;
left: 7px;
} }

8
resources/dailyNote/xiaoyao_Note.html
View File

@ -109,10 +109,12 @@
</div> </div>
</div> --> </div> -->
<div class="jdt"> <div class="jdt">
<img src="{{_res_path}}/dailyNote/speed/{{list.percentage}}.png"/> <img src="{{_res_path}}/dailyNote/speed/{{100-list.percentage}}.png"/>
</div> </div>
<div class="icon"> <div class="icon {{list.mb2_icon==''?'user_null':''}}" >
<img src="{{list.avatar_side_icon}}" alt=""> {{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>
<div class="text" style="top:{{list.remained_time==0?'30%':'20%'}}"> <div class="text" style="top:{{list.remained_time==0?'30%':'20%'}}">
<span>{{if list.remained_time==0}}已完成 <span>{{if list.remained_time==0}}已完成