modify event and collision

modify event and collision