From e69ff80ae3183fd3cfe6b36e1fe5bb9ab183bd46 Mon Sep 17 00:00:00 2001
From: Ctrlcvs <1509167646@qq.com>
Date: Sat, 6 May 2023 17:41:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=BC=80=E6=8B=93=E5=8A=9B?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/genshin/model/note.js                            | 9 ++++++++-
 .../resources/StarRail/html/dailyNote/dailyNote.html     | 6 +++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/plugins/genshin/model/note.js b/plugins/genshin/model/note.js
index 599e7cd..6603362 100644
--- a/plugins/genshin/model/note.js
+++ b/plugins/genshin/model/note.js
@@ -47,11 +47,18 @@ export default class Note extends base {
       let minutes =d.minutes()
       let seconds =d.seconds()
       resinMaxTime = hours+'小时'+minutes+'分钟'+seconds+'秒'
+      //精确到秒。。。。
       if(day>0){
         resinMaxTime =day+'天'+hours+'小时'+minutes+'分钟'+seconds+'秒'
+      }else if(hours>0){
+        resinMaxTime = hours+'小时'+minutes+'分钟'+seconds+'秒'
+      }else if(minutes>0){
+        resinMaxTime = minutes+'分钟'+seconds+'秒'
+      }else if(seconds>0){
+        resinMaxTime = seconds+'秒'
       }
     }
-    data.bfStamina = data.current_stamina / data.max_stamina * data.max_stamina +'%';
+    data.bfStamina = data.current_stamina / data.max_stamina * 100 +'%';
     /** 派遣 */
     for(let item of data.expeditions){
       let d = moment.duration(item.remaining_time, 'seconds');
diff --git a/plugins/genshin/resources/StarRail/html/dailyNote/dailyNote.html b/plugins/genshin/resources/StarRail/html/dailyNote/dailyNote.html
index 6169312..45ffac5 100644
--- a/plugins/genshin/resources/StarRail/html/dailyNote/dailyNote.html
+++ b/plugins/genshin/resources/StarRail/html/dailyNote/dailyNote.html
@@ -30,7 +30,11 @@
             <div class="subject_note">开拓力：<span>{{current_stamina}}</span>/<span>{{max_stamina}}</span></div>
             <div class="subject_solid"><span style="width: {{bfStamina}};"></span></div>
             <div class="subject_date">
-                剩余回复时间:<span style="margin-left: 25px;">{{resinMaxTime}}</span>
+                {{if stamina_recover_time>0}}
+                剩余恢复时间:<span style="margin-left: 25px;">{{resinMaxTime}}</span>
+                {{else}}
+                开拓力已完全恢复
+                {{/if}}
             </div>
         </div>
         <div class="title_wt">