From 8bbced312e5b16dcd288ff1a42c598be6abd17be Mon Sep 17 00:00:00 2001
From: Client_PangDeRong <593317293@qq.com>
Date: 星期一, 13 八月 2018 21:01:49 +0800
Subject: [PATCH] 【2454】转移N倍修行点
---
System/OpenServerActivity/OpenServerActivityWin.cs | 48 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 38 insertions(+), 10 deletions(-)
diff --git a/System/OpenServerActivity/OpenServerActivityWin.cs b/System/OpenServerActivity/OpenServerActivityWin.cs
index 2a38f16..b1a9880 100644
--- a/System/OpenServerActivity/OpenServerActivityWin.cs
+++ b/System/OpenServerActivity/OpenServerActivityWin.cs
@@ -49,6 +49,8 @@
MultipleExpModel multipleExpModel { get { return ModelCenter.Instance.GetModel<MultipleExpModel>(); } }
+ MultipleRealmPointModel multipleRealmPointModel { get { return ModelCenter.Instance.GetModel<MultipleRealmPointModel>(); } }
+
List<int> openActivitys = new List<int>();
List<int> activityReds = new List<int>();
List<int> alreadyOpenActivitys = new List<int>();
@@ -189,7 +191,14 @@
activityReds.Add(5);
}
}
-
+ if (OpenServerActivityCenter.Instance.IsMultipleRealmOpen())
+ {
+ openActivitys.Add(8);
+ if (multipleRealmPointModel.multipleRed.state == RedPointState.Simple)
+ {
+ activityReds.Add(8);
+ }
+ }
if (activityReds.Count > 0)
{
activityReds.Sort(Compare);
@@ -229,6 +238,10 @@
{
alreadyOpenActivitys.Add(5);
}
+ if (OpenServerActivityCenter.Instance.IsMultipleRealmOpen())
+ {
+ alreadyOpenActivitys.Add(8);
+ }
}
private void OnOpenServerActivityRefresh(ScrollerDataType type, CellView cell)
@@ -246,13 +259,19 @@
private void RefreshOpenActivityCell(OpenServerActivityCell _cell)
{
+ OperationBase operationBase;
switch (_cell.index)
{
case 5:
- OperationBase operationBase;
if (OperationTimeHepler.Instance.TryGetOperationTime(Operation.MultipleExp, out operationBase))
{
_cell.title.text = Language.Get("ExpActivity_Text5", (operationBase as OperationMultiExp).GetMultipleCHS());
+ }
+ break;
+ case 8:
+ if (OperationTimeHepler.Instance.TryGetOperationTime(Operation.MultipRealmPoint, out operationBase))
+ {
+ _cell.title.text = Language.Get("MultipleRealmPoint", Language.Get(StringUtility.Contact("Num_CHS_", (operationBase as OperationMultipleRealmPoint).multiplePractice)));
}
break;
default:
@@ -340,12 +359,9 @@
m_ActivityCtrl.AddCell(ScrollerDataType.Normal, sort * 100 + 2);
break;
case 3:
- m_ActivityCtrl.AddCell(ScrollerDataType.Header, sort);
- break;
case 4:
- m_ActivityCtrl.AddCell(ScrollerDataType.Header, sort);
- break;
case 5:
+ case 8:
m_ActivityCtrl.AddCell(ScrollerDataType.Header, sort);
break;
}
@@ -437,6 +453,16 @@
WindowCenter.Instance.Open<MultipleExpWin>(true);
}
break;
+ case 8:
+ if (windowState == WindowState.Opened)
+ {
+ WindowCenter.Instance.OpenWithoutAnimation<NPracticePointWin>();
+ }
+ else
+ {
+ WindowCenter.Instance.Open<NPracticePointWin>(true);
+ }
+ break;
}
}
@@ -464,6 +490,7 @@
WindowCenter.Instance.CloseImmediately<FlashSaleWin>();
WindowCenter.Instance.CloseImmediately<ConsumeRebateWin>();
WindowCenter.Instance.CloseImmediately<MultipleExpWin>();
+ WindowCenter.Instance.CloseImmediately<NPracticePointWin>();
}
private int Compare(int x, int y)
@@ -510,11 +537,12 @@
break;
case Operation.GiftPackage:
break;
- case Operation.FairyCeremony:
- break;
case Operation.MultipRealmPoint:
- break;
- case Operation.max:
+ if (state == 0 && !alreadyOpenActivitys.Contains(8))
+ {
+ alreadyOpenActivitys.Add(8);
+ UpdateFunctionBtns();
+ }
break;
}
}
--
Gitblit v1.8.0