Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-25 78bfe524ea4776c47f6314e56e97f39970b00fce

 Core/GameEngine/Model/Config/DogzConfig.cs

@@ -1,6 +1,6 @@
//--------------------------------------------------------
//    [Author]:         第二世界
//    [  Date ]:         Friday, August 17, 2018
//    [  Date ]:         Friday, September 21, 2018
//--------------------------------------------------------

using UnityEngine;
@@ -17,6 +17,7 @@
      public int[] BaseAttrTypes;

      public int[] BaseAttrValues;

      public int[] HelpBattleSkills;

      public int FightPowerEx { get ; private set ; }

      public int[] EquipPlaceColorList;

      public override string getKey()
@@ -54,7 +55,9 @@
                int.TryParse(HelpBattleSkillsStringArray[i],out HelpBattleSkills[i]);
            }

         

            string[] EquipPlaceColorListStringArray = rawContents[6].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
            FightPowerEx=IsNumeric(rawContents[6]) ? int.Parse(rawContents[6]):0; 
			
            string[] EquipPlaceColorListStringArray = rawContents[7].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
            EquipPlaceColorList = new int[EquipPlaceColorListStringArray.Length];
            for (int i=0;i<EquipPlaceColorListStringArray.Length;i++)
            {