愛ちゃん目パチ　水晶　座布団　シェーダー　ランプ　追加しましたー
Merge branch 'develop' of https://github.com/koron21/mvn into develop

Conflicts:
	game/Assets/Resource/font.meta
Merge branch 'develop' of https://github.com/koron21/mvn into develop

Conflicts:
	game/Assets/Scene/game.unity
Merge branch 'develop' of https://github.com/koron21/mvn into develop

Conflicts:
	game/Assets/Prefab/sys/Player.prefab
	game/Assets/Scene/game.unity
	game/Assets/Script/PatternAnimation.cs