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:
1741
Assets/Prefabs/Puzzles/AnneLise/AnneLiseBaseBush.prefab
Normal file
1741
Assets/Prefabs/Puzzles/AnneLise/AnneLiseBaseBush.prefab
Normal file
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 9b2926886934b554f9a1727331d34787
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,63 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1001 &3195881368778955934
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 2741639361616064442, guid: 9b2926886934b554f9a1727331d34787, type: 3}
|
||||
propertyPath: dialogueGraph
|
||||
value:
|
||||
objectReference: {fileID: 3965311268370046156, guid: 46759f564789eb143b76724597351ddb, type: 3}
|
||||
- target: {fileID: 5943355783477523754, guid: 9b2926886934b554f9a1727331d34787, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: AnneLiseBushB Variant
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -27.09
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 3.58
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 9b2926886934b554f9a1727331d34787, type: 3}
|
||||
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: f15bf96f88d21b14191ad80200912775
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,67 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1001 &1821939616807664211
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1193493154550576580, guid: 9b2926886934b554f9a1727331d34787, type: 3}
|
||||
propertyPath: reactionClipToPlay
|
||||
value:
|
||||
objectReference: {fileID: 8300000, guid: 33f05a858a3520a45bdec9db2cc6693c, type: 3}
|
||||
- target: {fileID: 2741639361616064442, guid: 9b2926886934b554f9a1727331d34787, type: 3}
|
||||
propertyPath: dialogueGraph
|
||||
value:
|
||||
objectReference: {fileID: 3965311268370046156, guid: dd4e693761c2f6b41b02a07b1a74bbd1, type: 3}
|
||||
- target: {fileID: 5943355783477523754, guid: 9b2926886934b554f9a1727331d34787, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: AnneLiseBush_FootballBird
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 54.84
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -37.62
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 9b2926886934b554f9a1727331d34787, type: 3}
|
||||
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: fc42c3bdda1c86d49b0bf80c28e5d372
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,63 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1001 &1354737084349956748
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 2741639361616064442, guid: 9b2926886934b554f9a1727331d34787, type: 3}
|
||||
propertyPath: dialogueGraph
|
||||
value:
|
||||
objectReference: {fileID: 3965311268370046156, guid: 810524054ceb4324fa4a594b416dde43, type: 3}
|
||||
- target: {fileID: 5943355783477523754, guid: 9b2926886934b554f9a1727331d34787, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: AnneLiseBushC Variant
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 15.12
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 33.35
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 9b2926886934b554f9a1727331d34787, type: 3}
|
||||
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 21444cac99fc9944a85884eccbc8b78d
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,63 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1001 &8113932533366191520
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1193493154550576580, guid: 9b2926886934b554f9a1727331d34787, type: 3}
|
||||
propertyPath: reactionClipToPlay
|
||||
value:
|
||||
objectReference: {fileID: 8300000, guid: 0ca909ee49d83134d9040e527ba94af4, type: 3}
|
||||
- target: {fileID: 5943355783477523754, guid: 9b2926886934b554f9a1727331d34787, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: AnneLiseBush_SoundBird
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -71.04
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 67.12
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 9b2926886934b554f9a1727331d34787, type: 3}
|
||||
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 3fa494ec083cbe54a86c3a1b107a90c0
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Reference in New Issue
Block a user