From fcfb2ecfee3c68e261a09f5e63f336bf34d724a9 Mon Sep 17 00:00:00 2001
From: Client_PangDeRong <593317293@qq.com>
Date: 星期五, 28 十二月 2018 14:26:51 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Treasure/KingThreeDimensionsBehaviour.cs | 8 ++++++--
System/Treasure/UI3DTreasureSelectStage.cs | 4 +++-
System/Treasure/KingTreasureWin.cs | 8 ++++++--
3 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/System/Treasure/KingThreeDimensionsBehaviour.cs b/System/Treasure/KingThreeDimensionsBehaviour.cs
index 2dff517..5a372f1 100644
--- a/System/Treasure/KingThreeDimensionsBehaviour.cs
+++ b/System/Treasure/KingThreeDimensionsBehaviour.cs
@@ -49,11 +49,15 @@
if (model.TryGetSeason(treasureId, out season)
&& treasureModel.TryGetTreasure(treasureId, out treasure))
{
- var seasonNotStart = season > CrossServerOneVsOnePKSeason.Instance.SeasonID;
+ var seasonNotStart = season > CrossServerOneVsOnePKSeason.Instance.SeasonID
+ || (season == CrossServerOneVsOnePKSeason.Instance.SeasonID
+ && CrossServerOneVsOnePKSeason.Instance.SeasonState == 0);
m_ContainerSeasonNotStart.gameObject.SetActive(seasonNotStart);
m_ContainerSeasonStartOrEnd.gameObject.SetActive(!seasonNotStart);
- bool seasonEnd = season < CrossServerOneVsOnePKSeason.Instance.SeasonID;
+ bool seasonEnd = season < CrossServerOneVsOnePKSeason.Instance.SeasonID
+ || (season == CrossServerOneVsOnePKSeason.Instance.SeasonID
+ && CrossServerOneVsOnePKSeason.Instance.SeasonState == 2);
if (!seasonNotStart)
{
m_EndState.gameObject.SetActive(seasonEnd);
diff --git a/System/Treasure/KingTreasureWin.cs b/System/Treasure/KingTreasureWin.cs
index 9283c8a..b36f1e6 100644
--- a/System/Treasure/KingTreasureWin.cs
+++ b/System/Treasure/KingTreasureWin.cs
@@ -128,7 +128,9 @@
{
DisplayGot();
}
- else if (season < CrossServerOneVsOnePKSeason.Instance.SeasonID)
+ else if (season < CrossServerOneVsOnePKSeason.Instance.SeasonID
+ || (season == CrossServerOneVsOnePKSeason.Instance.SeasonID
+ && CrossServerOneVsOnePKSeason.Instance.SeasonState == 2))
{
DisplayEnd();
}
@@ -232,7 +234,9 @@
var season = 0;
if (kingTreasureModel.TryGetSeason(id, out season))
{
- if (season == CrossServerOneVsOnePKSeason.Instance.SeasonID + 1)
+ if (season > CrossServerOneVsOnePKSeason.Instance.SeasonID
+ || (season == CrossServerOneVsOnePKSeason.Instance.SeasonID
+ && CrossServerOneVsOnePKSeason.Instance.SeasonState == 0))
{
SysNotifyMgr.Instance.ShowTip("TreasureOneVsOneSeasonNotStart");
return false;
diff --git a/System/Treasure/UI3DTreasureSelectStage.cs b/System/Treasure/UI3DTreasureSelectStage.cs
index 786e9ed..1bef742 100644
--- a/System/Treasure/UI3DTreasureSelectStage.cs
+++ b/System/Treasure/UI3DTreasureSelectStage.cs
@@ -712,7 +712,9 @@
var season = 0;
if (model.TryGetSeason(_treasureId, out season))
{
- if (season == CrossServerOneVsOnePKSeason.Instance.SeasonID + 1)
+ if (season > CrossServerOneVsOnePKSeason.Instance.SeasonID
+ || (season == CrossServerOneVsOnePKSeason.Instance.SeasonID
+ && CrossServerOneVsOnePKSeason.Instance.SeasonState == 0))
{
SysNotifyMgr.Instance.ShowTip("TreasureOneVsOneSeasonNotStart");
return;
--
Gitblit v1.8.0