From 1e9c26fc9aa42dd7f0ff2bf44ab801b3c396c54b Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期三, 31 十月 2018 15:33:40 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/FeatureNoticeModel.cs | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/System/MainInterfacePanel/FeatureNoticeModel.cs b/System/MainInterfacePanel/FeatureNoticeModel.cs
index e93ac03..0737c98 100644
--- a/System/MainInterfacePanel/FeatureNoticeModel.cs
+++ b/System/MainInterfacePanel/FeatureNoticeModel.cs
@@ -15,6 +15,8 @@
{
public List<FunctionForecastConfig> FunctionList = new List<FunctionForecastConfig>();
public Dictionary<int, ImpactRankModel.RankAwardItem> DicAwardItem = new Dictionary<int, ImpactRankModel.RankAwardItem>();//濂栧姳鐗╁搧
+ public Dictionary<int, OpenFuncState> DicOpenFuncState = new Dictionary<int, OpenFuncState>();
+ public event Action UpdateAwarfItem;
private const int Redpoint_key1 = 38;
public Redpoint redPointStre1 = new Redpoint(Redpoint_key1);
private int OpenFuncId = 0;
@@ -117,7 +119,7 @@
var _jsonData = LitJson.JsonMapper.ToObject(functionForecastConfig.Award);
foreach (string _key in _jsonData.Keys)
{
- var _job = int.Parse(key);
+ var _job = int.Parse(_key);
var _itemArray = LitJson.JsonMapper.ToObject<int[][]>(_jsonData[_key].ToJson());
for (int j = 0; j < _itemArray.Length; j++)
{
@@ -334,7 +336,37 @@
}
return lv;
}
-
+ public class OpenFuncState
+ {
+ public int State;
+ public int AwardState;
+
+ }
+
+ public void OpenFuncAwardState(HA302_tagMCFuncOpenStateList info)
+ {
+ for (int i = 0; i < info.FuncCount; i++)
+ {
+ int FuncID = info.FuncStateList[i].FuncID;
+ if (!DicOpenFuncState.ContainsKey(FuncID))
+ {
+ OpenFuncState openFuncState = new OpenFuncState();
+ openFuncState.State = info.FuncStateList[i].State;
+ openFuncState.AwardState = info.FuncStateList[i].State;
+ DicOpenFuncState.Add(FuncID, openFuncState);
+ }
+ else
+ {
+ DicOpenFuncState[FuncID].State= info.FuncStateList[i].State;
+ DicOpenFuncState[FuncID].AwardState = info.FuncStateList[i].State;
+ }
+ }
+ if (UpdateAwarfItem != null)
+ {
+ UpdateAwarfItem();
+ }
+ }
+
}
--
Gitblit v1.8.0