Skip to content

Commit

Permalink
Rework application settings (RE-SS3D#947)
Browse files Browse the repository at this point in the history
* Rework how application settings are handled

* Add default prefab generator path change

* Code cleanup and fix missing reference

* Fix unused import

* Rename editor ckey and initialize variable

* Add null check on permission system

* Fix issue where local player ckey was null

* change a letter
  • Loading branch information
joaoburatto authored Jan 4, 2023
1 parent 2145b58 commit dde09d8
Show file tree
Hide file tree
Showing 44 changed files with 477 additions and 421 deletions.
16 changes: 0 additions & 16 deletions Assets/AddressableAssetsData/link.xml

This file was deleted.

7 changes: 0 additions & 7 deletions Assets/AddressableAssetsData/link.xml.meta

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,15 @@ MonoBehaviour:
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3ad70174b079c2f4ebc7931d3dd1af6f, type: 3}
m_Name: DefaultPrefabObjects
m_Script: {fileID: 11500000, guid: 890a57b29b24482196b55e1ac5de1b43, type: 3}
m_Name: ApplicationSettings
m_EditorClassIdentifier:
_prefabs: []
_preload: 1
_type: 0
Ckey: editorUser
ServerAddress: 127.0.0.1
NetworkType: 2
SkipIntro: 1
EnableDiscord: 0
EditorServerAddress: 127.0.0.1
EditorServerCkey: editorUser

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3ad70174b079c2f4ebc7931d3dd1af6f, type: 3}
m_Name: SS3DSpawnablePrefabs
m_Name: DefaultPrefabObjects
m_EditorClassIdentifier:
_prefabs:
- {fileID: 562230263738288595, guid: 59f05e8a3a1d4b94eb5222aed605e260, type: 3}
Expand Down
8 changes: 0 additions & 8 deletions Assets/Content/FishNet.meta

This file was deleted.

8 changes: 0 additions & 8 deletions Assets/Content/FishNet/Runtime.meta

This file was deleted.

This file was deleted.

8 changes: 0 additions & 8 deletions Assets/FishNet.meta

This file was deleted.

8 changes: 0 additions & 8 deletions Assets/FishNet/Runtime.meta

This file was deleted.

15 changes: 0 additions & 15 deletions Assets/FishNet/Runtime/DefaultPrefabObjects.asset

This file was deleted.

57 changes: 49 additions & 8 deletions Assets/Scenes/Startup.unity
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ GameObject:
- component: {fileID: 193002072}
- component: {fileID: 193002073}
m_Layer: 0
m_Name: Persistent Startup Managers
m_Name: Persistent Startup Systems
m_TagString: Untagged
m_Icon: {fileID: 2800000, guid: 7ec379b7eb9a9a846b5ed6ea220115b9, type: 3}
m_NavMeshLayer: 0
Expand All @@ -154,6 +154,7 @@ Transform:
m_Children:
- {fileID: 1607392372}
- {fileID: 1628220426}
- {fileID: 1966326254}
m_Father: {fileID: 0}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Expand Down Expand Up @@ -224,7 +225,7 @@ MonoBehaviour:
_objectPool: {fileID: 0}
_persistence: 0
_logging: {fileID: 0}
_spawnablePrefabs: {fileID: 11400000, guid: 36555033d2a8fc94b95184be45446100, type: 2}
_spawnablePrefabs: {fileID: 11400000, guid: 59af76506e3115f479c03aedaf5de785, type: 2}
--- !u!114 &340427414
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -1512,7 +1513,7 @@ GameObject:
- component: {fileID: 1607392372}
- component: {fileID: 1607392373}
m_Layer: 0
m_Name: Application State Manager
m_Name: Application State System
m_TagString: Untagged
m_Icon: {fileID: 2800000, guid: 1bce13c2663afd54382ddd17e34235cd, type: 3}
m_NavMeshLayer: 0
Expand Down Expand Up @@ -1545,10 +1546,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 16bada615ca6f634d83ad055a8203a51, type: 3}
m_Name:
m_EditorClassIdentifier:
_testingSkipIntroInEditor: 1
_testingDiscordIntegrationInEditor: 0
_testingClientInEditor: 1
_testingServerInEditor: 1
--- !u!1 &1628220425
GameObject:
m_ObjectHideFlags: 0
Expand All @@ -1560,7 +1557,7 @@ GameObject:
- component: {fileID: 1628220426}
- component: {fileID: 1628220427}
m_Layer: 0
m_Name: Session Network Helper
m_Name: Session Network System
m_TagString: Untagged
m_Icon: {fileID: 2800000, guid: 449023493f4f5bf459d6bde76b93d2f4, type: 3}
m_NavMeshLayer: 0
Expand Down Expand Up @@ -1789,6 +1786,50 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1966326253
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1966326254}
- component: {fileID: 1966326255}
m_Layer: 0
m_Name: Command Line Args System
m_TagString: Untagged
m_Icon: {fileID: 2800000, guid: ebb14ff33e73f254daf273bbdb2c4b73, type: 3}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1966326254
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1966326253}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 193002072}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1966326255
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1966326253}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 851dde348ae5407fba100fe7e4b584c5, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &2092657031
GameObject:
m_ObjectHideFlags: 0
Expand Down

This file was deleted.

This file was deleted.

9 changes: 0 additions & 9 deletions Assets/Scripts/SS3D/Core/ApplicationMode.cs

This file was deleted.

3 changes: 0 additions & 3 deletions Assets/Scripts/SS3D/Core/ApplicationMode.cs.meta

This file was deleted.

111 changes: 0 additions & 111 deletions Assets/Scripts/SS3D/Core/ApplicationStateManager.cs

This file was deleted.

Loading

0 comments on commit dde09d8

Please sign in to comment.