Merge branch 'master' into 3687天赋功能

client_linchunjie

2018-10-09 c5a1b1eb5f845f72b0b3e48fc8c7ccf75cee5831

 System/ClientVersion/VersionConfig.cs

@@ -98,6 +98,8 @@
    public void Read(string _data)

    {

        var dataStrings = _data.Split('\t');

        try

        {

        m_AppId = dataStrings[2];

        m_VersionAuthority = (VersionAuthority)int.Parse(dataStrings[3]);

        m_Version = dataStrings[4];

@@ -117,6 +119,11 @@
        m_LogoPosition = dataStrings[18].Vector3Parse();

        m_BanHao = dataStrings[19];

    }

        catch (System.Exception ex)

        {

            DebugEx.Log(ex);

        }

    }



#if UNITY_EDITOR

    [ContextMenu("Apply")]