修改完善一些bug

Signed-off-by: yan1234 <1054974640@qq.com>
Merge branch 'master' of https://github.com/yan1234/Carpg.git