修正擴建條件儲存失效
修正錯誤
Merge remote-tracking branch 'upstream/master'
修正對話、自我結婚錯誤
Merge remote-tracking branch 'upstream/master'