Merge pull request #17 from luiges90/master

sync
剧本编辑器增加外交停战修改

剧本编辑器增加外交停战修改
fix

fix
剧本编辑器

fix
电脑解盟显示

fix
Merge pull request #75 from majorcheng/Diplomatic

Diplomatic