From b010718dbb8efdc9031570ddebe152e6890f80ae Mon Sep 17 00:00:00 2001
From: client_Lhy <995049470@qq.com>
Date: 星期三, 12 六月 2019 11:01:33 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/OpenServerActivity/OpenServerActivityWin.cs | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/System/OpenServerActivity/OpenServerActivityWin.cs b/System/OpenServerActivity/OpenServerActivityWin.cs
index f65b6eb..b035e3e 100644
--- a/System/OpenServerActivity/OpenServerActivityWin.cs
+++ b/System/OpenServerActivity/OpenServerActivityWin.cs
@@ -39,6 +39,7 @@
FairyLeagueModel fairyLeagueModel { get { return ModelCenter.Instance.GetModel<FairyLeagueModel>(); } }
OSGiftModel giftModel { get { return ModelCenter.Instance.GetModel<OSGiftModel>(); } }
FestivalRedpackModel festivalRedpackModel { get { return ModelCenter.Instance.GetModel<FestivalRedpackModel>(); } }
+ MonthWeekInvestModel monthWeekInvestModel { get { return ModelCenter.Instance.GetModel<MonthWeekInvestModel>(); } }
List<int> openActivitys = new List<int>();
List<int> priorityActivitys = new List<int>();
@@ -77,6 +78,7 @@
impactRankModel.gotoImpactRankType = 0;
envelopeModel.selectType = 1;
festivalRedpackModel.selectType = 1;
+ monthWeekInvestModel.selectType = monthWeekInvestModel.investTypes[0];
giftModel.SetAreadyOpens();
GlobalTimeEvent.Instance.secondEvent += SecondEvent;
CheckAlreadyOpen();
@@ -129,6 +131,10 @@
{
festivalRedpackModel.selectType = festivalRedpackModel.jumpType != 0 ? festivalRedpackModel.jumpType : 1;
festivalRedpackModel.jumpType = 0;
+ }
+ if (functionOrder == 22)
+ {
+ monthWeekInvestModel.selectType = monthWeekInvestModel.GetSelectType();
}
UpdateFunctionBtns();
}
@@ -229,6 +235,9 @@
}
festivalRedpackModel.selectType = 1;
break;
+ case OpenServerActivityCenter.OSActivityType.MonthWeekInvest:
+ monthWeekInvestModel.selectType = monthWeekInvestModel.GetSelectType();
+ break;
}
}
}
@@ -305,7 +314,7 @@
if (type == ScrollerDataType.Header)
{
if (!m_ActivitySpreadDict.ContainsKey(sort) || !m_ActivitySpreadDict[sort]
- || (sort != 2 && sort != 0 && sort != 19))
+ || (sort != 2 && sort != 0 && sort != 19 && sort != 22))
{
height = 114;
return true;
@@ -361,7 +370,8 @@
_cell.downArrow.gameObject.SetActive(false);
_cell.upArrow.gameObject.SetActive(false);
- if (_cell.activityType == 0 || _cell.activityType == 2 || _cell.activityType == 19)
+ if (_cell.activityType == 0 || _cell.activityType == 2 || _cell.activityType == 19
+ || _cell.activityType == 22)
{
_cell.downArrow.gameObject.SetActive(m_ActivitySpreadDict[_cell.activityType]);
_cell.upArrow.gameObject.SetActive(!m_ActivitySpreadDict[_cell.activityType]);
@@ -400,6 +410,11 @@
_cell.redpoint.redpointId = 20919 * 100 + _type;
_cell.titleTxt.text = Language.Get(StringUtility.Contact("FestivalRedpackType_", _type));
_cell.SetSelect(_type == festivalRedpackModel.selectType);
+ break;
+ case 22:
+ _cell.redpoint.redpointId = 20922 * 100 + _type;
+ _cell.titleTxt.text = Language.Get(StringUtility.Contact("MonthWeekInvestType_", _type));
+ _cell.SetSelect(_type == monthWeekInvestModel.selectType);
break;
}
_cell.functionBtn.onClick.RemoveAllListeners();
@@ -467,6 +482,18 @@
m_ActivityCtrl.AddCell(ScrollerDataType.Normal, sort * 100 + 1);
m_ActivityCtrl.AddCell(ScrollerDataType.Normal, sort * 100 + 2);
m_ActivityCtrl.AddCell(ScrollerDataType.Normal, sort * 100 + 3);
+ break;
+ case 22:
+ m_ActivityCtrl.AddCell(ScrollerDataType.Header, sort);
+ if (!m_ActivitySpreadDict[sort])
+ {
+ m_ActivitySpreadDict[sort] = false;
+ break;
+ }
+ for (int k = 0; k < monthWeekInvestModel.investTypes.Count; k++)
+ {
+ m_ActivityCtrl.AddCell(ScrollerDataType.Normal, sort * 100 + monthWeekInvestModel.investTypes[k]);
+ }
break;
default:
m_ActivityCtrl.AddCell(ScrollerDataType.Header, sort);
@@ -578,6 +605,9 @@
case 21:
WindowCenter.Instance.Open<LoginRewardWin>(true);
break;
+ case 22:
+ WindowCenter.Instance.Open<MonthWeekInvestWin>(true);
+ break;
}
}
@@ -596,6 +626,9 @@
case 19:
festivalRedpackModel.selectType = _type;
break;
+ case 22:
+ monthWeekInvestModel.selectType = _type;
+ break;
}
m_ActivityCtrl.m_Scorller.RefreshActiveCellViews();
}
--
Gitblit v1.8.0