update game logic
Merge remote-tracking branch 'origin/GamePlayTest' into GamePlayTest