From fc4dae35fe3769766d62ee45647418bbfd31c96c Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 27 十二月 2018 14:27:20 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/CrossServerOneVsOne/CrossServerRewardModel.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/System/CrossServerOneVsOne/CrossServerRewardModel.cs b/System/CrossServerOneVsOne/CrossServerRewardModel.cs
index 604b2e5..a87a85c 100644
--- a/System/CrossServerOneVsOne/CrossServerRewardModel.cs
+++ b/System/CrossServerOneVsOne/CrossServerRewardModel.cs
@@ -58,9 +58,9 @@
public class CrossServerRewardModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{
CrossServerOneVsOneModel crossServerModel { get { return ModelCenter.Instance.GetModel<CrossServerOneVsOneModel>(); } }
- public Dictionary<int, SeasonAwardClass> SegmentRewardDic = new Dictionary<int, SeasonAwardClass>();
- public ImpactRankModel.RankAwardItem SeasonRewardDic = new ImpactRankModel.RankAwardItem();
- public Dictionary<int, List<Item_Class>> SeasonRewardConfigDic = new Dictionary<int, List<Item_Class>>();
+ public Dictionary<int, SeasonAwardClass> SegmentRewardDic = new Dictionary<int, SeasonAwardClass>();//娈典綅濂栧姳
+ public ImpactRankModel.RankAwardItem SeasonRewardDic = new ImpactRankModel.RankAwardItem();//璧涘濂栧姳
+ public Dictionary<int, List<Item_Class>> SeasonRewardConfigDic = new Dictionary<int, List<Item_Class>>(); //璧涘濂栧姳
public Dictionary<ZoneRankingStruct, Dictionary<int, RankingInformationClass>> ZoneRankingDic = new Dictionary<ZoneRankingStruct, Dictionary<int, RankingInformationClass>>();
public Action CrossRealmPKAwardStateUpdate;//棰嗗彇濂栧姳鍒锋柊
public Action RankInformationUpdate;//鎺掕姒滃埛鏂�
@@ -115,7 +115,7 @@
seasonAwardClass.DanLv = _config.DanLV;
seasonAwardClass.Name = _config.Name;
seasonAwardClass.Score = _config.LVUpScore;
- var _jsonData = LitJson.JsonMapper.ToObject(_config.SeasonAwardList);
+ var _jsonData = LitJson.JsonMapper.ToObject(_config.DanLVAwardList);
List<Item_Class> itemClassList = new List<Item_Class>();
for (int j = 0; j < _jsonData.Count; j++)
{
--
Gitblit v1.8.0