From 5b9cfd3917819cfe493dae693508e1b685cc14fa Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期五, 28 十二月 2018 16:58:59 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/CrossServerOneVsOne/CrossServerOneVsOneWin.cs | 79 ++++++++++++++++++++++++++++++++++++---
1 files changed, 73 insertions(+), 6 deletions(-)
diff --git a/System/CrossServerOneVsOne/CrossServerOneVsOneWin.cs b/System/CrossServerOneVsOne/CrossServerOneVsOneWin.cs
index c515b6b..99d45eb 100644
--- a/System/CrossServerOneVsOne/CrossServerOneVsOneWin.cs
+++ b/System/CrossServerOneVsOne/CrossServerOneVsOneWin.cs
@@ -25,9 +25,12 @@
[SerializeField] GameObject seasonAward_SelectImg;
[SerializeField] Button honorStoreBtn;
[SerializeField] GameObject honorStore_SelectImg;
-
+ [SerializeField] Button lookDanLvBtn;
+ public static int funcId = 0;
CrossServerOneVsOnePlayerInfo playerInfo;
CrossServerWin crossServerWin;
+ CrossServerRewardModel m_CrossServerRewardModel;
+ CrossServerRewardModel crossServerRewardModel { get { return m_CrossServerRewardModel ?? (m_CrossServerRewardModel = ModelCenter.Instance.GetModel<CrossServerRewardModel>()); } }
#region Built-in
protected override void BindController()
{
@@ -39,14 +42,25 @@
arenaBtn.AddListener(ClickArena);
seasonAwardBtn.AddListener(ClickSeasonAward);
honorStoreBtn.AddListener(ClickHonorStore);
+ lookDanLvBtn.AddListener(ClickDanLv);
}
+
protected override void OnPreOpen()
{
SetDisplay();
+ SetZoneIDAndSeasonID();
PlayerDatas.Instance.PlayerDataRefreshInfoEvent += UpdatePlayerData;
CrossServerOneVsOnePlayerInfo.Instance.UpdatePlayerInfoEvent += UpdatePlayerInfo;
}
-
+ protected override void OnActived()
+ {
+ bool isbool = crossServerRewardModel.IsAwardState(CrossRealmPKAwardStateEnum.SeasonAwardState, -1);
+ if (CrossServerOneVsOnePKSeason.Instance.SeasonState == 2 && !isbool)
+ {
+ crossServerRewardModel.ViewCrossPKBillboard(crossServerRewardModel.ZoneID, crossServerRewardModel.SeasonID);//鍏充簬璧涘鏌ヨ
+ }
+
+ }
protected override void OnAfterOpen()
{
@@ -57,6 +71,7 @@
CloseSubWindows();
PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= UpdatePlayerData;
CrossServerOneVsOnePlayerInfo.Instance.UpdatePlayerInfoEvent -= UpdatePlayerInfo;
+ funcId = 0;
}
protected override void OnAfterClose()
{
@@ -90,7 +105,22 @@
UpdateScore();
UpdateRank();
UpdateHonor();
- ClickArena();
+ switch(funcId)
+ {
+ case 0:
+ case 1:
+ ClickArena();
+ break;
+ case 2:
+ ClickRankAward();
+ break;
+ case 3:
+ ClickSeasonAward();
+ break;
+ case 4:
+ ClickHonorStore();
+ break;
+ }
}
private void UpdateRank()
@@ -122,7 +152,14 @@
{
if (honorStore_SelectImg.activeInHierarchy) return;
CloseSubWindows();
- WindowCenter.Instance.Open<CrossServerOneVsOneHonorStoreWin>();
+ if (crossServerWin.windowState == WindowState.Opened)
+ {
+ WindowCenter.Instance.OpenWithoutAnimation<CrossServerOneVsOneHonorStoreWin>();
+ }
+ else
+ {
+ WindowCenter.Instance.Open<CrossServerOneVsOneHonorStoreWin>();
+ }
honorStore_SelectImg.SetActive(true);
}
@@ -131,9 +168,21 @@
if (seasonAward_SelectImg.activeInHierarchy) return;
CloseSubWindows();
- WindowCenter.Instance.Open<SeasonRewardWin>();
+ if (crossServerWin.windowState == WindowState.Opened)
+ {
+ WindowCenter.Instance.OpenWithoutAnimation<SeasonRewardWin>();
+ }
+ else
+ {
+ WindowCenter.Instance.Open<SeasonRewardWin>();
+ }
seasonAward_SelectImg.SetActive(true);
+ }
+
+ private void ClickDanLv()
+ {
+ WindowCenter.Instance.Open<CrossServerOneVsOneDanLVWin>();
}
private void ClickArena()
@@ -157,7 +206,14 @@
if (rankAward_SelectImg.activeInHierarchy) return;
CloseSubWindows();
- WindowCenter.Instance.Open<SegmentRewardWin>();
+ if (crossServerWin.windowState == WindowState.Opened)
+ {
+ WindowCenter.Instance.OpenWithoutAnimation<SegmentRewardWin>();
+ }
+ else
+ {
+ WindowCenter.Instance.Open<SegmentRewardWin>();
+ }
rankAward_SelectImg.SetActive(true);
}
@@ -172,5 +228,16 @@
seasonAward_SelectImg.SetActive(false);
honorStore_SelectImg.SetActive(false);
}
+ private void SetZoneIDAndSeasonID()//璁剧疆璧涘尯鍜孖D
+ {
+ if (crossServerRewardModel.ZoneID == 0)
+ {
+ crossServerRewardModel.ZoneID = CrossServerOneVsOnePKSeason.Instance.ZoneID;
+ }
+ if (crossServerRewardModel.SeasonID == 0)
+ {
+ crossServerRewardModel.SeasonID = CrossServerOneVsOnePKSeason.Instance.SeasonID;
+ }
+ }
}
}
--
Gitblit v1.8.0