Merge remote-tracking branch 'origin/master' into Cross_Server

client_Wu Xijin

2018-12-21 e5530e1ca1f28ab70c783d2b3ec685bb6569504b

 System/ItemDrop/DropItem.cs

@@ -4,9 +4,11 @@
using TableConfig;

using UnityEngine.UI;

using Snxxz.UI;

using System;



public class DropItem : HUDBehaviour

{

    public static event Action<Vector3> onDropItemDisappear;



    public static DropItem Drop(int _id, Vector3 _position, Camera _camera)

    {

@@ -132,9 +134,22 @@


        if (autoPickUp && Time.time > dispearTime)

        {

            var dropTrace = DropItemPool.RequireDropItemTrace();

            dropTrace.transform.position = this.transform.position;

            dropTrace.Trace(PlayerDatas.Instance.hero, new Vector3(0, 0.5f, 0), () => { DropItemPool.ReycleDropItemTrace(dropTrace); });

            var mapId = PlayerDatas.Instance.baseData.MapID;

            var dataMapId = ModelCenter.Instance.GetModel<DungeonModel>().GetDataMapIdByMapId(mapId);

            switch (dataMapId)

            {

                case GatherSoulDungeonModel.DUNGEON_MAPID:

                    if (onDropItemDisappear != null)

                    {

                        onDropItemDisappear(transform.position);

                    }

                    break;

                default:

                    var dropTrace = DropItemPool.RequireDropItemTrace();

                    dropTrace.transform.position = this.transform.position;

                    dropTrace.Trace(PlayerDatas.Instance.hero, new Vector3(0, 0.5f, 0), () => { DropItemPool.ReycleDropItemTrace(dropTrace); });

                    break;

            }



            DropItemPool.ReycleDropItem(this);

            RecyleEffect();