Merge branch 'master' of github.com:lpcwww/Adventy
js修正