From f2f6a288f1df9d5cf2eb07cf0ded09c1a6ce3af2 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期三, 15 八月 2018 16:01:55 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/HighSettingFadeInFadeOut.cs | 72 +++++++++++++++++++++++++----------
1 files changed, 51 insertions(+), 21 deletions(-)
diff --git a/System/MainInterfacePanel/HighSettingFadeInFadeOut.cs b/System/MainInterfacePanel/HighSettingFadeInFadeOut.cs
index 53aaede..a092d56 100644
--- a/System/MainInterfacePanel/HighSettingFadeInFadeOut.cs
+++ b/System/MainInterfacePanel/HighSettingFadeInFadeOut.cs
@@ -99,7 +99,7 @@
private void operationEndEvent(Operation arg1, int arg2)
{
- if (arg1 == Operation.GiftPackage || arg1 == Operation.FairyCeremony)
+ if (arg1 == Operation.FairyCeremony)
{
Classify();
}
@@ -107,7 +107,7 @@
private void operationStartEvent(Operation arg1, int arg2)
{
- if (arg1 == Operation.GiftPackage || arg1 == Operation.FairyCeremony)
+ if (arg1 == Operation.FairyCeremony)
{
Classify();
}
@@ -378,7 +378,6 @@
PositionReduction();
SetGroupTop();
SetGroupLow();
- // SetGroupThree();
SetfatherNodeTop();
SetfatherNodeLow();
SetfatherNodeThree();
@@ -555,7 +554,8 @@
}
else if (IndexOf == 1)
{
- if (ModelCenter.Instance.GetModel<OSGiftModel>().activate)//瓒呭�肩ぜ鍖�
+ var _funcOrder = 0;
+ if (OpenServerActivityCenter.Instance.IsAnyActivityOpen(out _funcOrder))//寮�鏈嶆椿鍔�
{
if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index))
{
@@ -581,22 +581,8 @@
}
else if (IndexOf == 2)
{
- var _funcOrder = 0;
- if (OpenServerActivityCenter.Instance.IsAnyActivityOpen(out _funcOrder))//寮�鏈嶆椿鍔�
- {
- if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index))
- {
- SelectCaseRequest selectCaseRequest = new SelectCaseRequest();
- selectCaseRequest.Tran = m_GroupIndex_Low.GetChild(i);
- selectCaseRequest.IsNagaaki = highBtnRecord.IsNagaaki;
- selectCaseRequest.Index = highBtnRecord.Index;
- AnimationFadeOutDicLow.Add(highBtnRecord.Index, selectCaseRequest);
- }
- }
- }
- else if (IndexOf == 3)
- {
- if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && OperationTimeHepler.Instance.InOperationTime(Operation.FairyCeremony))
+ bool Isopen = OpenServerActivityCenter.Instance.IsActivityOpen(4);
+ if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && Isopen)//闄愭椂鐗规儬
{
if (AnimationFadeOutDicLow.Count < 6)//------绗簩灞�
{
@@ -615,7 +601,51 @@
AnimationFadeOutDicThree.Add(highBtnRecord.Index, selectCaseRequest);
}
}
-
+ }
+ else if (IndexOf == 3)
+ {
+ bool Isopen = OpenServerActivityCenter.Instance.IsActivityOpen(0);
+ if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && Isopen)//闄愭椂鐗规儬
+ {
+ if (AnimationFadeOutDicLow.Count < 6)//------绗簩灞�
+ {
+ SelectCaseRequest selectCaseRequest = new SelectCaseRequest();
+ selectCaseRequest.Tran = m_GroupIndex_Low.GetChild(i);
+ selectCaseRequest.IsNagaaki = highBtnRecord.IsNagaaki;
+ selectCaseRequest.Index = highBtnRecord.Index;
+ AnimationFadeOutDicLow.Add(highBtnRecord.Index, selectCaseRequest);
+ }
+ else//------绗笁灞�
+ {
+ SelectCaseRequest selectCaseRequest = new SelectCaseRequest();
+ selectCaseRequest.Tran = m_GroupIndex_Low.GetChild(i);
+ selectCaseRequest.IsNagaaki = highBtnRecord.IsNagaaki;
+ selectCaseRequest.Index = highBtnRecord.Index;
+ AnimationFadeOutDicThree.Add(highBtnRecord.Index, selectCaseRequest);
+ }
+ }
+ }
+ else if (IndexOf == 4)
+ {
+ if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && OperationTimeHepler.Instance.InOperationTime(Operation.FairyCeremony))//绮剧伒鐩涘吀
+ {
+ if (AnimationFadeOutDicLow.Count < 6)//------绗簩灞�
+ {
+ SelectCaseRequest selectCaseRequest = new SelectCaseRequest();
+ selectCaseRequest.Tran = m_GroupIndex_Low.GetChild(i);
+ selectCaseRequest.IsNagaaki = highBtnRecord.IsNagaaki;
+ selectCaseRequest.Index = highBtnRecord.Index;
+ AnimationFadeOutDicLow.Add(highBtnRecord.Index, selectCaseRequest);
+ }
+ else//------绗笁灞�
+ {
+ SelectCaseRequest selectCaseRequest = new SelectCaseRequest();
+ selectCaseRequest.Tran = m_GroupIndex_Low.GetChild(i);
+ selectCaseRequest.IsNagaaki = highBtnRecord.IsNagaaki;
+ selectCaseRequest.Index = highBtnRecord.Index;
+ AnimationFadeOutDicThree.Add(highBtnRecord.Index, selectCaseRequest);
+ }
+ }
}
}
}
--
Gitblit v1.8.0