Player Update()マージ修正
Merge branch 'master' of https://github.com/apauu/game