浏览代码

Reorganising SceneDataSOs

/UI
Ciro Continisio 4 年前
当前提交
94a617c8
共有 17 个文件被更改,包括 34 次插入103 次删除
  1. 10
      UOP1_Project/Assets/AddressableAssetsData/AssetGroups/DataScriptableObjects.asset
  2. 6
      UOP1_Project/Assets/ScriptableObjects/SceneData/Gameplay.asset
  3. 7
      UOP1_Project/Assets/ScriptableObjects/SceneData/Initialization.asset
  4. 7
      UOP1_Project/Assets/ScriptableObjects/SceneData/Locations/Beach.asset
  5. 7
      UOP1_Project/Assets/ScriptableObjects/SceneData/Locations/Forest.asset
  6. 7
      UOP1_Project/Assets/ScriptableObjects/SceneData/Locations/Glade.asset
  7. 7
      UOP1_Project/Assets/ScriptableObjects/SceneData/Menus/MainMenu.asset
  8. 8
      UOP1_Project/Assets/ScriptableObjects/SceneData/PersistentManagers.asset
  9. 5
      UOP1_Project/Assets/ScriptableObjects/SceneData/WIP/ArtShowcase.asset
  10. 7
      UOP1_Project/Assets/ScriptableObjects/SceneData/WIP/TestingGround.asset
  11. 10
      UOP1_Project/Assets/Scripts/SceneManagement/ScriptableObjects/GameSceneSO.cs
  12. 5
      UOP1_Project/Assets/Scripts/SceneManagement/ScriptableObjects/GameplaySO.cs
  13. 2
      UOP1_Project/Assets/Scripts/SceneManagement/ScriptableObjects/LocationSO.cs
  14. 13
      UOP1_Project/Assets/Scripts/SceneManagement/ScriptableObjects/MenuSO.cs
  15. 2
      UOP1_Project/Assets/Scripts/SceneManagement/ScriptableObjects/PathSO.cs
  16. 26
      UOP1_Project/Assets/ScriptableObjects/SceneData/WIP/Whiteboxing_Map.asset
  17. 8
      UOP1_Project/Assets/ScriptableObjects/SceneData/WIP/Whiteboxing_Map.asset.meta

10
UOP1_Project/Assets/AddressableAssetsData/AssetGroups/DataScriptableObjects.asset


m_Address: Assets/ScriptableObjects/Audio
m_ReadOnly: 0
m_SerializedLabels: []
m_MainAsset: {fileID: 102900000, guid: e7009e3e2b334b548a409f0767264d4c, type: 3}
m_TargetAsset: {fileID: 102900000, guid: e7009e3e2b334b548a409f0767264d4c, type: 3}
m_MainAsset: {fileID: 0}
m_TargetAsset: {fileID: 0}
- m_GUID: c63a4917c16ecb94082a0b8f3577466b
m_Address: Assets/ScriptableObjects/Inventory
m_ReadOnly: 0

m_SerializedLabels: []
m_MainAsset: {fileID: 102900000, guid: f3dfc6bd09db0bc48a552f2fac5946ea, type: 3}
m_TargetAsset: {fileID: 102900000, guid: f3dfc6bd09db0bc48a552f2fac5946ea, type: 3}
- m_GUID: e271b750d2bb8f64d8f7c8637675da4c
- m_GUID: 58cd3c0eba455b8418fec6114f6b5377
m_MainAsset: {fileID: 102900000, guid: e271b750d2bb8f64d8f7c8637675da4c, type: 3}
m_TargetAsset: {fileID: 102900000, guid: e271b750d2bb8f64d8f7c8637675da4c, type: 3}
m_MainAsset: {fileID: 102900000, guid: 58cd3c0eba455b8418fec6114f6b5377, type: 3}
m_TargetAsset: {fileID: 102900000, guid: 58cd3c0eba455b8418fec6114f6b5377, type: 3}
m_ReadOnly: 0
m_Settings: {fileID: 11400000, guid: bffab80dc16c4464b92b2e97b6a1964c, type: 2}
m_SchemaSet:

6
UOP1_Project/Assets/ScriptableObjects/SceneData/Gameplay.asset


