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

Client_PangDeRong

2018-12-27 4c1036b559209132c9c63af4f8b9d9ecdd19040e

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

 System/CrossServerOneVsOne/CrossServerOneVsOneArenaWin.cs

@@ -20,6 +20,7 @@
        [SerializeField] Text winStreakText;

        [SerializeField] Button buyTimesBtn;

        [SerializeField] Button matchRecordBtn;

        [SerializeField] RedpointBehaviour matchRedPointBeh;

        [SerializeField] GameObject inSeasonTimeObj;

        [SerializeField] GameObject outSeasonTimeObj;

        [SerializeField] GameObject lookPlayerObj;

@@ -216,6 +217,7 @@


        private void OnStartMatch()

        {

            matchRedPointBeh.gameObject.SetActive(false);

            lookPlayerObj.SetActive(true);

            crossServerModel.matchStartTime = DateTime.Now;

            UpdateLookPlayerTime();

@@ -228,6 +230,7 @@
            if(type == 0)

            {

                crossServerModel.IsMatching = false;

                matchRedPointBeh.gameObject.SetActive(true);

                lookPlayerObj.SetActive(false);

                UpdateActivityState();

            }


 System/CrossServerOneVsOne/CrossServerOneVsOnePKSeason.cs

@@ -232,9 +232,19 @@


        public bool InOpenTime()

        {

            DailyQuestOpenTime _openTime = null;

            dailyQuestModel.TryGetOpenTime((int)DailyQuestType.CrossServerPk, out _openTime);

           return _openTime != null && _openTime.InOpenTime() && MatchState == 1;

            List<HourMinute> hourMinutes = GetActivityTimes();

            if (hourMinutes != null && MatchState == 1)

            {

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

                {

                    if (hourMinutes[i].InOpenTime())

                    {

                        return true;

                    }

                }

            }



            return false;

        }



        public List<HourMinute> GetActivityTimes()


 System/HeavenBattle/BattlePrepareCoolDownWin.cs

@@ -60,7 +60,7 @@


        private void UpdateFBEnd()

        {

            CloseImmediately();

            CloseWin();

        }



        protected override void LateUpdate()

@@ -126,10 +126,20 @@
        private void CloseWin()

        {

            CloseImmediately();

            if (!WindowCenter.Instance.IsOpen<DungeonEndCoolDownWin>())

            int mapId = PlayerDatas.Instance.baseData.MapID;

            int dataMapId = model.GetDataMapIdByMapId(mapId);

            switch(dataMapId)

            {

                WindowCenter.Instance.Open<DungeonEndCoolDownWin>();

                case CrossServerOneVsOneModel.CrossServerDataMapId:

                    break;

                default:

                    if (!WindowCenter.Instance.IsOpen<DungeonEndCoolDownWin>())

                    {

                        WindowCenter.Instance.Open<DungeonEndCoolDownWin>();

                    }

                    break;

            }



        }

    }

}


 System/PlayerDead/PlayerDeadModel.cs

@@ -34,7 +34,6 @@
        isOpenPrompting = true;

        this.deadCD = 0;

        localBossState = false;

        playerIsDie = false;

    }



    public void OnPlayerLoginOk()

@@ -68,7 +67,17 @@
    public bool isBossKill = false;

    public float duplicatesRebornTime = 0;

    private Dictionary<int, int> duplicatesRebornDict;

    public bool playerIsDie { get; private set; }

    public bool playerIsDie

    {

        get {



            if(PlayerDatas.Instance.hero != null)

            {

                return PlayerDatas.Instance.hero.ActorInfo.serverDie;

            }

            return false;

        }

    }



    DungeonModel _dungeonModel;

    DungeonModel dungeonModel {

@@ -166,7 +175,6 @@
        {

            return;

        }

        playerIsDie = true;

        _tagMapModel = Config.Instance.Get<MapConfig>(PlayerDatas.Instance.baseData.MapID);

        if (_tagMapModel.MapFBType == 0)

        {

@@ -279,7 +287,6 @@
        localBossState = false;

        this.deadCD = 0;

        isKillByPlayer = false;

        playerIsDie = false;

        TimeDownMgr.Instance.Stop(TimeDownMgr.CoolTimeType.DeadCD);

        TimeDownMgr.Instance.Stop(TimeDownMgr.CoolTimeType.BossAutoReborn);

        TimeDownMgr.Instance.Stop(TimeDownMgr.CoolTimeType.DuplicatesReborn);