From 3a7126b4f32c8770e59e0cc48266bb3fec06ccc4 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期二, 09 十二月 2025 14:02:02 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

---
 Main/System/FirstCharge/FirstChargeManager.cs |   43 +++++++++++++------------------------------
 1 files changed, 13 insertions(+), 30 deletions(-)

diff --git a/Main/System/FirstCharge/FirstChargeManager.cs b/Main/System/FirstCharge/FirstChargeManager.cs
index 34f8ba8..c647081 100644
--- a/Main/System/FirstCharge/FirstChargeManager.cs
+++ b/Main/System/FirstCharge/FirstChargeManager.cs
@@ -329,19 +329,20 @@
         OnUpdateFirstChargeInfo?.Invoke();
     }
 
+    public string key { get { return StringUtility.Contact("FirstCharge_AllRewardsClaimed_Time_", PlayerDatas.Instance.baseData.PlayerID); } }
+
     /// <summary>
     /// 妫�鏌ユ槸鍚︽墍鏈夐鍏呭鍔遍兘宸查鍙栵紝濡傛灉鏄紝鍒欏皢褰撳墠鏈嶅姟鍣ㄦ椂闂翠繚瀛樺埌鏈湴
     /// </summary>
     private void CheckAndSaveAllRewardsClaimedTime()
     {
-        // 妫�鏌ユ槸鍚︽墍鏈夊鍔遍兘宸查鍙�
-        if (IsAllFirstChargeRewardsClaimed())
-        {
-            // 鐢熸垚涓�涓敮涓�鐨勯敭鏉ュ瓨鍌ㄦ椂闂�
-            string key = $"FirstCharge_AllRewardsClaimed_Time_{PlayerDatas.Instance.baseData.PlayerID}";
-            // 灏嗗綋鍓嶆湇鍔″櫒鏃堕棿淇濆瓨鍒版湰鍦�
-            LocalSave.SetString(key, TimeUtility.ServerNow.Ticks.ToString());
-        }
+        if (LocalSave.HasKey(key))
+            return;
+        // 鎵�鏈夊鍔遍兘宸查鍙�?
+        if (!IsAllFirstChargeRewardsClaimed())
+            return;
+        // 灏嗗綋鍓嶆湇鍔″櫒鏃堕棿淇濆瓨鍒版湰鍦�
+        LocalSave.SetInt(key, TimeUtility.AllSeconds);
     }
     public void UpdateRedPoint()
     {
@@ -461,31 +462,13 @@
     // 妫�鏌ユ槸鍚﹀凡缁忚繃浜嗘墍鏈夊鍔遍鍙栧畬姣曞悗鐨勭浜屽ぉ0鐐�
     public bool IsNextDayAfterAllClaimed()
     {
-        // 鐢熸垚涓�涓敮涓�鐨勯敭鏉ヨ幏鍙栨椂闂�
-        string key = $"FirstCharge_AllRewardsClaimed_Time_{PlayerDatas.Instance.baseData.PlayerID}";
-
-        // 妫�鏌ユ槸鍚﹀瓨鍦ㄨ褰曠殑鏃堕棿鎴�
         if (!LocalSave.HasKey(key))
             return false;
-
-        // 鑾峰彇璁板綍鐨勬椂闂存埑
-        string timeString = LocalSave.GetString(key);
-        if (string.IsNullOrEmpty(timeString))
+        int time = LocalSave.GetInt(key);
+        if (time <= 0)
             return false;
-
-        // 瑙f瀽鏃堕棿鎴�
-        if (!long.TryParse(timeString, out long ticks))
-            return false;
-
-        // 灏嗘椂闂存埑杞崲涓篋ateTime
-        DateTime allRewardsClaimedTime = new DateTime(ticks);
-
-        // 璁$畻绗簩澶�0鐐圭殑鏃堕棿
-        DateTime nextDayStart = allRewardsClaimedTime.Date.AddDays(1);
-
-        // 鍒ゆ柇褰撳墠鏈嶅姟鍣ㄦ椂闂存槸鍚﹀凡缁忚繃浜嗙浜屽ぉ0鐐�
-        DateTime serverNow = TimeUtility.ServerNow;
-        return serverNow >= nextDayStart;
+        DateTime endDateTime = TimeUtility.GetTime((uint)time).Date.AddDays(1);
+        return TimeUtility.ServerNow >= endDateTime;
     }
 
 }

--
Gitblit v1.8.0