m_Script: {fileID: 11500000, guid: a4a9aff793e557d4790d9a834c6560bc, type: 3}
m_Name: Gameplay
m_EditorClassIdentifier:
sceneAsset: {fileID: 102900000, guid: 9a863f9bc60514821bc17f41d9f0162c, type: 3}
scenePath: Assets/Scenes/Gameplay.unity
shortDescription: Gameplay elements including UI and inventory managers
description: Gameplay elements including UI and inventory manager
music: {fileID: 0}
shortDescription:

7
UOP1_Project/Assets/ScriptableObjects/SceneData/Initialization.asset


m_Script: {fileID: 11500000, guid: 7eabf0d1b44567046bb98dff8a1cd7ac, type: 3}
m_Name: Initialization
m_EditorClassIdentifier:
description: The scene from where the game starts and it is responsible for loading
PersistentManagers scene and raises the event to load the main menu.
scenePath: Assets/Scenes/Initialization.unity
shortDescription: The scene from where the game starts and it is responsible for
loading PersistentManagers scene and raises the event to load the main menu.
music: {fileID: 0}
shortDescription:

7
UOP1_Project/Assets/ScriptableObjects/SceneData/Locations/Beach.asset


m_Script: {fileID: 11500000, guid: 8db63739a6674d74e8e232347422172f, type: 3}
m_Name: Beach
m_EditorClassIdentifier:
sceneAsset: {fileID: 102900000, guid: dfaf60263d5c5dc4e80e2793f4328b32, type: 3}
scenePath: Assets/Scenes/Locations/Beach.unity
shortDescription: The level to find X
description:
music: {fileID: 0}
shortDescription:
locationName:
m_TableReference:
m_TableCollectionName: GUID:5f392fa78068846188a7ed5595276c8f

m_FallbackState: 0
musicTrack: {fileID: 0}

7
UOP1_Project/Assets/ScriptableObjects/SceneData/Locations/Forest.asset


m_Script: {fileID: 11500000, guid: 8db63739a6674d74e8e232347422172f, type: 3}
m_Name: Forest
m_EditorClassIdentifier:
sceneAsset: {fileID: 102900000, guid: 3a816f06c17361b4398583570bcbf8eb, type: 3}
scenePath: Assets/Scenes/Locations/Forest.unity
shortDescription: Find Y
description:
music: {fileID: 0}
shortDescription:
locationName:
m_TableReference:
m_TableCollectionName: GUID:5f392fa78068846188a7ed5595276c8f

m_FallbackState: 0
musicTrack: {fileID: 0}

7
UOP1_Project/Assets/ScriptableObjects/SceneData/Locations/Glade.asset


m_Script: {fileID: 11500000, guid: 8db63739a6674d74e8e232347422172f, type: 3}
m_Name: Glade
m_EditorClassIdentifier:
sceneAsset: {fileID: 102900000, guid: 92a4a277a346e4344b629ad5613f7c51, type: 3}
scenePath: Assets/Scenes/Locations/Glade.unity
shortDescription: Glade Location
description:
music: {fileID: 0}
shortDescription:
locationName:
m_TableReference:
m_TableCollectionName: GUID:5f392fa78068846188a7ed5595276c8f

m_FallbackState: 0
musicTrack: {fileID: 0}

7
UOP1_Project/Assets/ScriptableObjects/SceneData/Menus/MainMenu.asset


m_Script: {fileID: 11500000, guid: 3546e1f9ebb6f054fb677b86f543542b, type: 3}
m_Name: MainMenu
m_EditorClassIdentifier:
sceneAsset: {fileID: 102900000, guid: df490f8a21305b549b67b8301af79724, type: 3}
scenePath: Assets/Scenes/Menus/MainMenu.unity
shortDescription: The main menu of the game
description: Main/title menu, the only menu that exists as a standalone scene
music: {fileID: 0}
menuType: 0
shortDescription:

8
UOP1_Project/Assets/ScriptableObjects/SceneData/PersistentManagers.asset


m_Script: {fileID: 11500000, guid: 7eabf0d1b44567046bb98dff8a1cd7ac, type: 3}
m_Name: PersistentManagers
m_EditorClassIdentifier:
sceneAsset: {fileID: 102900000, guid: 969b7f174e8c76843aa3fcdbade0487b, type: 3}
scenePath: Assets/Scenes/PersistentManagers.unity
shortDescription: The scene that contains all the persistent managers in the game
like scene loader and Audio manager etc...
description: The scene that contains all the persistent managers in the game like
scene loader and Audio manager etc...
music: {fileID: 0}
shortDescription:

