测试上传版本，感觉很多不需要的文件，不对的话回滚
chuckey auth界面
road preview 50%
chuckeytang
chuckeytang
Merge branch 'master' of https://github.com/icexiaohei/Simulation

Conflicts:
	Assets/Scenes/SimulationSetup.unity
	Assets/Scripts/Behaviours/SceneBehaviours/Simulation/SimulationManager.cs
	Library/AssetServerCacheV3
	Library/CurrentLayout.dwlt
	Library/CurrentMaximizeLayout.dwlt
	Library/EditorUserBuildSettings.asset
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp-Editor-firstpass.dll
	Library/ScriptAssemblies/Assembly-CSharp-Editor-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript-Editor-firstpass.dll
	Library/ScriptAssemblies/Assembly-UnityScript-Editor-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll
	Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript.dll
	Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Library/ScriptMapper
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/00/00000000000000004000000000000000
	Library/metadata/00/0000000000000000b000000000000000
	Library/metadata/00/0027d43536f6b674084b881a228df3e8
	Library/metadata/02/02008281390bf844a81be33404325314
	Library/metadata/03/037bece04f68d4f40856565e2abb88bb
	Library/metadata/03/03a80e867b381a346b2892317a61e010
	Library/metadata/05/05d7cea9723b32e4bb37c2d5e08fc60d
	Library/metadata/05/05f6c978afe090d4d8f0af42a61bbe7f
	Library/metadata/06/06134ea41efb34b63b4b0d3c703ea356
	Library/metadata/07/0723fdd1d7ab0e447bf8a9f28e4a19a1
	Library/metadata/07/07584cea722c4a64c83aefda269fc807
	Library/metadata/07/07f8f7d75c1ee76449c2a1bec848b8a2
	Library/metadata/0a/0a0ab7238aaa9400e9eb87ffd52f3b9e
	Library/metadata/0a/0ab79d7f243824f5d9826bd83522c8df
	Library/metadata/0a/0ad4367191aa74018b52886daaf085b1
	Library/metadata/0f/0f3c5da925fd23542859434a39b3162c
	Library/metadata/0f/0f757974b2713b7469533f177f1e07a6
	Library/metadata/0f/0fbe9e0fe8230754dbeb63332ab4efe5
	Library/metadata/15/15cf7ddae9b1fe046be82da564a1a017
	Library/metadata/15/15e8834927ec3e445a626ae399fd97db
	Library/metadata/17/17d7ee759c922254f892b6df676b0cc0
	Library/metadata/1a/1a8be0f554ae1b742867c8afa2b973d9
	Library/metadata/1b/1b23ec2e16eccae42b02d07534aefcfa
	Library/metadata/1e/1e597856c4388d240a8484fc2ecafaf2
	Library/metadata/1e/1eafa5bbd8f0c4de1bc4bff8a57d3098
	Library/metadata/1e/1ec09d2af6d7a1f4192fb71bead1f264
	Library/metadata/20/209641232aacf1845ab3975a61cbaf34
	Library/metadata/22/22c4cf005fa3c2e4784103319589fecf
	Library/metadata/25/2523b7e5960bbdb44bae029f5772f6ff
	Library/metadata/2c/2c406404c6b768848bbbb971e81c0e6b
	Library/metadata/2c/2c79e67ff5a0a044f8fcb590df9dc3d2
	Library/metadata/2e/2e428d87148604c44b27b793ae5bd892
	Library/metadata/31/314ebbbb9067740a19740b721d3ac7cd
	Library/metadata/33/336072311903ac747bc0575abeabe5e5
	Library/metadata/35/356d385a59c53487ebe6e3363ff4ffa2
	Library/metadata/38/38d36fe701ccf5d488aa96e40e235dc7
	Library/metadata/39/3922aa3057ca0454eb417c5a7aa7f916
	Library/metadata/3a/3a485fd7c9a94ee4097690a5bc4917fa
	Library/metadata/3c/3c94bed5c4760ea44b29c46f6da019ff
	Library/metadata/3d/3d4e750d5e259f342b33be52d1b7548b
	Library/metadata/3d/3dc93c0b3a4de4f9d919e886a9996b77
	Library/metadata/3f/3f0a4a3cb9b2a084fab27f521fc3f02a
	Library/metadata/40/408b5ad6f84cbea45912376a0dcab421
	Library/metadata/40/40a8e2ef3004ca44c8f13965f178b47c
	Library/metadata/41/416bf23a058ea4f4392df0b312592e8b
	Library/metadata/47/47fffe2e7dbd13847add82df17261a62
	Library/metadata/48/48a981ddbf21945e4a7e6d25eba9dcdb
	Library/metadata/4a/4a0aa99ce3d4448c1805a2f1a5787113
	Library/metadata/4b/4b9e3387e2121c84ca3d4f4ceab17363
	Library/metadata/4d/4d32a2f5f1a8a364eae2db970964c835
	Library/metadata/4e/4e08dee1e3810d54ba33088968af97d4
	Library/metadata/51/51358aea6c626a04392acdeed1794861
	Library/metadata/52/529db930fba65ed4ebec1e3bdf817f4b
	Library/metadata/53/53412155bc1016547b1a77b2333c0380
	Library/metadata/53/53e5a4fa2ba1c59439c833fc2347cdf2
	Library/metadata/54/54216e9ed42974e30967824b7f0b2806
	Library/metadata/57/57dae6752ad0b7d47b1efb90ad62208c
	Library/metadata/58/58396100fdec2784f963112897a598d0
	Library/metadata/5a/5aef8618ac468714a8ca7bb9915155c3
	Library/metadata/5b/5bea90b925f5ced498b23783c842176e
	Library/metadata/5c/5c645c85ed4826348b5000ddccd0f936
	Library/metadata/5c/5c7382fe159a35144a2ab22ba60cd84d
	Library/metadata/5c/5cb803cbe41367a4482d1e6ed99af8aa
	Library/metadata/5d/5d0185d208b72874ba3f64e1a99209e1
	Library/metadata/5d/5d7a2a9f2caf7a343909d1ff6acd56f3
	Library/metadata/63/63ff5b91ce81bcb4cb0c8b7bad804370
	Library/metadata/64/646d681a7969b47bc8000dcb59191cf1
	Library/metadata/66/6643724606fd4ba4683f191ed61092b8
	Library/metadata/66/6667bb8985947c14a83ab4d951a02b3f
	Library/metadata/68/68287fe10cd30434b9c21ff1c55f613f
	Library/metadata/68/68c9a859ebefdc04586d6d98d2aee14a
	Library/metadata/69/6993f1ee3ff1a4a3a8fec59e7cc67bde
	Library/metadata/69/6994f603b12844a43a646c1717d8870c
	Library/metadata/69/6998ad0f0d72a4cb6aefffc879bd9402
	Library/metadata/6a/6abf971823c3e53409bf9200d6b95975
	Library/metadata/6b/6bf1c3840fd6f4d4f995f961b40f9462
	Library/metadata/6f/6f537f860d89e444cab762379c04c44d
	Library/metadata/70/70c9d49a7d680154084bba0f22982f64
	Library/metadata/72/72bdf7a9f820bf0449a9a76d695ca327
	Library/metadata/74/74915955753e9004184334d8ae017d3b
	Library/metadata/78/78b0d2342423b4b008119d42e5f6a56c
	Library/metadata/79/79706420432094f00b6a6a7962208bdd
	Library/metadata/79/79dfba995a898e7499847ad5bb356502
	Library/metadata/7a/7a3134e5f9749c449ad2289cfe93f5d5
	Library/metadata/7b/7b54cf83dd2cd4dd9923ddc0047af001
	Library/metadata/7d/7d087970a83e84a42a754bb4e93900e1
	Library/metadata/7e/7e0b0a994d8934541a387e092630b5db
	Library/metadata/81/819226f6e5961434087c87bab9a2e025
	Library/metadata/85/85e1b30615e9d45fba9d7e44cb60489d
	Library/metadata/89/8942bec3b38d9a047acc992b8695f2c9
	Library/metadata/8b/8b48aa39591ed466caef8539a5dcbcac
	Library/metadata/8d/8d2407aaf5ee4a740a22afb4d92bbb08
	Library/metadata/8d/8d79f868b52777d4e920b060c9b6530e
	Library/metadata/8e/8ec5ca42564344357bf07360b97a7d1c
	Library/metadata/8f/8fa2a751ad926744893f55ea79f9d291
	Library/metadata/98/984b587bbfe17d64ab7e14dff646c5ce
	Library/metadata/99/9901da9232db99446b9ef450155c1933
	Library/metadata/9b/9b80313c5c90646ddb90ac8e59622b67
	Library/metadata/9c/9c0218fc9d2e58440be150c6d67c3f79
	Library/metadata/9c/9c2106d7ecc004fdd91c4299d59ac413
	Library/metadata/9d/9d4133d5d30b644bd87802a347eaccbe
	Library/metadata/9d/9d62fe94c73c94af6b927ca6392d118d
	Library/metadata/9e/9e86707b5817249d59ebdf333154a014
	Library/metadata/9f/9f119e6ce7418430a86a3287a5877e8b
	Library/metadata/a0/a08583ffef9e9d94a86a2b56eef43c3c
	Library/metadata/a1/a1c2524d59c967a45b5da914dc595fd4
	Library/metadata/a4/a44e0a698415b4643b3238f31c2785aa
	Library/metadata/a6/a6c23ad66d37f0e4c8c86d7c5293ac7c
	Library/metadata/a8/a8ce61d7887379348997e845141b7d5a
	Library/metadata/af/af660206c7b7319409a46102966d54d5
	Library/metadata/b1/b192daf61f1a78f4199b42fa87e8fb5a
	Library/metadata/b5/b53fd0eb625c17143b6e17e3d8aaa4b3
	Library/metadata/b5/b5559ce18abd8d74c831a424980b7df8
	Library/metadata/b8/b8626eb9630cb5b4283e76c4f845a462
	Library/metadata/b9/b94ccca47f6278546a9c07004926c4cd
	Library/metadata/b9/b9df781f778634529863bda3869b3cb5
	Library/metadata/ba/ba77baf7f6a65384e930c80a5178e5e2
	Library/metadata/ba/baff3c6d96200834689792af306a0771
	Library/metadata/bb/bb94d59812653424ba0f3387ef98927d
	Library/metadata/bd/bd37c0e037706ca439fb5ea363464ae9
	Library/metadata/bd/bd5137271a42b4d8584f1addbe371c4a
	Library/metadata/be/bee295f5f56994a8ea1d4b0555c23d6e
	Library/metadata/bf/bf07edd6175632547b6653bd5fe3c3a0
	Library/metadata/c4/c497afdb0bae502468416c4b7dff7052
	Library/metadata/c7/c770947df9cd5f64ea105a7ac624483a
	Library/metadata/c8/c8b2fdeb41a80ad4d9dfb899f701db0d
	Library/metadata/c8/c8edceef576ded048bfce3776e6d5a23
	Library/metadata/cf/cf9c368abed9e814bb27367290406dcd
	Library/metadata/d0/d02798e95720d47428e46aee97fbbece
	Library/metadata/d0/d0e9c4a061ef3934ba986f5340a58791
	Library/metadata/d3/d331b94ba7bbfa343bb6b9f9282b5c93
	Library/metadata/d5/d59d815e8a4daa8469c84103e1a4558d
	Library/metadata/db/dbbc1142af469b941ab11937223e5759
	Library/metadata/dd/dd43129f2b3db6e4a96b15dc573caa38
	Library/metadata/de/de0f43d22fb984a41882402bdca3174a
	Library/metadata/df/df1f47a0a2effe74488d5da197295a19
	Library/metadata/e2/e235f6e93caa74755a9f37b4dc6a5110
	Library/metadata/e3/e349c3f4b36417b48b65112d7bd0b54e
	Library/metadata/e3/e3e214f8620f35a4cb4e415a4b8c19cf
	Library/metadata/e4/e4ce70700c0addc41b39e21dcd7594fd
	Library/metadata/e7/e76626038981f124e81bf36ecc8d75b6
	Library/metadata/eb/eb6742be59eb7174883f6b4f05b5116f
	Library/metadata/eb/ebd1652c5999f1c4e98687e20e1d8af0
	Library/metadata/f3/f3095b3368cc012418da951d0b885446
	Library/metadata/f6/f6058c49b45c5c2468d4fb2e837f3f09
	Library/metadata/f9/f9169e3c73e12cf48b3983d4f0620c53
	Library/metadata/f9/f9549027fbac84e3780e267bb252dcc4
	Library/metadata/fa/fa48b6e3e82655944b5d1c2f64eec51e
	Library/metadata/fb/fb06bcc4ae8b6704b841703eb15d0fcc
	Library/metadata/fb/fbcb89fb53ac04a9bb5c634e147f4269
	Library/metadata/ff/ff4c7959bcf56de459b639c7cfeb673c
	ProjectSettings/EditorBuildSettings.asset