拖动画线bug fix
去掉某些日志
fix 日志 画线
fix 两个新建的ECS重叠样式
Merge branch 'sx_func' of https://github.com/lln7777/zhuyun into fixbug/scale

Conflicts:
	public/javascripts/funcs.coffee
	public/javascripts/funcs.js
Merge branch 'feature/jack' of https://github.com/lln7777/zhuyun into fixbug/scale
Merge branch 'fixbug/scale' into dev