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

client_Wu Xijin

2018-08-23 101b9a8619dcb2f7b10fe3f9bd793db8758dc72d

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

 System/DailyQuest/DayRemind.cs

@@ -42,7 +42,7 @@
    public const string POTENTIAL_NO_NOTIFY = "PotentialNoNotify";

    public const string FLASHSALE_REDPOINT = "FlashSale_Redpoint";

    public const string OSTIMEGIFT_REDPOINT = "OSTimeGift_Redpoint";

    public const string TRIALEXCHANGE_REDPOINT = "TrialExchange_Redpoint";

    public const string OSGIFT_REDPOINT = "OSGitf_Redpoint";

    public Dictionary<string, int[]> dayRemindDic = new Dictionary<string, int[]>();



    public bool GetDayRemind(string _remindKey)

@@ -93,7 +93,7 @@
        SetDayRemind(POTENTIAL_NO_NOTIFY);

        SetDayRemind(FLASHSALE_REDPOINT);

        SetDayRemind(OSTIMEGIFT_REDPOINT);

        SetDayRemind(TRIALEXCHANGE_REDPOINT);

        SetDayRemind(OSGIFT_REDPOINT);

    }



    private void SetDayRemind(string _key)


 System/OpenServerActivity/OSGiftModel.cs

@@ -27,22 +27,12 @@
            {

                onStateUpate(6);

            }

            UpdateRedpoint();

        }



        public event Action<int> onStateUpate;



        public bool activate { get; private set; }



        private bool m_GiftGetNotify = false;

        public bool giftGetNotify

        {

            get { return m_GiftGetNotify; }

            set

            {

                m_GiftGetNotify = value;

                OSGiftRedpoint.state = value ? RedPointState.Simple : RedPointState.None;

            }

        }



        StoreModel storeModel

        {

@@ -80,6 +70,7 @@
                {

                    onStateUpate(6);

                }

                UpdateRedpoint();

            }

        }



@@ -94,6 +85,7 @@
                    onStateUpate(6);

                }

            }

            UpdateRedpoint();

        }



        public bool CheckActivate()

@@ -131,7 +123,24 @@


        public void OnBeforePlayerDataInitialize()

        {

            giftGetNotify = false;

        }

        
        public void SetDayRemind()

        {

            if (OSGiftRedpoint.state == RedPointState.Simple)

            {

                DayRemind.Instance.SetDayRemind(DayRemind.OSGIFT_REDPOINT, true);

                UpdateRedpoint();

            }

        }



        void UpdateRedpoint()

        {

            OSGiftRedpoint.state = RedPointState.None;

            if (CheckActivate() && !DayRemind.Instance.GetDayRemind(DayRemind.OSGIFT_REDPOINT))

            {

                OSGiftRedpoint.state = RedPointState.Simple;

            }

        }



        public Redpoint OSGiftRedpoint = new Redpoint(MainRedDot.REDPOINT_OPENSERVER, 20906);


 System/OpenServerActivity/OpenServerGiftWin.cs

@@ -26,6 +26,8 @@
                return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<StoreModel>());

            }

        }



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

        #region Built-in

        protected override void BindController()

        {

@@ -43,9 +45,8 @@
        {

            WindowCenter.Instance.windowAfterOpenEvent += WindowAfterOpenEvent;

            WindowCenter.Instance.windowAfterCloseEvent += windowAfterCloseEvent;

            ModelCenter.Instance.GetModel<OSGiftModel>().giftGetNotify = false;

            model.RefreshBuyShopLimitEvent += RefreshBuyShopLimitEvent;



            giftModel.SetDayRemind();

            Display();



            m_ContainerDisplay.gameObject.SetActive(!WindowCenter.Instance.CheckOpen<OffLineOnHookWin>());


 System/Treasure/TreasureLevelUpWin.cs

@@ -931,6 +931,12 @@
            var stage = m_Treasure.treasureStages[m_Treasure.stage];

            var _index = m_Treasure.GetStageIndex(stage.stage);

            model.SetTreasureStageShow(m_Treasure.id, stage.stage);



            if (WindowCenter.Instance.CheckOpen<TreasureStageTipWin>())

            {

                WindowCenter.Instance.CloseImmediately<TreasureStageTipWin>();

            }



            switch (stage.unlockType)

            {

                case TreasureStageUnlock.Skill:


 System/Vip/FirstRechargeWin.cs

@@ -132,7 +132,6 @@
            if(PlayerDatas.Instance.baseData.coinPointTotal > 0

                && !model.firstChargeRewardGet)

            {

                ModelCenter.Instance.GetModel<OSGiftModel>().giftGetNotify = true;

                CA504_tagCMPlayerGetReward pak = new CA504_tagCMPlayerGetReward();

                pak.RewardType = (byte)GotServerRewardType.Def_RewardType_GoldGiftFirst;

                pak.DataEx = 0;