浏览代码

Fixes to ScriptableObjects values

/main
Ciro Continisio 3 年前
当前提交
534f3a7b
共有 21 个文件被更改,包括 63 次插入61 次删除
  1. 4
      UOP1_Project/Assets/AddressableAssetsData/AssetGroups/LogicScriptableObjects.asset
  2. 60
      UOP1_Project/Assets/Prefabs/Characters/NPCs_BasePrefabs/Groen.prefab
  3. 4
      UOP1_Project/Assets/ScriptableObjects/EventChannels/Questlines/Questline1Over-AddRockCandyRecipe.asset
  4. 4
      UOP1_Project/Assets/ScriptableObjects/EventChannels/Questlines/Questline5-DecideOnDishes.asset
  5. 2
      UOP1_Project/Assets/ScriptableObjects/EventChannels/Questlines/StartCinematic-IntroBeach.asset
  6. 2
      UOP1_Project/Assets/ScriptableObjects/EventChannels/Questlines/StartCinematic-RockCandyDiscovery.asset
  7. 2
      UOP1_Project/Assets/ScriptableObjects/EventChannels/Questlines/StartCinematic-SavoryDishTasting.asset
  8. 4
      UOP1_Project/Assets/ScriptableObjects/EventChannels/Questlines/StartCinematic-SlimeCrittersAttack.asset
  9. 2
      UOP1_Project/Assets/ScriptableObjects/EventChannels/Questlines/StartCinematic-SweetDishTasting.asset
  10. 4
      UOP1_Project/Assets/ScriptableObjects/EventChannels/SceneManagement/ColdStartup_Channel.asset
  11. 4
      UOP1_Project/Assets/ScriptableObjects/EventChannels/SceneManagement/LoadLocation_Channel.asset
  12. 5
      UOP1_Project/Assets/ScriptableObjects/EventChannels/SceneManagement/LoadMenu_Channel.asset
  13. 3
      UOP1_Project/Assets/ScriptableObjects/EventChannels/SceneManagement/OnSceneReady.asset
  14. 4
      UOP1_Project/Assets/ScriptableObjects/StateMachine/GameState/Conditions/IsInCombatGameState.asset
  15. 4
      UOP1_Project/Assets/ScriptableObjects/StateMachine/GameState/Conditions/IsInDialogueGameState.asset
  16. 4
      UOP1_Project/Assets/ScriptableObjects/StateMachine/GameState/Conditions/IsInGameplayGameState.asset
  17. 4
      UOP1_Project/Assets/ScriptableObjects/StateMachine/GameState/Conditions/IsInInventoryGameState.asset
  18. 4
      UOP1_Project/Assets/ScriptableObjects/StateMachine/GameState/Conditions/IsInPauseGameState.asset
  19. 4
      UOP1_Project/Assets/ScriptableObjects/StateMachine/GameState/Conditions/IsInTransitionGameState.asset
  20. 0
      /UOP1_Project/Assets/Scenes/WIP/Settings System.unity
  21. 0
      /UOP1_Project/Assets/Scenes/WIP/Settings System.unity.meta

4
UOP1_Project/Assets/AddressableAssetsData/AssetGroups/LogicScriptableObjects.asset


m_Address: Assets/ScriptableObjects/Input
m_ReadOnly: 0
m_SerializedLabels: []
- m_GUID: 58c5280ba04164e4e867544e2a10f4a3
m_Address: Assets/ScriptableObjects/Events
m_ReadOnly: 0
m_SerializedLabels: []
- m_GUID: 350f007900383bb498b0b44aa6129b13
m_Address: Assets/ScriptableObjects/RuntimeAnchors
m_ReadOnly: 0

60
UOP1_Project/Assets/Prefabs/Characters/NPCs_BasePrefabs/Groen.prefab


