chaos
sth in mapmaker
Merge branch 'master' into server_debugging

Conflicts:
	mapmaker.py
changes
Merge branch 'server_debugging'

Conflicts:
	mapmaker.py
main
攻击范围，transition动画：对逻辑的修改；改了图片格式方便打包，换了选择图片
new bugs with cpp
稍微改了技能，还不确定一些
发现有时候会出现getcommand调用时间出错的问题。
和逻辑商议了技能的判断
图片
fix cpp commun~ bug
infowidget 改名
fix bug of attack in invalid cmd
Merge branch 'origin/debugging' into server_debugging

Conflicts:
	basic.py
	lib/human/Humanai_Replay_event.py
	main.py
调试sample ai
small bugs fixed and codes cleared up
complete aiDebug
debugger
basic & sth