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

client_Wu Xijin

2018-12-27 b5651b96bb1bfd53341af7fbe4cb46db54dee58c

 System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs

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

                SendCrossMatch(1);

            }



            UpdateCrossArenaRedpoint();

        }



        public override void UnInit()

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

                UpdateDayAwardsEvent();

            }



            UpdateCrossArenaRedpoint();

        }



        private void UpdateFBHelp()

@@ -126,8 +130,8 @@
                    WindowCenter.Instance.Open<CrossServerOneVsOneRoundWin>();

                }

            }



            if(mission.isStart == 1)

            DebugEx.LogFormat("副本帮助信息回合是否开始：：{0}",mission.isStart);

            if (mission.isStart == 1)

            {

                if(WindowCenter.Instance.IsOpen<CrossServerOneVsOneRoundWin>())

                {

@@ -170,6 +174,7 @@
        public string priceFormula { get;private set;} //购买匹配次数需要价格公式

        public string winStreakScoreFormula { get; private set; } //连胜积分公式

        public List<AwardType> dayAwardTypelist { get; private set; }

        public int afterOpenDayOpenCross { get; private set;}

        private void ParseFuncConfig()

        {

            var CrossRealmPKAward = Config.Instance.Get<FuncConfigConfig>("CrossRealmPKAward");

@@ -241,6 +246,9 @@


            var CrossRealmPKScore = Config.Instance.Get<FuncConfigConfig>("CrossRealmPKScore");

            winStreakScoreFormula = CrossRealmPKScore.Numerical3;



            var CrossRealmCfg = Config.Instance.Get<FuncConfigConfig>("CrossRealmCfg");

            afterOpenDayOpenCross = int.Parse(CrossRealmCfg.Numerical1);

        }



        public class AwardType

@@ -363,6 +371,20 @@
                return true;

            }



            var teamModel = ModelCenter.Instance.GetModel<TeamModel>();

            bool isTeamMatch = teamModel.isMatching;

            if(isTeamMatch)

            {

                SysNotifyMgr.Instance.ShowTip("CrossMatching6");

                return true;

            }



            bool isDungeonPrepare = teamModel.teamPrepare.isPreparing;

            if(isDungeonPrepare)

            {

                SysNotifyMgr.Instance.ShowTip("CrossMatching7");

                return true;

            }

            return false;



        }

@@ -440,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;