Merge branch 'master' into DogzDungeon

client_Wu Xijin

2018-08-20 1c4c5c5cb829334303bff98837a69a9653dca714

 Core/GameEngine/Model/Config/TrialExchangeConfig.cs

@@ -1,6 +1,6 @@
//--------------------------------------------------------
//    [Author]:         第二世界
//    [  Date ]:         Thursday, August 02, 2018
//    [  Date ]:         Monday, August 20, 2018

//--------------------------------------------------------

using UnityEngine;
@@ -12,7 +12,7 @@
   public partial class TrialExchangeConfig : ConfigBase {



      public int id { get ; private set ; }

      public int exchangeItemID { get ; private set ; }

      public int[] exchangeItemID;

      public int exchangeItemCount { get ; private set ; }

      public int exchangeItemIsBind { get ; private set ; }

      public int tokenId { get ; private set ; }

@@ -29,7 +29,12 @@
            {

                id=IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]):0; 

         

            exchangeItemID=IsNumeric(rawContents[1]) ? int.Parse(rawContents[1]):0; 
            string[] exchangeItemIDStringArray = rawContents[1].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
            exchangeItemID = new int[exchangeItemIDStringArray.Length];
            for (int i=0;i<exchangeItemIDStringArray.Length;i++)
            {
                int.TryParse(exchangeItemIDStringArray[i],out exchangeItemID[i]);
            }

         

            exchangeItemCount=IsNumeric(rawContents[2]) ? int.Parse(rawContents[2]):0;