From c591cb6e215ea5e762560afdae059f1d4fd7f4ec Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期五, 28 九月 2018 16:32:37 +0800
Subject: [PATCH] Merge branch 'master' into 3687天赋功能

---
 System/FindPrecious/DemonJarModel.cs |   28 ++++++++++++++++++----------
 1 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/System/FindPrecious/DemonJarModel.cs b/System/FindPrecious/DemonJarModel.cs
index 8c0cc6b..81369ff 100644
--- a/System/FindPrecious/DemonJarModel.cs
+++ b/System/FindPrecious/DemonJarModel.cs
@@ -268,12 +268,25 @@
 
                     if (PlayerDatas.Instance.baseData.LV == GeneralConfig.Instance.demonJarRedPoint)
                     {
-                        var count = dungeonModel.GetTotalTimes(DEMONJAR_MAPID) - dungeonModel.GetEnterTimes(DEMONJAR_MAPID);
-                        redpoint.state = count > 0 ? RedPointState.Quantity : RedPointState.None;
-                        redpoint.count = count;
+                        UpdateRedpoint();
                     }
                     break;
             }
+        }
+
+        private void UpdateRedpoint()
+        {
+            if (FuncOpen.Instance.IsFuncOpen(76))
+            {
+                var count = dungeonModel.GetTotalTimes(DEMONJAR_MAPID) - dungeonModel.GetEnterTimes(DEMONJAR_MAPID);
+                redpoint.count = count;
+            }
+            else
+            {
+                redpoint.count = 0;
+            }
+
+            redpoint.state = redpoint.count > 0 ? RedPointState.Quantity : RedPointState.None;
         }
 
         private void OnMapLineUpdateEvent(int _mapId)
@@ -330,9 +343,7 @@
         {
             if (DEMONJAR_MAPID == _dataMapId && PlayerDatas.Instance.baseData.LV >= GeneralConfig.Instance.demonJarRedPoint)
             {
-                var count = dungeonModel.GetTotalTimes(_dataMapId) - dungeonModel.GetEnterTimes(_dataMapId);
-                redpoint.state = count > 0 ? RedPointState.Quantity : RedPointState.None;
-                redpoint.count = count;
+                UpdateRedpoint();
             }
         }
 
@@ -340,11 +351,8 @@
         {
             if (PlayerDatas.Instance.baseData.LV >= GeneralConfig.Instance.demonJarRedPoint)
             {
-                var count = dungeonModel.GetTotalTimes(DEMONJAR_MAPID) - dungeonModel.GetEnterTimes(DEMONJAR_MAPID);
-                redpoint.state = count > 0 ? RedPointState.Quantity : RedPointState.None;
-                redpoint.count = count;
+                UpdateRedpoint();
             }
-
         }
 
         private void AutoSubscribeLastUnLockBoss(int _bossId)

--
Gitblit v1.8.0