From 356821032f10ee7076b1cd8ddb9b02a2a5ddfbb1 Mon Sep 17 00:00:00 2001
From: client_Lhy <995049470@qq.com>
Date: 星期一, 24 六月 2019 13:35:01 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 System/FindPrecious/DemonJarModel.cs |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/System/FindPrecious/DemonJarModel.cs b/System/FindPrecious/DemonJarModel.cs
index a74f5d2..3a75f3b 100644
--- a/System/FindPrecious/DemonJarModel.cs
+++ b/System/FindPrecious/DemonJarModel.cs
@@ -467,9 +467,27 @@
 
         private void OnDungeonRecordUpdate(int _dataMapId)
         {
-            if (DATA_MAPID == _dataMapId && PlayerDatas.Instance.baseData.LV >= GeneralDefine.demonJarRedPoint)
+            if (DATA_MAPID != _dataMapId)
+            {
+                return;
+            }
+
+            if (PlayerDatas.Instance.baseData.LV >= GeneralDefine.demonJarRedPoint)
             {
                 UpdateRedpoint();
+            }
+
+            foreach (var boss in demonBosses.Values)
+            {
+                if (this.findPreciousModel.IsBossAutoSubscribe(boss.id))
+                {
+                    var config = DemonJarConfig.Get(boss.id);
+                    var grade = dungeonModel.GetGrade(new Dungeon(DATA_MAPID, config.LineID));
+                    if (grade > 0 && config.CancelAttentionAfterKill == 1)
+                    {
+                        this.findPreciousModel.RequestDeSubscribeBoss(boss.id);
+                    }
+                }
             }
         }
 
@@ -498,12 +516,13 @@
 
             if (bossId != 0 && this.findPreciousModel.IsBossNeverSubscribe(bossId))
             {
-                if (findPreciousModel.IsBossUnlock(bossId))
+                if (IsBossUnlock(bossId))
                 {
                     var config = DemonJarConfig.Get(bossId);
                     if (config.AutoAttention == 1)
                     {
                         this.findPreciousModel.RequestSubscribeBoss(bossId, true);
+
                         var model = ModelCenter.Instance.GetModel<DungeonModel>();
                         var grade = model.GetGrade(new Dungeon(DATA_MAPID, config.LineID));
                         if ((config.CanEnterTimes == 0 || grade == 0) && this.findPreciousModel.IsBossAlive(bossId))

--
Gitblit v1.8.0