1
1
Merge branch 'master' of https://github.com/Multimillionaires/multi-plan

Conflicts:
	ZombieEvil/Classes/AppDelegate.cpp
	ZombieEvil/Classes/View/SettingLayer.cpp
123
123
不兼容
Merge branch 'master' of https://github.com/Multimillionaires/multi-plan

Conflicts:
	ZombieEvil/Classes/WorldScene.cpp
	ZombieEvil/Classes/WorldScene.h
添加选章节界面
不兼容恢复