Server and Game Complete
Server and Game Complete 22222222
Light gamback
Player Switch light
Trivia
Merge branch 'master' of https://github.com/pbes0707/DifBird into pbes0707-master

Conflicts:
	Horror/Assets/Game/GameScene/GameCharacter_1.cs
	Horror/Assets/Game/GameScene/GameScene.unity
	Horror/Assets/Game/GameScene/GameScene/NavMesh.asset
	Horror/Assets/Photon Unity Networking/Test/Resources/Beam.prefab
	Horror/Assets/Photon Unity Networking/Test/Resources/Enemy.prefab
	Horror/Assets/Photon Unity Networking/Test/Resources/user.prefab
	Horror/Library/AssetServerCacheV3
	Horror/Library/EditorUserBuildSettings.asset
	Horror/Library/InspectorExpandedItems.asset
	Horror/Library/ProjectSettings.asset
	Horror/Library/assetDatabase3
	Horror/Library/expandedItems
	Horror/Library/guidmapper
	Horror/ProjectSettings/ProjectSettings.asset
Merge branch 'pbes0707-master'

Conflicts:
	Horror/Assets/Game/GameScene/GameScene.unity
	Horror/Assets/Game/GameScene/GameScene/NavMesh.asset
	Horror/Assets/Game/GameScene/Resources/Character.prefab
	Horror/Assets/Photon Unity Networking/Test/Resources/user.prefab
	Horror/Library/InspectorExpandedItems.asset
	Horror/Library/assetDatabase3
	Horror/Library/guidmapper
	Horror/ProjectSettings/EditorBuildSettings.asset