update life and modify the color
Merge branch 'develop'