Station_Obscurum/station_obscurum_unity
Archived
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed powercore from lobby

Browse Source
This commit is contained in:
Madhav Kapa 2023-06-15 15:03:23 +05:30
parent 463545ad9c
commit bd5ac9b7c9
4 changed files with 84 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
.idea/.idea.station_obscurum_temp/.idea/workspace.xml generated
View File

@ -9,19 +9,9 @@
</component>
<component name="ChangeListManager">
<list default="true" id="8e9b3697-c9b4-441a-aeed-4ea7b4488600" name="Changes" comment="">
<change beforePath="$PROJECT_DIR$/.idea/.idea.station_obscurum_temp/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.station_obscurum_temp/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Materials/Levels/Level0/CeilLightMaterial.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Materials/Levels/Level0/CeilLightMaterial.mat" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Packages/Facepunch.meta" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Prefabs/Astronaut/AstronautWithCameraWithNetworking.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Prefabs/Astronaut/AstronautWithCameraWithNetworking.prefab" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Prefabs/LevelPrefabs/Cryopod.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Prefabs/LevelPrefabs/Cryopod.prefab" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/DefaultPrefabObjects.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/DefaultPrefabObjects.asset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Prefabs/Items/PowerCore.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Prefabs/Items/PowerCore.prefab" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scenes/Experimentation/MultiplayerScenes/StylizedLobbyScene.unity" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scenes/Experimentation/MultiplayerScenes/StylizedLobbyScene.unity" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/MainMenu/MainMenuManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/MainMenu/MainMenuManager.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Player/PlayerMovementController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Player/PlayerMovementController.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/TextMesh Pro/Examples &amp; Extras/Resources/Fonts &amp; Materials/Electronic Highway Sign SDF.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/TextMesh Pro/Examples &amp; Extras/Resources/Fonts &amp; Materials/Electronic Highway Sign SDF.asset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/TextMesh Pro/Examples &amp; Extras/Resources/Fonts &amp; Materials/Oswald Bold SDF.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/TextMesh Pro/Examples &amp; Extras/Resources/Fonts &amp; Materials/Oswald Bold SDF.asset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/VFXGraph/GabrielAguiarProductions/VFXGraph_Muzzle_2020.3_HDRP_v1.0.1.unitypackage.meta" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/VFXGraph/GabrielAguiarProductions/VFXGraph_Muzzle_2020.3_URP_v1.0.1.unitypackage.meta" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/ProjectSettings/EditorBuildSettings.asset" beforeDir="false" afterPath="$PROJECT_DIR$/ProjectSettings/EditorBuildSettings.asset" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -66,6 +56,14 @@
}
}</component>
<component name="RunManager" selected="Attach to Unity Editor.Attach to Unity Editor">
<configuration name="Standalone Player" type="RunUnityExe" factoryName="Unity Executable">
<option name="EXE_PATH" value="$PROJECT_DIR$/Build/StationObscurum.exe" />
<option name="PROGRAM_PARAMETERS" value="" />
<option name="WORKING_DIRECTORY" value="C:\Users\madha\Documents\station_obscurum_temp\Build" />
<option name="PASS_PARENT_ENVS" value="1" />
<option name="USE_EXTERNAL_CONSOLE" value="0" />
<method v="2" />
</configuration>
<configuration name="Start Unity" type="RunUnityExe" factoryName="Unity Executable">
<option name="EXE_PATH" value="C:\Program Files\Unity\Hub\Editor\2021.3.18f1\Editor\Unity.exe" />
<option name="PROGRAM_PARAMETERS" value="-projectPath C:\Users\madha\Documents\station_obscurum_temp -debugCodeOptimization" />
@ -120,6 +118,7 @@
<workItem from="1685617157524" duration="2799000" />
<workItem from="1685632962650" duration="5878000" />
<workItem from="1686678780511" duration="1269000" />
<workItem from="1686815200830" duration="57000" />
</task>
<servers />
</component>

1
Assets/DefaultPrefabObjects.asset
View File

@ -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}

30
Assets/Prefabs/Items/PowerCore.prefab
View File

@ -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:
<IsNested>k__BackingField: 0
<ComponentIndex>k__BackingField: 0
<PredictedSpawn>k__BackingField: {fileID: 0}
_networkBehaviours: []
<ParentNetworkObject>k__BackingField: {fileID: 0}
<ChildNetworkObjects>k__BackingField: []
_isNetworked: 1
_isGlobal: 0
_initializeOrder: 0
_defaultDespawnType: 0
NetworkObserver: {fileID: 0}
<PrefabId>k__BackingField: 0
<SpawnableCollectionId>k__BackingField: 0
_scenePathHash: 0
<SceneId>k__BackingField: 0
<AssetPathHash>k__BackingField: 12789115409722646910
_sceneNetworkObjects: []
--- !u!1 &1596045746090915546
GameObject:
m_ObjectHideFlags: 0

50
Assets/Scenes/Experimentation/MultiplayerScenes/StylizedLobbyScene.unity
View File

@ -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