加入最愛艾氏兄弟的修改
update gitignore
Merge branch 'ai-edit'

Conflicts:
	GameGlobal/GameGlobal/GlobalStrings.cs
	GameObjects/GameObjects/Architecture.cs
	GameObjects/GameObjects/GameScenario.cs
	GameObjects/GameObjects/Military.cs
	GameObjects/GameObjects/OutsideTaskKind.cs
	GameObjects/GameObjects/Person.cs
	GameObjects/GameObjects/Routeway.cs
	GameObjects/GameObjects/Troop.cs
	MapEditor/MapEditor/formMapEditor.cs
	WorldOfTheThreeKingdoms/Chuangkou/formAbout.resx
	WorldOfTheThreeKingdoms/YouxiPingmu/ScreenManager.cs
	WorldOfTheThreeKingdoms/bin/x86/Release/GameComponents/ContextMenu/ContextMenuData.xml
	WorldOfTheThreeKingdoms/bin/x86/Release/GameComponents/GameRecord/Data/RecordTextTree.xml
	WorldOfTheThreeKingdoms/bin/x86/Release/GameComponents/Help/Data/HelpTextTree.xml
	WorldOfTheThreeKingdoms/bin/x86/Release/GameComponents/TabList/TabListData.xml
	WorldOfTheThreeKingdoms/bin/x86/Release/GameComponents/tupianwenzi/Data/tupianwenziTextTree.xml
	WorldOfTheThreeKingdoms/bin/x86/Release/GameData/Scenario/251_yingxiongjijie.mdb
	WorldOfTheThreeKingdoms/bin/x86/Release/WhatsNew.txt
修正不能編譯
Merge branch 'master' into ai-edit

Conflicts:
	GameObjects/GameObjects/Architecture.cs
Merge branch 'master' into ai-edit

Conflicts:
	WorldOfTheThreeKingdoms/bin/x86/Release/GameComponents/TabList/TabListData.xml
Merge remote-tracking branch 'origin/master' into ai-edit

Conflicts:
	GameObjects/GameObjects/Architecture.cs
Merge branch 'master' into ai-edit
merging
Fix errors
Include AI-Work
修正錯誤
AI工作時考慮資金糧草，補充所有部隊
獨有部隊不要給弱將帶領
參數化獨有部隊戰鬥力界限
重命名變量
調整徵兵AI