m_Name:
m_EditorClassIdentifier:
_healthConfigSO: {fileID: 11400000, guid: 301a61db8a2a4ef408992e723f0b6b53, type: 2}
_currentHealthSO: {fileID: 0}
_updateHealthEvent: {fileID: 11400000, guid: 2447a760b3f9f134f8730aa53c8d2ece, type: 2}
_deathEvent: {fileID: 11400000, guid: 0a29544909be226418bc1677ec369790, type: 2}
_restoreHealth: {fileID: 11400000, guid: de4a39f85969d44cba990125224ff7ef, type: 2}
--- !u!114 &5617243883715629265
MonoBehaviour:
m_ObjectHideFlags: 0

objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 415e24332f8993c4da4c452ed27d2873, type: 3}
--- !u!4 &7900849304968062265 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1745331680755163471, guid: 415e24332f8993c4da4c452ed27d2873,
type: 3}
m_PrefabInstance: {fileID: 8475173613595968630}
m_PrefabAsset: {fileID: 0}
--- !u!4 &2154738241042901890 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 7528600739965906932, guid: 415e24332f8993c4da4c452ed27d2873,

--- !u!4 &1577963483032510801 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 6952379229305972007, guid: 415e24332f8993c4da4c452ed27d2873,
type: 3}
m_PrefabInstance: {fileID: 8475173613595968630}
m_PrefabAsset: {fileID: 0}
--- !u!4 &7618537762606215315 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -7194598512780364571, guid: 415e24332f8993c4da4c452ed27d2873,
type: 3}
m_PrefabInstance: {fileID: 8475173613595968630}
m_PrefabAsset: {fileID: 0}

type: 3}
m_PrefabInstance: {fileID: 8475173613595968630}
m_PrefabAsset: {fileID: 0}
--- !u!4 &7618537762606215315 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -7194598512780364571, guid: 415e24332f8993c4da4c452ed27d2873,
--- !u!1 &8745063237678790951 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 415e24332f8993c4da4c452ed27d2873,
type: 3}
m_PrefabInstance: {fileID: 8475173613595968630}
m_PrefabAsset: {fileID: 0}

