From 39001a600fcae2bcf27c225df8752d75fb92fef4 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期五, 31 十月 2025 11:18:26 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

---
 Main/Utility/TimeUtility.cs |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/Main/Utility/TimeUtility.cs b/Main/Utility/TimeUtility.cs
index 22c4141..5889fb3 100644
--- a/Main/Utility/TimeUtility.cs
+++ b/Main/Utility/TimeUtility.cs
@@ -252,6 +252,7 @@
         return StringUtility.Contact(hours.ToString("D2"), ":", mins.ToString("D2"), ":", seconds.ToString("D2"));
     }
 
+
     //璇︾粏鏄剧ず
     //xx灏忔椂xx鍒哫X绉�
     //xx鍒哫X绉�
@@ -424,7 +425,7 @@
     //渚嬪瓙
     //x澶�
     //x鏃�
-    //x鍒唜绉�
+    //x鍒�
     //x绉�
     public static string SecondsToConsumeRebate(int _seconds)
     {
@@ -438,15 +439,15 @@
         }
         else if (hours >= 1)
         {
-            return StringUtility.Contact(Mathf.CeilToInt(hours), Language.Get("Hour"));
+            return StringUtility.Contact(Mathf.CeilToInt(hours), Language.Get("L1072"));
         }
         else if (mins >= 1)
         {
-            return StringUtility.Contact(mins, Language.Get("Minute"), seconds, Language.Get("RealmWin_Bewrite_35"));
+            return StringUtility.Contact(mins, Language.Get("L1073"));
         }
         else
         {
-            return StringUtility.Contact(seconds, Language.Get("RealmWin_Bewrite_35"));
+            return StringUtility.Contact(seconds, Language.Get("L1075"));
         }
     }
 
@@ -495,6 +496,17 @@
 
     }
 
+    // 鍒�10鐐硅繕瑕佸灏戠锛屽鏋滃凡缁忚繃浜�10鐐癸紝杩斿洖0
+    public static int GetToTenClockSeconds()
+    {
+        var now = ServerNow;
+        if (now.Hour < 10)
+        {
+            return (int)(ServerNow - new DateTime(now.Year, now.Month, now.Day, 10, 0, 0)).TotalSeconds;
+        }
+        return 0;
+    }
+
     //寮�鏈嶅ぉ缁撴潫鍊掕鏃讹紱鍗曚綅绉�
     public static int GetRemindTimeByOpenDay(int days)
     {

--
Gitblit v1.8.0