From d1ad6a5aea3331e9cc812756adee63679a57e007 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期三, 13 二月 2019 18:04:49 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/CrossServerOneVsOne/CrossServerOneVsOneRewardModel.cs | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/System/CrossServerOneVsOne/CrossServerOneVsOneRewardModel.cs b/System/CrossServerOneVsOne/CrossServerOneVsOneRewardModel.cs
index 4d9574a..699cb79 100644
--- a/System/CrossServerOneVsOne/CrossServerOneVsOneRewardModel.cs
+++ b/System/CrossServerOneVsOne/CrossServerOneVsOneRewardModel.cs
@@ -81,6 +81,7 @@
private int MianOpenLV = 0;//璺ㄦ湇鎸夐挳寮�鍚潯浠�
public string ZoneName = string.Empty;//璧涘尯鍚�
+ private int currentId = 0;
public override void Init()
{
GetSeasonAward();
@@ -91,6 +92,7 @@
public void OnBeforePlayerDataInitialize()
{
+ currentId = 0;
ZoneID = 0;
SeasonID = 0;
PkDanLvNow = 0;
@@ -157,18 +159,29 @@
WindowCenter.Instance.Open<CrossServerSettlementWin>();
}
}
- private void GetSeasonAward()
+ public void GetSeasonAward()//娈典綅濂栧姳鏁版嵁鑾峰彇
{
- var config = Config.Instance.GetAllValues<CrossServerArenaConfig>();
- for (int i = 0; i < config.Count; i++)
+ // if(currentId)
+ var seasonID = CrossServerOneVsOnePKSeason.Instance.SeasonID;
+ if (seasonID == 0)
{
- var _config = config[i];
- if (!SegmentRewardDic.ContainsKey(_config.DanLV))
- {
+ seasonID +=1;
+ }
+ var configPK = Config.Instance.GetAllValues<CrossRealmPKDanAwardConfig>();
+ // var config = Config.Instance.GetAllValues<CrossServerArenaConfig>();
+ for (int i = 0; i < configPK.Count; i++)
+ {
+ var _config = configPK[i];
+ if (!SegmentRewardDic.ContainsKey(_config.DanLV) && _config.SeasonID== seasonID)
+ {
SeasonAwardClass seasonAwardClass = new SeasonAwardClass();
seasonAwardClass.DanLv = _config.DanLV;
- seasonAwardClass.Name = _config.Name;
- seasonAwardClass.Score = _config.LVUpScore;
+ var crossServerArena = Config.Instance.Get<CrossServerArenaConfig>(_config.DanLV);
+ if (crossServerArena != null)
+ {
+ seasonAwardClass.Name = crossServerArena.Name;
+ seasonAwardClass.Score = crossServerArena.LVUpScore;
+ }
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