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

client_Hale

2018-09-29 9dac90c7110737ef906d9a40a7940ca94f0f7226

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

 System/FairylandCeremony/CeremonyFirepartyWin.cs

@@ -9,6 +9,7 @@
    public class CeremonyFirepartyWin : Window

    {

        [SerializeField] Button buyBtn;

        [SerializeField] Text buyPriceText;

        [SerializeField] Text remainTimeText;

        [SerializeField] CommonItemBaisc fireItem;

        [SerializeField] List<CommonItemBaisc> itemBaiscs = new List<CommonItemBaisc>();

@@ -54,6 +55,7 @@
            storeConfig = ceremonyModel.GetFireIdByLv();

            if (storeConfig == null) return;



            buyPriceText.text = storeConfig.MoneyNumber.ToString();

            ItemCellModel fireModel = new ItemCellModel(storeConfig.ItemID,true,(ulong)storeConfig.ItemCnt,storeConfig.IsBind);

            fireItem.Init(fireModel);

            fireItem.cellBtn.AddListener(() =>

@@ -109,7 +111,7 @@
                return;

            }



            if(ceremonyModel.CheckIsBuyFireCondi())

            if(ceremonyModel.CheckIsBuyFireCondi(storeConfig))

            {

                ModelCenter.Instance.GetModel<StoreModel>().SendBuyShopItem(storeConfig,1);

            }


 System/FairylandCeremony/FairylandCeremonyModel.cs

@@ -326,10 +326,10 @@
            return null;

        }



        public bool CheckIsBuyFireCondi(int buyNum = 1)

        public bool CheckIsBuyFireCondi(StoreConfig storeConfig,int buyNum = 1)

        {

            ulong price =(ulong)(80 * buyNum);

            if(UIHelper.GetMoneyCnt(1) >= price)

            ulong price =(ulong)(storeConfig.MoneyNumber * buyNum);

            if(UIHelper.GetMoneyCnt(storeConfig.MoneyType) >= price)

            {

                return true;

            }