Merge remote-tracking branch 'origin/master' into SpringFestival

client_Zxw

2019-01-28 f47ea60f59e0b2b8601583351e269151237c6708

 Core/GameEngine/Model/Config/JadeDynastyTowerConfig.cs

@@ -1,6 +1,6 @@
//--------------------------------------------------------
//    [Author]:         第二世界
//    [  Date ]:         Tuesday, January 22, 2019
//    [  Date ]:         Thursday, January 24, 2019
//--------------------------------------------------------

using UnityEngine;
@@ -14,6 +14,8 @@
      public int floorId { get ; private set ; }
      public int floorIndex { get ; private set ; }
      public string floorName { get ; private set; } 
      public int[] rewardIdsFirstS;
      public int[] rewardCountsFirstS;
      public int[] rewardIdsLevelS;
      public int[] rewardCountsLevelS;
      public int[] rewardIdsLevelA;
@@ -38,53 +40,67 @@
         
            floorName = rawContents[2].Trim();
         
            string[] rewardIdsLevelSStringArray = rawContents[3].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
            string[] rewardIdsFirstSStringArray = rawContents[3].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
            rewardIdsFirstS = new int[rewardIdsFirstSStringArray.Length];
            for (int i=0;i<rewardIdsFirstSStringArray.Length;i++)
            {
                int.TryParse(rewardIdsFirstSStringArray[i],out rewardIdsFirstS[i]);
            }
			
            string[] rewardCountsFirstSStringArray = rawContents[4].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
            rewardCountsFirstS = new int[rewardCountsFirstSStringArray.Length];
            for (int i=0;i<rewardCountsFirstSStringArray.Length;i++)
            {
                int.TryParse(rewardCountsFirstSStringArray[i],out rewardCountsFirstS[i]);
            }
			
            string[] rewardIdsLevelSStringArray = rawContents[5].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
            rewardIdsLevelS = new int[rewardIdsLevelSStringArray.Length];
            for (int i=0;i<rewardIdsLevelSStringArray.Length;i++)
            {
                int.TryParse(rewardIdsLevelSStringArray[i],out rewardIdsLevelS[i]);
            }
         
            string[] rewardCountsLevelSStringArray = rawContents[4].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
            string[] rewardCountsLevelSStringArray = rawContents[6].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
            rewardCountsLevelS = new int[rewardCountsLevelSStringArray.Length];
            for (int i=0;i<rewardCountsLevelSStringArray.Length;i++)
            {
                int.TryParse(rewardCountsLevelSStringArray[i],out rewardCountsLevelS[i]);
            }
         
            string[] rewardIdsLevelAStringArray = rawContents[5].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
            string[] rewardIdsLevelAStringArray = rawContents[7].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
            rewardIdsLevelA = new int[rewardIdsLevelAStringArray.Length];
            for (int i=0;i<rewardIdsLevelAStringArray.Length;i++)
            {
                int.TryParse(rewardIdsLevelAStringArray[i],out rewardIdsLevelA[i]);
            }
         
            string[] rewardCountsLevelAStringArray = rawContents[6].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
            string[] rewardCountsLevelAStringArray = rawContents[8].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
            rewardCountsLevelA = new int[rewardCountsLevelAStringArray.Length];
            for (int i=0;i<rewardCountsLevelAStringArray.Length;i++)
            {
                int.TryParse(rewardCountsLevelAStringArray[i],out rewardCountsLevelA[i]);
            }
         
            string[] rewardIdsLevelBStringArray = rawContents[7].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
            string[] rewardIdsLevelBStringArray = rawContents[9].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
            rewardIdsLevelB = new int[rewardIdsLevelBStringArray.Length];
            for (int i=0;i<rewardIdsLevelBStringArray.Length;i++)
            {
                int.TryParse(rewardIdsLevelBStringArray[i],out rewardIdsLevelB[i]);
            }
         
            string[] rewardCountsLevelBStringArray = rawContents[8].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
            string[] rewardCountsLevelBStringArray = rawContents[10].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
            rewardCountsLevelB = new int[rewardCountsLevelBStringArray.Length];
            for (int i=0;i<rewardCountsLevelBStringArray.Length;i++)
            {
                int.TryParse(rewardCountsLevelBStringArray[i],out rewardCountsLevelB[i]);
            }
         
            unLockEquipPlace=IsNumeric(rawContents[9]) ? int.Parse(rawContents[9]):0; 
            unLockEquipPlace=IsNumeric(rawContents[11]) ? int.Parse(rawContents[11]):0; 
         
            specialRewardDescription = rawContents[10].Trim();
            specialRewardDescription = rawContents[12].Trim();
         
            fightPower=IsNumeric(rawContents[11]) ? int.Parse(rawContents[11]):0; 
            fightPower=IsNumeric(rawContents[13]) ? int.Parse(rawContents[13]):0; 
            }
            catch (Exception ex)
            {