type: 3}
m_PrefabInstance: {fileID: 8475173613595968630}
m_PrefabAsset: {fileID: 0}
--- !u!4 &8221149608678237085 stripped
--- !u!4 &7900849304968062265 stripped
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 415e24332f8993c4da4c452ed27d2873,
m_CorrespondingSourceObject: {fileID: 1745331680755163471, guid: 415e24332f8993c4da4c452ed27d2873,
--- !u!1 &8745063237678790951 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 415e24332f8993c4da4c452ed27d2873,
--- !u!4 &3367916164164828314 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 6566495199314442476, guid: 415e24332f8993c4da4c452ed27d2873,
--- !u!4 &5123279322988003801 stripped
--- !u!4 &7492415303597500717 stripped
m_CorrespondingSourceObject: {fileID: -5583242968700353105, guid: 415e24332f8993c4da4c452ed27d2873,
m_CorrespondingSourceObject: {fileID: -7897143885434458789, guid: 415e24332f8993c4da4c452ed27d2873,
--- !u!4 &4188975802292468309 stripped
--- !u!4 &7234782137268576505 stripped
m_CorrespondingSourceObject: {fileID: 5746564759562468899, guid: 415e24332f8993c4da4c452ed27d2873,
m_CorrespondingSourceObject: {fileID: -7927811463243438961, guid: 415e24332f8993c4da4c452ed27d2873,
type: 3}
m_PrefabInstance: {fileID: 8475173613595968630}
m_PrefabAsset: {fileID: 0}

type: 3}
m_PrefabInstance: {fileID: 8475173613595968630}
m_PrefabAsset: {fileID: 0}
--- !u!4 &7234782137268576505 stripped
--- !u!4 &2333203040040827346 stripped
m_CorrespondingSourceObject: {fileID: -7927811463243438961, guid: 415e24332f8993c4da4c452ed27d2873,
m_CorrespondingSourceObject: {fileID: -3027282400719110748, guid: 415e24332f8993c4da4c452ed27d2873,
type: 3}
m_PrefabInstance: {fileID: 8475173613595968630}
m_PrefabAsset: {fileID: 0}

type: 3}
m_PrefabInstance: {fileID: 8475173613595968630}
m_PrefabAsset: {fileID: 0}
--- !u!4 &2333203040040827346 stripped
--- !u!4 &5093156719673898483 stripped
m_CorrespondingSourceObject: {fileID: -3027282400719110748, guid: 415e24332f8993c4da4c452ed27d2873,
m_CorrespondingSourceObject: {fileID: -5533980067985051259, guid: 415e24332f8993c4da4c452ed27d2873,
type: 3}
m_PrefabInstance: {fileID: 8475173613595968630}
m_PrefabAsset: {fileID: 0}

type: 3}
m_PrefabInstance: {fileID: 8475173613595968630}
m_PrefabAsset: {fileID: 0}
--- !u!4 &7492415303597500717 stripped
--- !u!4 &4188975802292468309 stripped
m_CorrespondingSourceObject: {fileID: -7897143885434458789, guid: 415e24332f8993c4da4c452ed27d2873,
m_CorrespondingSourceObject: {fileID: 5746564759562468899, guid: 415e24332f8993c4da4c452ed27d2873,
--- !u!4 &3367916164164828314 stripped
--- !u!4 &8221149608678237085 stripped
m_CorrespondingSourceObject: {fileID: 6566495199314442476, guid: 415e24332f8993c4da4c452ed27d2873,
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 415e24332f8993c4da4c452ed27d2873,
--- !u!4 &5093156719673898483 stripped
--- !u!4 &5123279322988003801 stripped
m_CorrespondingSourceObject: {fileID: -5533980067985051259, guid: 415e24332f8993c4da4c452ed27d2873,
m_CorrespondingSourceObject: {fileID: -5583242968700353105, guid: 415e24332f8993c4da4c452ed27d2873,
type: 3}
m_PrefabInstance: {fileID: 8475173613595968630}
m_PrefabAsset: {fileID: 0}

4
UOP1_Project/Assets/ScriptableObjects/EventChannels/Questlines/Questline1Over-AddRockCandyRecipe.asset


m_Script: {fileID: 11500000, guid: 7fafac715ff920c4383fed91a38a351e, type: 3}
m_Name: Questline1Over-AddRockCandyRecipe
m_EditorClassIdentifier:
description: "At the end of questline 1 a special recipe needs to be added to the
inventory. \nThe Game Manager listens to this event. "
description: 'At the end of questline 1 a special recipe needs to be added to the
inventory. The Game Manager listens to this event. '

4
UOP1_Project/Assets/ScriptableObjects/EventChannels/Questlines/Questline5-DecideOnDishes.asset


m_Script: {fileID: 11500000, guid: 7fafac715ff920c4383fed91a38a351e, type: 3}
m_Name: Questline5-DecideOnDishes
m_EditorClassIdentifier:
description: 'When Pig chef meets the bardhare, he decides on preparing one of
two dishes '
description: 'When Hamlet meets the Bard Hare, he decides on preparing one of two
dishes '

2
UOP1_Project/Assets/ScriptableObjects/EventChannels/Questlines/StartCinematic-IntroBeach.asset


m_Script: {fileID: 11500000, guid: 7fafac715ff920c4383fed91a38a351e, type: 3}
m_Name: StartCinematic-IntroBeach
m_EditorClassIdentifier:
description: Start the cinematic when pig chef arrives on the boat
description: Start the cinematic when Hamlet arrives on the boat

2
UOP1_Project/Assets/ScriptableObjects/EventChannels/Questlines/StartCinematic-RockCandyDiscovery.asset


m_Script: {fileID: 11500000, guid: 7fafac715ff920c4383fed91a38a351e, type: 3}
m_Name: StartCinematic-RockCandyDiscovery
m_EditorClassIdentifier:
description: Start the cinematic for Rock candy discovery
description: Start the cinematic for the discovery of the Rock candy recipe

2
UOP1_Project/Assets/ScriptableObjects/EventChannels/Questlines/StartCinematic-SavoryDishTasting.asset


m_Script: {fileID: 11500000, guid: 7fafac715ff920c4383fed91a38a351e, type: 3}
m_Name: StartCinematic-SavoryDishTasting
m_EditorClassIdentifier:
description: 'Start the cinematic for savory dish tasting by the fry king. '
description: Start the cinematic for savory dish tasting by the Legendary chef.

4
UOP1_Project/Assets/ScriptableObjects/EventChannels/Questlines/StartCinematic-SlimeCrittersAttack.asset


m_Script: {fileID: 11500000, guid: 7fafac715ff920c4383fed91a38a351e, type: 3}
m_Name: StartCinematic-SlimeCrittersAttack
m_EditorClassIdentifier:
description: Start the cinematic for the slime critters attack in farmland when
interacting with Townsfolk1
description: Start the cinematic for the slime critters attack in the Farmlands
when interacting with Townsfolk1

2
UOP1_Project/Assets/ScriptableObjects/EventChannels/Questlines/StartCinematic-SweetDishTasting.asset


m_Script: {fileID: 11500000, guid: 7fafac715ff920c4383fed91a38a351e, type: 3}
m_Name: StartCinematic-SweetDishTasting
m_EditorClassIdentifier:
description: 'Start the cinematic for sweet dish tasting by the fry king. '
description: Start the cinematic for sweet dish tasting by the Legendary Chef

4
UOP1_Project/Assets/ScriptableObjects/EventChannels/SceneManagement/ColdStartup_Channel.asset


m_Script: {fileID: 11500000, guid: 82df99cd4c7564d4ca44d50a1dce516b, type: 3}
m_Name: ColdStartup_Channel
m_EditorClassIdentifier:
description: Raised to notify the SceneLoader that the user has pressed Play in
the editor from a Location scene.
description: Raised by the EditorInitializer Prefab to notify the SceneLoader that
the user has pressed Play in the editor from a Location scene.

4
UOP1_Project/Assets/ScriptableObjects/EventChannels/SceneManagement/LoadLocation_Channel.asset


m_Script: {fileID: 11500000, guid: 82df99cd4c7564d4ca44d50a1dce516b, type: 3}
m_Name: LoadLocation_Channel
m_EditorClassIdentifier:
description: Raised to change scene, and load one or multiple new scenes. Usually
as a result of the player entering a trigger to move to another location.
description: Raised to request the loading of a new Location scene. Usually as
a result of the player entering a trigger to move to another location.

5
UOP1_Project/Assets/ScriptableObjects/EventChannels/SceneManagement/LoadMenu_Channel.asset


m_Script: {fileID: 11500000, guid: 82df99cd4c7564d4ca44d50a1dce516b, type: 3}
m_Name: LoadMenu_Channel
m_EditorClassIdentifier:
description: Raised to change scene, when going back to Main Menu or when the game
moves from initiatlization to Main Menu at the beginning
description: Raised to request the loading of a new Menu scene, when going back
to Main Menu or when the game moves from initiatlization to Main Menu at the
beginning

3
UOP1_Project/Assets/ScriptableObjects/EventChannels/SceneManagement/OnSceneReady.asset


m_Script: {fileID: 11500000, guid: 7fafac715ff920c4383fed91a38a351e, type: 3}
m_Name: OnSceneReady
m_EditorClassIdentifier:
description: Raised when the scene is loaded and set active
description: Raised by the SceneLoader script when the scene is loaded and set
active

4
UOP1_Project/Assets/ScriptableObjects/StateMachine/GameState/Conditions/IsInCombatGameState.asset


m_Script: {fileID: 11500000, guid: 7019e587931b79440a550f74f9fffb47, type: 3}
m_Name: IsInCombatGameState
m_EditorClassIdentifier:
_currentGameState: 6
_gameStateManager: {fileID: 11400000, guid: 159f9c22d98e249ceb08f2c5de2311a4, type: 2}
gameStateToCheck: 6
gameStateSO: {fileID: 11400000, guid: 159f9c22d98e249ceb08f2c5de2311a4, type: 2}

4
UOP1_Project/Assets/ScriptableObjects/StateMachine/GameState/Conditions/IsInDialogueGameState.asset


m_Script: {fileID: 11500000, guid: 7019e587931b79440a550f74f9fffb47, type: 3}
m_Name: IsInDialogueGameState
m_EditorClassIdentifier:
_currentGameState: 3
_gameStateManager: {fileID: 11400000, guid: 159f9c22d98e249ceb08f2c5de2311a4, type: 2}
gameStateToCheck: 3
gameStateSO: {fileID: 11400000, guid: 159f9c22d98e249ceb08f2c5de2311a4, type: 2}

4
UOP1_Project/Assets/ScriptableObjects/StateMachine/GameState/Conditions/IsInGameplayGameState.asset


m_Script: {fileID: 11500000, guid: 7019e587931b79440a550f74f9fffb47, type: 3}
m_Name: IsInGameplayGameState
m_EditorClassIdentifier:
_currentGameState: 0
_gameStateManager: {fileID: 11400000, guid: 159f9c22d98e249ceb08f2c5de2311a4, type: 2}
gameStateToCheck: 0
gameStateSO: {fileID: 11400000, guid: 159f9c22d98e249ceb08f2c5de2311a4, type: 2}

4
UOP1_Project/Assets/ScriptableObjects/StateMachine/GameState/Conditions/IsInInventoryGameState.asset


m_Script: {fileID: 11500000, guid: 7019e587931b79440a550f74f9fffb47, type: 3}
m_Name: IsInInventoryGameState
m_EditorClassIdentifier:
_currentGameState: 2
_gameStateManager: {fileID: 11400000, guid: 159f9c22d98e249ceb08f2c5de2311a4, type: 2}
gameStateToCheck: 2
gameStateSO: {fileID: 11400000, guid: 159f9c22d98e249ceb08f2c5de2311a4, type: 2}

4
UOP1_Project/Assets/ScriptableObjects/StateMachine/GameState/Conditions/IsInPauseGameState.asset


m_Script: {fileID: 11500000, guid: 7019e587931b79440a550f74f9fffb47, type: 3}
m_Name: IsInPauseGameState
m_EditorClassIdentifier:
_currentGameState: 1
_gameStateManager: {fileID: 11400000, guid: 159f9c22d98e249ceb08f2c5de2311a4, type: 2}
gameStateToCheck: 1
gameStateSO: {fileID: 11400000, guid: 159f9c22d98e249ceb08f2c5de2311a4, type: 2}

4
UOP1_Project/Assets/ScriptableObjects/StateMachine/GameState/Conditions/IsInTransitionGameState.asset


m_Script: {fileID: 11500000, guid: 7019e587931b79440a550f74f9fffb47, type: 3}
m_Name: IsInTransitionGameState
m_EditorClassIdentifier:
_currentGameState: 5
_gameStateManager: {fileID: 11400000, guid: 159f9c22d98e249ceb08f2c5de2311a4, type: 2}
gameStateToCheck: 5
gameStateSO: {fileID: 11400000, guid: 159f9c22d98e249ceb08f2c5de2311a4, type: 2}

/UOP1_Project/Assets/Scenes/Settings System.unity → /UOP1_Project/Assets/Scenes/WIP/Settings System.unity

/UOP1_Project/Assets/Scenes/Settings System.unity.meta → /UOP1_Project/Assets/Scenes/WIP/Settings System.unity.meta

正在加载...
取消
保存