Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane

Assets/Temp/Scripts/Backpack.cs

@@ -71,13 +71,18 @@ public class Backpack : MonoBehaviour
         {
             if (hit.collider.gameObject.tag == "AttackTarget")
             {
+                if (hit.collider.gameObject.GetComponent<EquipmentCommon>().isPlayer)
+                {
+
                     mastermanagement.Onobj(hit.collider.gameObject);
                     mastermanagement.Remove(hit.collider.gameObject);
+
                     Id = hit.collider.gameObject.GetComponent<EquipmentCommon>().deviceID;
                     Deletedevice();
                 }
             }
         }
+    }
 
     private void Deletedevice()
     {