промежуточный
merge
продолжаю рефакторить юнит и монстра
Merge branch 'master' of github.com:Fila61/shooter

Conflicts:
	shooter/Assembly-UnityScript-Editor.pidb
	shooter/Assembly-UnityScript.pidb
	shooter/Assets/Shooter/Scripts/BattleModel.js
	shooter/Assets/Shooter/Scripts/BattleWaveModel.js
	shooter/Assets/Shooter/Scripts/BattleWaveMonsterModel.js
	shooter/Assets/Shooter/Scripts/SceneBuilder.js
	shooter/Library/assetDatabase3
	shooter/Library/guidmapper