item effect rewrite
Merge branch 'john'

Conflicts:
	test2d/Assets/Scenes/johnTest.unity
	test2d/Assets/dev/script/manager/GameFlowSinglePlayerManager.cs
	test2d/test2d.userprefs