From 463545ad9cde1b72d2cbfd2d2655a5ca2be338cc Mon Sep 17 00:00:00 2001 From: Madhav Kapa Date: Wed, 14 Jun 2023 07:21:44 -0400 Subject: [PATCH] Lobby done with broken animation and without steam --- Assets/DefaultPrefabObjects.asset | 3 +- .../Levels/Level0/CeilLightMaterial.mat | 2 +- Assets/Prefabs/Astronaut/Astronaut.prefab | 108 ++++ .../Astronaut/AstronautWithCamera.prefab | 4 +- ...ng.prefab => CameraForNetworkAstro.prefab} | 235 +------- ...meta => CameraForNetworkAstro.prefab.meta} | 0 .../StylizedLobbyScene.unity | 557 +++++++++++------- Assets/Scripts/Player/CameraController.cs | 6 +- .../LobbyPlayer/LobbyPlayerComponent.cs | 2 - .../Player/PlayerAnimationController.cs | 2 +- .../Player/PlayerMovementController.cs | 38 +- 11 files changed, 497 insertions(+), 460 deletions(-) rename Assets/Prefabs/Astronaut/{AstronautWithCameraWithNetworking.prefab => CameraForNetworkAstro.prefab} (85%) rename Assets/Prefabs/Astronaut/{AstronautWithCameraWithNetworking.prefab.meta => CameraForNetworkAstro.prefab.meta} (100%) diff --git a/Assets/DefaultPrefabObjects.asset b/Assets/DefaultPrefabObjects.asset index e67f4fb..e0ba03c 100644 --- a/Assets/DefaultPrefabObjects.asset +++ b/Assets/DefaultPrefabObjects.asset @@ -13,8 +13,7 @@ MonoBehaviour: m_Name: DefaultPrefabObjects m_EditorClassIdentifier: _prefabs: - - {fileID: 1976054203064788043, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} - - {fileID: 5869338221815862114, guid: 502609875cf67524391bcf30129c195b, type: 3} + - {fileID: 5498159848629933595, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} - {fileID: 4512293259955182956, guid: 300370bdf7819da41937e0beac65b32c, type: 3} - {fileID: 233110740096973419, guid: e05b94df3e7783a48ac1ed2d12a71774, type: 3} - {fileID: 611616139817875448, guid: bf5f023b4017a5e41a9815ec5745df3d, type: 3} diff --git a/Assets/Materials/Levels/Level0/CeilLightMaterial.mat b/Assets/Materials/Levels/Level0/CeilLightMaterial.mat index 715777f..354b23f 100644 --- a/Assets/Materials/Levels/Level0/CeilLightMaterial.mat +++ b/Assets/Materials/Levels/Level0/CeilLightMaterial.mat @@ -206,7 +206,7 @@ Material: - _StencilWriteMask: 6 - _StencilWriteMaskDepth: 8 - _StencilWriteMaskGBuffer: 14 - - _StencilWriteMaskMV: 42 + - _StencilWriteMaskMV: 40 - _SubsurfaceMask: 1 - _SupportDecals: 1 - _SurfaceType: 0 diff --git a/Assets/Prefabs/Astronaut/Astronaut.prefab b/Assets/Prefabs/Astronaut/Astronaut.prefab index dba3415..c79545d 100644 --- a/Assets/Prefabs/Astronaut/Astronaut.prefab +++ b/Assets/Prefabs/Astronaut/Astronaut.prefab @@ -44,6 +44,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3847c9aa2dda4d64f84842c3cc880d7e, type: 3} m_Name: m_EditorClassIdentifier: + _componentIndexCache: 3 + _addedNetworkObject: {fileID: 5498159848629933595} + _networkObjectCache: {fileID: 5498159848629933595} cam: {fileID: 0} target: {fileID: 5307183109647314236} --- !u!1 &1506393995 @@ -1735,6 +1738,7 @@ MonoBehaviour: noiseManager: {fileID: 1000589094} shift: {fileID: 0} isDead: 0 + manager: {fileID: 0} --- !u!1 &1542395871221419507 GameObject: m_ObjectHideFlags: 0 @@ -5187,6 +5191,9 @@ GameObject: - component: {fileID: 1000589095} - component: {fileID: 5309760701942746954} - component: {fileID: 8094861134790488103} + - component: {fileID: 5498159848629933595} + - component: {fileID: 3207797364320485426} + - component: {fileID: 558651035056782169} m_Layer: 0 m_Name: Astronaut m_TagString: Player @@ -5225,6 +5232,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 04d9fbdb37200704a9166659474a658a, type: 3} m_Name: m_EditorClassIdentifier: + _componentIndexCache: 0 + _addedNetworkObject: {fileID: 5498159848629933595} + _networkObjectCache: {fileID: 5498159848629933595} animcontroller: {fileID: 6195543837284837351} ccontroller: {fileID: 800476564762967425} cameraController: {fileID: 165371622} @@ -5239,6 +5249,7 @@ MonoBehaviour: mouseXAxis: Mouse X mouseYAxis: Mouse Y isDead: 0 + manager: {fileID: 11400000, guid: 11aa6a76246138741ae6aeda5ffa9a94, type: 2} --- !u!143 &800476564762967425 CharacterController: m_ObjectHideFlags: 0 @@ -5332,6 +5343,7 @@ MonoBehaviour: knockbackDuration: 1 knockbackDistance: 5 statsOutput: {fileID: 968039030} + settings: {fileID: 11400000, guid: 2e758242c6149fa49836fdef8a592240, type: 2} --- !u!114 &5309760701942746954 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5375,6 +5387,102 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1fb5120753ff7544bb106f2fcaaad636, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &5498159848629933595 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5307183109647314239} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 26b716c41e9b56b4baafaf13a523ba2e, type: 3} + m_Name: + m_EditorClassIdentifier: + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: {fileID: 0} + _networkBehaviours: + - {fileID: 2821278824672803001} + - {fileID: 3207797364320485426} + - {fileID: 0} + - {fileID: 165371622} + k__BackingField: {fileID: 0} + k__BackingField: [] + _isNetworked: 1 + _isGlobal: 0 + _initializeOrder: 0 + _defaultDespawnType: 0 + NetworkObserver: {fileID: 0} + k__BackingField: 0 + k__BackingField: 0 + _scenePathHash: 0 + k__BackingField: 0 + k__BackingField: 11756453637959437467 + _sceneNetworkObjects: [] +--- !u!114 &3207797364320485426 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5307183109647314239} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a2836e36774ca1c4bbbee976e17b649c, type: 3} + m_Name: + m_EditorClassIdentifier: + _componentIndexCache: 1 + _addedNetworkObject: {fileID: 5498159848629933595} + _networkObjectCache: {fileID: 5498159848629933595} + _componentConfiguration: 1 + _synchronizeParent: 0 + _packing: + Position: 1 + Rotation: 1 + Scale: 0 + _interpolation: 2 + _extrapolation: 2 + _enableTeleport: 0 + _teleportThreshold: 1 + _clientAuthoritative: 1 + _sendToOwner: 1 + _synchronizePosition: 1 + _positionSnapping: + X: 0 + Y: 0 + Z: 0 + _synchronizeRotation: 1 + _rotationSnapping: + X: 0 + Y: 0 + Z: 0 + _synchronizeScale: 1 + _scaleSnapping: + X: 0 + Y: 0 + Z: 0 +--- !u!114 &558651035056782169 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5307183109647314239} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e8cac635f24954048aad3a6ff9110beb, type: 3} + m_Name: + m_EditorClassIdentifier: + _componentIndexCache: 255 + _addedNetworkObject: {fileID: 5498159848629933595} + _networkObjectCache: {fileID: 0} + IgnoredParameters: [] + _animator: {fileID: 5567518431331631942} + _smoothFloats: 1 + _interpolation: 2 + _clientAuthoritative: 1 + _sendToOwner: 0 --- !u!1 &5341511970532214645 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Astronaut/AstronautWithCamera.prefab b/Assets/Prefabs/Astronaut/AstronautWithCamera.prefab index af1e7af..f9b2904 100644 --- a/Assets/Prefabs/Astronaut/AstronautWithCamera.prefab +++ b/Assets/Prefabs/Astronaut/AstronautWithCamera.prefab @@ -1464,8 +1464,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 365318978543542559} - m_LocalRotation: {x: 0.05827527, y: -9.223996e-25, z: 5.384459e-26, w: 0.99830055} - m_LocalPosition: {x: 0, y: 0.581164, z: -0.9154434} + m_LocalRotation: {x: 0.058275275, y: -0, z: 1.110223e-16, w: 0.99830055} + m_LocalPosition: {x: 0, y: 0.82000005, z: -3.618225} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: diff --git a/Assets/Prefabs/Astronaut/AstronautWithCameraWithNetworking.prefab b/Assets/Prefabs/Astronaut/CameraForNetworkAstro.prefab similarity index 85% rename from Assets/Prefabs/Astronaut/AstronautWithCameraWithNetworking.prefab rename to Assets/Prefabs/Astronaut/CameraForNetworkAstro.prefab index 2dccb70..d1a7384 100644 --- a/Assets/Prefabs/Astronaut/AstronautWithCameraWithNetworking.prefab +++ b/Assets/Prefabs/Astronaut/CameraForNetworkAstro.prefab @@ -34,7 +34,7 @@ RectTransform: - {fileID: 2022190477} - {fileID: 1867809576} m_Father: {fileID: 365318977076093362} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -592,7 +592,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 365318976786001977} - m_LocalRotation: {x: -0.03520201, y: -0.00000001750598, z: 0.000000002846753, w: 0.99938023} + m_LocalRotation: {x: -0.02170661, y: -0.000000010128789, z: 0.0000000017877855, w: 0.9997644} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -662,11 +662,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 365318977076093362} - - component: {fileID: 3680155643994880520} - - component: {fileID: 2163932450281608785} - - component: {fileID: 8715267731073342382} m_Layer: 0 - m_Name: AstronautWithCameraWithNetworking + m_Name: CameraForNetworkAstro m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 1 @@ -684,106 +681,12 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 5527950049018812812} - {fileID: 365318977167042207} - {fileID: 365318978543542555} - {fileID: 292360325} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &3680155643994880520 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 365318977076093365} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 26b716c41e9b56b4baafaf13a523ba2e, type: 3} - m_Name: - m_EditorClassIdentifier: - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: {fileID: 0} - _networkBehaviours: - - {fileID: 2163932450281608785} - k__BackingField: {fileID: 0} - k__BackingField: [] - _isNetworked: 1 - _isGlobal: 0 - _initializeOrder: 0 - _defaultDespawnType: 0 - NetworkObserver: {fileID: 0} - k__BackingField: 0 - k__BackingField: 0 - _scenePathHash: 0 - k__BackingField: 0 - k__BackingField: 14265391951304151143 - _sceneNetworkObjects: [] ---- !u!114 &2163932450281608785 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 365318977076093365} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a2836e36774ca1c4bbbee976e17b649c, type: 3} - m_Name: - m_EditorClassIdentifier: - _componentIndexCache: 0 - _addedNetworkObject: {fileID: 3680155643994880520} - _networkObjectCache: {fileID: 3680155643994880520} - _componentConfiguration: 0 - _synchronizeParent: 0 - _packing: - Position: 1 - Rotation: 1 - Scale: 0 - _interpolation: 2 - _extrapolation: 2 - _enableTeleport: 0 - _teleportThreshold: 1 - _clientAuthoritative: 1 - _sendToOwner: 1 - _synchronizePosition: 1 - _positionSnapping: - X: 0 - Y: 0 - Z: 0 - _synchronizeRotation: 1 - _rotationSnapping: - X: 0 - Y: 0 - Z: 0 - _synchronizeScale: 1 - _scaleSnapping: - X: 0 - Y: 0 - Z: 0 ---- !u!114 &8715267731073342382 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 365318977076093365} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e8cac635f24954048aad3a6ff9110beb, type: 3} - m_Name: - m_EditorClassIdentifier: - _componentIndexCache: 255 - _addedNetworkObject: {fileID: 3680155643994880520} - _networkObjectCache: {fileID: 0} - IgnoredParameters: [] - _animator: {fileID: 5527950048190765059} - _smoothFloats: 1 - _interpolation: 2 - _clientAuthoritative: 1 - _sendToOwner: 0 --- !u!1 &365318977112772366 GameObject: m_ObjectHideFlags: 0 @@ -946,7 +849,7 @@ Transform: - {fileID: 365318977785173342} - {fileID: 365318978058098911} m_Father: {fileID: 365318977076093362} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &365318977167042204 MonoBehaviour: @@ -996,8 +899,8 @@ MonoBehaviour: m_StreamingVersion: 20170927 m_Priority: 10 m_StandbyUpdate: 2 - m_LookAt: {fileID: 365318977280207447} - m_Follow: {fileID: 5527950049018812812} + m_LookAt: {fileID: 0} + m_Follow: {fileID: 0} m_CommonLens: 1 m_Lens: FieldOfView: 40 @@ -1240,7 +1143,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 365318977785173328} - m_LocalRotation: {x: -0.053374406, y: -3.9161743e-10, z: 5.6392228e-11, w: 0.9985746} + m_LocalRotation: {x: -0.039888214, y: -0.000000017519138, z: 0.0000000027646274, w: 0.99920416} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -1470,7 +1373,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 365318978058098897} - m_LocalRotation: {x: -0.07148121, y: -0.000000017597836, z: 0.0000000022089703, w: 0.99744195} + m_LocalRotation: {x: -0.058008675, y: -0.00000001969665, z: 0.000000002743013, w: 0.9983161} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -1560,15 +1463,15 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 365318978543542559} - m_LocalRotation: {x: 0.04479234, y: 0.0000000344453, z: -0.0000000015444355, w: 0.9989963} - m_LocalPosition: {x: 0, y: 0.82000005, z: -3} + m_LocalRotation: {x: 0.05827527, y: -9.223996e-25, z: 5.384459e-26, w: 0.99830055} + m_LocalPosition: {x: 0, y: 0.581164, z: -0.9154434} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2031122445} - {fileID: 1424249522} m_Father: {fileID: 365318977076093362} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 13.821, y: 0, z: 0} --- !u!20 &365318978543542556 Camera: @@ -1910,119 +1813,3 @@ MonoBehaviour: m_YawDamping: 0 m_RollDamping: 0 m_AngularDamping: 0 ---- !u!1001 &365318977165309104 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 365318977076093362} - m_Modifications: - - target: {fileID: 165371622, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} - propertyPath: cam - value: - objectReference: {fileID: 365318978543542556} - - target: {fileID: 1000589095, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} - propertyPath: cameraFreeLook - value: - objectReference: {fileID: 365318977167042205} - - target: {fileID: 367716966863965416, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} - propertyPath: m_Name - value: HealthText - objectReference: {fileID: 0} - - target: {fileID: 1830643123924126821, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} - propertyPath: shift - value: - objectReference: {fileID: 2559662377923291013} - - target: {fileID: 2821278824672803001, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} - propertyPath: cam - value: - objectReference: {fileID: 365318978543542556} - - target: {fileID: 2821278824672803001, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} - propertyPath: freelook - value: - objectReference: {fileID: 365318977167042205} - - target: {fileID: 3871953178811630791, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} - propertyPath: m_Name - value: OxygenText - objectReference: {fileID: 0} - - target: {fileID: 5307183109647314236, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5307183109647314236, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5307183109647314236, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} - propertyPath: m_LocalPosition.y - value: -1.18 - objectReference: {fileID: 0} - - target: {fileID: 5307183109647314236, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5307183109647314236, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5307183109647314236, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5307183109647314236, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5307183109647314236, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5307183109647314236, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5307183109647314236, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5307183109647314236, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5307183109647314239, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} - propertyPath: m_Name - value: Astronaut - objectReference: {fileID: 0} - - target: {fileID: 5309760701942746954, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} - propertyPath: selectedImage - value: - objectReference: {fileID: 2022190478} - - target: {fileID: 5309760701942746954, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} - propertyPath: selectedQuantityText - value: - objectReference: {fileID: 1867809577} - - target: {fileID: 6195543837284837351, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} - propertyPath: hiddenCam - value: - objectReference: {fileID: 365318978543542556} - - target: {fileID: 8148338960242662890, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} - propertyPath: m_Name - value: StaminaText - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} ---- !u!4 &365318977280207447 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 165371623, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} - m_PrefabInstance: {fileID: 365318977165309104} - m_PrefabAsset: {fileID: 0} ---- !u!95 &5527950048190765059 stripped -Animator: - m_CorrespondingSourceObject: {fileID: 5307183109390085299, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} - m_PrefabInstance: {fileID: 365318977165309104} - m_PrefabAsset: {fileID: 0} ---- !u!4 &5527950049018812812 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5307183109647314236, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} - m_PrefabInstance: {fileID: 365318977165309104} - m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Astronaut/AstronautWithCameraWithNetworking.prefab.meta b/Assets/Prefabs/Astronaut/CameraForNetworkAstro.prefab.meta similarity index 100% rename from Assets/Prefabs/Astronaut/AstronautWithCameraWithNetworking.prefab.meta rename to Assets/Prefabs/Astronaut/CameraForNetworkAstro.prefab.meta diff --git a/Assets/Scenes/Experimentation/MultiplayerScenes/StylizedLobbyScene.unity b/Assets/Scenes/Experimentation/MultiplayerScenes/StylizedLobbyScene.unity index 206c7ef..a65363e 100644 --- a/Assets/Scenes/Experimentation/MultiplayerScenes/StylizedLobbyScene.unity +++ b/Assets/Scenes/Experimentation/MultiplayerScenes/StylizedLobbyScene.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.010425299, g: 0.008907616, b: 0.009156868, a: 1} + m_IndirectSpecularColor: {r: 0.01042524, g: 0.0089074075, b: 0.0091569275, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -313,6 +313,95 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d434b10738197414b8cd18b6a1c3895a, type: 3} +--- !u!1001 &345890558 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 7443408887813606049, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} + propertyPath: m_RootOrder + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 7443408887813606049, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7443408887813606049, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7443408887813606049, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7443408887813606049, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7443408887813606049, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7443408887813606049, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7443408887813606049, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7443408887813606049, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7443408887813606049, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7443408887813606049, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7443408887813606050, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} + propertyPath: _spawnablePrefabs + value: + objectReference: {fileID: 11400000, guid: e6b71f999cc8fc647a3f73f7088802e0, type: 2} + - target: {fileID: 7443408887813606051, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} + propertyPath: m_Name + value: NetworkManager + objectReference: {fileID: 0} + - target: {fileID: 7443408887813606060, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} + propertyPath: _playerPrefab + value: + objectReference: {fileID: 5498159848629933595, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} + - target: {fileID: 7443408887813606060, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} + propertyPath: Spawns.Array.size + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 7443408887813606060, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} + propertyPath: _addToDefaultScene + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7443408887813606060, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} + propertyPath: Spawns.Array.data[0] + value: + objectReference: {fileID: 592482424} + - target: {fileID: 7443408887813606060, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} + propertyPath: Spawns.Array.data[1] + value: + objectReference: {fileID: 1878683334} + - target: {fileID: 7443408887813606060, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} + propertyPath: Spawns.Array.data[2] + value: + objectReference: {fileID: 1182598124} + - target: {fileID: 7443408887813606060, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} + propertyPath: Spawns.Array.data[3] + value: + objectReference: {fileID: 428265586} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} --- !u!1001 &361856476 PrefabInstance: m_ObjectHideFlags: 0 @@ -486,7 +575,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &416614175 GameObject: @@ -600,6 +689,11 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 +--- !u!4 &428265586 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2036610878, guid: 231880aae7c09254dac056505dfab7f9, type: 3} + m_PrefabInstance: {fileID: 1073158888} + m_PrefabAsset: {fileID: 0} --- !u!1 &507240982 GameObject: m_ObjectHideFlags: 0 @@ -696,7 +790,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!95 &518716621 stripped Animator: @@ -806,6 +900,11 @@ Transform: m_Father: {fileID: 767103619} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} +--- !u!4 &592482424 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2036610878, guid: 231880aae7c09254dac056505dfab7f9, type: 3} + m_PrefabInstance: {fileID: 1924711287} + m_PrefabAsset: {fileID: 0} --- !u!1 &723247483 GameObject: m_ObjectHideFlags: 0 @@ -1043,7 +1142,7 @@ Transform: - {fileID: 518716622} - {fileID: 834908175} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &809476871 GameObject: @@ -1436,7 +1535,7 @@ Transform: - {fileID: 2062417812} - {fileID: 809476874} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1084468139 GameObject: @@ -1468,8 +1567,33 @@ Transform: m_Children: - {fileID: 369256296} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1101242180 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7443408887813606051, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} + m_PrefabInstance: {fileID: 345890558} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1101242185 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1101242180} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 34e4a322dca349547989b14021da4e23, type: 3} + m_Name: + m_EditorClassIdentifier: + Transport: {fileID: 0} + _intermediateLayer: {fileID: 0} + _latencySimulator: + _enabled: 0 + _simulateHost: 1 + _latency: 0 + _outOfOrder: 0 + _packetLoss: 0 --- !u!1001 &1138118844 PrefabInstance: m_ObjectHideFlags: 0 @@ -1547,25 +1671,65 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: -3312733423110655666, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} + propertyPath: _networkObjectCache + value: + objectReference: {fileID: 1823754982} + - target: {fileID: -3312733423110655666, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} + propertyPath: _componentIndexCache + value: 1 + objectReference: {fileID: 0} - target: {fileID: 165371622, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 165371622, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} + propertyPath: _networkObjectCache + value: + objectReference: {fileID: 1823754982} + - target: {fileID: 165371622, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} + propertyPath: _componentIndexCache + value: 2 + objectReference: {fileID: 0} - target: {fileID: 1659802797, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 558651035056782169, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} + propertyPath: _networkObjectCache + value: + objectReference: {fileID: 1823754982} + - target: {fileID: 558651035056782169, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} + propertyPath: _componentIndexCache + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1830643123924126821, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 2400638427582812689, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} + propertyPath: _networkObjectCache + value: + objectReference: {fileID: 1823754982} + - target: {fileID: 2400638427582812689, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} + propertyPath: _componentIndexCache + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3066151442036166192, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 3207797364320485426, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} + propertyPath: _networkObjectCache + value: + objectReference: {fileID: 1823754982} + - target: {fileID: 3207797364320485426, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} + propertyPath: _componentIndexCache + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5307183109647314236, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} propertyPath: m_RootOrder - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5307183109647314236, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} propertyPath: m_LocalScale.x @@ -1623,6 +1787,38 @@ PrefabInstance: propertyPath: m_Name value: LobbyAstronaut objectReference: {fileID: 0} + - target: {fileID: 5498159848629933595, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} + propertyPath: _scenePathHash + value: 1572940557 + objectReference: {fileID: 0} + - target: {fileID: 5498159848629933595, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} + propertyPath: k__BackingField + value: 6755728253387166402 + objectReference: {fileID: 0} + - target: {fileID: 5498159848629933595, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} + propertyPath: _networkBehaviours.Array.size + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5498159848629933595, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} + propertyPath: _sceneNetworkObjects.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5498159848629933595, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} + propertyPath: _networkBehaviours.Array.data[0] + value: + objectReference: {fileID: 1823754981} + - target: {fileID: 5498159848629933595, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} + propertyPath: _networkBehaviours.Array.data[1] + value: + objectReference: {fileID: 1823754984} + - target: {fileID: 5498159848629933595, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} + propertyPath: _networkBehaviours.Array.data[2] + value: + objectReference: {fileID: 1508325430} + - target: {fileID: 5498159848629933595, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} + propertyPath: _sceneNetworkObjects.Array.data[0] + value: + objectReference: {fileID: 1823754982} - target: {fileID: 6195543837284837351, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} propertyPath: m_Enabled value: 0 @@ -1651,6 +1847,11 @@ PrefabInstance: - {fileID: 1830643123924126821, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} - {fileID: 506506833991321686, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} +--- !u!4 &1182598124 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2036610878, guid: 231880aae7c09254dac056505dfab7f9, type: 3} + m_PrefabInstance: {fileID: 1359210190} + m_PrefabAsset: {fileID: 0} --- !u!95 &1210089948 stripped Animator: m_CorrespondingSourceObject: {fileID: 919132147631665776, guid: d434b10738197414b8cd18b6a1c3895a, type: 3} @@ -1750,216 +1951,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 231880aae7c09254dac056505dfab7f9, type: 3} ---- !u!1 &1397598461 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1397598464} - - component: {fileID: 1397598463} - - component: {fileID: 1397598462} - - component: {fileID: 1397598465} - m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!81 &1397598462 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1397598461} - m_Enabled: 1 ---- !u!20 &1397598463 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1397598461} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 40 - orthographic: 0 - orthographic size: 5 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 0 - m_AllowMSAA: 0 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &1397598464 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1397598461} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.79, y: 2.5, z: -13.21} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1397598465 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1397598461} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 23c1ce4fb46143f46bc5cb5224c934f6, type: 3} - m_Name: - m_EditorClassIdentifier: - clearColorMode: 0 - backgroundColorHDR: {r: 0.025, g: 0.07, b: 0.19, a: 0} - clearDepth: 1 - volumeLayerMask: - serializedVersion: 2 - m_Bits: 1 - volumeAnchorOverride: {fileID: 0} - antialiasing: 0 - SMAAQuality: 2 - dithering: 0 - stopNaNs: 0 - taaSharpenStrength: 0.5 - TAAQuality: 1 - taaHistorySharpening: 0.35 - taaAntiFlicker: 0.5 - taaMotionVectorRejection: 0 - taaAntiHistoryRinging: 0 - taaBaseBlendFactor: 0.875 - taaJitterScale: 1 - physicalParameters: - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - flipYMode: 0 - xrRendering: 1 - fullscreenPassthrough: 0 - allowDynamicResolution: 0 - customRenderingSettings: 0 - invertFaceCulling: 0 - probeLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - hasPersistentHistory: 0 - allowDeepLearningSuperSampling: 1 - deepLearningSuperSamplingUseCustomQualitySettings: 0 - deepLearningSuperSamplingQuality: 0 - deepLearningSuperSamplingUseCustomAttributes: 0 - deepLearningSuperSamplingUseOptimalSettings: 1 - deepLearningSuperSamplingSharpening: 0 - exposureTarget: {fileID: 0} - materialMipBias: 0 - m_RenderingPathCustomFrameSettings: - bitDatas: - data1: 72198260625768269 - data2: 13763000477350330392 - lodBias: 1 - lodBiasMode: 0 - lodBiasQualityLevel: 0 - maximumLODLevel: 0 - maximumLODLevelMode: 0 - maximumLODLevelQualityLevel: 0 - sssQualityMode: 0 - sssQualityLevel: 0 - sssCustomSampleBudget: 20 - msaaMode: 1 - materialQuality: 0 - renderingPathCustomFrameSettingsOverrideMask: - mask: - data1: 0 - data2: 0 - defaultFrameSettings: 0 - m_Version: 8 - m_ObsoleteRenderingPath: 0 - m_ObsoleteFrameSettings: - overrides: 0 - enableShadow: 0 - enableContactShadows: 0 - enableShadowMask: 0 - enableSSR: 0 - enableSSAO: 0 - enableSubsurfaceScattering: 0 - enableTransmission: 0 - enableAtmosphericScattering: 0 - enableVolumetrics: 0 - enableReprojectionForVolumetrics: 0 - enableLightLayers: 0 - enableExposureControl: 1 - diffuseGlobalDimmer: 0 - specularGlobalDimmer: 0 - shaderLitMode: 0 - enableDepthPrepassWithDeferredRendering: 0 - enableTransparentPrepass: 0 - enableMotionVectors: 0 - enableObjectMotionVectors: 0 - enableDecals: 0 - enableRoughRefraction: 0 - enableTransparentPostpass: 0 - enableDistortion: 0 - enablePostprocess: 0 - enableOpaqueObjects: 0 - enableTransparentObjects: 0 - enableRealtimePlanarReflection: 0 - enableMSAA: 0 - enableAsyncCompute: 0 - runLightListAsync: 0 - runSSRAsync: 0 - runSSAOAsync: 0 - runContactShadowsAsync: 0 - runVolumeVoxelizationAsync: 0 - lightLoopSettings: - overrides: 0 - enableDeferredTileAndCluster: 0 - enableComputeLightEvaluation: 0 - enableComputeLightVariants: 0 - enableComputeMaterialVariants: 0 - enableFptlForForwardOpaque: 0 - enableBigTilePrepass: 0 - isFptlEnabled: 0 --- !u!1 &1441839667 GameObject: m_ObjectHideFlags: 0 @@ -2238,6 +2229,17 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d434b10738197414b8cd18b6a1c3895a, type: 3} +--- !u!114 &1508325430 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 165371622, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} + m_PrefabInstance: {fileID: 1163429556} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3847c9aa2dda4d64f84842c3cc880d7e, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1525206402 GameObject: m_ObjectHideFlags: 0 @@ -2352,11 +2354,49 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: anim: {fileID: 993864586} +--- !u!114 &1823754981 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3207797364320485426, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} + m_PrefabInstance: {fileID: 1163429556} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1823754977} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a2836e36774ca1c4bbbee976e17b649c, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1823754982 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5498159848629933595, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} + m_PrefabInstance: {fileID: 1163429556} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1823754977} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 26b716c41e9b56b4baafaf13a523ba2e, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1823754984 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 558651035056782169, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} + m_PrefabInstance: {fileID: 1163429556} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1823754977} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e8cac635f24954048aad3a6ff9110beb, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!4 &1834071857 stripped Transform: m_CorrespondingSourceObject: {fileID: 6960644867054158483, guid: 231880aae7c09254dac056505dfab7f9, type: 3} m_PrefabInstance: {fileID: 283318320} m_PrefabAsset: {fileID: 0} +--- !u!4 &1878683334 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2036610878, guid: 231880aae7c09254dac056505dfab7f9, type: 3} + m_PrefabInstance: {fileID: 283318320} + m_PrefabAsset: {fileID: 0} --- !u!95 &1884533573 stripped Animator: m_CorrespondingSourceObject: {fileID: 919132147631665776, guid: d434b10738197414b8cd18b6a1c3895a, type: 3} @@ -2463,7 +2503,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!1001 &1924711287 PrefabInstance: @@ -2579,6 +2619,87 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d434b10738197414b8cd18b6a1c3895a, type: 3} +--- !u!1001 &1952435268 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2031122448, guid: 502609875cf67524391bcf30129c195b, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 365318977076093362, guid: 502609875cf67524391bcf30129c195b, type: 3} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 365318977076093362, guid: 502609875cf67524391bcf30129c195b, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 365318977076093362, guid: 502609875cf67524391bcf30129c195b, type: 3} + propertyPath: m_LocalPosition.y + value: 1.18 + objectReference: {fileID: 0} + - target: {fileID: 365318977076093362, guid: 502609875cf67524391bcf30129c195b, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 365318977076093362, guid: 502609875cf67524391bcf30129c195b, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 365318977076093362, guid: 502609875cf67524391bcf30129c195b, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 365318977076093362, guid: 502609875cf67524391bcf30129c195b, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 365318977076093362, guid: 502609875cf67524391bcf30129c195b, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 365318977076093362, guid: 502609875cf67524391bcf30129c195b, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 365318977076093362, guid: 502609875cf67524391bcf30129c195b, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 365318977076093362, guid: 502609875cf67524391bcf30129c195b, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 365318977076093365, guid: 502609875cf67524391bcf30129c195b, type: 3} + propertyPath: m_Name + value: CameraForNetworkAstro + objectReference: {fileID: 0} + - target: {fileID: 365318978543542555, guid: 502609875cf67524391bcf30129c195b, type: 3} + propertyPath: m_LocalPosition.y + value: 0.82000005 + objectReference: {fileID: 0} + - target: {fileID: 365318978543542555, guid: 502609875cf67524391bcf30129c195b, type: 3} + propertyPath: m_LocalPosition.z + value: -3.618225 + objectReference: {fileID: 0} + - target: {fileID: 365318978543542555, guid: 502609875cf67524391bcf30129c195b, type: 3} + propertyPath: m_LocalRotation.x + value: 0.058275275 + objectReference: {fileID: 0} + - target: {fileID: 365318978543542555, guid: 502609875cf67524391bcf30129c195b, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 365318978543542555, guid: 502609875cf67524391bcf30129c195b, type: 3} + propertyPath: m_LocalRotation.z + value: 1.110223e-16 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 502609875cf67524391bcf30129c195b, type: 3} --- !u!1 &1992251127 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Player/CameraController.cs b/Assets/Scripts/Player/CameraController.cs index c4d0308..07f402c 100644 --- a/Assets/Scripts/Player/CameraController.cs +++ b/Assets/Scripts/Player/CameraController.cs @@ -1,7 +1,10 @@ using UnityEngine; +using FishNet.Object; +using FishNet.Connection; + namespace Player { - public class CameraController : MonoBehaviour + public class CameraController : NetworkBehaviour { //private float mouseX = 0; //private float mouseY; @@ -20,7 +23,6 @@ namespace Player //[SerializeField] // private bool isChild = false; - // Start is called before the first frame update private void Start() { diff --git a/Assets/Scripts/Player/LobbyPlayer/LobbyPlayerComponent.cs b/Assets/Scripts/Player/LobbyPlayer/LobbyPlayerComponent.cs index 9c2064a..8ebe04f 100644 --- a/Assets/Scripts/Player/LobbyPlayer/LobbyPlayerComponent.cs +++ b/Assets/Scripts/Player/LobbyPlayer/LobbyPlayerComponent.cs @@ -1,5 +1,3 @@ -using System.Collections; -using System.Collections.Generic; using UnityEngine; namespace Player { diff --git a/Assets/Scripts/Player/PlayerAnimationController.cs b/Assets/Scripts/Player/PlayerAnimationController.cs index f68411e..6577171 100644 --- a/Assets/Scripts/Player/PlayerAnimationController.cs +++ b/Assets/Scripts/Player/PlayerAnimationController.cs @@ -19,7 +19,7 @@ namespace Player [SerializeField] private PlayerMovementController movement; //private float verticalAiming = 0; - [SerializeField] private Camera hiddenCam; + public Camera hiddenCam; private bool isRunning; diff --git a/Assets/Scripts/Player/PlayerMovementController.cs b/Assets/Scripts/Player/PlayerMovementController.cs index 7315c2b..4b0d0cd 100644 --- a/Assets/Scripts/Player/PlayerMovementController.cs +++ b/Assets/Scripts/Player/PlayerMovementController.cs @@ -1,11 +1,13 @@ using System.Collections; using Cinemachine; using UnityEngine; +using FishNet.Object; +using FishNet.Connection; namespace Player { - public class PlayerMovementController : MonoBehaviour + public class PlayerMovementController : NetworkBehaviour { [SerializeField] private PlayerAnimationController animcontroller; @@ -21,6 +23,8 @@ namespace Player [SerializeField] public Camera cam; + private GameObject camObject; + [HideInInspector] public bool AllowRotation; [HideInInspector] public bool IsAiming; @@ -46,7 +50,7 @@ namespace Player private Vector3 lookingDirectionVector; [SerializeField] private Scriptable.GameState manager; - + private bool movementLocked; @@ -57,15 +61,33 @@ namespace Player public float NoiseDistance => noiseSettings.NoiseDistance; + public override void OnStartClient() + { + base.OnStartClient(); + if (base.IsOwner) + { + cam = GameObject.Find("CameraHidden").GetComponent(); + camObject = GameObject.Find("CM vcam1"); + Debug.Log("Setting camera for " + transform.GetChild(0).GetChild(2).name + "with camera " + camObject.name); + camObject.GetComponent().Follow = transform; + camObject.GetComponent().LookAt = transform.GetChild(0).GetChild(2); + transform.GetChild(0).GetComponent().hiddenCam = cam; + } + else + { + this.enabled = false; + } + } // Start is called before the first frame update private void Start() { + ccForceAddon = ccontroller.gameObject.GetComponent(); - + initXSensitivity = freelook.m_XAxis.m_MaxSpeed; initYSensitivity = freelook.m_YAxis.m_MaxSpeed; - + } // Update is called once per frame @@ -105,10 +127,10 @@ namespace Player IsRunning = Mathf.Abs(y) > 0.1f || Mathf.Abs(x) > 0.1f; } - /// - /// Gets called by PlayerComponent to change sensitivity. - /// - /// + /// + /// Gets called by PlayerComponent to change sensitivity. + /// + /// public void SetSensitivity(float sensitivity) { freelook.m_XAxis.m_MaxSpeed = initXSensitivity * sensitivity;