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

client_Zxw

2018-12-21 e2324f8cb793ba2f51ff798de4464fd846fff255

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

 Core/GameEngine/Model/Player/Character/PlayerBaseData.cs

@@ -157,6 +157,10 @@
        PosX = mainServerDataBuf.PosX;

        PosY = mainServerDataBuf.PosY;

        HP = mainServerDataBuf.HP;

        if (PlayerDatas.Instance.hero != null)

        {

            PlayerDatas.Instance.hero.ActorInfo.serverDie = mainServerDataBuf.heroServerDie;

        }

    }



    public void RecordMainServerData(bool isMainServerData, PlayerDataRefresh playerDataType, uint value)

@@ -193,6 +197,11 @@
        }

    }



    public void RecordMainServerDie(bool isMainServerData, bool serverDie)

    {

        mainServerDataBuf.heroServerDie = serverDie;

    }



    public class PartDataBuf

    {

        public string PlayerName;

@@ -202,6 +211,7 @@
        public ushort PosX;

        public ushort PosY;

        public uint HP;

        public bool heroServerDie;

    }



}


 Core/GameEngine/Model/Player/PlayerDatas.cs

@@ -517,6 +517,11 @@
                        LoadingWin.targetMapResId = 1;

                        WindowCenter.Instance.Open<LoadingWin>();

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

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

                        {

                            hero.IdleImmediate();

                            hero.State = E_ActorState.Idle;

                        }

                    }

                }

                break;


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

@@ -17,14 +17,12 @@
            H0104_tagServerDisconnect vNetData = vNetPack as H0104_tagServerDisconnect;

            DebugEx.Log("DTC0104_tagServerDisconnect" + vNetData.Reason);



            GameNetSystem.Instance.LoginOut();

            ModelCenter.Instance.GetModel<LoginModel>().busy = false;



            ServerForceExitHintWin.reason = vNetData.Reason;



            switch (vNetData.socketType)

            {

                case GameNetSystem.SocketType.Main:

                    GameNetSystem.Instance.LoginOut();

                    ModelCenter.Instance.GetModel<LoginModel>().busy = false;

                    if (VersionConfig.Get().versionAuthority == VersionAuthority.Release)

                    {

                        if (vNetData.Reason == 1)


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

@@ -25,6 +25,11 @@
            return;

        }



        if (vNetData.socketType == GameNetSystem.SocketType.Main)

        {

            PlayerDatas.Instance.baseData.RecordMainServerDie(true, false);

        }



        DeadModel.RebornSuccess(vNetData);



        GActorPlayerBase _player = GAMgr.Instance.GetBySID(vNetData.PlayerID) as GActorPlayerBase;


 Core/NetworkPackage/DTCFile/ServerPack/H06_PlayerVsNPC/DTC0609_tagPlayerDie.cs

@@ -21,6 +21,12 @@
        base.Done(vNetPack);



        H0609_tagPlayerDie vNetData = vNetPack as H0609_tagPlayerDie;

       
        if (vNetData.socketType==GameNetSystem.SocketType.Main)

        {

            PlayerDatas.Instance.baseData.RecordMainServerDie(true,true);

        }



        DeadModel.PlayerDie(vNetData.PlayerID);



        GActorPlayerBase _player = GAMgr.Instance.GetBySID(vNetData.PlayerID) as GActorPlayerBase;


 System/CrossServerOneVsOne/CrossServerModel.cs

@@ -331,7 +331,49 @@
        #endregion



        #region 红点

        #endregion

        public const int CrossArenaRedKey = 2130101;

        public Redpoint crossArenaRedpoint = new Redpoint(CrossArenaRedKey);

        public const int CrossDayAwardsRedKey = 21301011;

        public Redpoint crossDayAwardsRedpoint = new Redpoint(CrossArenaRedKey,CrossDayAwardsRedKey);

        public const int CrossMatchRedKey = 21301012;

        public Redpoint crossMatchRedpoint = new Redpoint(CrossArenaRedKey, CrossMatchRedKey);

        public void UpdateCrossArenaRedpoint()

        {

            var playerInfo = CrossServerPlayerInfo.Instance;

            var pkSeason = CrossServerPKSeason.Instance;



            if(pkSeason.InDay(TimeUtility.ServerNow) 
                && pkSeason.InOpenTime()

                && playerInfo.GetDayRemainNum() > 0)

            {

                crossMatchRedpoint.state = RedPointState.Simple;

            }

            else

            {

                crossMatchRedpoint.state = RedPointState.None;

            }



         
            bool isReceive = false;

            for(int i = 0; i < dayAwardTypelist.Count; i++)

            {

                var awardType = dayAwardTypelist[i];

                if(awardType.progress == AwardType.CompleteProgress.Completed)

                {

                    isReceive = true;

                    break;

                }

            }



            if(isReceive)

            {

                crossDayAwardsRedpoint.state = RedPointState.Simple;

            }

            else

            {

                crossDayAwardsRedpoint.state = RedPointState.None;

            }

        }

        #endregion

    }

}


 System/CrossServerOneVsOne/CrossServerPKSeason.cs

@@ -31,7 +31,7 @@
        public event Action activityEndEvent;

        private bool inDateNotify = false;

        private bool stepDateNotify = false;

        public  const int dailyQuestId = 21;

        public  const int dailyQuestId = 31;

        DailyQuestModel dailyQuestModel { get { return ModelCenter.Instance.GetModel<DailyQuestModel>(); } }



        public CrossServerPKSeason()