合并唐军代码

Signed-off-by: 南博æ? <nanbowen@fuego.cn>