default resource dir
fix
barrage font size
fix bug
Ignore data*
fix bug
Merge branch 'master' of https://github.com/zsxsoft/screen-controller

Conflicts:
	data.json