Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_linchunjie

2018-08-29 c6355a680d3b61c45580c052b38bc6c1b726aa82

 System/Debug/DebugLogin.cs

@@ -8,51 +8,31 @@
public class DebugLogin : MonoBehaviour

{
    public InputField appid;
    public InputField serverId;
    public InputField ipInputField;
    public InputField portInputField;

    public InputField gateInputField;
    public InputField account;
    public InputField password;

    public Toggle isToken;

    string appidRecorder {

    string appidRecorder

    {

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

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

    }



    string serverIdRecorder {

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

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

    }



    string ipRecorder {

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

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

    }



    string portRecorder {

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

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

    }



    string gateRecorder {

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

        set { LocalSave.SetString("DebugLogin_Gate", 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 {

    bool istokenRecorder

    {

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

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

    }
@@ -60,10 +40,6 @@
    private void OnEnable()

    {

        appid.text = appidRecorder;

        serverId.text = serverIdRecorder;

        ipInputField.text = ipRecorder;

        portInputField.text = portRecorder;

        gateInputField.text = gateRecorder;

        account.text = accountRecorder;

        password.text = passwordRecorder;

        isToken.isOn = istokenRecorder;

@@ -72,29 +48,18 @@
    public void Login()

    {

        appidRecorder = appid.text;

        serverIdRecorder = serverId.text;

        ipRecorder = ipInputField.text;

        portRecorder = portInputField.text;

        gateRecorder = gateInputField.text;

        accountRecorder = account.text;

        passwordRecorder = password.text;

        istokenRecorder = isToken.isOn;



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

        {

            VersionConfig.Get().m_AppId = appid.text;

        }



        if (isToken.isOn)

        {

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



            var ip = ipInputField.text;

            var port = int.Parse(portInputField.text);

            var gamePort = int.Parse(gateInputField.text);

            VersionConfig.Get().m_AppId = appid.text;

            ServerListCenter.Instance.currentServer = new ServerData()

            {

                region_flag = int.Parse(serverId.text),

                login_port = port,

                game_port = gamePort,

            };



            loginModel.sdkLoginResult = new SDKUtility.FP_LoginOk()

            {

                account = account.text,

@@ -105,6 +70,9 @@
            };



            loginModel.sdkLogined = true;

            var ip = ServerListCenter.Instance.currentServer.region_domain;

            var port = ServerListCenter.Instance.currentServer.login_port;

            var gamePort = ServerListCenter.Instance.currentServer.game_port;

            loginModel.AccountLogin(ip, port, gamePort);

        }

        else

@@ -141,18 +109,9 @@
                };



                SDKUtility.Instance.FreePlatformCheckIDAuthentication(result.account);



                var ip = ipInputField.text;

                var port = int.Parse(portInputField.text);

                var gamePort = int.Parse(gateInputField.text);

                VersionConfig.Get().m_AppId = appid.text;

                ServerListCenter.Instance.currentServer = new ServerData()

                {

                    region_flag = int.Parse(serverId.text),

                    login_port = port,

                    game_port = gamePort,

                };



                var ip = ServerListCenter.Instance.currentServer.region_domain;

                var port = ServerListCenter.Instance.currentServer.login_port;

                var gamePort = ServerListCenter.Instance.currentServer.game_port;

                loginModel.AccountLogin(ip, port, gamePort);

            }

            else