tschesky
011901eb8f
### 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
132 lines
5.8 KiB
Plaintext
132 lines
5.8 KiB
Plaintext
%YAML 1.1
|
|
%TAG !u! tag:unity3d.com,2011:
|
|
--- !u!1001 &3407175540968533319
|
|
PrefabInstance:
|
|
m_ObjectHideFlags: 0
|
|
serializedVersion: 2
|
|
m_Modification:
|
|
serializedVersion: 3
|
|
m_TransformParent: {fileID: 0}
|
|
m_Modifications:
|
|
- target: {fileID: 592045584872845087, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
|
|
propertyPath: itemData
|
|
value:
|
|
objectReference: {fileID: 11400000, guid: ff4bbba87722023468a0f6395d1f96c7, type: 2}
|
|
- target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
|
|
propertyPath: m_LocalScale.x
|
|
value: 2
|
|
objectReference: {fileID: 0}
|
|
- target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
|
|
propertyPath: m_LocalScale.y
|
|
value: 2
|
|
objectReference: {fileID: 0}
|
|
- target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
|
|
propertyPath: m_LocalScale.z
|
|
value: 0.5
|
|
objectReference: {fileID: 0}
|
|
- target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
|
|
propertyPath: m_LocalPosition.x
|
|
value: 66.7
|
|
objectReference: {fileID: 0}
|
|
- target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
|
|
propertyPath: m_LocalPosition.y
|
|
value: 28.3
|
|
objectReference: {fileID: 0}
|
|
- target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
|
|
propertyPath: m_LocalPosition.z
|
|
value: 0
|
|
objectReference: {fileID: 0}
|
|
- target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
|
|
propertyPath: m_LocalRotation.w
|
|
value: 1
|
|
objectReference: {fileID: 0}
|
|
- target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
|
|
propertyPath: m_LocalRotation.x
|
|
value: 0
|
|
objectReference: {fileID: 0}
|
|
- target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
|
|
propertyPath: m_LocalRotation.y
|
|
value: 0
|
|
objectReference: {fileID: 0}
|
|
- target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
|
|
propertyPath: m_LocalRotation.z
|
|
value: 0
|
|
objectReference: {fileID: 0}
|
|
- target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
|
|
propertyPath: m_LocalEulerAnglesHint.x
|
|
value: 0
|
|
objectReference: {fileID: 0}
|
|
- target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
|
|
propertyPath: m_LocalEulerAnglesHint.y
|
|
value: 0
|
|
objectReference: {fileID: 0}
|
|
- target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
|
|
propertyPath: m_LocalEulerAnglesHint.z
|
|
value: 0
|
|
objectReference: {fileID: 0}
|
|
- target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
|
|
propertyPath: m_ConstrainProportionsScale
|
|
value: 1
|
|
objectReference: {fileID: 0}
|
|
- target: {fileID: 3070149615425714466, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
|
|
propertyPath: m_Size.x
|
|
value: 2
|
|
objectReference: {fileID: 0}
|
|
- target: {fileID: 3070149615425714466, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
|
|
propertyPath: m_Size.y
|
|
value: 2
|
|
objectReference: {fileID: 0}
|
|
- target: {fileID: 3070149615425714466, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
|
|
propertyPath: m_SpriteTilingProperty.pivot.x
|
|
value: 0.5
|
|
objectReference: {fileID: 0}
|
|
- target: {fileID: 3070149615425714466, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
|
|
propertyPath: m_SpriteTilingProperty.pivot.y
|
|
value: 0.5
|
|
objectReference: {fileID: 0}
|
|
- target: {fileID: 3070149615425714466, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
|
|
propertyPath: m_SpriteTilingProperty.newSize.x
|
|
value: 1.34
|
|
objectReference: {fileID: 0}
|
|
- target: {fileID: 3070149615425714466, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
|
|
propertyPath: m_SpriteTilingProperty.newSize.y
|
|
value: 1.53
|
|
objectReference: {fileID: 0}
|
|
- target: {fileID: 3070149615425714466, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
|
|
propertyPath: m_SpriteTilingProperty.oldSize.x
|
|
value: 3.68
|
|
objectReference: {fileID: 0}
|
|
- target: {fileID: 3070149615425714466, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
|
|
propertyPath: m_SpriteTilingProperty.oldSize.y
|
|
value: 3.96
|
|
objectReference: {fileID: 0}
|
|
- target: {fileID: 3070149615425714466, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
|
|
propertyPath: m_SpriteTilingProperty.adaptiveTilingThreshold
|
|
value: 0.5
|
|
objectReference: {fileID: 0}
|
|
- target: {fileID: 7447346505753002421, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
|
|
propertyPath: m_Name
|
|
value: Chocolate
|
|
objectReference: {fileID: 0}
|
|
- target: {fileID: 7494677664706785084, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
|
|
propertyPath: m_Size.x
|
|
value: 1.34
|
|
objectReference: {fileID: 0}
|
|
- target: {fileID: 7494677664706785084, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
|
|
propertyPath: m_Size.y
|
|
value: 1.53
|
|
objectReference: {fileID: 0}
|
|
- target: {fileID: 7494677664706785084, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
|
|
propertyPath: m_Sprite
|
|
value:
|
|
objectReference: {fileID: -3811075571101519331, guid: 4a1a1ea0011e5644c917aaa7255ab48f, type: 3}
|
|
- target: {fileID: 7494677664706785084, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
|
|
propertyPath: m_WasSpriteAssigned
|
|
value: 1
|
|
objectReference: {fileID: 0}
|
|
m_RemovedComponents: []
|
|
m_RemovedGameObjects: []
|
|
m_AddedGameObjects: []
|
|
m_AddedComponents: []
|
|
m_SourcePrefab: {fileID: 100100000, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
|