From 3e896c7ddb83106919b590d5a9eda19f8332dfd2 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期六, 22 十一月 2025 14:09:55 +0800
Subject: [PATCH] 0312 红点整理切换账号问题

---
 Main/System/Recharge/RechargeManager.cs            |   38 +++++++++----------
 Main/System/DayMission/DayMissionManager.cs        |    2 
 Main/System/Recharge/ExpSecretCollectionManager.cs |    5 --
 Main/System/DayMission/SignManager.cs              |    2 
 Main/System/Invest/InvestModel.cs                  |   13 +++++-
 Main/System/Achievement/AchievementManager.cs      |    4 +-
 Main/System/InternalAffairs/GoldRushManager.cs     |   15 +++----
 Main/System/BattlePass/BattlePassManager.Common.cs |    2 
 Main/System/BattlePass/BattlePassManager.Week.cs   |    2 
 9 files changed, 41 insertions(+), 42 deletions(-)

diff --git a/Main/System/Achievement/AchievementManager.cs b/Main/System/Achievement/AchievementManager.cs
index 22a74c2..14a27c8 100644
--- a/Main/System/Achievement/AchievementManager.cs
+++ b/Main/System/Achievement/AchievementManager.cs
@@ -146,12 +146,12 @@
 
         foreach (var type in _types)
         {
+            var redpoint = RedpointCenter.Instance.GetRedpoint(redpointDict[type]);
+            redpoint.state = RedPointState.None;
             if (!isOpened(type))
             {
                 continue;
             }
-            var redpoint = RedpointCenter.Instance.GetRedpoint(redpointDict[type]);
-            redpoint.state = RedPointState.None;
             //鏍规嵁ID鍒ゆ柇鏄惁鏈夊彲棰嗗彇鐨�
             var allAchivement = SuccessConfig.GetTypeToIDDict(type);
             var process = GetAchievementProgress(type);
diff --git a/Main/System/BattlePass/BattlePassManager.Common.cs b/Main/System/BattlePass/BattlePassManager.Common.cs
index 475166b..abe8c99 100644
--- a/Main/System/BattlePass/BattlePassManager.Common.cs
+++ b/Main/System/BattlePass/BattlePassManager.Common.cs
@@ -31,11 +31,11 @@
         {
             return;
         }
+        redpointCommonDict[_type].state = RedPointState.None;
         if (!FuncOpen.Instance.IsFuncOpen(typeToFuncIDDict[_type]))
         {
             return;
         }
-        redpointCommonDict[_type].state = RedPointState.None;
         battlePassDataDict.TryGetValue(_type, out BattlePassData battlePassData);
         if (battlePassData == null) return;
         int totalValue = 0;
diff --git a/Main/System/BattlePass/BattlePassManager.Week.cs b/Main/System/BattlePass/BattlePassManager.Week.cs
index 8fce347..d671375 100644
--- a/Main/System/BattlePass/BattlePassManager.Week.cs
+++ b/Main/System/BattlePass/BattlePassManager.Week.cs
@@ -11,12 +11,12 @@
     Redpoint redpoint = new Redpoint(MainRedDot.RedPoint_DailyKey, MainRedDot.RedPoint_WeekBPFuncKey);
     void UpdateWeekRedPoint()
     {
+        redpoint.state = RedPointState.None;
         if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.DayMission))
         {
             return;
         }
 
-        redpoint.state = RedPointState.None;
         //璐拱锛屾椿璺�
         battlePassDataDict.TryGetValue((int)BattlePassType.Week, out BattlePassData battlePassData);
         if (battlePassData == null) return;
diff --git a/Main/System/DayMission/DayMissionManager.cs b/Main/System/DayMission/DayMissionManager.cs
index 208d51b..8e3fb1c 100644
--- a/Main/System/DayMission/DayMissionManager.cs
+++ b/Main/System/DayMission/DayMissionManager.cs
@@ -116,12 +116,12 @@
     Redpoint redpoint = new Redpoint(MainRedDot.RedPoint_DailyKey, MainRedDot.RedPoint_DailyFuncKey);
     void UpdateRedpoint()
     {
+        redpoint.state = RedPointState.None;
         if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.DayMission))
         {
             return;
         }
         //绱Н濂栧姳 鍜� 鍙鍙栦换鍔″鍔变换涓�
-        redpoint.state = RedPointState.None;
         foreach (var config in DailyLivenessRewardConfig.GetValues())
         {
             if (GetDayActivityState(config) == 1)
diff --git a/Main/System/DayMission/SignManager.cs b/Main/System/DayMission/SignManager.cs
index 73688c1..3f5f9bd 100644
--- a/Main/System/DayMission/SignManager.cs
+++ b/Main/System/DayMission/SignManager.cs
@@ -65,6 +65,7 @@
     public Redpoint redPointSign = new Redpoint(MainRedDot.RightFuncRedpoint, MainRedDot.RedPoint_SignKey);
     void UpdateRedpoint()
     {
+        redPointSign.state = RedPointState.None;
         if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.DaySign))
         {
             return;
@@ -77,7 +78,6 @@
                 return;
             }
         }
-        redPointSign.state = RedPointState.None;
     }
 
 }
