fix the bug about rendering a surviving time
Merge branch 'develop'