From 5200b4140affc6770a6e64f0decd32af57646e38 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 15 十月 2019 04:39:58 +0800
Subject: [PATCH] 0312 每日礼包（灵石）
---
System/OpenServerActivity/OpenServerActivityWin.cs | 84 +++++++++++++++++++++---------------------
1 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/System/OpenServerActivity/OpenServerActivityWin.cs b/System/OpenServerActivity/OpenServerActivityWin.cs
index 5c6bdbd..34a20ea 100644
--- a/System/OpenServerActivity/OpenServerActivityWin.cs
+++ b/System/OpenServerActivity/OpenServerActivityWin.cs
@@ -19,7 +19,7 @@
List<int> m_OpenServerActivities = new List<int>();
Dictionary<int, bool> m_ActivitySpreadDict = new Dictionary<int, bool>();
- ImpactRankModel impactRankModel { get { return ModelCenter.Instance.GetModel<ImpactRankModel>(); } }
+ //ImpactRankModel impactRankModel { get { return ModelCenter.Instance.GetModel<ImpactRankModel>(); } }
OSRedEnvelopeModel envelopeModel { get { return ModelCenter.Instance.GetModel<OSRedEnvelopeModel>(); } }
FairyLeagueModel fairyLeagueModel { get { return ModelCenter.Instance.GetModel<FairyLeagueModel>(); } }
OSGiftModel giftModel { get { return ModelCenter.Instance.GetModel<OSGiftModel>(); } }
@@ -64,13 +64,13 @@
{
m_ActivitySpreadDict[m_OpenServerActivities[i]] = false;
}
- var impactDefaultType = impactRankModel.GetDefaultSelectType();
- if (impactRankModel.IsLock(impactDefaultType))
- {
- impactDefaultType = impactRankModel.impactRankSorts[0];
- }
- impactRankModel.presentSelectType = impactDefaultType;
- impactRankModel.gotoImpactRankType = 0;
+ //var impactDefaultType = impactRankModel.GetDefaultSelectType();
+ //if (impactRankModel.IsLock(impactDefaultType))
+ //{
+ // impactDefaultType = impactRankModel.impactRankSorts[0];
+ //}
+ //impactRankModel.presentSelectType = impactDefaultType;
+ //impactRankModel.gotoImpactRankType = 0;
envelopeModel.selectType = 1;
festivalRedpackModel.selectType = 1;
monthWeekInvestModel.selectType = monthWeekInvestModel.investTypes[0];
@@ -149,7 +149,7 @@
protected override void OnAfterOpen()
{
- impactRankModel.OSCEffectOpen = false;
+ //impactRankModel.OSCEffectOpen = false;
}
protected override void OnPreClose()
@@ -159,7 +159,7 @@
OpenServerActivityCenter.Instance.openServerActivityStateChange -= OpenServerActivityStateChange;
GlobalTimeEvent.Instance.secondEvent -= SecondEvent;
CloseOtherWin();
- impactRankModel.gotoImpactRankType = 0;
+ //impactRankModel.gotoImpactRankType = 0;
}
protected override void OnAfterClose()
@@ -390,10 +390,10 @@
_cell.redpoint.redpointId = (209 * 100 + _order) * 100 + _type;
switch (_order)
{
- case 0:
- _cell.titleTxt.text = Language.Get(StringUtility.Contact("ImpactRankType_", _type));
- _cell.SetSelect(_type == impactRankModel.presentSelectType);
- break;
+ //case 0:
+ // _cell.titleTxt.text = Language.Get(StringUtility.Contact("ImpactRankType_", _type));
+ // _cell.SetSelect(_type == impactRankModel.presentSelectType);
+ // break;
case 2:
_cell.titleTxt.text = Language.Get(StringUtility.Contact("OSRedEnvelopeType_", _type));
_cell.SetSelect(_type == envelopeModel.selectType);
@@ -431,26 +431,26 @@
}
switch (activityId)
{
- case 0:
- m_ActivityCtrl.AddCell(ScrollerDataType.Header, activityId);
- if (functionOrder != activityId)
- {
- m_ActivitySpreadDict[activityId] = false;
- break;
- }
- if (!m_ActivitySpreadDict[activityId])
- {
- break;
- }
- foreach (var _type in impactRankModel.impactRankSorts)
- {
- //if (impactRankModel.IsLock(_type))
- //{
- // continue;
- //}
- m_ActivityCtrl.AddCell(ScrollerDataType.Normal, activityId * 100 + _type);
- }
- break;
+ //case 0:
+ // m_ActivityCtrl.AddCell(ScrollerDataType.Header, activityId);
+ // if (functionOrder != activityId)
+ // {
+ // m_ActivitySpreadDict[activityId] = false;
+ // break;
+ // }
+ // if (!m_ActivitySpreadDict[activityId])
+ // {
+ // break;
+ // }
+ //foreach (var _type in impactRankModel.impactRankSorts)
+ //{
+ // //if (impactRankModel.IsLock(_type))
+ // //{
+ // // continue;
+ // //}
+ // m_ActivityCtrl.AddCell(ScrollerDataType.Normal, activityId * 100 + _type);
+ //}
+ //break;
case 2:
m_ActivityCtrl.AddCell(ScrollerDataType.Header, activityId);
if (!m_ActivitySpreadDict[activityId])
@@ -564,14 +564,14 @@
var _type = _index % 100;
switch (_order)
{
- case 0:
- if (impactRankModel.IsLock(_type))
- {
- SysNotifyMgr.Instance.ShowTip("ImpactRankActivityUnOpen");
- return;
- }
- impactRankModel.presentSelectType = _type;
- break;
+ //case 0:
+ // if (impactRankModel.IsLock(_type))
+ // {
+ // SysNotifyMgr.Instance.ShowTip("ImpactRankActivityUnOpen");
+ // return;
+ // }
+ // impactRankModel.presentSelectType = _type;
+ // break;
case 2:
envelopeModel.selectType = _type;
break;
--
Gitblit v1.8.0