Merge branch 'master' into leonard

client_Wu Xijin

2018-10-26 82931aabaaa3e479bc04e11630a77cd9c9dd5fe3

 System/ClientVersion/VersionConfig.cs

@@ -10,7 +10,7 @@
[CreateAssetMenu(menuName = "Config/VersionConfig")]

public class VersionConfig : ScriptableObject

{

    public const string VERSION_ALTERNATIVE = "0.0.0";

    public const string VERSION_ALTERNATIVE = "99.99.99";



    [SerializeField] public string m_AppId = string.Empty;

    public string appId { get { return m_AppId; } }