From 56091a5a2b3df0681996731982f812003daf85e9 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期四, 20 九月 2018 15:52:47 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Team/TeamModel.cs | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/System/Team/TeamModel.cs b/System/Team/TeamModel.cs
index 5051e54..a652817 100644
--- a/System/Team/TeamModel.cs
+++ b/System/Team/TeamModel.cs
@@ -15,6 +15,7 @@
bool serverInited = false;
FriendsModel friendsModel { get { return ModelCenter.Instance.GetModel<FriendsModel>(); } }
DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }
+ FairyModel fairyModel { get { return ModelCenter.Instance.GetModel<FairyModel>(); } }
public bool autoAcceptApplication {
get { return (PlayerDatas.Instance.baseData.ExAttr2 / 10) % 10 == 0; }
@@ -193,10 +194,12 @@
levelMaxBuf = GeneralConfig.Instance.playerMaxLevel;
ParseTeamMission();
DTCB309_tagGCAnswerPlayerShortInfo.OnPlayerShortInfoEvent += OnGetPlayerShortInfo;
+ PlayerDatas.Instance.fairyData.OnRefreshFairyInfo += OnUpdateFairyInfo;
}
public override void UnInit()
{
+ PlayerDatas.Instance.fairyData.OnRefreshFairyInfo -= OnUpdateFairyInfo;
DTCB309_tagGCAnswerPlayerShortInfo.OnPlayerShortInfoEvent -= OnGetPlayerShortInfo;
}
@@ -632,11 +635,7 @@
}
break;
case TeamInviteType.Fairy:
- GetFairyMemebers();
- if (teamInvitesUpdateEvent != null)
- {
- teamInvitesUpdateEvent(_inviteType);
- }
+ fairyModel.UpdateFairyInfo();
break;
case TeamInviteType.NearBy:
RequestQueryNearbyPlayers();
@@ -738,6 +737,18 @@
}
}
+ private void OnUpdateFairyInfo()
+ {
+ if (currentInviteType == TeamInviteType.Fairy)
+ {
+ GetFairyMemebers();
+ if (teamInvitesUpdateEvent != null)
+ {
+ teamInvitesUpdateEvent(TeamInviteType.Fairy);
+ }
+ }
+ }
+
public void OnGetPlayerShortInfo(HB309_tagGCAnswerPlayerShortInfo _inTeamInfo)
{
if (playerInTeamAnswerEvent != null)
--
Gitblit v1.8.0