fix particle color error
Merge branch 'master' of ssh://oa.ejoy.com/ejoy2d
Merge branch 'master' of ssh://oa.ejoy.com/ejoy2d
avoid warning
Merge branch 'master' of ssh://oa.ejoy.com/ejoy2d