Merge branch 'Cross_Server' of http://192.168.0.87:10010/r/snxxz_scripts in...

Client_PangDeRong

2018-12-24 90a87e575d3877882be1d1982eb6ebd604ae76c7

Merge branch 'Cross_Server' of http://192.168.0.87:10010/r/snxxz_scripts into Cross_Server

 System/CrossServerOneVsOne/CrossServerOneVsOneEnterConfirmWin.cs

@@ -50,9 +50,12 @@

            if (Time.time >= CrossServerLogin.Instance.oneVsOnePlayerData.autoEnsureTime)
            {
                WindowCenter.Instance.Close<CrossServerOneVsOneEnterConfirmWin>();
            }
            else
            {
                var surplusSeconds = Mathf.RoundToInt(CrossServerLogin.Instance.oneVsOnePlayerData.autoEnsureTime - Time.time);
                m_CountDown.text = string.Format("{0}秒后进入", surplusSeconds);
                WindowCenter.Instance.Close<CrossServerOneVsOneEnterConfirmWin>();
            }

        }

 System/Loading/LoadingWin.cs

@@ -53,7 +53,7 @@


        protected override void OnPreOpen()

        {

            if (!CrossServerLogin.Instance.oneVsOnePlayerData.alreadyLogin)

            if (CrossServerLogin.Instance.oneVsOnePlayerData.waitForLoginCrossServer)

            {

                loadingType = LoadingType.CrossServerOneOne;

            }


 System/Login/CrossServerLogin.cs

@@ -44,7 +44,7 @@
            oneVsOnePlayerData = new CrossServerOneVsOne()
            {
                roomId = matchOK.RoomID,
                alreadyLogin = false,
                waitForLoginCrossServer = true,
                validTimeLimited = Time.time + 30f,
                autoEnsureTime = Time.time + 5f,
                myName = matchOK.PlayerName,
@@ -56,7 +56,7 @@

            Clock.Create(DateTime.Now + new TimeSpan(5 * TimeSpan.TicksPerSecond), () =>
            {
                if (!oneVsOnePlayerData.alreadyLogin)
                if (oneVsOnePlayerData.waitForLoginCrossServer)
                {
                    CrossServerOneVsOneLogin();
                }
@@ -72,7 +72,7 @@
            var port = GameNetSystem.Instance.crossServerData.port;

            WindowCenter.Instance.Open<LoadingWin>();
            oneVsOnePlayerData = oneVsOnePlayerData.SetLoginState(true);
            oneVsOnePlayerData = oneVsOnePlayerData.SetWaitForLoginCrossServer(false);
            AccountLogin(account, ip, port);
        }

@@ -310,7 +310,7 @@
    public struct CrossServerOneVsOne
    {
        public int roomId;
        public bool alreadyLogin;
        public bool waitForLoginCrossServer;
        public float autoEnsureTime;
        public float validTimeLimited;
        public string myName;
@@ -321,9 +321,9 @@
        public int opponentLevel;
        public int opponentMaxHp;

        public CrossServerOneVsOne SetLoginState(bool alreadyLogin)
        public CrossServerOneVsOne SetWaitForLoginCrossServer(bool waitForLoginCrossServer)
        {
            this.alreadyLogin = alreadyLogin;
            this.waitForLoginCrossServer = waitForLoginCrossServer;
            return this;
        }