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

client_Zxw

2018-08-23 37faac49ffd3d59300c104a1638a5621e8048a3a

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

 System/OpenServerActivity/ImpactRankModel.cs

@@ -495,7 +495,8 @@
        public bool CanGetAward(int _type, out int _displayIndex)

        {

            _displayIndex = 0;

            if (IsMissImpactRank(_type) || !IsActivityClose(_type))

            bool _locked = IsLock(_type);

            if (IsMissImpactRank(_type) || _locked)

            {

                return false;

            }

@@ -524,7 +525,7 @@
                        }

                    }

                }

                else

                else if (IsActivityClose(_type))

                {

                    var _start = (_cfg as OSCBillRankAwardConfig).RankA;

                    var _end = (_cfg as OSCBillRankAwardConfig).RankB;


 System/OpenServerActivity/OSGiftBehaviour.cs

@@ -18,6 +18,7 @@
        [SerializeField] Text m_OriginalMoneyValue;

        [SerializeField] Button m_BuyBtn;

        [SerializeField] Image m_Complete;

        [SerializeField] Text m_OwnMoney;



        StoreModel m_StoreModel;

        StoreModel storeModel

@@ -55,11 +56,21 @@
        private void OnEnable()

        {

            storeModel.RefreshBuyShopLimitEvent += RefreshBuyShopLimitEvent;

            PlayerDatas.Instance.PlayerDataRefreshInfoEvent += PlayerDataRefreshInfoEvent;

        }



        private void OnDisable()

        {

            storeModel.RefreshBuyShopLimitEvent -= RefreshBuyShopLimitEvent;

            PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= PlayerDataRefreshInfoEvent;

        }



        private void PlayerDataRefreshInfoEvent(PlayerDataRefresh refreshType)

        {

            if (refreshType == PlayerDataRefresh.Gold || refreshType == PlayerDataRefresh.GoldPaper)

            {

                DisplayOwnMoney();

            }

        }



        private void RefreshBuyShopLimitEvent()

@@ -111,11 +122,22 @@
                m_OriginalMoneyValue.text = _storeConfig.MoneyOriginal.ToString();

            }



            DisplayOwnMoney();



            var _limit = storeModel.GetBuyShopLimit((uint)storeId);

            m_Complete.gameObject.SetActive(_limit != null && _limit.BuyCnt >= _storeConfig.PurchaseNumber[0]);

            m_BuyBtn.gameObject.SetActive(_limit == null || _limit.BuyCnt < _storeConfig.PurchaseNumber[0]);

        }



        private void DisplayOwnMoney()

        {

            if (m_OwnMoney != null)

            {

                var config = Config.Instance.Get<StoreConfig>(storeId);

                m_OwnMoney.text = UIHelper.GetMoneyCnt(config == null ? 1 : config.MoneyType).ToString();

            }

        }



        private void OnBuyBtn()

        {

            var _storeConfig = Config.Instance.Get<StoreConfig>(storeId);