Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-26 703337574c8d4d4e852ea90c778e3aff3523ce12

 System/SystemSetting/SettingEffectMgr.cs

@@ -60,13 +60,11 @@
        delayTime = 2;

        HeroBehaviour.OnStartHandupAI -= OnStartHandupAI;

        HeroBehaviour.OnStopHandupAI -= OnStopHandupAI;

        playerPack.ItemCntAddAct -= RefreshItemCnt;

        DeadModel.playerDieEvent -= OnPlayerDie;

        m_storeModel.RefreshBuyResultEvent -= RefreshBuySuccess;

        DeadModel.CloseRebornWinEvent -= PlayerRebornSuccess;

        HeroBehaviour.OnStartHandupAI += OnStartHandupAI;

        HeroBehaviour.OnStopHandupAI += OnStopHandupAI;

        playerPack.ItemCntAddAct += RefreshItemCnt;

        DeadModel.playerDieEvent += OnPlayerDie;

        m_storeModel.RefreshBuyResultEvent += RefreshBuySuccess;

        DeadModel.CloseRebornWinEvent += PlayerRebornSuccess;

@@ -102,19 +100,10 @@
            }

        }

     

        if (secondTimer > 1f)

        if (secondTimer >= 1f)

        {

            if(isGetNewItem)

            {

                secondTimer = 0f;

                delayTime -= 1;

                if (delayTime <= 0)

                {

                    isGetNewItem = false;

                    delayTime = 2f;

                    DealBagItem();

                }

            }

            secondTimer = 0f;

            RefreshBagItem();

        }

    }



@@ -153,11 +142,6 @@
        }

    }



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

    {

        RefreshBagItem();

    }



    public void RefreshBagItem()

    {

        if (!_isAutoHangUp)

@@ -165,9 +149,7 @@
            DebugEx.Log("请开启自动挂机，否则无法出售");

            return;

        }



        DealBagItem();

        isGetNewItem = true;

    }



    /// <summary>

@@ -175,12 +157,11 @@
    /// </summary>

    private void DealBagItem()

    {

        if (playerPack.GetReaminGridCount(PackType.rptItem) < 5)

        if (playerPack.GetReaminGridCount(PackType.rptItem) < 5 && modelInterface.isPackResetOk)

        {

            if (HangUpSetModel.Instance.GetBool(HangUpAutoBoolType.isAutoDevour))

            {

                List<ItemModel> list = playerPack.GetCanDevourModellist();

                if (list !=  null &&  list.Count > 0)

                if(playerPack.IsReachMinDecomposeNum())

                {

                    playerPack.SendEquipdevourQuest();

                    return;