Merge branch 'master' into 3687天赋功能

client_linchunjie

2018-09-28 c591cb6e215ea5e762560afdae059f1d4fd7f4ec

 System/GeneralConfig/GeneralConfig.cs

@@ -5,6 +5,7 @@
using System;

using System.Text.RegularExpressions;

using System.Linq;

using Snxxz.UI;



public class GeneralConfig : Singleton<GeneralConfig>

{

@@ -140,6 +141,8 @@


    public string teamWorldCall;

    public int teamWorldCallInviteCount;



    public List<Item> ancientKingAwards = new List<Item>();



    public void Init()

    {

@@ -492,6 +495,21 @@


            teamWorldCall = GetInputString("TeamWorldCall");

            teamWorldCallInviteCount = GetInt("TeamWorldCall", 2);



            var ancientKingAwradConfig = Config.Instance.Get<FuncConfigConfig>("ElderBattlefieldTopAward");

            if (ancientKingAwradConfig != null)

            {

                var itemArray = LitJson.JsonMapper.ToObject<int[][]>(ancientKingAwradConfig.Numerical1);

                for (int k = 0; k < itemArray.Length; k++)

                {

                    ancientKingAwards.Add(new Item()

                    {

                        id = itemArray[k][0],

                        count = itemArray[k][1],

                        bind = itemArray[k][2] == 1,

                    });

                }

            }

        }

        catch (Exception ex)

        {