Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Wu Xijin

2018-12-27 b5651b96bb1bfd53341af7fbe4cb46db54dee58c

 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;//排行榜刷新

@@ -70,7 +70,7 @@
    private int SeasonAwardState; // 赛季结算奖励是否已领取

    public int ZoneID = 0;//赛区ID

    public int SeasonID = 0;//赛季ID

    public int MyRank = 0;//我的排名

    public int MyRank = -1;//我的排名

    public override void Init()

    {

        GetSeasonAward();

@@ -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++)

                {