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

client_Wu Xijin

2018-08-11 708f6278c274ea642a6a77cbfde09eba331d3333

 System/SystemSetting/SettingEffectMgr.cs

@@ -99,9 +99,9 @@
     

        if (secondTimer > 1f)

        {

            secondTimer = 0f;

            if (isGetNewItem)

            if(isGetNewItem)

            {

                secondTimer = 0f;

                delayTime -= 1;

                if (delayTime <= 0)

                {

@@ -161,6 +161,7 @@
            return;

        }



        DealBagItem();

        isGetNewItem = true;

    }



@@ -173,7 +174,8 @@
        {

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

            {

                if (playerPack.GetCanDevourModellist().Count > 0)

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

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

                {

                    playerPack.SendEquipdevourQuest();

                }