5398 子 【开发】【1.4】跨服竞技场 / 【前端】【1.4】跨服竞技场开发

client_Wu Xijin

2018-12-28 9e0f4784eae764b84b118b0649d37ff1c3b6c5e0

5398 子 【开发】【1.4】跨服竞技场 / 【前端】【1.4】跨服竞技场开发

 Core/NetworkPackage/DTCFile/ServerPack/H01_System/DTC0102_tagCDBPlayer.cs

@@ -136,14 +136,14 @@
            var account = loginModel.accountBuf;

            var ip = GameNetSystem.Instance.crossServerData.ip;

            var port = GameNetSystem.Instance.crossServerData.port;

            CrossServerLogin.Instance.AccountLogin(account, ip, port);

            CrossServerLogin.Instance.AccountLogin(account, ip, port, loginModel.reconnectBackGround);

        }

        else

        {

            switch (vNetData.MapID)

            {

                case 31250:

                    StageManager.Instance.Load<GuardDungeonStage>(_mapConfig.MapID,vNetData.socketType);

                    StageManager.Instance.Load<GuardDungeonStage>(_mapConfig.MapID, vNetData.socketType);

                    break;

                case RuneTowerModel.RUNETOWER_MAPID:

                    StageManager.Instance.Load<RuneTowerDungeonStage>(_mapConfig.MapID, vNetData.socketType);


 Core/NetworkPackage/DTCFile/ServerPack/H01_System/DTC0109_tagServerPrepareOK.cs

@@ -41,7 +41,7 @@
                }

                break;

            case GameNetSystem.SocketType.CrossSever:

                if (loginModel.reconnectBackGround || StageManager.Instance.socketType != GameNetSystem.SocketType.CrossSever)

                if (CrossServerLogin.Instance.reconnectBackGround || StageManager.Instance.socketType != GameNetSystem.SocketType.CrossSever)

                {

                    var mapOk = new C0107_tagCInitMapOK();

                    mapOk.MapID = PlayerDatas.Instance.baseData.MapID;


 Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0403_tagPlayerLoginLoadOK.cs

@@ -17,6 +17,19 @@
        var vNetData = vNetPack as H0403_tagPlayerLoginLoadOK;

        GameNetSystem.Instance.netState = GameNetSystem.NetState.Connected;

        finishedLogin = true;



        switch (vNetData.socketType)

        {

            case GameNetSystem.SocketType.Main:

                loginModel.reconnectBackGround = false;

                break;

            case GameNetSystem.SocketType.CrossSever:

                CrossServerLogin.Instance.reconnectBackGround = false;

                break;

            default:

                break;

        }



        if (neverLoginOk)

        {

            try

@@ -27,11 +40,6 @@
                    {

                        playerLoginOkEvent();

                    }

                }



                if (loginModel.reconnectBackGround)

                {

                    loginModel.reconnectBackGround = false;

                }

            }

            catch (Exception ex)


 Core/NetworkPackage/GameNetSystem.cs

@@ -252,6 +252,7 @@
            netState = NetState.DisConnected;

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

            loginModel.busy = false;

            CrossServerLogin.Instance.busy = false;

        }

    }



@@ -300,6 +301,7 @@
        finally

        {

            netState = NetState.AccountLogin;

            CrossServerLogin.Instance.busy = false;

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

            loginModel.busy = false;

            loginModel.ReAccountLogin();

@@ -332,6 +334,7 @@
        finally

        {

            netState = NetState.NerverConnect;

            CrossServerLogin.Instance.busy = false;

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

            loginModel.busy = false;

            WindowJumpMgr.Instance.ClearJumpData();


 System/DailyQuest/DailyQuestData.cs

@@ -229,7 +229,7 @@
            return true;

        }



        var isSpecialDay = TimeUtility.OpenWeekCnt <= 1;

        var isSpecialDay = TimeUtility.OpenWeekCnt <= 1 && (DailyQuestType)id != DailyQuestType.CrossServerPk;

        var openDayWeek = (int)TimeUtility.openServerDayOfWeek;

        var dayIndex = TimeUtility.OpenDay + 1;

        if (isSpecialDay)

@@ -278,7 +278,7 @@


    public bool TryGetTodayNearestOpenTime(out HourMinute _hourMinute)

    {

        var isSpecialDay = TimeUtility.OpenWeekCnt <= 1;

        var isSpecialDay = TimeUtility.OpenWeekCnt <= 1 && (DailyQuestType)id != DailyQuestType.CrossServerPk;

        var openDayWeek = (int)TimeUtility.openServerDayOfWeek;

        var dayIndex = TimeUtility.OpenDay + 1;

        if (isSpecialDay)


 System/Login/CrossServerLogin.cs

@@ -13,6 +13,8 @@
            set { m_Busy = value; }
        }

        public bool reconnectBackGround { get; set; }

        int reLoginTime = 0;
        Clock loginOverTimeClock;

@@ -73,7 +75,7 @@

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

        public bool IsEnterCrossServerPreparing()
@@ -81,7 +83,7 @@
            return oneVsOnePlayerData.IsCrossServerOneVsOneEntering();
        }

        public void AccountLogin(string account, string ip, int gamePort)
        public void AccountLogin(string account, string ip, int gamePort, bool reconnectBackGround)
        {
            if (Application.internetReachability == NetworkReachability.NotReachable)
            {
@@ -103,6 +105,7 @@

            try
            {
                this.reconnectBackGround = reconnectBackGround;
                accountBuf = account;
                ipBuf = ip;
                gamePortBuf = gamePort;