diff --git a/Assets/DefaultPrefabObjects.asset b/Assets/DefaultPrefabObjects.asset index 3dab808..439051b 100644 --- a/Assets/DefaultPrefabObjects.asset +++ b/Assets/DefaultPrefabObjects.asset @@ -26,3 +26,4 @@ MonoBehaviour: - {fileID: 3624261834906416601, guid: 4e1673ccc2acac543871855a0e8bed71, type: 3} - {fileID: 201277550, guid: d904f93bc171bb144ba33c5155282f6f, type: 3} - {fileID: 27039729695437543, guid: f820efff6a2871447b961fc755212ba3, type: 3} + - {fileID: 2567458756038211005, guid: 6e7c21afe51065e4aae8fa80f880f1e5, type: 3} diff --git a/Assets/Prefabs/GunPrefabs/BoltParticle.prefab b/Assets/Prefabs/GunPrefabs/BoltParticle.prefab index be61ffe..5b05d6e 100644 --- a/Assets/Prefabs/GunPrefabs/BoltParticle.prefab +++ b/Assets/Prefabs/GunPrefabs/BoltParticle.prefab @@ -14,6 +14,8 @@ GameObject: - component: {fileID: 798998949141553076} - component: {fileID: 4501594814801579078} - component: {fileID: 7108721673541318495} + - component: {fileID: 2567458756038211005} + - component: {fileID: -3564311083844894730} m_Layer: 0 m_Name: BoltParticle m_TagString: Untagged @@ -132,6 +134,77 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 1, y: 0.5, z: 0.5} m_Center: {x: -0.0094472375, y: 0, z: 0} +--- !u!114 &2567458756038211005 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6919974783650283166} + 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: 12766050960347525273 + _sceneNetworkObjects: [] +--- !u!114 &-3564311083844894730 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6919974783650283166} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a2836e36774ca1c4bbbee976e17b649c, type: 3} + m_Name: + m_EditorClassIdentifier: + _componentIndexCache: 255 + _addedNetworkObject: {fileID: 2567458756038211005} + _networkObjectCache: {fileID: 0} + _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!1001 &3557129382295009827 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Experimentation/MultiplayerScenes/StylizedLobbyScene.unity b/Assets/Scenes/Experimentation/MultiplayerScenes/StylizedLobbyScene.unity index 536f2fb..32a4518 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.010405465, g: 0.008891271, b: 0.009139929, a: 1} + m_IndirectSpecularColor: {r: 0.010425299, g: 0.008907616, b: 0.009156868, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -1737,6 +1737,22 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 2278651747416643762, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} + propertyPath: _scenePathHash + value: 1572940557 + objectReference: {fileID: 0} + - target: {fileID: 2278651747416643762, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} + propertyPath: k__BackingField + value: 6755728251500021199 + objectReference: {fileID: 0} + - target: {fileID: 2278651747416643762, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} + propertyPath: _sceneNetworkObjects.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2278651747416643762, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} + propertyPath: _sceneNetworkObjects.Array.data[0] + value: + objectReference: {fileID: 1823754982} - target: {fileID: 2400638427582812689, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} propertyPath: _networkObjectCache value: