From 3e65795817eba4fe9419d3e93c913e8d4f46c8e7 Mon Sep 17 00:00:00 2001
From: Client_PangDeRong <593317293@qq.com>
Date: 星期一, 24 十二月 2018 11:44:17 +0800
Subject: [PATCH] 5398 子 【开发】【1.4】跨服竞技场 ,正在进入跨服时，限制进入副本
---
System/CrossServerOneVsOne/CrossServerWin.cs | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/System/CrossServerOneVsOne/CrossServerWin.cs b/System/CrossServerOneVsOne/CrossServerWin.cs
index 32d48fe..73087ac 100644
--- a/System/CrossServerOneVsOne/CrossServerWin.cs
+++ b/System/CrossServerOneVsOne/CrossServerWin.cs
@@ -34,8 +34,8 @@
[SerializeField] GameObject honorStore_SelectImg;
CrossServerRewardModel m_CrossServerRewardModel;
CrossServerRewardModel crossServerRewardModel { get { return m_CrossServerRewardModel ?? (m_CrossServerRewardModel = ModelCenter.Instance.GetModel<CrossServerRewardModel>()); } }
- CrossServerModel crossServerModel { get { return ModelCenter.Instance.GetModel<CrossServerModel>(); } }
- CrossServerPlayerInfo playerInfo;
+ CrossServerOneVsOneModel crossServerModel { get { return ModelCenter.Instance.GetModel<CrossServerOneVsOneModel>(); } }
+ CrossServerOneVsOnePlayerInfo playerInfo;
#region Built-in
protected override void BindController()
{
@@ -82,7 +82,7 @@
private void SetDisplay()
{
- playerInfo = CrossServerPlayerInfo.Instance;
+ playerInfo = CrossServerOneVsOnePlayerInfo.Instance;
var playerData = PlayerDatas.Instance.baseData;
headImg.SetSprite(GeneralDefine.GetOtherJobHeadPortrait(playerData.Job, 0));
nameText.text = playerData.PlayerName;
@@ -137,7 +137,7 @@
{
if (honorStore_SelectImg.activeInHierarchy) return;
CloseSubWindows();
- WindowCenter.Instance.Open<HonorStoreWin>();
+ WindowCenter.Instance.Open<CrossServerOneVsOneHonorStoreWin>();
honorStore_SelectImg.SetActive(true);
}
@@ -164,11 +164,11 @@
{
if (windowState == WindowState.Opened)
{
- WindowCenter.Instance.OpenWithoutAnimation<CrossServerArenaWin>();
+ WindowCenter.Instance.OpenWithoutAnimation<CrossServerOneVsOneArenaWin>();
}
else
{
- WindowCenter.Instance.Open<CrossServerArenaWin>();
+ WindowCenter.Instance.Open<CrossServerOneVsOneArenaWin>();
}
}
arena_SelectImg.SetActive(true);
@@ -197,8 +197,8 @@
//{
// WindowCenter.Instance.Close(window);
//}
- WindowCenter.Instance.CloseImmediately<CrossServerArenaWin>();
- WindowCenter.Instance.CloseImmediately<HonorStoreWin>();
+ WindowCenter.Instance.CloseImmediately<CrossServerOneVsOneArenaWin>();
+ WindowCenter.Instance.CloseImmediately<CrossServerOneVsOneHonorStoreWin>();
WindowCenter.Instance.CloseImmediately<SeasonRewardWin>();
WindowCenter.Instance.CloseImmediately<SegmentRewardWin>();
WindowCenter.Instance.CloseImmediately<MatchWin>();
--
Gitblit v1.8.0