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

client_Zxw

2018-11-10 f2fe52bc5ae4a2a520794d350dd65c1b8155eff3

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

 Fight/GameActor/GActorInfo.cs

@@ -210,7 +210,7 @@
            }
            else
            {
                Hp = 0;
                Hp = SyncServerHp;
            }
        }
        else

 System/Chat/ChatSendComponent.cs

@@ -247,9 +247,9 @@
        }



        #region 恶意发言

        private string repeatChatContent = string.Empty;

        private int repeatChatCount = 0;

        private DateTime repeatTime = DateTime.Now;

        static string repeatChatContent = string.Empty;

        static int repeatChatCount = 0;

        static DateTime repeatTime = DateTime.Now;

        private void CheckRepeatContent(string _content)

        {

            if (repeatChatContent.Equals(_content)

@@ -269,9 +269,9 @@
            }

        }



        int maliceChatCount = 0;

        int maliceRecordCount = 0;

        private DateTime maliceChatTime = DateTime.Now;

        static int maliceChatCount = 0;

        static int maliceRecordCount = 0;

        static DateTime maliceChatTime = DateTime.Now;

        private void CheckMaliceChat(string _content)

        {

            if ((TimeUtility.ServerNow - maliceChatTime).TotalSeconds < chatCenter.banCheckSecond


 System/OpenServerActivity/AccumulateRechargeWin.cs

@@ -34,6 +34,11 @@
        {

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

        }



        PlayerPackModel packModel

        {

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

        }

        #region Built-in

        protected override void BindController()

        {

@@ -48,19 +53,15 @@


        protected override void OnPreOpen()

        {

            model.selectIndex = 0;

            model.selectIndex = GetSelect();

            model.selectUpdate += SelectUpdate;

            model.accumulateRechargeUpdate += AccumulateRechargeUpdate;

            OperationTimeHepler.Instance.dayResetEvent += DayResetEvent;

            TimeUtility.OnServerOpenDayRefresh += OnServerOpenDayRefresh;

            OperationTimeHepler.Instance.operationEndEvent += OperationEndEvent;

            OperationTimeHepler.Instance.operationStartEvent += OperationStartEvent;



            DisplayMoney(model.selectIndex);

            DisplayItems(model.selectIndex);

            DisplayFunc(model.selectIndex);

            DisplayRecharge();

            DisplayRewards();

            DisplayTime();

            Dipslay();

        }



        protected override void OnAfterOpen()

@@ -74,12 +75,23 @@
            OperationTimeHepler.Instance.dayResetEvent -= DayResetEvent;

            TimeUtility.OnServerOpenDayRefresh -= OnServerOpenDayRefresh;

            OperationTimeHepler.Instance.operationEndEvent -= OperationEndEvent;

            OperationTimeHepler.Instance.operationStartEvent -= OperationStartEvent;

        }



        protected override void OnAfterClose()

        {

        }

        #endregion



        private void Dipslay()

        {

            DisplayMoney(model.selectIndex);

            DisplayItems(model.selectIndex);

            DisplayFunc(model.selectIndex);

            DisplayRecharge();

            DisplayRewards();

            DisplayTime();

        }



        private void OnFunc()

        {

@@ -101,11 +113,44 @@
            }

            if (recharge != null)

            {

                var count = packModel.GetReaminGridCount(PackType.rptItem);

                if (count < recharge.items.Count)

                {

                    SysNotifyMgr.Instance.ShowTip("BagFull");

                    return;

                }

                if (model.SatisfyGetReward(recharge))

                {

                    model.GetAccumulateRechargeReward(recharge);

                }

            }

        }



        private int GetSelect()

        {

            OperationBase operationBase;

            if (OperationTimeHepler.Instance.TryGetOperationTime(Operation.AccumulateRecharge, out operationBase))

            {

                OperationAccumulateRecharge operation = operationBase as OperationAccumulateRecharge;

                var reward = operation.GetReward(TimeUtility.ServerNow);

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

                {

                    var recharge = reward.recharges[i];

                    if (model.SatisfyGetReward(recharge))

                    {

                        return i;

                    }

                }

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

                {

                    var recharge = reward.recharges[i];

                    if (!model.IsRewardGot(recharge) && !model.SatisfyGetReward(recharge))

                    {

                        return i;

                    }

                }

            }

            return 0;

        }



        private void DisplayMoney(int index)

@@ -241,6 +286,7 @@
                    m_ScrollerControl.AddCell(ScrollerDataType.Header, i);

                }

                m_ScrollerControl.Restart();

                m_ScrollerControl.JumpIndex(model.selectIndex);

            }

        }



@@ -283,8 +329,8 @@
            {

                if (resetType == operationBase.resetType)

                {

                    DisplayRewards();

                    DisplayTime();

                    model.selectIndex = GetSelect();

                    Dipslay();

                }

            }

        }

@@ -297,10 +343,19 @@
            }

        }



        private void OperationStartEvent(Operation operation, int state)

        {

            if (operation == Operation.AccumulateRecharge && state == 0)

            {

                model.selectIndex = GetSelect();

                Dipslay();

            }

        }



        private void OnServerOpenDayRefresh()

        {

            DisplayRewards();

            DisplayTime();

            model.selectIndex = GetSelect();

            Dipslay();

        }

    }




 System/OpenServerActivity/OpenServerActivityWin.cs

@@ -123,7 +123,7 @@
            }

            OnOpenActivity(functionOrder);



            var index = functionOrder;

            var index = alreadyOpenActivitys.IndexOf(functionOrder);

            if (alreadyOpenActivitys.Contains(6))

            {

                if (functionOrder > 6)