no message
Merge branch 'master' of https://github.com/4liumingliang/CocosBattle

Conflicts:
	proj.ios_mac/CocosBattleGame.xcodeproj/project.pbxproj
no message
+ 敌人AI与跟随主角移动