From 85448a839d432aab4220e6b23e55a0270e007b6f Mon Sep 17 00:00:00 2001
From: Client_PangDeRong <593317293@qq.com>
Date: 星期四, 23 八月 2018 18:03:38 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/OpenServerActivity/OpenServerActivityWin.cs | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/System/OpenServerActivity/OpenServerActivityWin.cs b/System/OpenServerActivity/OpenServerActivityWin.cs
index 0b6809f..96f062c 100644
--- a/System/OpenServerActivity/OpenServerActivityWin.cs
+++ b/System/OpenServerActivity/OpenServerActivityWin.cs
@@ -55,7 +55,12 @@
{
m_ActivitySpreadDict[m_SortArray[i]] = false;
}
- impactRankModel.presentSelectType = impactRankModel.GetDefaultSelectType();
+ var impactDefaultType= impactRankModel.GetDefaultSelectType();
+ if (impactRankModel.IsLock(impactDefaultType))
+ {
+ impactDefaultType = impactRankModel.billRankCfgDict.Keys.First();
+ }
+ impactRankModel.presentSelectType = impactDefaultType;
impactRankModel.gotoImpactRankType = 0;
envelopeModel.selectType = 1;
CheckAlreadyOpen();
@@ -241,7 +246,8 @@
private void OnStepServerDayEvent()
{
- m_ActivityCtrl.m_Scorller.RefreshActiveCellViews();
+ //m_ActivityCtrl.m_Scorller.RefreshActiveCellViews();
+ UpdateFunctionBtns();
}
private void RefreshActivityTypeCell(OpenActivityRankTypeCell _cell)
@@ -292,6 +298,10 @@
}
foreach (var _type in impactRankModel.billRankCfgDict.Keys)
{
+ if (impactRankModel.IsLock(_type))
+ {
+ continue;
+ }
m_ActivityCtrl.AddCell(ScrollerDataType.Normal, sort * 100 + _type);
}
break;
--
Gitblit v1.8.0