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: #44
This commit is contained in:
2025-11-03 10:12:51 +00:00
parent d317fffad7
commit 011901eb8f
148 changed files with 969503 additions and 10746 deletions

View File

@@ -11,7 +11,6 @@ GameObject:
- component: {fileID: 4428217320659622763}
- component: {fileID: 5374700348512867011}
- component: {fileID: 841695541655102207}
- component: {fileID: 4981092805118965486}
- component: {fileID: 1397300447834037203}
m_Layer: 10
m_Name: BaseLevelSwitch
@@ -55,6 +54,8 @@ SpriteRenderer:
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_ForceMeshLod: -1
m_MeshLodSelectionBias: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -76,6 +77,7 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
@@ -136,18 +138,6 @@ BoxCollider2D:
m_AutoTiling: 0
m_Size: {x: 1, y: 1}
m_EdgeRadius: 0
--- !u!114 &4981092805118965486
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1498439134679474750}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 73d6494a73174ffabc6a7d3089d51e73, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &1397300447834037203
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -160,5 +150,19 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 66cdab2e217c4c8388e2fc66da02f296, type: 3}
m_Name:
m_EditorClassIdentifier:
isOneTime: 0
cooldown: -1
characterToInteract: 0
interactionStarted:
m_PersistentCalls:
m_Calls: []
interactionInterrupted:
m_PersistentCalls:
m_Calls: []
characterArrived:
m_PersistentCalls:
m_Calls: []
interactionComplete:
m_PersistentCalls:
m_Calls: []
switchData: {fileID: 0}
iconRenderer: {fileID: 5374700348512867011}

View File

@@ -0,0 +1,143 @@
%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}
- 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: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 7f0745739e84b73439c2fac1d3c3884c, type: 3}

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: f44866deaba5f5c4a90f0330dd9957f0
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -11,7 +11,6 @@ GameObject:
- component: {fileID: 4428217320659622763}
- component: {fileID: 5374700348512867011}
- component: {fileID: 841695541655102207}
- component: {fileID: 4981092805118965486}
- component: {fileID: 8846215231430339145}
m_Layer: 10
m_Name: MinigameLevelSwitch
@@ -139,33 +138,6 @@ BoxCollider2D:
m_AutoTiling: 0
m_Size: {x: 1, y: 1}
m_EdgeRadius: 0
--- !u!114 &4981092805118965486
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1498439134679474750}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 73d6494a73174ffabc6a7d3089d51e73, type: 3}
m_Name:
m_EditorClassIdentifier:
isOneTime: 0
cooldown: -1
characterToInteract: 2
interactionStarted:
m_PersistentCalls:
m_Calls: []
interactionInterrupted:
m_PersistentCalls:
m_Calls: []
characterArrived:
m_PersistentCalls:
m_Calls: []
interactionComplete:
m_PersistentCalls:
m_Calls: []
--- !u!114 &8846215231430339145
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -178,4 +150,19 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d9b7a2b4b1fe492aae7b0f280b4063cf, type: 3}
m_Name:
m_EditorClassIdentifier: AppleHillsScripts::Levels.MinigameSwitch
isOneTime: 0
cooldown: -1
characterToInteract: 0
interactionStarted:
m_PersistentCalls:
m_Calls: []
interactionInterrupted:
m_PersistentCalls:
m_Calls: []
characterArrived:
m_PersistentCalls:
m_Calls: []
interactionComplete:
m_PersistentCalls:
m_Calls: []
switchData: {fileID: 0}

View File

@@ -1 +0,0 @@


View File

@@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: 7c62f153a7edbe140b9d4a960a25345e
timeCreated: 1756719493