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

client_Zxw

2018-12-28 115f6b3e3ad5a58fb79713618b1536cb4a9d9845

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

 Core/GameEngine/Model/Player/PlayerDatas.cs

@@ -531,21 +531,8 @@


                if (oldExAttr5 == 1 && value == 0)

                {

                    baseData.ApplyMainServerDataBuf();

                    if (GameNetSystem.Instance.crossServerConnected_Loigc)

                    {

                        GameNetSystem.Instance.crossServerConnected_Loigc = false;

                        LoadingWin.targetMapResId = 1;

                        WindowCenter.Instance.Open<LoadingWin>();

                        StageManager.Instance.Load<DungeonStage>(baseData.MapID, GameNetSystem.SocketType.CrossSever, true);

                        if (hero != null && !hero.ActorInfo.serverDie)

                        {

                            hero.RequestName();

                            hero.SwitchRedName(StatusMgr.Instance.IsExist(PlayerId, StatusMgr.Instance.redNameBuffID));

                            hero.IdleImmediate();

                            hero.State = E_ActorState.Idle;

                        }

                    }

                    GameNetSystem.Instance.crossServerConnected_Loigc = false;

                    GameNetSystem.Instance.Reconnect();

                }

                break;

            case PlayerDataRefresh.Faction:


 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,20 @@
        var vNetData = vNetPack as H0403_tagPlayerLoginLoadOK;

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

        finishedLogin = true;



        NetLinkWin.Hide();

        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 +41,6 @@
                    {

                        playerLoginOkEvent();

                    }

                }



                if (loginModel.reconnectBackGround)

                {

                    loginModel.reconnectBackGround = false;

                }

            }

            catch (Exception ex)


 Core/NetworkPackage/DTCFile/ServerPack/HA7_Interaction/DTCA713_tagMCDynamicBarrierState.cs

@@ -98,11 +98,21 @@
                        _scale = _obstacle.transform.localScale.z * 0.25f;

                    }



                    // 创建特效

                    SFXController _sfx = SFXPlayUtility.Instance.PlayWithEulerAngle(1040, _pos, _isHorizontal ? new Vector3(0, 0, 0) : new Vector3(0, 90, 0));

                    _sfx.duration = 0;

                    _sfx.transform.localScale = new Vector3(_scale, 1, 1);

                    sfxDict.Add(id, _sfx);

                    if (package.BarrierList[i].Angle == 0)

                    {

                        // 创建特效

                        SFXController _sfx = SFXPlayUtility.Instance.PlayWithEulerAngle(1040, _pos, _isHorizontal ? new Vector3(0, 0, 0) : new Vector3(0, 90, 0));

                        _sfx.duration = 0;

                        _sfx.transform.localScale = new Vector3(_scale, 1, 1);

                        sfxDict.Add(id, _sfx);

                    }

                    else

                    {   
                        SFXController _sfx = SFXPlayUtility.Instance.PlayWithEulerAngle(1040, _pos, new Vector3(0, package.BarrierList[i].Angle, 0));

                        _sfx.duration = 0;

                        _sfx.transform.localScale = new Vector3(_scale, 1, 1);

                        sfxDict.Add(id, _sfx);

                    }

                }

            }

            else if (package.State == 0)


 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;

@@ -61,7 +63,6 @@
                    CrossServerOneVsOneLogin();
                }
            });

        }

        public void CrossServerOneVsOneLogin()
@@ -73,7 +74,7 @@

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

        public bool IsEnterCrossServerPreparing()
@@ -81,7 +82,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 +104,7 @@

            try
            {
                this.reconnectBackGround = reconnectBackGround;
                accountBuf = account;
                ipBuf = ip;
                gamePortBuf = gamePort;
@@ -113,6 +115,8 @@
                }
                loginOverTimeClock = Clock.Create(DateTime.Now + new TimeSpan(15 * TimeSpan.TicksPerSecond), ProcessLoginFailure);
                GameNetSystem.Instance.BeginConnectCrossServer(ipBuf, gamePortBuf, OnGameServerConnected);

                NetLinkWin.Show();
            }
            catch (Exception ex)
            {
@@ -139,44 +143,13 @@

                loginOverTimeClock = Clock.Create(DateTime.Now + new TimeSpan(15 * TimeSpan.TicksPerSecond), ProcessLoginFailure);
                GameNetSystem.Instance.BeginConnectCrossServer(ipBuf, gamePortBuf, OnGameServerConnected);

                NetLinkWin.Show();
            }
            catch (Exception ex)
            {
                Debug.Log(ex);
                busy = false;
            }
        }

        private void OnAccountLogin(bool _ok, string _result)
        {
            if (!_ok)
            {
                busy = false;
                DebugEx.LogError(_result);
                return;
            }

            if (string.IsNullOrEmpty(_result))
            {
                busy = false;
                return;
            }

            var stringSet = _result.Split('|');
            if (stringSet[0] != "OK")
            {
                busy = false;
                return;
            }

            try
            {
                GameNetSystem.Instance.BeginConnectCrossServer(ipBuf, gamePortBuf, OnGameServerConnected);
            }
            catch (Exception ex)
            {
                busy = false;
                Debug.Log(ex);
            }
        }

@@ -197,6 +170,7 @@
        public void AccessLogin(H0101_tagServerPrepared _serverInfo)
        {
            GameNetSystem.Instance.SendToCrossServer(loginModel.Get0101SendPackage(_serverInfo)); // 登录
            NetLinkWin.Show();
        }

        public void CheckClientVersion()
@@ -204,10 +178,12 @@
            var sendInfo = new C010D_tagCClientVersion();
            sendInfo.Version = "10.1000.1";
            GameNetSystem.Instance.SendToCrossServer(sendInfo);
            NetLinkWin.Show();
        }

        public void OnGetPlayerLoginInfo(byte _type)
        {
            NetLinkWin.Hide();
            busy = false;
            if (Application.internetReachability == NetworkReachability.NotReachable)
            {
@@ -226,6 +202,8 @@
            tagCRoleLoginAsk.ClientID = SDKUtility.Instance.RegistrationID;
            GameNetSystem.Instance.SendToCrossServer(tagCRoleLoginAsk);

            NetLinkWin.Show();

            if (loginOverTimeClock != null)
            {
                loginOverTimeClock.Stop();