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

client_Zxw

2018-09-04 39827a1a4933524823ffc4f126de7593fbe23ea1

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

 System/BlastFurnace/LingDanTips.cs

@@ -96,7 +96,6 @@
            _toggleGroup = _danDrugCtrl.GetComponent<ToggleGroup>();

            _makeDanBtn.onClick.AddListener(OnClickMakeDan);

            FurnaceModel.RefreshStoveModelEvent += RefreshStoveModel;

            playerPack.RefreshItemCountAct += RefreshItemCnt;

            FurnaceModel.RefreshAddSpecMatEvent += SetSpecMatItemCell;

            _randomLineCtrl.OnRefreshCell += RefreshRandomLineCell;

           // makeDrugEffect.OnComplete += OnMakeDrugEffectComplete;

@@ -110,7 +109,6 @@
            ChangeMakeDanBtn(true);

            chooseSpecModel = null;

            ChooseWin.gameObject.SetActive(false);

            RefreshStoveModel();

            presentIndex = 0;

            CreateCell();

            StartCoroutine(CheckJumpToModel());

@@ -185,7 +183,7 @@
                _danDrugCtrl.m_Scorller.RefreshActiveCellViews();

            }



            OnClickDandrugCell(presentIndex);

            RefreshStoveModel();

        }



        private void RefreshStoveModel()

@@ -218,6 +216,19 @@
                CreateCell();

                OnClickDandrugCell(presentIndex);

            }

            else

            {

                OnClickDandrugCell(presentIndex);

                if (chooseSpecModel != null)

                {

                    int haveCnt = playerPack.GetItemCountByID(PackType.rptItem, chooseSpecModel.SpecialMaterialD);

                    if (haveCnt <= 0)

                    {

                        SetSpecMatItemCell(null);

                        CreateRandomLineCell();

                    }

                }

            }

        }



        private void RefreshVirtualFill(float value)

@@ -248,21 +259,6 @@
                }

            }

            _danDrugCtrl.Restart();

        }



        private void RefreshItemCnt(PackType type, int index, int id)

        {

            CreateCell();

            OnClickDandrugCell(presentIndex);

            if(chooseSpecModel != null)

            {

                int haveCnt = playerPack.GetItemCountByID(PackType.rptItem,chooseSpecModel.SpecialMaterialD);

                if(haveCnt <= 0)

                {

                    SetSpecMatItemCell(null);

                    CreateRandomLineCell();

                }

            }

        }



        private void RefreshDandrugCell(ScrollerDataType type, CellView cell)


 System/SystemSetting/SettingEffectMgr.cs

@@ -81,6 +81,11 @@
    float halfSecondTimer = 0;

    private void LateUpdate()

    {

        if (!(StageManager.Instance.CurrentStage is DungeonStage))

        {

            return;

        }



        secondTimer += Time.deltaTime;

        halfSecondTimer += Time.deltaTime;

        if(halfSecondTimer >= 0.5f)