Merge branch 'master' into GrowthFund

client_Zxw

2019-01-15 4c6d58af44cd4235501e15a78bf79674ba2fcc4a

 System/GeneralConfig/GeneralDefine.cs

@@ -168,7 +168,7 @@
    public static int fairyLandBuffId { get; private set; }
    public static int achievementEarlierStageLevel { get; private set; }
    public static int DemonJarAutoTime { get; private set; }

    public static List<int> CrossUseItemIds { get; private set; }
    public static Dictionary<int, Dictionary<int, GA_NpcFightSgzcZZ.EquipRandomInfo>> SgzzRobotEquipDict { get; private set; }
    public static Dictionary<int, int> SgzcRealm { get; private set; }

@@ -178,6 +178,7 @@
    {
        try
        {
            CrossUseItemIds = new List<int>(GetIntArray("CrossUseItem"));
            CompareEquipPlaces = GetIntArray("EquipUpType");
            greatMasterStartLV = GetInt("GreatMasterStartLV");
            playerMaxLevel = GetInt("PlayerMaxLV");