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

QD_LCJ

2018-08-10 fa4f662777fd57c2b098520ceed7b22150c98cf5

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

 System/BlastFurnace/DanDrugRecycleTip.cs

@@ -15,6 +15,7 @@
        [SerializeField] Text getMoneyText;

        [SerializeField] Text _resetRefreshTimeText;

        [SerializeField] Button recycleBtn;

        [SerializeField] UIEffect uieffect;

        [Header("回收丹药格子数")]

        [SerializeField] int sumGridCnt = 45;



@@ -30,8 +31,10 @@
        BlastFurnaceModel blastFurnace { get { return ModelCenter.Instance.GetModel<BlastFurnaceModel>(); } }

        Dictionary<string, List<ItemModel>> recycleDict;

        List<string> recycleKeylist;

        bool isFirstOpen = true;

        private void OnEnable()

        {

            isFirstOpen = true;

            GlobalTimeEvent.Instance.secondEvent += RefreshResetTime;

            blastFurnace.RefreshSelectRecycleAct += RefreshRecycleGetMoney;

            danDrugCtrl.OnRefreshCell += RefreshRecycleDan;

@@ -58,7 +61,8 @@
        private void RefreshItemCnt(PackType type, int index, int id)

        {

            if (type != PackType.rptItem || !playerPack.CheckIsDrugById(id)) return;

            Init();

            CreateRecycleDan();

            RefreshRecycleGetMoney();

        }



        private void Init()

@@ -95,6 +99,11 @@
            if (refreshType != PlayerDataRefresh.CDBPlayerRefresh_Danjing) return;



            sumMoneyText.text = modelInterface.OnChangeCoinsUnit(UIHelper.GetMoneyCnt(27));

            if(!isFirstOpen)

            {

                uieffect.Play();

            }

            isFirstOpen = false;

        }



        private void RefreshRecycleGetMoney()


 System/KnapSack/Logic/MakeDrugCell.cs

@@ -212,7 +212,10 @@
            singlePack.GetItemCountByID(itemId,out list);

            if(list.Count > 0)

            {

                PackSendQuestMgr.Instance.SendMakeUseQuest(list[0].itemInfo.ItemPlace);

                if(PackSendQuestMgr.Instance.CheckItemUselimit(list[0].chinItemModel))

                {

                    PackSendQuestMgr.Instance.SendMakeUseQuest(list[0].itemInfo.ItemPlace);

                }

            }

        }