7。18home
Merge branch 'master' of https://github.com/caihan1984/demotest

Conflicts:
	demo/Assembly-CSharp-Editor-vs.csproj
	demo/Assembly-CSharp-Editor.csproj
	demo/Assembly-CSharp-vs.csproj
	demo/Assembly-CSharp.csproj
	demo/Library/CurrentLayout.dwlt
	demo/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	demo/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	demo/Library/ScriptAssemblies/Assembly-CSharp.dll
	demo/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	demo/Library/assetDatabase3
	demo/Library/expandedItems
	demo/Library/guidmapper
	demo/Library/metadata/08/08b380b313658c64cb65e93835ed33ab
	demo/Library/metadata/0b/0ba40df461958884f93c0a8ecf019582
	demo/Library/metadata/11/11c8fb8578ecf044e96e7b7f5b46d26c
	demo/Library/metadata/1c/1cdda94048c7e1a4b85e3ea446ced490
	demo/Library/metadata/5d/5d65c9841437d124a97ff55c73e611ab
	demo/Library/metadata/61/61ba07eedf516194fb196af930216419
	demo/Library/metadata/df/df7bcb90cc7601b4497825293ecfcecf
	demo/Library/shadercompiler-1.log
	demo/demo-csharp.sln
	demo/demo.sln
	demo/demo.userprefs
整理