diff --git a/.idea/.idea.station_obscurum_temp/.idea/workspace.xml b/.idea/.idea.station_obscurum_temp/.idea/workspace.xml index 917b977..77543c9 100644 --- a/.idea/.idea.station_obscurum_temp/.idea/workspace.xml +++ b/.idea/.idea.station_obscurum_temp/.idea/workspace.xml @@ -9,19 +9,9 @@ - - - - - + + - - - - - - - + + diff --git a/Assets/DefaultPrefabObjects.asset b/Assets/DefaultPrefabObjects.asset index e0ba03c..5fe5ca5 100644 --- a/Assets/DefaultPrefabObjects.asset +++ b/Assets/DefaultPrefabObjects.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: _prefabs: - {fileID: 5498159848629933595, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} + - {fileID: -3690528308152583234, guid: 148456ca1eee0994eb0165cb943e8322, type: 3} - {fileID: 4512293259955182956, guid: 300370bdf7819da41937e0beac65b32c, type: 3} - {fileID: 233110740096973419, guid: e05b94df3e7783a48ac1ed2d12a71774, type: 3} - {fileID: 611616139817875448, guid: bf5f023b4017a5e41a9815ec5745df3d, type: 3} diff --git a/Assets/Prefabs/Items/PowerCore.prefab b/Assets/Prefabs/Items/PowerCore.prefab index a4f8f75..10a94bc 100644 --- a/Assets/Prefabs/Items/PowerCore.prefab +++ b/Assets/Prefabs/Items/PowerCore.prefab @@ -691,6 +691,7 @@ GameObject: - component: {fileID: 1596045745830814580} - component: {fileID: 1596045745830814579} - component: {fileID: 1596045745830814578} + - component: {fileID: -3690528308152583234} m_Layer: 6 m_Name: PowerCore m_TagString: Untagged @@ -764,6 +765,35 @@ MonoBehaviour: itemSize: 1 interactionCanvas: {fileID: 1596045745206130463} canPickup: 1 +--- !u!114 &-3690528308152583234 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1596045745830814576} + 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: [] + 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: 12789115409722646910 + _sceneNetworkObjects: [] --- !u!1 &1596045746090915546 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Experimentation/MultiplayerScenes/StylizedLobbyScene.unity b/Assets/Scenes/Experimentation/MultiplayerScenes/StylizedLobbyScene.unity index a65363e..58926e9 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.01042524, g: 0.0089074075, b: 0.0091569275, a: 1} + m_IndirectSpecularColor: {r: 0.010405465, g: 0.008891271, b: 0.009139929, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -322,7 +322,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 7443408887813606049, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} propertyPath: m_RootOrder - value: 7 + value: 6 objectReference: {fileID: 0} - target: {fileID: 7443408887813606049, guid: 0b650fca685f2eb41a86538aa883e4c1, type: 3} propertyPath: m_LocalPosition.x @@ -575,7 +575,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &416614175 GameObject: @@ -1586,7 +1586,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 34e4a322dca349547989b14021da4e23, type: 3} m_Name: m_EditorClassIdentifier: - Transport: {fileID: 0} + Transport: {fileID: 1101242187} _intermediateLayer: {fileID: 0} _latencySimulator: _enabled: 0 @@ -1594,6 +1594,36 @@ MonoBehaviour: _latency: 0 _outOfOrder: 0 _packetLoss: 0 +--- !u!114 &1101242186 +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: ef4bffeda13d7a748973ff9204401c07, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1101242187 +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: 400639878008206409ec440eb16c3007, type: 3} + m_Name: + m_EditorClassIdentifier: + _steamAppID: 480 + _serverBindAddress: + _port: 7770 + _maximumClients: 3188 + _peerToPeer: 0 + _clientAddress: --- !u!1001 &1138118844 PrefabInstance: m_ObjectHideFlags: 0 @@ -2640,11 +2670,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 365318977076093362, guid: 502609875cf67524391bcf30129c195b, type: 3} propertyPath: m_LocalPosition.y - value: 1.18 + value: 3 objectReference: {fileID: 0} - target: {fileID: 365318977076093362, guid: 502609875cf67524391bcf30129c195b, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: -10 objectReference: {fileID: 0} - target: {fileID: 365318977076093362, guid: 502609875cf67524391bcf30129c195b, type: 3} propertyPath: m_LocalRotation.w @@ -2678,13 +2708,17 @@ PrefabInstance: propertyPath: m_Name value: CameraForNetworkAstro objectReference: {fileID: 0} + - target: {fileID: 365318978543542555, guid: 502609875cf67524391bcf30129c195b, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 365318978543542555, guid: 502609875cf67524391bcf30129c195b, type: 3} propertyPath: m_LocalPosition.y - value: 0.82000005 + value: 0.8200002 objectReference: {fileID: 0} - target: {fileID: 365318978543542555, guid: 502609875cf67524391bcf30129c195b, type: 3} propertyPath: m_LocalPosition.z - value: -3.618225 + value: -3 objectReference: {fileID: 0} - target: {fileID: 365318978543542555, guid: 502609875cf67524391bcf30129c195b, type: 3} propertyPath: m_LocalRotation.x