PaiGramTeam/miao-plugin
3
0
Fork 0
mirror of https://github.com/yoimiya-kokomi/miao-plugin.git synced 2024-11-22 06:58:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of gitee.com:yoimiya-kokomi/miao-plugin

Browse Source 
 Conflicts:
	components/models/Artifact.js
This commit is contained in:
yoimiya-kokomi 2022-06-26 07:47:38 +08:00
commit ba9a9d01fd
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/admin.js
View File

@ -175,7 +175,7 @@ export async function updateMiaoPlugin(e) {
e.reply("喵喵更新失败！\nError code: " + error.code + "\n" + error.stack + "\n 请稍后重试。"); e.reply("喵喵更新失败！\nError code: " + error.code + "\n" + error.stack + "\n 请稍后重试。");
return true; return true;
} }
e.reply("喵喵更新成功，尝试重新启动Yunzai以应用更新..."); e.reply("喵喵更新成功，正在尝试重新启动Yunzai以应用更新...");
timer && clearTimeout(timer); timer && clearTimeout(timer);
redis.set("miao:restart-msg", JSON.stringify({ redis.set("miao:restart-msg", JSON.stringify({
msg: "重启成功，新版喵喵已经生效", msg: "重启成功，新版喵喵已经生效",

2
resources/character/artis.html
View File

@ -12,7 +12,7 @@
{{each artis ds}} {{each artis ds}}
<div class="item arti"> <div class="item arti">
{{if ds.name && ds.main && ds.main[0] && ds.main[0]!="undefined"}} {{if ds && ds.name && ds.main && ds.main[0] && ds.main[0]!="undefined"}}
<div class="avatar"> <div class="avatar">
<img src="{{_res_path}}meta/character/{{ds.avatar}}/side.png" onerror="whenError(this)"/> <img src="{{_res_path}}meta/character/{{ds.avatar}}/side.png" onerror="whenError(this)"/>
</div> </div>

2
resources/character/detail.html
View File

@ -119,7 +119,7 @@
{{each artis ds}} {{each artis ds}}
<div class="item arti"> <div class="item arti">
{{if ds.name }} {{if ds && ds.name }}
<div class="arti-icon"> <div class="arti-icon">
<img src="{{_sys_res_path}}/genshin/logo/reliquaries/{{ds.name}}.png"/> <img src="{{_sys_res_path}}/genshin/logo/reliquaries/{{ds.name}}.png"/>
<span>+{{ds.level}}</span> <span>+{{ds.level}}</span>