地图更新刷怪器实体，刷怪器已经可以正常工作
Merge remote-tracking branch 'origin/master'

Conflicts:
	tools_asset_info.bin
	tools_thumbnail_cache.bin