Playerオブジェクト追加
Merge branch 'zx_work'

Conflicts:
	Unity/Assets/mainScene.unity