简单血条hpBar
简单血条hpBar
Merge branch 'master' of https://github.com/phisiart/ds15gl

Conflicts:
	ds15gl/dsScene.h
	ds15gl/dsSoldier.cpp
	ds15gl/dsSoldier.h