+翻页组件
同步问题
Merge branch 'master' of https://github.com/4liumingliang/CocosBattle

Conflicts:
	Classes/AppDelegate.cpp
	Classes/NBRole/BattleDefines.h
no message