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

client_linchunjie

2018-12-27 e0ddddb0bc570b756a5adc0292486d153c808c3f

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

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

@@ -3,15 +3,18 @@
using Snxxz.UI;



//04 31 倒计时#tagTimeTick


public class DTC0431_tagTimeTick : DtcBasic {

    public override void Done(GameNetPackBasic vNetPack) {

public class DTC0431_tagTimeTick : DtcBasic

{

    public override void Done(GameNetPackBasic vNetPack)

    {

        base.Done(vNetPack);


        H0431_tagTimeTick vNetData = vNetPack as H0431_tagTimeTick;

        var dungeonModel = ModelCenter.Instance.GetModel<DungeonModel>();

        dungeonModel.UpdateCoolDown((DungeonCoolDownType)vNetData.Type,vNetData.Tick);

        if((DungeonCoolDownType)vNetData.Type == DungeonCoolDownType.WaitStart)

        dungeonModel.UpdateCoolDown((DungeonCoolDownType)vNetData.Type, vNetData.Tick);

        var mapId = dungeonModel.GetDataMapIdByMapId(PlayerDatas.Instance.baseData.MapID);

      
        if ((DungeonCoolDownType)vNetData.Type == DungeonCoolDownType.WaitStart)

        {

            var mapId = dungeonModel.GetDataMapIdByMapId(PlayerDatas.Instance.baseData.MapID);

            switch (mapId)

            {

                case HeavenBattleModel.HEAVEBATTLE_MAPID:

@@ -24,7 +27,6 @@
                    }

                    break;

                case CrossServerOneVsOneModel.CrossServerDataMapId:

                    WindowCenter.Instance.CloseImmediately<DungeonBeginCoolDownWin>();

                    WindowCenter.Instance.CloseImmediately<DungeonEndCoolDownWin>();

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

                    {

@@ -33,5 +35,11 @@
                    break;

            }

        }

        switch (mapId)

        {

            case CrossServerOneVsOneModel.CrossServerDataMapId:

                WindowCenter.Instance.CloseImmediately<DungeonBeginCoolDownWin>();

                break;

        }

    }


}



 System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs

@@ -59,6 +59,8 @@
            {

                SendCrossMatch(1);

            }



            UpdateCrossArenaRedpoint();

        }



        public override void UnInit()

@@ -110,6 +112,8 @@
            {

                UpdateDayAwardsEvent();

            }



            UpdateCrossArenaRedpoint();

        }



        private void UpdateFBHelp()

@@ -458,8 +462,10 @@
        #endregion



        #region 红点

        public const int CrossOneVsOneRedKey = 21301;

        public Redpoint crossOneVsOneRedpoint = new Redpoint(CrossOneVsOneRedKey);

        public const int CrossArenaRedKey = 2130101;

        public Redpoint crossArenaRedpoint = new Redpoint(CrossArenaRedKey);

        public Redpoint crossArenaRedpoint = new Redpoint(CrossOneVsOneRedKey, CrossArenaRedKey);

        public const int CrossDayAwardsRedKey = 21301011;

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

        public const int CrossMatchRedKey = 21301012;


 System/CrossServerOneVsOne/CrossServerOneVsOnePKSeason.cs

@@ -242,7 +242,16 @@
            DailyQuestOpenTime _openTime = null;

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

            var dayOfWeek = (int)TimeUtility.ServerNow.DayOfWeek;

            return _openTime != null ? _openTime.GetHourMinuteByWeek(dayOfWeek) : null;

            Dictionary<int, List<HourMinute>> keyValues = null;

            if(_openTime != null)

            {

                keyValues = _openTime.NormalOpenTimes;

                if(keyValues.ContainsKey(dayOfWeek))

                {

                    return keyValues[dayOfWeek];

                }

            }

            return null;

        }



        public int IndexOfDays(DateTime time)


 System/CrossServerOneVsOne/CrossServerOneVsOnePlayerInfo.cs

@@ -50,7 +50,8 @@
            this.DayPKCount = playerInfo.DayPKCount;

            this.DayBuyCount = playerInfo.DayBuyCount;

            this.DayWinCount = playerInfo.DayWinCount;

            if(UpdatePlayerInfoEvent != null)

            crossServerModel.UpdateCrossArenaRedpoint();

            if (UpdatePlayerInfoEvent != null)

            {

                UpdatePlayerInfoEvent();

            }


 System/CrossServerOneVsOne/CrossServerSettlementWin.cs

@@ -191,7 +191,7 @@
                m_SegmentTxt2.text = config2.Name;

               

            }

            m_SorceText.text = crossServerModel.pkResultInfo.CurScore + "(" + crossServerModel.pkResultInfo.AddScore + ")";

            m_SorceText.text = crossServerModel.pkResultInfo.CurScore + "(+" + crossServerModel.pkResultInfo.AddScore + ")";

        }

        private void SetBrokenLine()

@@ -222,13 +222,13 @@
                m_Segment_Txt1.text = config1.Name;

                var config2 = Config.Instance.Get<CrossServerArenaConfig>(crossServerModel.pkResultInfo.DanLV);

                m_Segment_Txt2.text = config2.Name;

                m_SorceText.text = crossServerModel.pkResultInfo.CurScore + "(" + crossServerModel.pkResultInfo.AddScore + ")";

                m_SorceText.text = crossServerModel.pkResultInfo.CurScore + "(+" + crossServerModel.pkResultInfo.AddScore + ")";

            }

            else

            {

                m_SegmentObj1.SetActive(false);

            }

            m_Sorce_Txt.text = crossServerModel.pkResultInfo.CurScore + "(" + crossServerModel.pkResultInfo.AddScore + ")";

            m_Sorce_Txt.text = crossServerModel.pkResultInfo.CurScore + "(+" + crossServerModel.pkResultInfo.AddScore + ")";

        }
    }


 System/DailyQuest/DailyQuestData.cs

@@ -56,6 +56,7 @@


    //常规的活动时间，key是星期x

    Dictionary<int, List<HourMinute>> openTimes = new Dictionary<int, List<HourMinute>>();

    public Dictionary<int, List<HourMinute>> NormalOpenTimes { get { return openTimes; }}

    //开服前2周的活动时间,key1是开服日的星期，key2是开服第几天

    Dictionary<int, Dictionary<int, List<HourMinute>>> specialOpenTimes = new Dictionary<int, Dictionary<int, List<HourMinute>>>();