5
UOP1_Project/Assets/ScriptableObjects/SceneData/WIP/ArtShowcase.asset


m_Script: {fileID: 11500000, guid: a4a9aff793e557d4790d9a834c6560bc, type: 3}
m_Name: ArtShowcase
m_EditorClassIdentifier:
description: Just a demo scene to see art assets, not used in the game
scenePath: Assets/Scenes/WIP/ArtShowcase.unity
shortDescription: Just a demo scene to see art assets, not used in the game
music: {fileID: 0}
shortDescription:

7
UOP1_Project/Assets/ScriptableObjects/SceneData/WIP/TestingGround.asset


m_Script: {fileID: 11500000, guid: 8db63739a6674d74e8e232347422172f, type: 3}
m_Name: TestingGround
m_EditorClassIdentifier:
sceneAsset: {fileID: 102900000, guid: 1e57caa7d7ed5e24a88cb3b5c309cc65, type: 3}
scenePath: Assets/Scenes/WIP/TestingGround.unity
shortDescription:
description: Just a WIP scene, not used in the game
music: {fileID: 0}
shortDescription:
locationName:
m_TableReference:
m_TableCollectionName:

m_FallbackState: 0
musicTrack: {fileID: 0}

10
UOP1_Project/Assets/Scripts/SceneManagement/ScriptableObjects/GameSceneSO.cs


/// This class is a base class which contains what is common to all game scenes (Locations or Menus)
/// </summary>
public class GameSceneSO : ScriptableObject
public class GameSceneSO : DescriptionBaseSO
[Header("Information")]
public string scenePath;
[TextArea] public string shortDescription;
[Header("Sounds")]
public AudioClip music;
}

5
UOP1_Project/Assets/Scripts/SceneManagement/ScriptableObjects/GameplaySO.cs


[CreateAssetMenu(fileName = "NewGameplayScene", menuName = "Scene Data/Gameplay")]
public class GameplaySO : GameSceneSO
{
//[Header("Gameplay specific")]
}
public class GameplaySO : GameSceneSO { }

2
UOP1_Project/Assets/Scripts/SceneManagement/ScriptableObjects/LocationSO.cs


[CreateAssetMenu(fileName = "NewLocation", menuName = "Scene Data/Location")]
public class LocationSO : GameSceneSO
{
[Header("Location specific")]
public AudioClip musicTrack;
}

13
UOP1_Project/Assets/Scripts/SceneManagement/ScriptableObjects/MenuSO.cs


/// <summary>
/// This class contains Settings specific to Menus only
/// </summary>
public enum Menu
{
Main_Menu,
Pause_Menu
}
public class MenuSO : GameSceneSO
{
[Header("Menu specific")]
public Menu menuType;
}
public class MenuSO : GameSceneSO { }

2
UOP1_Project/Assets/Scripts/SceneManagement/ScriptableObjects/PathSO.cs


using UnityEngine;
/// <summary>
/// This class contains Settings specific to Paths, which are used to determine the connecting entrances and exits between Locations
/// Paths are used to determine the connecting entrances and exits between Locations
/// </summary>
[CreateAssetMenu(fileName = "BetweenLocation1AndLocation2", menuName = "Scene Data/Path")]

26
UOP1_Project/Assets/ScriptableObjects/SceneData/WIP/Whiteboxing_Map.asset


%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8db63739a6674d74e8e232347422172f, type: 3}
m_Name: Whiteboxing_Map
m_EditorClassIdentifier:
sceneAsset: {fileID: 102900000, guid: dc0e470f94aabbd4c8eb653a65b00315, type: 3}
scenePath: Assets/Scenes/Whiteboxing/GeneralMap/Proposal 1/GeneralMap_Proposal
1.unity
shortDescription: Whiteboxing of the whole island
music: {fileID: 0}
locationName:
m_TableReference:
m_TableCollectionName:
m_TableEntryReference:
m_KeyId: 0
m_Key:
enemiesCount: 0

8
UOP1_Project/Assets/ScriptableObjects/SceneData/WIP/Whiteboxing_Map.asset.meta


fileFormatVersion: 2
guid: b6eb99b6a389e7240a76ba358990126b
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
正在加载...
取消
保存