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

client_linchunjie

2019-02-13 d1ad6a5aea3331e9cc812756adee63679a57e007

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

 Core/GameEngine/Model/Config/CrossRealmPKDanAwardConfig.cs

New file
@@ -0,0 +1,53 @@
//--------------------------------------------------------
//    [Author]:            第二世界
//    [  Date ]:           Wednesday, February 13, 2019
//--------------------------------------------------------

using UnityEngine;
using System;

namespace TableConfig {

    
    public partial class CrossRealmPKDanAwardConfig : ConfigBase {

        public int id { get ; private set ; }

        public string CrossZoneName { get ; private set; } 
        public int SeasonID { get ; private set ; }

        public int DanLV { get ; private set ; }

        public string DanLVAwardList { get ; private set; } 
        public string SeasonAwardList { get ; private set; } 

        public override string getKey()
        {
            return id.ToString();
        }

        public override void Parse() {
            try
            {
                id=IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]):0; 
			
                CrossZoneName = rawContents[1].Trim();

			
                SeasonID=IsNumeric(rawContents[2]) ? int.Parse(rawContents[2]):0; 
			
                DanLV=IsNumeric(rawContents[3]) ? int.Parse(rawContents[3]):0; 
			
                DanLVAwardList = rawContents[4].Trim();

			
                SeasonAwardList = rawContents[5].Trim();
            }
            catch (Exception ex)
            {
                DebugEx.Log(ex);
            }
        }
	
    }

}





 Core/GameEngine/Model/Config/CrossRealmPKDanAwardConfig.cs.meta

New file
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: 96531a774cbac5a44a470f8684588371
timeCreated: 1550050945
licenseType: Pro
MonoImporter:
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 Core/GameEngine/Model/Config/CrossServerArenaConfig.cs

@@ -1,6 +1,6 @@
//--------------------------------------------------------
//    [Author]:            第二世界
//    [  Date ]:           Thursday, December 27, 2018
//    [  Date ]:           Wednesday, February 13, 2019
//--------------------------------------------------------

using UnityEngine;

 Core/GameEngine/Model/Config/CrossServerArenaConfig.cs.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: f10a2faba8659904ab5c13d1a770a7e2
timeCreated: 1545893867
timeCreated: 1550050368
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 Core/GameEngine/Model/ConfigManager.cs

@@ -237,6 +237,7 @@
        AddAsyncTask<HolidayHomingConfig>();

        AddAsyncTask<HolidayHomingPointConfig>();

        AddAsyncTask<LoginRewardConfig>();

        AddAsyncTask<CrossRealmPKDanAwardConfig>();

        while (!AllCompleted())

        {

            var completedCount = 0;


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