From 6c625bf8c05cf809491f807d1c3ee58d26d2cf49 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期一, 11 三月 2019 20:59:04 +0800
Subject: [PATCH] Merge branch 'master' into Equip
---
Fight/PrepareHandler.cs | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/Fight/PrepareHandler.cs b/Fight/PrepareHandler.cs
index ac0683b..11d27b8 100644
--- a/Fight/PrepareHandler.cs
+++ b/Fight/PrepareHandler.cs
@@ -85,7 +85,17 @@
break;
case E_PrepareType.pstCollecting:
- PlayerDatas.Instance.realm.OnRefreshData(H0812);
+ if (H0812.PlayerID == PlayerDatas.Instance.PlayerId)
+ {
+ NormalCollectWin.s_CollectInfo = new ClientH0812()
+ {
+ PlayerID = PlayerDatas.Instance.PlayerId,
+ PrepareState = (byte)E_PrepareType.pstMissionCollecting,
+ MaxTime = H0812.MaxTime,
+ PrepareID = (int)H0812.PrepareID,
+ };
+ WindowCenter.Instance.Open<NormalCollectWin>();
+ }
_player = GAMgr.Instance.GetBySID(H0812.PlayerID) as GActorPlayerBase;
if (_player != null)
@@ -108,7 +118,17 @@
break;
case E_PrepareType.pstMissionCollecting:
- PlayerDatas.Instance.realm.OnRefreshData(H0812);
+ if (H0812.PlayerID == PlayerDatas.Instance.PlayerId)
+ {
+ NormalCollectWin.s_CollectInfo = new ClientH0812()
+ {
+ PlayerID = PlayerDatas.Instance.PlayerId,
+ PrepareState = (byte)E_PrepareType.pstMissionCollecting,
+ MaxTime = H0812.MaxTime,
+ PrepareID = (int)H0812.PrepareID,
+ };
+ WindowCenter.Instance.Open<NormalCollectWin>();
+ }
_player = GAMgr.Instance.GetBySID(H0812.PlayerID) as GActorPlayerBase;
if (_player != null)
@@ -135,6 +155,7 @@
}
public UnityEngine.Events.UnityAction OnPrepareEndSuccess;
+ public UnityEngine.Events.UnityAction<int, int> OnPrepareEnd;
public void ServerPrepareEnd(H0813_tagPrepareEnd h0813)
{
@@ -147,7 +168,11 @@
}
WindowCenter.Instance.Close<PrepareWin>();
- PlayerDatas.Instance.realm.OnRefreshData(h0813);
+
+ if (h0813.PlayerID == PlayerDatas.Instance.baseData.PlayerID)
+ {
+ WindowCenter.Instance.Close<NormalCollectWin>();
+ }
GActorPlayerBase _player = null;
@@ -240,6 +265,10 @@
//Debug.LogFormat("鏀跺埌杩涘害鏉＄粨鏉熷紓甯告儏鍐�: {0}", (E_PrepareType)h0813.Type);
}
+ if (OnPrepareEnd != null)
+ {
+ OnPrepareEnd((int)h0813.PlayerID, h0813.Type);
+ }
H0812 = null;
}
--
Gitblit v1.8.0