Merge branch 'master' into leonard

client_Wu Xijin

2018-10-23 a974a2621a6dcb90b8fe52b23d075814873c0960

 System/Debug/DebugLogin.cs

@@ -11,36 +11,41 @@
    public InputField serverId;

    public InputField account;

    public InputField password;

    public InputField platform;



    public Toggle isToken;



    string appidRecorder

    {

    string appidRecorder {

        get { return LocalSave.GetString("DebugLogin_AppId"); }

        set { LocalSave.SetString("DebugLogin_AppId", value); }

    }



    string serverIdRecorder

    {

    string serverIdRecorder {

        get { return LocalSave.GetString("DebugLogin_ServerId"); }

        set { LocalSave.SetString("DebugLogin_ServerId", value); }

    }





    string accountRecorder

    {

    string accountRecorder {

        get { return LocalSave.GetString("DebugLogin_Account"); }

        set { LocalSave.SetString("DebugLogin_Account", value); }

    }



    string passwordRecorder

    {

    string passwordRecorder {

        get { return LocalSave.GetString("DebugLogin_Password"); }

        set { LocalSave.SetString("DebugLogin_Password", value); }

    }



    bool istokenRecorder

    {

    int platformRecorder {

        get {

            return LocalSave.GetInt("DebugLoging_Platform", 1);

        }

        set {

            LocalSave.SetInt("DebugLoging_Platform", value);

        }

    }



    bool istokenRecorder {

        get { return LocalSave.GetBool("DebugLogin_IsToken", false); }

        set { LocalSave.SetBool("DebugLogin_IsToken", value); }

    }

@@ -51,6 +56,7 @@
        serverId.text = serverIdRecorder;

        account.text = accountRecorder;

        password.text = passwordRecorder;

        platform.text = platformRecorder.ToString();

        isToken.isOn = istokenRecorder;

    }



@@ -60,6 +66,9 @@
        serverIdRecorder = serverId.text;

        accountRecorder = account.text;

        passwordRecorder = password.text;

        var platformTemp = 0;

        int.TryParse(platform.text, out platformTemp);

        platformRecorder = platformTemp;

        istokenRecorder = isToken.isOn;



        if (!string.IsNullOrEmpty(appid.text))

@@ -67,6 +76,8 @@
            VersionConfig.Get().m_AppId = appid.text;

        }



        SDKUtility.Instance.ChannelPlatform = (SDKUtility.E_ChannelPlatform)int.Parse(platform.text);



        if (isToken.isOn)

        {

            var loginModel = ModelCenter.Instance.GetModel<LoginModel>();