From d21341cd667e5b506a19a6d7deacfcd74b1a103d Mon Sep 17 00:00:00 2001
From: Client_PangDeRong <593317293@qq.com>
Date: 星期四, 13 十二月 2018 14:25:34 +0800
Subject: [PATCH] Revert "5398 子 【开发】【1.4】跨服竞技场 / 【前端】【1.4】跨服竞技场开发"
---
System/CrossServerOneVsOne/CrossServerRewardModel.cs | 51 +++------------------------------------------------
1 files changed, 3 insertions(+), 48 deletions(-)
diff --git a/System/CrossServerOneVsOne/CrossServerRewardModel.cs b/System/CrossServerOneVsOne/CrossServerRewardModel.cs
index ff5d1c9..13f8a9f 100644
--- a/System/CrossServerOneVsOne/CrossServerRewardModel.cs
+++ b/System/CrossServerOneVsOne/CrossServerRewardModel.cs
@@ -24,41 +24,24 @@
public class CrossServerRewardModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{
public Dictionary<int, SeasonAwardClass> SegmentRewardDic = new Dictionary<int, SeasonAwardClass>();
- public ImpactRankModel.RankAwardItem SeasonRewardDic = new ImpactRankModel.RankAwardItem();
- private bool m_IsOpenMatch;
- public bool IsOpenMatch
- {
- get { return m_IsOpenMatch; }
- set { m_IsOpenMatch = value; }
- }
- DateTime m_DateTime = DateTime.Now;
- public DateTime Date_Time
- {
- get { return m_DateTime; }
- set { m_DateTime = value; }
- }
public override void Init()
{
GetSeasonAward();
- GetSegmentReward();
}
public void OnBeforePlayerDataInitialize()
{
- GlobalTimeEvent.Instance.secondEvent -= secondEvent;
}
public void OnPlayerLoginOk()
{
- GlobalTimeEvent.Instance.secondEvent += secondEvent;
+
}
-
-
public override void UnInit()
{
-
+
}
private void GetSeasonAward()
@@ -78,7 +61,7 @@
for (int j = 0; j < _jsonData.Count; j++)
{
Item_Class itemClass = new Item_Class();
- itemClass.ItemId = int.Parse((_jsonData[j][0]).ToString());
+ itemClass.ItemId= int.Parse((_jsonData[j][0]).ToString());
itemClass.ItemNumber = int.Parse((_jsonData[j][1]).ToString());
itemClass.Isbind = int.Parse((_jsonData[j][2]).ToString());
itemClassList.Add(itemClass);
@@ -87,34 +70,6 @@
SegmentRewardDic.Add(_config.DanLV, seasonAwardClass);
}
}
- }
- private void GetSegmentReward()
- {
- var CrossRealmPKAward = Config.Instance.Get<FuncConfigConfig>("CrossRealmPKAward");
- ImpactRankModel.RankAwardItem _award = new ImpactRankModel.RankAwardItem();
- var _jsonData = LitJson.JsonMapper.ToObject(CrossRealmPKAward.Numerical3);
- foreach (string key in _jsonData.Keys)
- {
- var _ranking = int.Parse(key);
- var _itemArray = LitJson.JsonMapper.ToObject<int[][]>(_jsonData[key].ToJson());
- for (int j = 0; j < _itemArray.Length; j++)
- {
- _award.Add(_ranking, new AwardItem()
- {
- item = new Item(_itemArray[j][0], _itemArray[j][1]),
- isBind = _itemArray[j][2],
- });
- }
- }
- SeasonRewardDic = _award;
- }
- public void ResetTime()
- {
- Date_Time= TimeUtility.ServerNow;
- }
- private void secondEvent()
- {
-
}
}
--
Gitblit v1.8.0