修正說服必成功..
檔案合併
修正說服必成功
修正錯誤
關閉糧道系統時的錯誤
Merge pull request #75 from majorcheng/Diplomatic

Diplomatic
Merge pull request #18 from luiges90/master

sync