fixed bug
Merge branch 'develop' of https://github.com/ketoo/NoahGameFrame into develop