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

client_Zxw

2018-11-10 275d39b788496566bed3ffce93e748e5370a4ec8

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

 Core/GameEngine/Model/Player/PlayerDatas.cs

@@ -297,6 +297,7 @@
                baseData.HP = value;

                if (hero != null)

                {

                    hero.ActorInfo.SyncServerHp = value;

                    hero.ActorInfo.ResetHp((int)value);

                }

                break;


 Fight/GameActor/GActorInfo.cs

@@ -170,6 +170,17 @@
            MaxHpEx = (ushort)valMaxEx;
        }

        if (sid == PlayerDatas.Instance.PlayerId)
        {
            if (Hp == 0)
            {
                if (Hp != SyncServerHp)
                {
                    Hp = SyncServerHp;
                }
            }
        }

        // if (sid != PlayerDatas.Instance.PlayerId)
        // {
        //     Debug.LogFormat("<color=yellow>设置血量 {0}, 当前hp: {1}, hpEx: {2}</color>", sid, Hp, HpEx);
@@ -239,6 +250,16 @@
        //         Debug.LogFormat("<color=red>---- 计算后, hp: {0}, hpEx: {1}</color>", Hp, HpEx);
        //     }
        // }
        if (sid == PlayerDatas.Instance.PlayerId)
        {
            if (Hp == 0)
            {
                if (Hp != SyncServerHp)
                {
                    Hp = SyncServerHp;
                }
            }
        }

        if (OnHpChange != null)
        {

 System/MainInterfacePanel/InGamePushContainer.cs

@@ -27,6 +27,9 @@
        [SerializeField] FairyGrabBossHelpBehaviour m_FairyGrabBossHelpBehaviour;

        [SerializeField] DogzNotifyBehaviour m_DogzNotifyBehaviour;

        [SerializeField] InSevenDayBehavior m_InSevenDayBehavior;

        [SerializeField] FlashRushToBuyNotify flashRushToBuyNotify;



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

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

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

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

@@ -65,6 +68,8 @@
            CheckFairyGrabBossHelp();

            CheckDogzNotify();

            InSevenDayShow();

            CheckFlashRushToBuy();

            activityNotifyModel.UpdateFlashRushToBuyEvent += CheckFlashRushToBuy;

            playerPack.RefreshDecomAttrAct += CheckEquipDecompose;

            betterEquipGetModel.showEquipRefreshEvent += CheckBetterEquip;

            realmEquipModel.showEquipRefreshEvent += CheckRealmBetterEquip;

@@ -93,6 +98,24 @@
            realmEquipModel.showEquipRefreshEvent -= CheckRealmBetterEquip;

            fairyGrabBossModel.fairyGrabBossHelpUpdate -= CheckFairyGrabBossHelp;

            dogzModel.UpdateDogzPutRedEvent -= CheckDogzNotify;

            activityNotifyModel.UpdateFlashRushToBuyEvent -= CheckFlashRushToBuy;

        }



        private void CheckFlashRushToBuy()

        {

            OperationFlashRushToBuy.FlashSaleShop saleShop = null;

            if (activityNotifyModel.flashSaleShops.Count > 0)

            {

                saleShop = activityNotifyModel.flashSaleShops[activityNotifyModel.flashSaleShops.Count - 1];

            }

            if (saleShop != null && !activityNotifyModel.closeflashSaleShops.Contains(saleShop))

            {

                flashRushToBuyNotify.gameObject.SetActive(true);

            }

            else

            {

                flashRushToBuyNotify.gameObject.SetActive(false);

            }

        }



        private void CheckRealmBetterEquip()


 System/OpenServerActivity/FlashRushToBuyCoolDown.cs

@@ -48,16 +48,16 @@
                        int split = (3600 - seconds)/30 % 2;

                        if(split == 0)

                        {

                            timeText.text = Language.Get("FlashRushToBuy106", TimeUtility.SecondsToMS(seconds));

                            timeText.text = Language.Get("FlashRushToBuy109", TimeUtility.SecondsToMS(seconds));

                        }

                        else

                        {

                            timeText.text = Language.Get("FlashRushToBuy106", operation.ToDisplayBuyTime(operationTime.startHour, operationTime.startMinute));

                            timeText.text = Language.Get("FlashRushToBuy109", operation.ToDisplayBuyTime(operationTime.startHour, operationTime.startMinute));

                        }

                    }

                    else

                    {

                        timeText.text = Language.Get("FlashRushToBuy106", operation.ToDisplayBuyTime(operationTime.startHour, operationTime.startMinute));

                        timeText.text = Language.Get("FlashRushToBuy109", operation.ToDisplayBuyTime(operationTime.startHour, operationTime.startMinute));

                    }

                    break;

                case FlashRushToBuyModel.FlashRushToBuySate.Begining:


 System/OpenServerActivity/FlashRushToBuyModel.cs

@@ -316,13 +316,49 @@
                    }

                    break;

                case FlashRushToBuySate.Begining:

                    if (saleShop != null)

                    {

                        for (int i = 0; i < saleShop.items.Length; i++)

                        {

                            var saleItem = saleShop.items[i];

                            if(GetSellSate(saleItem) == 0)

                            {

                    return true;

                            }

                        }

                    }

                    break;

                case FlashRushToBuySate.End:

                    break;

            }

            return false;

        }



        /// <summary>

        /// 0 秒杀 1 已买到 2 已抢光

        /// </summary>

        /// <returns></returns>

        private int GetSellSate(OperationFlashRushToBuy.FlashSaleItem saleItem)

        {

            var buyInfo = storeModel.GetBuyShopLimit((uint)saleItem.shopId);

            var buyCount = 0;

            int fullRemainNum = saleItem.fullServerLimitNum - GetFullServerBuyCntById(saleItem.shopId);

            if (buyInfo != null)

            {

                buyCount = buyInfo.BuyCnt;

            }

            if (buyCount >= saleItem.limitNum)

            {

                return 1;

            }



            if (fullRemainNum <= 0)

            {

                return 2;

            }

            return 0;

        }



        private void OperationEndEvent(Operation type, int state)

        {

            if (type == Operation.FlashRushToBuy && state == 0)


 System/OpenServerActivity/FlashRushToBuyNotify.cs

@@ -17,7 +17,7 @@
        protected override void Display()

        {

            base.Display();

            titleText.text = "限时抢购";

            //titleText.text = "限时抢购";

        }



        protected override void ClickGotoBtn()


 System/OpenServerActivity/OpenServerActivityNotifyModel.cs

@@ -34,10 +34,6 @@
            NewBieCenter.Instance.guideCompletedEvent += GuideCompletedEvent;

            GlobalTimeEvent.Instance.minuteEvent += UpdateMinute;

            SetFlashRushToBuyNotify();

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

            {

                WindowCenter.Instance.Open<OpenServerActivityNotifyWin>();

            }

        }



        public override void UnInit()


 System/OpenServerActivity/OpenServerActivityNotifyWin.cs

File was deleted

 System/OpenServerActivity/OpenServerActivityNotifyWin.cs.meta

File was deleted