diff --git a/Main/System/InternalAffairs/GoldRushManager.cs b/Main/System/InternalAffairs/GoldRushManager.cs
index 238d5ab..856d68b 100644
--- a/Main/System/InternalAffairs/GoldRushManager.cs
+++ b/Main/System/InternalAffairs/GoldRushManager.cs
@@ -502,6 +502,9 @@
 
     void UpdateRedpoint()
     {
+        workerRedpoint.state = RedPointState.None;
+        awardRedpoint.state = RedPointState.None;
+        campRedpoint.state = RedPointState.None;
         if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.GoldRush))
             return;
             
@@ -509,22 +512,16 @@
         {
             workerRedpoint.state = RedPointState.Simple;
         }
-        else
-        {
-            workerRedpoint.state = RedPointState.None;
-        }
 
         if (CheckHasFinishGoldRush())
         {
             awardRedpoint.state = RedPointState.Simple;
         }
-        else
+
+        if (CheckCanUnLockCamp())
         {
-            awardRedpoint.state = RedPointState.None;
+            campRedpoint.state = RedPointState.Simple;
         }
-
-
-        campRedpoint.state = CheckCanUnLockCamp() ? RedPointState.Simple : RedPointState.None;
     }
 
     //鐜╁鏁版嵁绫诲瀷
diff --git a/Main/System/Invest/InvestModel.cs b/Main/System/Invest/InvestModel.cs
index a11b019..fee4056 100644
--- a/Main/System/Invest/InvestModel.cs
+++ b/Main/System/Invest/InvestModel.cs
@@ -214,13 +214,20 @@
 
     void UpdateRedpoint()
     {
+        redpoint1.state = RedPointState.None;
+        redpoint2.state = RedPointState.None;
         if (!IsOpen())
         {
             return;
         }
-
-        redpoint1.state = GetInvestState(monthCardType) == 1 ? RedPointState.Simple : RedPointState.None;
-        redpoint2.state = GetInvestState(foreverCardType) == 1 ? RedPointState.Simple : RedPointState.None;
+        if (GetInvestState(monthCardType) == 1)
+        {
+            redpoint1.state = RedPointState.Simple;
+        }
+        if (GetInvestState(foreverCardType) == 1)
+        {
+            redpoint2.state = RedPointState.Simple;
+        }
 
     }
 
diff --git a/Main/System/Recharge/ExpSecretCollectionManager.cs b/Main/System/Recharge/ExpSecretCollectionManager.cs
index 669eec8..ea7097b 100644
--- a/Main/System/Recharge/ExpSecretCollectionManager.cs
+++ b/Main/System/Recharge/ExpSecretCollectionManager.cs
@@ -49,16 +49,13 @@
     public Redpoint redPointLLMJ = new Redpoint(MainRedDot.RightFuncRedpoint, MainRedDot.RedPoint_LLMJKey);
     void UpdateRedpoint()
     {
+        redPointLLMJ.state = RedPointState.None;
         if (m_MJLV == 0) return;
         var nextConfig = LLMJConfig.Get(m_MJLV + 1);
         if (nextConfig == null) return;
         if (m_Zhanchui >= nextConfig.CostWarhammer)
         {
             redPointLLMJ.state = RedPointState.Simple;
-        }
-        else
-        {
-            redPointLLMJ.state = RedPointState.None;
         }
     }
 }
diff --git a/Main/System/Recharge/RechargeManager.cs b/Main/System/Recharge/RechargeManager.cs
index 860d6f1..477765d 100644
--- a/Main/System/Recharge/RechargeManager.cs
+++ b/Main/System/Recharge/RechargeManager.cs
@@ -310,8 +310,6 @@
     private DateTime beforeCTGTime = DateTime.Now;
     private Redpoint rechargeRedpoint = new Redpoint(21);
     public Redpoint firstRechargeRedpoint = new Redpoint(210000);//棣栧厖棰嗗彇绾㈢偣
-    public Redpoint rechargeFuncRedpoint = new Redpoint(21, 2101);
-    public Redpoint rechargeGiftRedpoint = new Redpoint(2101, 210101);//18鍏冪ぜ鍖�
 
     public bool TryGetOrderInfo(int _id, out OrderInfoConfig config)
     {
@@ -702,24 +700,24 @@
 
     private void UpdateRedpoint()
     {
-        if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.Recharge))
-        {
-            return;
-        }
-        if (FirstGoldServerDay <= 0 || !IsFirstChargeRewardGetByDay(1))
-        {
-            return;
-        }
-        var list = GetCTGConfigs(VersionConfig.Get().appId);
-        var config = CTGConfig.Get(list[0]);
-        if (m_RechargeCountDict.ContainsKey(config.RecordID))
-        {
-            if (config.DailyBuyCount > 0 &&
-                config.DailyBuyCount <= m_RechargeCountDict[config.RecordID].todayCount)
-            {
-                return;
-            }
-        }
+        // if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.Recharge))
+        // {
+        //     return;
+        // }
+        // if (FirstGoldServerDay <= 0 || !IsFirstChargeRewardGetByDay(1))
+        // {
+        //     return;
+        // }
+        // var list = GetCTGConfigs(VersionConfig.Get().appId);
+        // var config = CTGConfig.Get(list[0]);
+        // if (m_RechargeCountDict.ContainsKey(config.RecordID))
+        // {
+        //     if (config.DailyBuyCount > 0 &&
+        //         config.DailyBuyCount <= m_RechargeCountDict[config.RecordID].todayCount)
+        //     {
+        //         return;
+        //     }
+        // }
     }
 
 

--
Gitblit v1.8.0