チャージ率計算、マップ位置変更
Merge branch 'master' of https://github.com/ShionKubota/Project_Eleconnect

Conflicts:
	Eleconnect/Eleconnect.userprefs
	Eleconnect/Eleconnect/Eleconnect.pidb
	Eleconnect/Eleconnect/sources/General/Sprite2D.cs
	Eleconnect/Eleconnect/sources/Scene/SceneManager.cs
no message