战斗过程简码中的id替换成代表实际意义的值
Merge branch 'master' of github.com:MacDino/fightgame