From 3402c086b47d8051eb02f87995ae8e01d7c6f470 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期五, 31 八月 2018 15:32:05 +0800
Subject: [PATCH] 2960 优化骑宠争夺界面
---
System/FairyAu/FairyGrabBossWin.cs | 15 +++++++++++----
System/FairyAu/FairyGrabBossModel.cs | 5 +++++
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/System/FairyAu/FairyGrabBossModel.cs b/System/FairyAu/FairyGrabBossModel.cs
index df2bc33..3089bef 100644
--- a/System/FairyAu/FairyGrabBossModel.cs
+++ b/System/FairyAu/FairyGrabBossModel.cs
@@ -83,6 +83,7 @@
public event Action<int> bossSelectedEvent;
public event Action<int, int> bossHurtUpdate;
public event Action<int> bossProgressUpdate;
+ public event Action bossAllProgressUpdate;
public event Action bossGrabHintEvent;
DailyQuestModel dailyQuestModel { get { return ModelCenter.Instance.GetModel<DailyQuestModel>(); } }
@@ -353,6 +354,10 @@
bossProgressUpdate(bossProgress.NPCID);
}
}
+ if (bossAllProgressUpdate != null)
+ {
+ bossAllProgressUpdate();
+ }
}
public bool TryGetBossProgress(int bossId,out BossProgressInfo bossProgressInfo)
diff --git a/System/FairyAu/FairyGrabBossWin.cs b/System/FairyAu/FairyGrabBossWin.cs
index 2d5ddc6..dd3e418 100644
--- a/System/FairyAu/FairyGrabBossWin.cs
+++ b/System/FairyAu/FairyGrabBossWin.cs
@@ -54,6 +54,7 @@
GlobalTimeEvent.Instance.secondEvent += SecondEvent;
model.bossSelectedEvent += BossSelectedEvent;
model.bossProgressUpdate += BossProgressUpdate;
+ model.bossAllProgressUpdate += BossAllProgressUpdate;
model.stateUpdate += StateUpdate;
m_Timer = 0;
}
@@ -76,6 +77,7 @@
GlobalTimeEvent.Instance.secondEvent -= SecondEvent;
model.bossSelectedEvent -= BossSelectedEvent;
model.bossProgressUpdate -= BossProgressUpdate;
+ model.bossAllProgressUpdate -= BossAllProgressUpdate;
model.stateUpdate -= StateUpdate;
}
@@ -211,15 +213,20 @@
private void BossProgressUpdate(int bossId)
{
- if (!autoSelect)
- {
- AutoSelect();
- }
if (bossId == model.selectBoss)
{
DisplayHighestFairy();
}
}
+
+ void BossAllProgressUpdate()
+ {
+ if (!autoSelect)
+ {
+ AutoSelect();
+ }
+ }
+
private void StateUpdate()
{
DisplayHighestFairy();
--
Gitblit v1.8.0