行動制御関連修正
Merge branch 'master' of https://github.com/apauu/game

Conflicts:
	survival_game/Assets/Animater/player.controller
	survival_game/Assets/Scripts/Character_Base.cs