Files
AppleHillsProduction/Assets/Prefabs/Levels/DivingForPictures Variant.prefab

263 lines
12 KiB
Plaintext
Raw Permalink Normal View History

Refactoring of the interaction system and preliminary integration of save/load functionality across the game. (#44) ### Interactables Architecture Refactor - Converted composition to inheritance, moved from component-based to class-based interactables. No more requirement for chain of "Interactable -> Item" etc. - Created `InteractableBase` abstract base class with common functionality that replaces the old component - Specialized child classes: `Pickup`, `ItemSlot`, `LevelSwitch`, `MinigameSwitch`, `CombinationItem`, `OneClickInteraction` are now children classes - Light updates to the interactable inspector, moved some things arround, added collapsible inspector sections in the UI for better editor experience ### State Machine Integration - Custom `AppleMachine` inheritong from Pixelplacement's StateMachine which implements our own interface for saving, easy place for future improvements - Replaced all previous StateMachines by `AppleMachine` - Custom `AppleState` extends from default `State`. Added serialization, split state logic into "EnterState", "RestoreState", "ExitState" allowing for separate logic when triggering in-game vs loading game - Restores directly to target state without triggering transitional logic - Migration tool converts existing instances ### Prefab Organization - Saved changes from scenes into prefabs - Cleaned up duplicated components, confusing prefabs hierarchies - Created prefab variants where possible - Consolidated Environment prefabs and moved them out of Placeholders subfolder into main Environment folder - Organized item prefabs from PrefabsPLACEHOLDER into proper Items folder - Updated prefab references - All scene references updated to new locations - Removed placeholder files from Characters, Levels, UI, and Minigames folders ### Scene Updates - Quarry scene with major updates - Saved multiple working versions (Quarry, Quarry_Fixed, Quarry_OLD) - Added proper lighting data - Updated all interactable components to new architecture ### Minor editor tools - New tool for testing cards from an editor window (no in-scene object required) - Updated Interactable Inspector - New debug option to opt in-and-out of the save/load system - Tooling for easier migration Co-authored-by: Michal Pikulski <michal.a.pikulski@gmail.com> Reviewed-on: https://homelab.tailf7f81b.ts.net/tschesky/AppleHillsProduction/pulls/44
2025-11-03 10:12:51 +00:00
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &8217106691260952431
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 841695541655102207, guid: 7f0745739e84b73439c2fac1d3c3884c, type: 3}
propertyPath: m_Size.x
value: 19.587194
objectReference: {fileID: 0}
- target: {fileID: 841695541655102207, guid: 7f0745739e84b73439c2fac1d3c3884c, type: 3}
propertyPath: m_Size.y
value: 11.473267
objectReference: {fileID: 0}
- target: {fileID: 841695541655102207, guid: 7f0745739e84b73439c2fac1d3c3884c, type: 3}
propertyPath: m_Offset.x
value: 0.086318016
objectReference: {fileID: 0}
- target: {fileID: 841695541655102207, guid: 7f0745739e84b73439c2fac1d3c3884c, type: 3}
propertyPath: m_Offset.y
value: 0.43159032
objectReference: {fileID: 0}
- target: {fileID: 841695541655102207, guid: 7f0745739e84b73439c2fac1d3c3884c, type: 3}
propertyPath: m_SpriteTilingProperty.pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 841695541655102207, guid: 7f0745739e84b73439c2fac1d3c3884c, type: 3}
propertyPath: m_SpriteTilingProperty.pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 841695541655102207, guid: 7f0745739e84b73439c2fac1d3c3884c, type: 3}
propertyPath: m_SpriteTilingProperty.newSize.x
value: 19.4
objectReference: {fileID: 0}
- target: {fileID: 841695541655102207, guid: 7f0745739e84b73439c2fac1d3c3884c, type: 3}
propertyPath: m_SpriteTilingProperty.newSize.y
value: 12.07
objectReference: {fileID: 0}
- target: {fileID: 841695541655102207, guid: 7f0745739e84b73439c2fac1d3c3884c, type: 3}
propertyPath: m_SpriteTilingProperty.oldSize.x
value: 19.4
objectReference: {fileID: 0}
- target: {fileID: 841695541655102207, guid: 7f0745739e84b73439c2fac1d3c3884c, type: 3}
propertyPath: m_SpriteTilingProperty.oldSize.y
value: 12.07
objectReference: {fileID: 0}
- target: {fileID: 841695541655102207, guid: 7f0745739e84b73439c2fac1d3c3884c, type: 3}
propertyPath: m_SpriteTilingProperty.adaptiveTilingThreshold
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1498439134679474750, guid: 7f0745739e84b73439c2fac1d3c3884c, type: 3}
propertyPath: m_Name
value: DivingForPictures
objectReference: {fileID: 0}
- target: {fileID: 4428217320659622763, guid: 7f0745739e84b73439c2fac1d3c3884c, type: 3}
propertyPath: m_LocalScale.x
value: 0.6
objectReference: {fileID: 0}
- target: {fileID: 4428217320659622763, guid: 7f0745739e84b73439c2fac1d3c3884c, type: 3}
propertyPath: m_LocalScale.y
value: 0.6
objectReference: {fileID: 0}
- target: {fileID: 4428217320659622763, guid: 7f0745739e84b73439c2fac1d3c3884c, type: 3}
propertyPath: m_LocalScale.z
value: 0.6
objectReference: {fileID: 0}
- target: {fileID: 4428217320659622763, guid: 7f0745739e84b73439c2fac1d3c3884c, type: 3}
propertyPath: m_LocalPosition.x
value: 53.24
objectReference: {fileID: 0}
- target: {fileID: 4428217320659622763, guid: 7f0745739e84b73439c2fac1d3c3884c, type: 3}
propertyPath: m_LocalPosition.y
value: 48.2
objectReference: {fileID: 0}
- target: {fileID: 4428217320659622763, guid: 7f0745739e84b73439c2fac1d3c3884c, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4428217320659622763, guid: 7f0745739e84b73439c2fac1d3c3884c, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4428217320659622763, guid: 7f0745739e84b73439c2fac1d3c3884c, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4428217320659622763, guid: 7f0745739e84b73439c2fac1d3c3884c, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4428217320659622763, guid: 7f0745739e84b73439c2fac1d3c3884c, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4428217320659622763, guid: 7f0745739e84b73439c2fac1d3c3884c, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4428217320659622763, guid: 7f0745739e84b73439c2fac1d3c3884c, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4428217320659622763, guid: 7f0745739e84b73439c2fac1d3c3884c, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4428217320659622763, guid: 7f0745739e84b73439c2fac1d3c3884c, type: 3}
propertyPath: m_ConstrainProportionsScale
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4981092805118965486, guid: 7f0745739e84b73439c2fac1d3c3884c, type: 3}
propertyPath: characterToInteract
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5374700348512867011, guid: 7f0745739e84b73439c2fac1d3c3884c, type: 3}
propertyPath: m_Size.x
value: 19.4
objectReference: {fileID: 0}
- target: {fileID: 5374700348512867011, guid: 7f0745739e84b73439c2fac1d3c3884c, type: 3}
propertyPath: m_Size.y
value: 12.07
objectReference: {fileID: 0}
- target: {fileID: 5374700348512867011, guid: 7f0745739e84b73439c2fac1d3c3884c, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 2730440365418504821, guid: 55ac8382720be7e4c856d9fc8864902c, type: 3}
2025-12-12 14:36:39 +01:00
- target: {fileID: 5374700348512867011, guid: 7f0745739e84b73439c2fac1d3c3884c, type: 3}
propertyPath: m_SortingOrder
value: 1
objectReference: {fileID: 0}
Refactoring of the interaction system and preliminary integration of save/load functionality across the game. (#44) ### Interactables Architecture Refactor - Converted composition to inheritance, moved from component-based to class-based interactables. No more requirement for chain of "Interactable -> Item" etc. - Created `InteractableBase` abstract base class with common functionality that replaces the old component - Specialized child classes: `Pickup`, `ItemSlot`, `LevelSwitch`, `MinigameSwitch`, `CombinationItem`, `OneClickInteraction` are now children classes - Light updates to the interactable inspector, moved some things arround, added collapsible inspector sections in the UI for better editor experience ### State Machine Integration - Custom `AppleMachine` inheritong from Pixelplacement's StateMachine which implements our own interface for saving, easy place for future improvements - Replaced all previous StateMachines by `AppleMachine` - Custom `AppleState` extends from default `State`. Added serialization, split state logic into "EnterState", "RestoreState", "ExitState" allowing for separate logic when triggering in-game vs loading game - Restores directly to target state without triggering transitional logic - Migration tool converts existing instances ### Prefab Organization - Saved changes from scenes into prefabs - Cleaned up duplicated components, confusing prefabs hierarchies - Created prefab variants where possible - Consolidated Environment prefabs and moved them out of Placeholders subfolder into main Environment folder - Organized item prefabs from PrefabsPLACEHOLDER into proper Items folder - Updated prefab references - All scene references updated to new locations - Removed placeholder files from Characters, Levels, UI, and Minigames folders ### Scene Updates - Quarry scene with major updates - Saved multiple working versions (Quarry, Quarry_Fixed, Quarry_OLD) - Added proper lighting data - Updated all interactable components to new architecture ### Minor editor tools - New tool for testing cards from an editor window (no in-scene object required) - Updated Interactable Inspector - New debug option to opt in-and-out of the save/load system - Tooling for easier migration Co-authored-by: Michal Pikulski <michal.a.pikulski@gmail.com> Reviewed-on: https://homelab.tailf7f81b.ts.net/tschesky/AppleHillsProduction/pulls/44
2025-11-03 10:12:51 +00:00
- target: {fileID: 5374700348512867011, guid: 7f0745739e84b73439c2fac1d3c3884c, type: 3}
propertyPath: m_WasSpriteAssigned
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8846215231430339145, guid: 7f0745739e84b73439c2fac1d3c3884c, type: 3}
propertyPath: switchData
value:
objectReference: {fileID: 11400000, guid: 5861b0a3b22b57f43a00cab7c7faafaa, type: 2}
m_RemovedComponents: []
m_RemovedGameObjects: []
2025-12-12 14:36:39 +01:00
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 4428217320659622763, guid: 7f0745739e84b73439c2fac1d3c3884c, type: 3}
insertIndex: -1
addedObject: {fileID: 3759928168912412826}
Refactoring of the interaction system and preliminary integration of save/load functionality across the game. (#44) ### Interactables Architecture Refactor - Converted composition to inheritance, moved from component-based to class-based interactables. No more requirement for chain of "Interactable -> Item" etc. - Created `InteractableBase` abstract base class with common functionality that replaces the old component - Specialized child classes: `Pickup`, `ItemSlot`, `LevelSwitch`, `MinigameSwitch`, `CombinationItem`, `OneClickInteraction` are now children classes - Light updates to the interactable inspector, moved some things arround, added collapsible inspector sections in the UI for better editor experience ### State Machine Integration - Custom `AppleMachine` inheritong from Pixelplacement's StateMachine which implements our own interface for saving, easy place for future improvements - Replaced all previous StateMachines by `AppleMachine` - Custom `AppleState` extends from default `State`. Added serialization, split state logic into "EnterState", "RestoreState", "ExitState" allowing for separate logic when triggering in-game vs loading game - Restores directly to target state without triggering transitional logic - Migration tool converts existing instances ### Prefab Organization - Saved changes from scenes into prefabs - Cleaned up duplicated components, confusing prefabs hierarchies - Created prefab variants where possible - Consolidated Environment prefabs and moved them out of Placeholders subfolder into main Environment folder - Organized item prefabs from PrefabsPLACEHOLDER into proper Items folder - Updated prefab references - All scene references updated to new locations - Removed placeholder files from Characters, Levels, UI, and Minigames folders ### Scene Updates - Quarry scene with major updates - Saved multiple working versions (Quarry, Quarry_Fixed, Quarry_OLD) - Added proper lighting data - Updated all interactable components to new architecture ### Minor editor tools - New tool for testing cards from an editor window (no in-scene object required) - Updated Interactable Inspector - New debug option to opt in-and-out of the save/load system - Tooling for easier migration Co-authored-by: Michal Pikulski <michal.a.pikulski@gmail.com> Reviewed-on: https://homelab.tailf7f81b.ts.net/tschesky/AppleHillsProduction/pulls/44
2025-11-03 10:12:51 +00:00
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 7f0745739e84b73439c2fac1d3c3884c, type: 3}
2025-12-12 14:36:39 +01:00
--- !u!212 &4080194752436190636 stripped
SpriteRenderer:
m_CorrespondingSourceObject: {fileID: 5374700348512867011, guid: 7f0745739e84b73439c2fac1d3c3884c, type: 3}
m_PrefabInstance: {fileID: 8217106691260952431}
m_PrefabAsset: {fileID: 0}
--- !u!4 &5727794563305583620 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4428217320659622763, guid: 7f0745739e84b73439c2fac1d3c3884c, type: 3}
m_PrefabInstance: {fileID: 8217106691260952431}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &8942606456399796501
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 5727794563305583620}
m_Modifications:
- target: {fileID: 1386870209246758790, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: m_LocalPosition.x
value: -0.4
objectReference: {fileID: 0}
- target: {fileID: 1852608221241404454, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 2730440365418504821, guid: 55ac8382720be7e4c856d9fc8864902c, type: 3}
- target: {fileID: 2974211257881602794, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: m_LocalPosition.y
value: -0.4
objectReference: {fileID: 0}
- target: {fileID: 4322425255501872291, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: m_Name
value: GlowOutline
objectReference: {fileID: 0}
- target: {fileID: 4848605646775039287, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: m_LocalPosition.y
value: 0.4
objectReference: {fileID: 0}
- target: {fileID: 5094223041467069679, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 2730440365418504821, guid: 55ac8382720be7e4c856d9fc8864902c, type: 3}
- target: {fileID: 5203759348480833935, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5203759348480833935, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5203759348480833935, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5203759348480833935, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5203759348480833935, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5203759348480833935, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5203759348480833935, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5203759348480833935, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5203759348480833935, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5203759348480833935, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5692747743727126428, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 2730440365418504821, guid: 55ac8382720be7e4c856d9fc8864902c, type: 3}
- target: {fileID: 5928692606425386029, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: m_LocalPosition.x
value: 0.4
objectReference: {fileID: 0}
- target: {fileID: 6093743105869044773, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 2730440365418504821, guid: 55ac8382720be7e4c856d9fc8864902c, type: 3}
- target: {fileID: 6900224008763310802, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: thiccness
value: 0.4
objectReference: {fileID: 0}
- target: {fileID: 6900224008763310802, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: itemSprite
value:
objectReference: {fileID: 4080194752436190636}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
--- !u!4 &3759928168912412826 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 5203759348480833935, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
m_PrefabInstance: {fileID: 8942606456399796501}
m_PrefabAsset: {fileID: 0}