Merge branch 'master' into leonard

client_Wu Xijin

2018-10-23 a974a2621a6dcb90b8fe52b23d075814873c0960

 Fight/Stage/Dungeon/DropItemManager.cs

@@ -299,7 +299,7 @@
    public static void CheckPickupItem(Vector3 checkPosition)

    {

        // 挂机状态下

        if (SettingEffectMgr.Instance.GetSettingEffect())

        if (SettingEffectMgr.Instance.GetSettingEffect() && !UserInputHandler.isTouched)

        {

            // 不自动拾取则直接返回

            if (HangUpSetModel.Instance.GetBool(HangUpAutoBoolType.isAutoDrop) == false)

@@ -317,7 +317,7 @@
                continue;

            }



            if (!CheckCanPickUp(m_MapItemDict[m_MapItemIdList[i]]))

            if (!CheckCanPickUp(m_MapItemDict[m_MapItemIdList[i]]) && !UserInputHandler.isTouched)

            {

                continue;

            }