Compare commits

..

13 Commits

Author SHA1 Message Date
Michal Pikulski
5b33eb8fbb Finalize work on the dump controller switching 2025-12-15 10:18:43 +01:00
Michal Pikulski
b14fdfbe68 A bit wonky but working switching 2025-12-15 00:57:50 +01:00
Michal Pikulski
8995dd1949 Working item switcher 2025-12-15 00:05:35 +01:00
journaliciouz
a78085adee Factory changes 2025-12-14 17:50:52 +01:00
journaliciouz
1f344efb08 Tweaked intro timeline to deactivate if not used 2025-12-14 17:39:55 +01:00
journaliciouz
313d27f7f2 Added outlines to overworld 2025-12-14 17:12:08 +01:00
journaliciouz
b3efb02c2c Made intro timeline, added it to cementfactory 2025-12-14 17:02:37 +01:00
journaliciouz
a0a316dbbd Made level flyover in cement factory 2025-12-13 23:08:50 +01:00
journaliciouz
dd7eeea6db Fixed pantsless worker anims 2025-12-13 18:16:49 +01:00
journaliciouz
a83e4e7cef Tweaked and flipped some dialogues in quarry 2025-12-13 15:49:29 +01:00
journaliciouz
dc6ea23240 Added animation to dialogue bubbles 2025-12-13 15:34:34 +01:00
journaliciouz
2dd9d34e6c Added animation to dialogue prompts 2025-12-13 15:17:19 +01:00
458124dbce Animated outline slightly 2025-12-12 15:27:53 +01:00
91 changed files with 10287 additions and 1298 deletions

View File

@@ -15,7 +15,7 @@ MonoBehaviour:
m_DefaultGroup: 6f3207429a65b3e4b83935ac19791077
m_currentHash:
serializedVersion: 2
Hash: b784c72547c16021d9ba62425af8f54d
Hash: db7c325bc1c3b07b5df2a878bfe7afa8
m_OptimizeCatalogSize: 0
m_BuildRemoteCatalog: 0
m_CatalogRequestsTimeout: 0

View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 862a414e356d3ac46b3a88fe0c87ca4e
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,14 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d6fa2d92fc1b3f34da284357edf89c3b, type: 3}
m_Name: ExplodeMachine
m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.SignalAsset

View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 624acdeeb1ef5d041945271eb29fb68f
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,14 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d6fa2d92fc1b3f34da284357edf89c3b, type: 3}
m_Name: ExplosionFinished
m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.SignalAsset

View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 50cc58e8ee01bf841a920508fe336516
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 04513080f1b7ba446b8584d74f2a962c
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,101 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1107 &-6484590902691764050
AnimatorStateMachine:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: -688496058071959580}
m_Position: {x: 200, y: 0, z: 0}
- serializedVersion: 1
m_State: {fileID: 7748524414974568688}
m_Position: {x: 235, y: 65, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: -688496058071959580}
--- !u!1102 &-688496058071959580
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: IntroCameraPan
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 0680383f2c43345488fb3bf4825b277e, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: IntroCamera
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: -6484590902691764050}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_DefaultWeight: 0
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1102 &7748524414974568688
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: IntroCameraDolly
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 6badee07711138a42949c8da798ddec4, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:

View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: cb52439326f0dfd4081f11e37b78525e
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,122 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: IntroCameraDolly
serializedVersion: 7
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 9
value: 0.9999
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_SplineSettings.Position
path:
classID: 114
script: {fileID: 11500000, guid: 90eebaab98e4b44b0ba8c79821e554e1, type: 3}
flags: 0
m_PPtrCurves: []
m_SampleRate: 30
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 0
attribute: 1440463563
script: {fileID: 11500000, guid: 90eebaab98e4b44b0ba8c79821e554e1, type: 3}
typeID: 114
customType: 0
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 9
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 9
value: 0.9999
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_SplineSettings.Position
path:
classID: 114
script: {fileID: 11500000, guid: 90eebaab98e4b44b0ba8c79821e554e1, type: 3}
flags: 0
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []

View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 6badee07711138a42949c8da798ddec4
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,285 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: IntroCameraPan
serializedVersion: 7
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 49.6, y: -24.3, z: -355.72003}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 2.5
value: {x: 49.6, y: -70.7, z: -355.72003}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 5
value: {x: -42.1, y: -70.7, z: -355.72003}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 7.4666667
value: {x: -42.1, y: -24.6, z: -355.72003}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 9.966666
value: {x: -9.2, y: -67.6, z: -355.72003}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path:
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves: []
m_SampleRate: 30
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 0
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 9.966666
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 49.6
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.5
value: 49.6
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 5
value: -42.1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 7.4666667
value: -42.1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 9.966666
value: -9.2
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.x
path:
classID: 4
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -24.3
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.5
value: -70.7
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 5
value: -70.7
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 7.4666667
value: -24.6
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 9.966666
value: -67.6
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.y
path:
classID: 4
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -355.72003
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.5
value: -355.72003
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 5
value: -355.72003
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 7.4666667
value: -355.72003
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 9.966666
value: -355.72003
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path:
classID: 4
script: {fileID: 0}
flags: 0
m_EulerEditorCurves: []
m_HasGenericRootTransform: 1
m_HasMotionFloatCurves: 0
m_Events: []

View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 0680383f2c43345488fb3bf4825b277e
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,14 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d6fa2d92fc1b3f34da284357edf89c3b, type: 3}
m_Name: PrintMachineWorking
m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.SignalAsset

View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: fc40e2ad40f81aa4595bdf7a53dc58b3
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,14 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d6fa2d92fc1b3f34da284357edf89c3b, type: 3}
m_Name: ScreenShakeSignall
m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.SignalAsset

View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: f6e768cb2846e014897c467c13e9377a
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -16,7 +16,28 @@ AnimationClip:
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_FloatCurves:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_FlipX
path:
classID: 212
script: {fileID: 0}
flags: 0
m_PPtrCurves:
- serializedVersion: 2
curve:
@@ -138,6 +159,15 @@ AnimationClip:
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 0
attribute: 555744692
script: {fileID: 0}
typeID: 212
customType: 0
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
- serializedVersion: 2
path: 0
attribute: 0
@@ -221,8 +251,43 @@ AnimationClip:
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves: []
m_EditorCurves:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_FlipX
path:
classID: 212
script: {fileID: 0}
flags: 0
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []
m_Events:
- time: 0.26666668
functionName: PauseTween
data:
objectReferenceParameter: {fileID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0
- time: 1.7333333
functionName: WorkerGotUp
data:
objectReferenceParameter: {fileID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0

View File

@@ -276,4 +276,18 @@ AnimationClip:
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []
m_Events:
- time: 0.26666668
functionName: PauseTween
data:
objectReferenceParameter: {fileID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0
- time: 1.7333333
functionName: WorkerGotUp
data:
objectReferenceParameter: {fileID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0

View File

@@ -217,8 +217,8 @@ AnimationClip:
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events:
- time: 0.1
functionName:
- time: 1.6333333
functionName: TransitionToReturnState
data:
objectReferenceParameter: {fileID: 0}
floatParameter: 0

View File

@@ -126,4 +126,11 @@ AnimationClip:
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []
m_Events:
- time: 0.6333333
functionName: EnableBeltInteraction
data:
objectReferenceParameter: {fileID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0

View File

@@ -16,7 +16,28 @@ AnimationClip:
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_FloatCurves:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_FlipX
path:
classID: 212
script: {fileID: 0}
flags: 0
m_PPtrCurves:
- serializedVersion: 2
curve:
@@ -46,6 +67,15 @@ AnimationClip:
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 0
attribute: 555744692
script: {fileID: 0}
typeID: 212
customType: 0
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
- serializedVersion: 2
path: 0
attribute: 0
@@ -83,7 +113,28 @@ AnimationClip:
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves: []
m_EditorCurves:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_FlipX
path:
classID: 212
script: {fileID: 0}
flags: 0
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0

View File

@@ -16,7 +16,28 @@ AnimationClip:
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_FloatCurves:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_FlipX
path:
classID: 212
script: {fileID: 0}
flags: 0
m_PPtrCurves:
- serializedVersion: 2
curve:
@@ -74,6 +95,15 @@ AnimationClip:
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 0
attribute: 555744692
script: {fileID: 0}
typeID: 212
customType: 0
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
- serializedVersion: 2
path: 0
attribute: 0
@@ -125,7 +155,28 @@ AnimationClip:
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves: []
m_EditorCurves:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_FlipX
path:
classID: 212
script: {fileID: 0}
flags: 0
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0

View File

@@ -16,7 +16,28 @@ AnimationClip:
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_FloatCurves:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_FlipX
path:
classID: 212
script: {fileID: 0}
flags: 0
m_PPtrCurves:
- serializedVersion: 2
curve:
@@ -72,6 +93,15 @@ AnimationClip:
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 0
attribute: 555744692
script: {fileID: 0}
typeID: 212
customType: 0
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
- serializedVersion: 2
path: 0
attribute: 0
@@ -122,7 +152,28 @@ AnimationClip:
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves: []
m_EditorCurves:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_FlipX
path:
classID: 212
script: {fileID: 0}
flags: 0
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0

View File

@@ -16,7 +16,28 @@ AnimationClip:
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_FloatCurves:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_FlipX
path:
classID: 212
script: {fileID: 0}
flags: 0
m_PPtrCurves:
- serializedVersion: 2
curve:
@@ -42,6 +63,15 @@ AnimationClip:
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 0
attribute: 555744692
script: {fileID: 0}
typeID: 212
customType: 0
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
- serializedVersion: 2
path: 0
attribute: 0
@@ -77,7 +107,28 @@ AnimationClip:
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves: []
m_EditorCurves:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_FlipX
path:
classID: 212
script: {fileID: 0}
flags: 0
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0

View File

@@ -0,0 +1,517 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-7559709786221121258
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2ade37431c2ce3f498221263298558ff, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::ResetTrigger
triggerToReset: shouldFall?
--- !u!114 &-7400305621533718299
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2ade37431c2ce3f498221263298558ff, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::ResetTrigger
triggerToReset: shouldFall?
--- !u!114 &-6778143586135497295
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5a1c7afe0aaa3f94e87d17a0795a0aa2, type: 3}
m_Name:
m_EditorClassIdentifier: '::'
--- !u!1102 &-6567889547732147609
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: worker_noPantsWalk_r
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -2209893457913046377}
- {fileID: 6809965347497371432}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: b516fcb66c5323b46afb777e0ad49be7, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &-5339321826386231782
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -2592505286661766779}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0.34060892
m_ExitTime: 0.9934487
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-4911838176500225459
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: shouldFall?
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -129613960355832961}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0.14150952
m_ExitTime: 1
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-4623195881401911605
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: walkingRight?
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 7979021593183280829}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 1.0738486
m_ExitTime: 1.0008069
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-4246026034738526664
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -6567889547732147609}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0.3329118
m_ExitTime: 0.99873567
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-4140271114307507140
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -2592505286661766779}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0.33330896
m_ExitTime: 0.9999275
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1107 &-4102663254947421282
AnimatorStateMachine:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: NoPants
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: -2592505286661766779}
m_Position: {x: 140, y: 290, z: 0}
- serializedVersion: 1
m_State: {fileID: 7979021593183280829}
m_Position: {x: 460, y: 230, z: 0}
- serializedVersion: 1
m_State: {fileID: -129613960355832961}
m_Position: {x: 140, y: 460, z: 0}
- serializedVersion: 1
m_State: {fileID: 7973066089414065652}
m_Position: {x: 750, y: 450, z: 0}
- serializedVersion: 1
m_State: {fileID: 8593148252126181856}
m_Position: {x: 460, y: 400, z: 0}
- serializedVersion: 1
m_State: {fileID: -6567889547732147609}
m_Position: {x: 750, y: 280, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 330, y: 60, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: -2592505286661766779}
--- !u!1102 &-2592505286661766779
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: worker_noPantsWalk_l
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -4623195881401911605}
- {fileID: -4911838176500225459}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: bf1d4d93be0ea294d81bd746b2afb3ec, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &-2209893457913046377
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 2
m_ConditionEvent: walkingRight?
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 8593148252126181856}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 1.0719782
m_ExitTime: 1.0001835
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &-129613960355832961
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: worker_PantsFall_l
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -5339321826386231782}
m_StateMachineBehaviours:
- {fileID: -7559709786221121258}
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: bd79c81f4acaaa141a3390d8b2efb4e5, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: WalkingWorker_NoPants
serializedVersion: 5
m_AnimatorParameters:
- m_Name: isLifting?
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
- m_Name: walkingRight?
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
- m_Name: beltSnatched?
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
- m_Name: shouldFall?
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
- m_Name: pantsDown?
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: 4941208078434220659}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_DefaultWeight: 0
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1107 &4941208078434220659
AnimatorStateMachine:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Base Layer
m_ChildStates: []
m_ChildStateMachines:
- serializedVersion: 1
m_StateMachine: {fileID: -4102663254947421282}
m_Position: {x: 120, y: 310, z: 0}
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 160, y: 140, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: -2592505286661766779}
--- !u!1101 &5772367669253040934
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -6567889547732147609}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0.3474311
m_ExitTime: 0.9961518
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &6809965347497371432
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: shouldFall?
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 7973066089414065652}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0.13495815
m_ExitTime: 0.9834656
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!114 &6965343785813838728
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: eee1f05978eee2e428f4683aa88b99e8, type: 3}
m_Name:
m_EditorClassIdentifier: '::'
--- !u!1102 &7973066089414065652
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: worker_PantsFall_r
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 5772367669253040934}
m_StateMachineBehaviours:
- {fileID: -7400305621533718299}
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 04b1e8252c869a44482b51f2e1f9c79a, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &7979021593183280829
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: worker_noPantsTurn_l
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -4246026034738526664}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: ac6142b208fb10b4aa6ac58cfa9dc13b, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &8593148252126181856
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: worker_noPantsTurn_r
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -4140271114307507140}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 5dd9b6b83a867d842881e651db6e3913, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:

View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: fc3d5896722098d488aa4a8d74401ef7
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -85,7 +85,7 @@ AnimatorStateTransition:
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: beltSnatched?
m_ConditionEvent: pantsDown?
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -2592505286661766779}
@@ -156,6 +156,18 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!114 &-6778143586135497295
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5a1c7afe0aaa3f94e87d17a0795a0aa2, type: 3}
m_Name:
m_EditorClassIdentifier: '::'
--- !u!1102 &-6595828197760105551
AnimatorState:
serializedVersion: 6
@@ -528,9 +540,9 @@ AnimatorStateTransition:
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.85
m_TransitionDuration: 0
m_TransitionOffset: 0.3571433
m_ExitTime: 1
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
@@ -547,6 +559,9 @@ AnimatorStateTransition:
- m_ConditionMode: 2
m_ConditionEvent: isLifting?
m_EventTreshold: 0
- m_ConditionMode: 2
m_ConditionEvent: pantsDown?
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 7035337645352864553}
m_Solo: 0
@@ -674,6 +689,12 @@ AnimatorController:
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
- m_Name: pantsDown?
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
@@ -687,6 +708,23 @@ AnimatorController:
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1109 &927456190632279895
AnimatorTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: pantsDown?
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -2592505286661766779}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 1
--- !u!1107 &1511038749384435185
AnimatorStateMachine:
serializedVersion: 6
@@ -808,7 +846,7 @@ AnimatorStateMachine:
m_Position: {x: 520, y: 380, z: 0}
- serializedVersion: 1
m_State: {fileID: 7035337645352864553}
m_Position: {x: 490, y: 590, z: 0}
m_Position: {x: 470, y: 620, z: 0}
- serializedVersion: 1
m_State: {fileID: -4614972993273545715}
m_Position: {x: 60, y: 470, z: 0}
@@ -821,9 +859,9 @@ AnimatorStateMachine:
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 50, y: 120, z: 0}
m_EntryPosition: {x: 570, y: 200, z: 0}
m_ExitPosition: {x: 940, y: 80, z: 0}
m_ParentStateMachinePosition: {x: 320, y: 450, z: 0}
m_ParentStateMachinePosition: {x: 330, y: 450, z: 0}
m_DefaultState: {fileID: -6595828197760105551}
--- !u!1101 &4350741523647240393
AnimatorStateTransition:
@@ -865,16 +903,19 @@ AnimatorStateMachine:
m_ChildStateMachines:
- serializedVersion: 1
m_StateMachine: {fileID: 4060046627194947660}
m_Position: {x: -80, y: 370, z: 0}
m_Position: {x: -80, y: 450, z: 0}
- serializedVersion: 1
m_StateMachine: {fileID: -4102663254947421282}
m_Position: {x: 410, y: 370, z: 0}
m_Position: {x: 440, y: 440, z: 0}
- serializedVersion: 1
m_StateMachine: {fileID: 1511038749384435185}
m_Position: {x: 170, y: 370, z: 0}
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineTransitions:
- first: {fileID: 4060046627194947660}
second:
- {fileID: 927456190632279895}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 160, y: 140, z: 0}
@@ -1059,6 +1100,9 @@ AnimatorStateTransition:
- m_ConditionMode: 1
m_ConditionEvent: isLifting?
m_EventTreshold: 0
- m_ConditionMode: 2
m_ConditionEvent: pantsDown?
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -1520664498156015716}
m_Solo: 0

View File

@@ -57,7 +57,7 @@ Material:
- _Thickness: 0.01
m_Colors:
- White: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1, g: 0.87843144, b: 0.57254905, a: 1}
- _Color: {r: 1, g: 0.8784314, b: 0.57254905, a: 1}
- _Colour: {r: 0.9341286, g: 1, b: 0, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

View File

@@ -0,0 +1,169 @@
fileFormatVersion: 2
guid: 4e5d5a9dd24adad4f80facf870ec454c
TextureImporter:
internalIDToNameTable:
- first:
213: 6821686978506991011
second: SpeakerOption_question_0
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 80
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: iOS
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: SpeakerOption_question_0
rect:
serializedVersion: 2
x: 12
y: 2
width: 245
height: 148
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
customData:
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 3a521d20a208bae50800000000000000
internalID: 6821686978506991011
vertices: []
indices:
edges: []
weights: []
outline: []
customData:
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable:
SpeakerOption_question_0: 6821686978506991011
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,101 @@
using UnityEditor;
using UnityEngine;
using Items;
namespace Editor
{
/// <summary>
/// Custom editor for ControllerSwitchItem that shows only relevant fields based on camera switch mode.
/// </summary>
[CustomEditor(typeof(ControllerSwitchItem))]
public class ControllerSwitchItemEditor : UnityEditor.Editor
{
private SerializedProperty _targetControllerName;
private SerializedProperty _cameraSwitchMode;
private SerializedProperty _targetVirtualCamera;
private SerializedProperty _targetCameraState;
private SerializedProperty _visualRepresentation;
// Base class properties
private SerializedProperty _isOneTime;
private SerializedProperty _cooldown;
private SerializedProperty _characterToInteract;
private void OnEnable()
{
// Controller Switch Settings
_targetControllerName = serializedObject.FindProperty("targetControllerName");
_cameraSwitchMode = serializedObject.FindProperty("cameraSwitchMode");
_targetVirtualCamera = serializedObject.FindProperty("targetVirtualCamera");
_targetCameraState = serializedObject.FindProperty("targetCameraState");
_visualRepresentation = serializedObject.FindProperty("visualRepresentation");
// Base class properties
_isOneTime = serializedObject.FindProperty("isOneTime");
_cooldown = serializedObject.FindProperty("cooldown");
_characterToInteract = serializedObject.FindProperty("characterToInteract");
}
public override void OnInspectorGUI()
{
serializedObject.Update();
// Draw script field (read-only)
EditorGUI.BeginDisabledGroup(true);
EditorGUILayout.ObjectField("Script", MonoScript.FromMonoBehaviour((MonoBehaviour)target), GetType(), false);
EditorGUI.EndDisabledGroup();
EditorGUILayout.Space();
// Interaction Settings (from base class)
EditorGUILayout.LabelField("Interaction Settings", EditorStyles.boldLabel);
EditorGUILayout.PropertyField(_isOneTime);
EditorGUILayout.PropertyField(_cooldown);
EditorGUILayout.PropertyField(_characterToInteract);
EditorGUILayout.Space();
// Controller Switch Settings
EditorGUILayout.LabelField("Controller Switch Settings", EditorStyles.boldLabel);
EditorGUILayout.PropertyField(_targetControllerName);
EditorGUILayout.Space();
// Camera Settings
EditorGUILayout.LabelField("Camera Settings", EditorStyles.boldLabel);
EditorGUILayout.PropertyField(_cameraSwitchMode);
// Show relevant camera fields based on mode
CameraSwitchMode mode = (CameraSwitchMode)_cameraSwitchMode.enumValueIndex;
switch (mode)
{
case CameraSwitchMode.None:
EditorGUILayout.HelpBox("No camera switching will occur. Only the controller will be switched.", MessageType.Info);
break;
case CameraSwitchMode.DirectReference:
EditorGUILayout.PropertyField(_targetVirtualCamera);
if (_targetVirtualCamera.objectReferenceValue == null)
{
EditorGUILayout.HelpBox("Assign a Cinemachine camera to blend to when switching controllers.", MessageType.Warning);
}
break;
case CameraSwitchMode.TrashMazeCameraState:
EditorGUILayout.PropertyField(_targetCameraState);
EditorGUILayout.HelpBox("Uses TrashMazeCameraController to switch camera state. Make sure TrashMazeCameraController is present in the scene.", MessageType.Info);
break;
}
EditorGUILayout.Space();
// Visual Feedback
EditorGUILayout.LabelField("Visual Feedback", EditorStyles.boldLabel);
EditorGUILayout.PropertyField(_visualRepresentation);
serializedObject.ApplyModifiedProperties();
}
}
}

View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: e193f0999dad43a4a15ace4245249070
timeCreated: 1765750391

View File

@@ -2096,6 +2096,14 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2913690643654480743, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
propertyPath: m_AnchoredPosition.x
value: 292.34677
objectReference: {fileID: 0}
- target: {fileID: 2913690643654480743, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
propertyPath: m_AnchoredPosition.y
value: 166.88583
objectReference: {fileID: 0}
- target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -2238,11 +2246,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8307219291215824345, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
propertyPath: m_AnchoredPosition.x
value: -131.34683
value: 18
objectReference: {fileID: 0}
- target: {fileID: 8307219291215824345, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
propertyPath: m_AnchoredPosition.y
value: -183.88577
value: -91
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []

View File

@@ -393,6 +393,8 @@ PlayableDirector:
value: {fileID: 0}
- key: {fileID: 6964431640287062015, guid: 1791fd5a24a3142418ed441a2a25b374, type: 2}
value: {fileID: 0}
- key: {fileID: 6955792371262468379, guid: 1791fd5a24a3142418ed441a2a25b374, type: 2}
value: {fileID: 0}
m_ExposedReferences:
m_References: []
--- !u!114 &6417332830266550134

View File

@@ -143,6 +143,8 @@ MonoBehaviour:
itemSprite: {fileID: 0}
thiccness: 0.2
interactionType: 0
animatedSprite: 0
outlineMaterial: {fileID: 2100000, guid: 5971a6dc0428a6e4b9d9718e9e97359e, type: 2}
--- !u!114 &2525679661197630634
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -245,7 +247,9 @@ MonoBehaviour:
m_Calls: []
DebugActive: 0
InScriptDrivenPause: 0
FeedbacksList: []
FeedbacksList:
- rid: 2447049174296297580
- rid: 2447049174296297569
KeepPlayModeChanges: 0
PerformanceMode: 0
RestoreInitialValuesOnDisable: 0
@@ -256,7 +260,326 @@ MonoBehaviour:
MMF_ChannelDefinition: {fileID: 0}
references:
version: 2
RefIds: []
RefIds:
- rid: 2447049174296297569
type: {class: MMF_Looper, ns: MoreMountains.Feedbacks, asm: MoreMountains.Tools}
data:
Active: 1
UniqueID: 1242809834
Label: Looper
OriginalLabel: Looper
ChannelMode: 0
Channel: 0
MMChannelDefinition: {fileID: 0}
Chance: 100
Timing:
TimescaleMode: 0
ExcludeFromHoldingPauses: 0
ContributeToTotalDuration: 1
InitialDelay: 0
CooldownDuration: 0
InterruptsOnStop: 1
NumberOfRepeats: 0
RepeatForever: 0
DelayBetweenRepeats: 1
PlayCount: 0
LimitPlayCount: 0
MaxPlayCount: 3
SetPlayCountToZeroOnReset: 0
MMFeedbacksDirectionCondition: 0
PlayDirection: 0
ConstantIntensity: 0
UseIntensityInterval: 0
IntensityIntervalMin: 0
IntensityIntervalMax: 0
Sequence: {fileID: 0}
TrackID: 0
Quantized: 0
TargetBPM: 120
AutomatedTargetAcquisition:
Mode: 0
ChildIndex: 0
RandomizeOutput: 0
RandomMultiplier: {x: 0.8, y: 1}
RandomizeDuration: 0
RandomDurationMultiplier: {x: 0.5, y: 2}
UseRange: 0
RangeDistance: 5
UseRangeFalloff: 0
RangeFalloff:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
RemapRangeFalloff: {x: 0, y: 1}
AutomaticShakerSetupButton:
ButtonText:
Owner: {fileID: 2525679661197630634}
DebugActive: 0
PauseDuration: 0
RandomizePauseDuration: 0
MinPauseDuration: 1
MaxPauseDuration: 3
RandomizeOnEachPlay: 1
ScriptDriven: 0
AutoResume: 0
AutoResumeAfter: 0.25
LoopAtLastPause: 0
LoopAtLastLoopStart: 0
InfiniteLoop: 1
NumberOfLoops: 2
NumberOfLoopsLeft: 1
InInfiniteLoop: 0
TriggerMMFeedbacksEvents: 1
OnLoop:
m_PersistentCalls:
m_Calls: []
- rid: 2447049174296297580
type: {class: MMF_Scale, ns: MoreMountains.Feedbacks, asm: MoreMountains.Tools}
data:
Active: 1
UniqueID: -1362307363
Label: Scale
OriginalLabel: Scale
ChannelMode: 0
Channel: 0
MMChannelDefinition: {fileID: 0}
Chance: 100
Timing:
TimescaleMode: 0
ExcludeFromHoldingPauses: 0
ContributeToTotalDuration: 1
InitialDelay: 0
CooldownDuration: 0
InterruptsOnStop: 1
NumberOfRepeats: 0
RepeatForever: 0
DelayBetweenRepeats: 1
PlayCount: 0
LimitPlayCount: 0
MaxPlayCount: 3
SetPlayCountToZeroOnReset: 0
MMFeedbacksDirectionCondition: 0
PlayDirection: 0
ConstantIntensity: 0
UseIntensityInterval: 0
IntensityIntervalMin: 0
IntensityIntervalMax: 0
Sequence: {fileID: 0}
TrackID: 0
Quantized: 0
TargetBPM: 120
AutomatedTargetAcquisition:
Mode: 0
ChildIndex: 0
RandomizeOutput: 0
RandomMultiplier: {x: 0.8, y: 1}
RandomizeDuration: 1
RandomDurationMultiplier: {x: 0.9, y: 1.3}
UseRange: 0
RangeDistance: 5
UseRangeFalloff: 0
RangeFalloff:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
RemapRangeFalloff: {x: 0, y: 1}
AutomaticShakerSetupButton:
ButtonText:
Owner: {fileID: 2525679661197630634}
DebugActive: 0
Mode: 0
AnimateScaleTarget: {fileID: 5203759348480833935}
MovementMode: 0
AnimateScaleDuration: 2
AnimatePositionSpeed: 1
RemapCurveZero: 1
RemapCurveOne: 1.05
Offset: 0
AnimateX: 1
AnimateScaleTweenX:
MMTweenDefinitionType: 1
MMTweenCurve: 4
Curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.3
value: 1.5
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
Initialized: 0
ConditionPropertyName: AnimateX
EnumConditionPropertyName:
EnumConditions: 0000000000000000000000000000000000000000000000000000000000000000
AnimateY: 1
AnimateScaleTweenY:
MMTweenDefinitionType: 1
MMTweenCurve: 4
Curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.3
value: 1.5
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
Initialized: 0
ConditionPropertyName: AnimateY
EnumConditionPropertyName:
EnumConditions: 0000000000000000000000000000000000000000000000000000000000000000
AnimateZ: 1
AnimateScaleTweenZ:
MMTweenDefinitionType: 1
MMTweenCurve: 4
Curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.3
value: 1.5
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
Initialized: 0
ConditionPropertyName: AnimateZ
EnumConditionPropertyName:
EnumConditions: 0000000000000000000000000000000000000000000000000000000000000000
UniformScaling: 0
AllowAdditivePlays: 0
DetermineScaleOnPlay: 0
DestinationScale: {x: 1, y: 1, z: 1}
AnimateScaleX:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
AnimateScaleY:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
AnimateScaleZ:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!1 &4516817821029416964
GameObject:
m_ObjectHideFlags: 0

View File

@@ -184,7 +184,7 @@ PrefabInstance:
- target: {fileID: 1852608221241404454, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: 'm_Materials.Array.data[0]'
value:
objectReference: {fileID: 0}
objectReference: {fileID: 2100000, guid: 5971a6dc0428a6e4b9d9718e9e97359e, type: 2}
- target: {fileID: 4322425255501872291, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: m_Name
value: GlowOutline
@@ -196,7 +196,7 @@ PrefabInstance:
- target: {fileID: 5094223041467069679, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: 'm_Materials.Array.data[0]'
value:
objectReference: {fileID: 0}
objectReference: {fileID: 2100000, guid: 5971a6dc0428a6e4b9d9718e9e97359e, type: 2}
- target: {fileID: 5203759348480833935, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: m_LocalPosition.x
value: 0
@@ -244,7 +244,7 @@ PrefabInstance:
- target: {fileID: 5692747743727126428, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: 'm_Materials.Array.data[0]'
value:
objectReference: {fileID: 0}
objectReference: {fileID: 2100000, guid: 5971a6dc0428a6e4b9d9718e9e97359e, type: 2}
- target: {fileID: 6093743105869044773, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: m_Sprite
value:
@@ -252,7 +252,7 @@ PrefabInstance:
- target: {fileID: 6093743105869044773, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: 'm_Materials.Array.data[0]'
value:
objectReference: {fileID: 0}
objectReference: {fileID: 2100000, guid: 5971a6dc0428a6e4b9d9718e9e97359e, type: 2}
- target: {fileID: 6900224008763310802, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: itemSprite
value:

View File

@@ -2114,6 +2114,7 @@ MonoBehaviour:
roamingWorker: {fileID: 5377715489692883818}
workerBeltObject: {fileID: 0}
workerAnimator: {fileID: 5383043036581615591}
pantslessController: {fileID: 9100000, guid: fc3d5896722098d488aa4a8d74401ef7, type: 2}
workerBeltStateMAchineRef: {fileID: 469746994189165090}
StartingAnchor: {fileID: 7759211224397440031}
EndingAnchor: {fileID: 7842440814220139303}
@@ -2128,6 +2129,7 @@ GameObject:
- component: {fileID: 4357190152722936295}
- component: {fileID: 458415185846848580}
- component: {fileID: 5383043036581615591}
- component: {fileID: 6101333632423197301}
m_Layer: 0
m_Name: RoamingWorkerSprites
m_TagString: Untagged
@@ -2219,7 +2221,7 @@ Animator:
m_GameObject: {fileID: 5377715489692883818}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: ee4c670ec56af694cad4fc30f78a057b, type: 2}
m_Controller: {fileID: 9100000, guid: fc3d5896722098d488aa4a8d74401ef7, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
@@ -2231,6 +2233,19 @@ Animator:
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!114 &6101333632423197301
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5377715489692883818}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a7c2bc850a85b1843bc20fd916d10650, type: 3}
m_Name:
m_EditorClassIdentifier: '::'
roamingBehaviour: {fileID: 4844309227962071648}
--- !u!1 &5555436269397455817
GameObject:
m_ObjectHideFlags: 0
@@ -2959,6 +2974,7 @@ GameObject:
- component: {fileID: 4711946738383341462}
- component: {fileID: 3102897100191072367}
- component: {fileID: 7488072885374278401}
- component: {fileID: 647902266520623799}
m_Layer: 0
m_Name: LiftingWorkerSprites
m_TagString: Untagged
@@ -3062,6 +3078,21 @@ Animator:
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!114 &647902266520623799
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7360871946912628879}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b744b8758f070614b976c431633925cb, type: 3}
m_Name:
m_EditorClassIdentifier: '::'
beltObject: {fileID: 3218216546217663448}
stateMachine: {fileID: 469746994189165090}
walkingWorkerAnimator: {fileID: 5383043036581615591}
--- !u!1 &7543599203499611814
GameObject:
m_ObjectHideFlags: 0
@@ -3552,7 +3583,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!4 &1887787980523955733
Transform:
m_ObjectHideFlags: 0
@@ -3567,6 +3598,7 @@ Transform:
m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 5426619384574848356}
- {fileID: 1634540469052352835}
m_Father: {fileID: 8534026900723933185}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &3359175225018089405
@@ -4379,10 +4411,86 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1441476127707699004, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: -9075458657767321858, guid: 6113a70fdffa15e498f283d01550c069, type: 3}
- target: {fileID: 1688506115392420945, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
propertyPath: itemData
value:
objectReference: {fileID: 11400000, guid: 45c190ffad50b994ba53f64a9838751d, type: 2}
- target: {fileID: 1688506115392420945, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
propertyPath: interactionComplete.m_PersistentCalls.m_Calls.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1688506115392420945, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
propertyPath: interactionComplete.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1688506115392420945, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
propertyPath: interactionComplete.m_PersistentCalls.m_Calls.Array.data[1].m_Mode
value: 6
objectReference: {fileID: 0}
- target: {fileID: 1688506115392420945, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
propertyPath: interactionComplete.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 647902266520623799}
- target: {fileID: 1688506115392420945, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
propertyPath: interactionComplete.m_PersistentCalls.m_Calls.Array.data[1].m_Target
value:
objectReference: {fileID: 5383043036581615591}
- target: {fileID: 1688506115392420945, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
propertyPath: interactionComplete.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 1688506115392420945, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
propertyPath: interactionComplete.m_PersistentCalls.m_Calls.Array.data[1].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 1688506115392420945, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
propertyPath: interactionComplete.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: BeltSnatched
objectReference: {fileID: 0}
- target: {fileID: 1688506115392420945, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
propertyPath: interactionComplete.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName
value: set_enabled
objectReference: {fileID: 0}
- target: {fileID: 1688506115392420945, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
propertyPath: interactionComplete.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: BeltSnatchBehaviour, AppleHillsScripts
objectReference: {fileID: 0}
- target: {fileID: 1688506115392420945, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
propertyPath: interactionComplete.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName
value: UnityEngine.Animator, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 1688506115392420945, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
propertyPath: interactionComplete.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_BoolArgument
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1688506115392420945, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
propertyPath: interactionComplete.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_BoolArgument
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1688506115392420945, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
propertyPath: interactionComplete.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgument
value:
objectReference: {fileID: 0}
- target: {fileID: 1688506115392420945, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
propertyPath: interactionComplete.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 1688506115392420945, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
propertyPath: interactionComplete.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 2201073438000381084, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
propertyPath: m_LocalPosition.x
value: -0.1
objectReference: {fileID: 0}
- target: {fileID: 2662307821751030256, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
propertyPath: m_LocalPosition.y
value: -0.1
objectReference: {fileID: 0}
- target: {fileID: 3873876058501900908, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
propertyPath: m_SpriteTilingProperty.oldSize.x
value: 4.5125
@@ -4391,6 +4499,30 @@ PrefabInstance:
propertyPath: m_SpriteTilingProperty.oldSize.y
value: 1.65
objectReference: {fileID: 0}
- target: {fileID: 4806568215540268166, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: -9075458657767321858, guid: 6113a70fdffa15e498f283d01550c069, type: 3}
- target: {fileID: 5406218854466047989, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: -9075458657767321858, guid: 6113a70fdffa15e498f283d01550c069, type: 3}
- target: {fileID: 5691805146112871981, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
propertyPath: m_LocalPosition.y
value: 0.1
objectReference: {fileID: 0}
- target: {fileID: 5942053956875418056, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
propertyPath: thiccness
value: 0.1
objectReference: {fileID: 0}
- target: {fileID: 6423747889074906943, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: -9075458657767321858, guid: 6113a70fdffa15e498f283d01550c069, type: 3}
- target: {fileID: 6913620511357318967, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
propertyPath: m_LocalPosition.x
value: 0.1
objectReference: {fileID: 0}
- target: {fileID: 7092109305969191084, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
propertyPath: stepData
value:
@@ -4407,13 +4539,120 @@ PrefabInstance:
propertyPath: m_Name
value: FancyBelt
objectReference: {fileID: 0}
- target: {fileID: 8647987978133738235, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
--- !u!1 &3218216546217663448 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 8647987978133738235, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
m_PrefabInstance: {fileID: 6100888595769592099}
m_PrefabAsset: {fileID: 0}
--- !u!4 &6048812228219351440 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 530025588511586483, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
m_PrefabInstance: {fileID: 6100888595769592099}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &6816332640200478924
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 1887787980523955733}
m_Modifications:
- target: {fileID: 1852608221241404454, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: m_FlipX
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1852608221241404454, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: -528113553, guid: de45b1513a2bac144882383abf7a8f32, type: 3}
- target: {fileID: 4322425255501872291, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: m_Name
value: GlowOutline
objectReference: {fileID: 0}
- target: {fileID: 5094223041467069679, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: m_FlipX
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5094223041467069679, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: -528113553, guid: de45b1513a2bac144882383abf7a8f32, 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_FlipX
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5692747743727126428, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: -528113553, guid: de45b1513a2bac144882383abf7a8f32, type: 3}
- target: {fileID: 6093743105869044773, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: m_FlipX
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6093743105869044773, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: -528113553, guid: de45b1513a2bac144882383abf7a8f32, type: 3}
- target: {fileID: 6900224008763310802, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: itemSprite
value:
objectReference: {fileID: 5001643405208547291}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
--- !u!4 &1634540469052352835 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 5203759348480833935, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
m_PrefabInstance: {fileID: 6816332640200478924}
m_PrefabAsset: {fileID: 0}

View File

@@ -38,6 +38,7 @@ Transform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &239658593309924751
SpriteRenderer:
serializedVersion: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@@ -83,6 +84,7 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_MaskInteraction: 0
m_Sprite: {fileID: 21300000, guid: bda9d4c6e0894b345b1b3286b071d97c, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -92,7 +94,6 @@ SpriteRenderer:
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &3083594724729558494
GameObject:
@@ -285,6 +286,7 @@ GameObject:
- component: {fileID: 209748223923144383}
- component: {fileID: 3035588724321947031}
- component: {fileID: 2429074051491030959}
- component: {fileID: 8914807138525393966}
m_Layer: 0
m_Name: Working
m_TagString: Untagged
@@ -331,6 +333,7 @@ Animator:
m_WriteDefaultValuesOnDisable: 0
--- !u!212 &3035588724321947031
SpriteRenderer:
serializedVersion: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@@ -376,6 +379,7 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_MaskInteraction: 0
m_Sprite: {fileID: 21300000, guid: dc369ec0f869be542b4dd3099aa4972e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -385,7 +389,6 @@ SpriteRenderer:
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!114 &2429074051491030959
MonoBehaviour:
@@ -400,6 +403,18 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier: '::'
stateMachine: {fileID: 4349144095261672277}
--- !u!114 &8914807138525393966
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5637859103962238792}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 95e46aacea5b42888ee7881894193c11, type: 3}
m_Name:
m_EditorClassIdentifier: AppleHillsScripts::Core.SaveLoad.AppleState
--- !u!1 &6250741417003874177
GameObject:
m_ObjectHideFlags: 0
@@ -457,6 +472,7 @@ Animator:
m_WriteDefaultValuesOnDisable: 0
--- !u!212 &6614438533160772325
SpriteRenderer:
serializedVersion: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@@ -502,6 +518,7 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_MaskInteraction: 0
m_Sprite: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -511,7 +528,6 @@ SpriteRenderer:
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 0
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &6495881348270040804
GameObject:
@@ -548,6 +564,7 @@ Transform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &5589287127171019735
SpriteRenderer:
serializedVersion: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@@ -593,6 +610,7 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_MaskInteraction: 0
m_Sprite: {fileID: 427652746, guid: c6ef6099a9e14ed4d87be5fb110ba9a6, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -602,7 +620,6 @@ SpriteRenderer:
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!95 &463331636439896276
Animator:
@@ -768,6 +785,7 @@ Animator:
m_WriteDefaultValuesOnDisable: 0
--- !u!212 &4562360989078165731
SpriteRenderer:
serializedVersion: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@@ -813,6 +831,7 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 1
m_MaskInteraction: 0
m_Sprite: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -822,7 +841,6 @@ SpriteRenderer:
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 0
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1001 &634317491552167302
PrefabInstance:

View File

@@ -249,6 +249,7 @@ Transform:
m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 2293963432838816911}
- {fileID: 4731012930784154469}
m_Father: {fileID: 4351896034555078809}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &684015267381189558
@@ -561,6 +562,104 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 95e46aacea5b42888ee7881894193c11, type: 3}
m_Name:
m_EditorClassIdentifier: AppleHillsScripts::Core.SaveLoad.AppleState
--- !u!1001 &689218690334993130
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 8068943584558347665}
m_Modifications:
- target: {fileID: 1852608221241404454, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 323c6add77a408f44a48fb4ed888a328, type: 3}
- target: {fileID: 1852608221241404454, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: m_SortingOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4322425255501872291, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: m_Name
value: GlowOutline
objectReference: {fileID: 0}
- target: {fileID: 5094223041467069679, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 323c6add77a408f44a48fb4ed888a328, type: 3}
- target: {fileID: 5094223041467069679, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: m_SortingOrder
value: 0
objectReference: {fileID: 0}
- 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: 21300000, guid: 323c6add77a408f44a48fb4ed888a328, type: 3}
- target: {fileID: 5692747743727126428, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: m_SortingOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6093743105869044773, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 323c6add77a408f44a48fb4ed888a328, type: 3}
- target: {fileID: 6093743105869044773, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: m_SortingOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6900224008763310802, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: itemSprite
value:
objectReference: {fileID: 684015267381189558}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
--- !u!4 &4731012930784154469 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 5203759348480833935, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
m_PrefabInstance: {fileID: 689218690334993130}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &2698631342829578556
PrefabInstance:
m_ObjectHideFlags: 0
@@ -633,6 +732,10 @@ PrefabInstance:
propertyPath: m_LocalScale.z
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1441476127707699004, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: a7a2a4eb566f6db4fad02c199c5ef9db, type: 3}
- target: {fileID: 1688506115392420945, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
propertyPath: itemData
value:
@@ -645,6 +748,18 @@ PrefabInstance:
propertyPath: m_SpriteTilingProperty.oldSize.y
value: 3.9384615
objectReference: {fileID: 0}
- target: {fileID: 4806568215540268166, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: a7a2a4eb566f6db4fad02c199c5ef9db, type: 3}
- target: {fileID: 5406218854466047989, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: a7a2a4eb566f6db4fad02c199c5ef9db, type: 3}
- target: {fileID: 6423747889074906943, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: a7a2a4eb566f6db4fad02c199c5ef9db, type: 3}
- target: {fileID: 7092109305969191084, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
propertyPath: stepData
value:
@@ -810,6 +925,7 @@ MonoBehaviour:
m_EditorClassIdentifier: AppleHillsScripts::CookieEatingBehavior
cookieEatingSprites: {fileID: 3227046881050279041}
consumedCookieSprites: {fileID: 684015267381189558}
cookieOutline: {fileID: 0}
--- !u!114 &2258058195972808157
MonoBehaviour:
m_ObjectHideFlags: 0

View File

@@ -18,7 +18,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &4109193314185099672
Transform:
m_ObjectHideFlags: 0
@@ -229,7 +229,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!4 &2462859606906815513
Transform:
m_ObjectHideFlags: 0
@@ -293,6 +293,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 4151707630564924317}
- {fileID: 4618476073652588657}
m_Father: {fileID: 2462859606906815513}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &372099769474499156
@@ -342,7 +343,7 @@ SpriteRenderer:
m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_SortingOrder: 1
m_MaskInteraction: 0
m_Sprite: {fileID: 7366617892383084551, guid: 4d2abb3cade29284c96d0310f7b076a6, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -1003,3 +1004,105 @@ MonoBehaviour:
m_EditorClassIdentifier: '::'
holdFlowerDuration: 2
flowerWasStolen: 0
--- !u!1001 &589804470169594366
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 7740622357567329673}
m_Modifications:
- target: {fileID: 1386870209246758790, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: m_LocalPosition.x
value: -0.1
objectReference: {fileID: 0}
- target: {fileID: 1852608221241404454, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 7366617892383084551, guid: 4d2abb3cade29284c96d0310f7b076a6, type: 3}
- target: {fileID: 2974211257881602794, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: m_LocalPosition.y
value: -0.1
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.1
objectReference: {fileID: 0}
- target: {fileID: 5094223041467069679, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 7366617892383084551, guid: 4d2abb3cade29284c96d0310f7b076a6, 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: 7366617892383084551, guid: 4d2abb3cade29284c96d0310f7b076a6, type: 3}
- target: {fileID: 5928692606425386029, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: m_LocalPosition.x
value: 0.1
objectReference: {fileID: 0}
- target: {fileID: 6093743105869044773, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 7366617892383084551, guid: 4d2abb3cade29284c96d0310f7b076a6, type: 3}
- target: {fileID: 6900224008763310802, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: thiccness
value: 0.1
objectReference: {fileID: 0}
- target: {fileID: 6900224008763310802, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: itemSprite
value:
objectReference: {fileID: 372099769474499156}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
--- !u!4 &4618476073652588657 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 5203759348480833935, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
m_PrefabInstance: {fileID: 589804470169594366}
m_PrefabAsset: {fileID: 0}

View File

@@ -202,6 +202,7 @@ GameObject:
- component: {fileID: 7827818490430456969}
- component: {fileID: 2572582986883531434}
- component: {fileID: 6003643145791118478}
- component: {fileID: 6143559876964956968}
m_Layer: 0
m_Name: MuseumInteractable
m_TagString: Untagged
@@ -218,10 +219,11 @@ Transform:
m_GameObject: {fileID: 4242724393814467592}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -5.7543, y: 7.1254025, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalPosition: {x: -5.56, y: 10.69, z: 0}
m_LocalScale: {x: 1.095097, y: 1.095097, z: 1.095097}
m_ConstrainProportionsScale: 0
m_Children: []
m_Children:
- {fileID: 1444064630927970554}
m_Father: {fileID: 2026638221585309211}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &7827818490430456969
@@ -297,17 +299,17 @@ BoxCollider2D:
m_UsedByEffector: 0
m_CompositeOperation: 0
m_CompositeOrder: 0
m_Offset: {x: 0.28208542, y: 1.6486282}
m_Offset: {x: 0.0015069246, y: -1.9807575}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.28866667}
oldSize: {x: 1, y: 1}
newSize: {x: 1, y: 1}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 3.11, y: 3.15}
newSize: {x: 3.525, y: 8.3}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
m_Size: {x: 4.239647, y: 7.7809525}
m_Size: {x: 4.1491385, y: 6.9663835}
m_EdgeRadius: 0
--- !u!114 &6003643145791118478
MonoBehaviour:
@@ -324,6 +326,65 @@ MonoBehaviour:
stepData: {fileID: 11400000, guid: be4c25532111a0d49a4a539f0c15b68b, type: 2}
puzzleIndicator: {fileID: 0}
drawPromptRangeGizmo: 1
--- !u!212 &6143559876964956968
SpriteRenderer:
serializedVersion: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4242724393814467592}
m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_ForceMeshLod: -1
m_MeshLodSelectionBias: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_MaskInteraction: 0
m_Sprite: {fileID: 4316081645348803466, guid: a268a460164e36a41b6d1b592d89c5d5, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 3.525, y: 8.3}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_SpriteSortPoint: 0
--- !u!1 &6462491270683186527
GameObject:
m_ObjectHideFlags: 0
@@ -664,6 +725,10 @@ PrefabInstance:
propertyPath: m_LocalScale.z
value: 0.7
objectReference: {fileID: 0}
- target: {fileID: 1441476127707699004, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 8e41d315fe9532043af2269fd98668ac, type: 3}
- target: {fileID: 1688506115392420945, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
propertyPath: itemData
value:
@@ -676,6 +741,18 @@ PrefabInstance:
propertyPath: m_SpriteTilingProperty.oldSize.y
value: 3.9384615
objectReference: {fileID: 0}
- target: {fileID: 4806568215540268166, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 8e41d315fe9532043af2269fd98668ac, type: 3}
- target: {fileID: 5406218854466047989, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 8e41d315fe9532043af2269fd98668ac, type: 3}
- target: {fileID: 6423747889074906943, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 8e41d315fe9532043af2269fd98668ac, type: 3}
- target: {fileID: 7092109305969191084, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
propertyPath: stepData
value:
@@ -702,3 +779,101 @@ Transform:
m_CorrespondingSourceObject: {fileID: 530025588511586483, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
m_PrefabInstance: {fileID: 3880191394412363918}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &6646519958416894325
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 7919796442741971004}
m_Modifications:
- target: {fileID: 1852608221241404454, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 4316081645348803466, guid: a268a460164e36a41b6d1b592d89c5d5, type: 3}
- target: {fileID: 1852608221241404454, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: m_SortingOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4322425255501872291, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: m_Name
value: GlowOutline
objectReference: {fileID: 0}
- target: {fileID: 5094223041467069679, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 4316081645348803466, guid: a268a460164e36a41b6d1b592d89c5d5, type: 3}
- target: {fileID: 5094223041467069679, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: m_SortingOrder
value: 0
objectReference: {fileID: 0}
- 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: 4316081645348803466, guid: a268a460164e36a41b6d1b592d89c5d5, type: 3}
- target: {fileID: 5692747743727126428, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: m_SortingOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6093743105869044773, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 4316081645348803466, guid: a268a460164e36a41b6d1b592d89c5d5, type: 3}
- target: {fileID: 6093743105869044773, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: m_SortingOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6900224008763310802, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
propertyPath: itemSprite
value:
objectReference: {fileID: 6143559876964956968}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
--- !u!4 &1444064630927970554 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 5203759348480833935, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3}
m_PrefabInstance: {fileID: 6646519958416894325}
m_PrefabAsset: {fileID: 0}

View File

@@ -0,0 +1,173 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &1190045438452732069
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1136290793271151494}
- component: {fileID: 5320225058563658919}
- component: {fileID: 7813271480623895155}
- component: {fileID: 6196606079257550}
m_Layer: 0
m_Name: ControllerSwitchItem_To_pulver
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1136290793271151494
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1190045438452732069}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -56, y: -38.8, z: 0}
m_LocalScale: {x: 10, y: 10, z: 10}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &5320225058563658919
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1190045438452732069}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 915abd653d714ea3ae11bbf14feafb1e, type: 3}
m_Name:
m_EditorClassIdentifier: AppleHillsScripts::Items.ControllerSwitchItem
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: []
targetControllerName: pulver
cameraSwitchMode: 2
targetVirtualCamera: {fileID: 0}
targetCameraState: 1
visualRepresentation: {fileID: 0}
--- !u!212 &7813271480623895155
SpriteRenderer:
serializedVersion: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1190045438452732069}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_ForceMeshLod: -1
m_MeshLodSelectionBias: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_MaskInteraction: 0
m_Sprite: {fileID: 2636902231072113825, guid: ee014bd71cac2bc4ab845f435726f383, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 0.42, y: 0.42}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_SpriteSortPoint: 0
--- !u!61 &6196606079257550
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1190045438452732069}
m_Enabled: 1
serializedVersion: 3
m_Density: 1
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_ForceSendLayers:
serializedVersion: 2
m_Bits: 4294967295
m_ForceReceiveLayers:
serializedVersion: 2
m_Bits: 4294967295
m_ContactCaptureLayers:
serializedVersion: 2
m_Bits: 4294967295
m_CallbackLayers:
serializedVersion: 2
m_Bits: 4294967295
m_IsTrigger: 0
m_UsedByEffector: 0
m_CompositeOperation: 0
m_CompositeOrder: 0
m_Offset: {x: -0.002767995, y: -0.000000022351742}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 0.42, y: 0.42}
newSize: {x: 0.42, y: 0.42}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
m_Size: {x: 0.44087836, y: 0.440879}
m_EdgeRadius: 0

View File

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

View File

@@ -65,7 +65,8 @@ MonoBehaviour:
itemData: {fileID: 11400000, guid: ba611946a9f3d5d4784bd16d7061c2c6, type: 2}
iconRenderer: {fileID: 0}
slottedItemRenderers:
- {fileID: 853265584245318634}
- renderer: {fileID: 0}
assignedItem: {fileID: 0}
onItemSlotted:
m_PersistentCalls:
m_Calls: []
@@ -173,6 +174,7 @@ Transform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &853265584245318634
SpriteRenderer:
serializedVersion: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@@ -218,6 +220,7 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_MaskInteraction: 0
m_Sprite: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -227,5 +230,4 @@ SpriteRenderer:
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 0
m_MaskInteraction: 0
m_SpriteSortPoint: 0

View File

@@ -37,6 +37,7 @@ Transform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &1054160620432813893
SpriteRenderer:
serializedVersion: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@@ -82,6 +83,7 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 1
m_MaskInteraction: 0
m_Sprite: {fileID: -5380470264793805610, guid: 9aee36bc2f2ec8248ad3db30306aa7f4, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -91,7 +93,6 @@ SpriteRenderer:
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!61 &3660267275524594777
BoxCollider2D:

View File

@@ -36,6 +36,7 @@ Transform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &4945860249160435993
SpriteRenderer:
serializedVersion: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@@ -81,6 +82,7 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_MaskInteraction: 0
m_Sprite: {fileID: -6493275343144376112, guid: f3e1e24212ad86445b362335713279bd, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -90,7 +92,6 @@ SpriteRenderer:
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!114 &7255725277252707145
MonoBehaviour:

View File

@@ -37,6 +37,7 @@ Transform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &5787940828305859459
SpriteRenderer:
serializedVersion: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@@ -82,6 +83,7 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 1
m_MaskInteraction: 0
m_Sprite: {fileID: 3212686851042344676, guid: 2c96f5ba929679d47ad402a4eda5bd9f, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -91,7 +93,6 @@ SpriteRenderer:
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!61 &1572163134238919128
BoxCollider2D:

View File

@@ -0,0 +1,784 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &1556656459464491038
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3084735925300392939}
- component: {fileID: 4242692913154398155}
- component: {fileID: 1750150636601738610}
- component: {fileID: 312065399629250141}
- component: {fileID: 958555906425148618}
m_Layer: 0
m_Name: FocusCamera
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3084735925300392939
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1556656459464491038}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -1.4, y: -73.24, z: -460.1861}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4013966011268908366}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &4242692913154398155
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1556656459464491038}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f9dfa5b682dcd46bda6128250e975f58, type: 3}
m_Name:
m_EditorClassIdentifier: Unity.Cinemachine::Unity.Cinemachine.CinemachineCamera
Priority:
Enabled: 1
m_Value: -1
OutputChannel: 1
StandbyUpdate: 2
m_StreamingVersion: 20241001
m_LegacyPriority: 0
Target:
TrackingTarget: {fileID: 0}
LookAtTarget: {fileID: 0}
CustomLookAtTarget: 0
Lens:
FieldOfView: 60
OrthographicSize: 23
NearClipPlane: 0.01
FarClipPlane: 1000
Dutch: 0
ModeOverride: 0
PhysicalProperties:
GateFit: 2
SensorSize: {x: 21.946, y: 16.002}
LensShift: {x: 0, y: 0}
FocusDistance: 10
Iso: 200
ShutterSpeed: 0.005
Aperture: 16
BladeCount: 5
Curvature: {x: 2, y: 11}
BarrelClipping: 0.25
Anamorphism: 0
BlendHint: 0
--- !u!114 &1750150636601738610
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1556656459464491038}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 00b2d199b96b516448144ab30fb26aed, type: 3}
m_Name:
m_EditorClassIdentifier: Unity.Cinemachine::Unity.Cinemachine.CinemachineImpulseListener
ApplyAfter: 2
ChannelMask: 1
Gain: 1
Use2DDistance: 0
UseCameraSpace: 1
SignalCombinationMode: 0
ReactionSettings:
m_SecondaryNoise: {fileID: 0}
AmplitudeGain: 1
FrequencyGain: 1
Duration: 1
m_NoiseOffsets: {x: -0.9332886, y: 886.0443, z: 475.03036}
--- !u!114 &312065399629250141
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1556656459464491038}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6da43522623d4704e979466dc7650b65, type: 3}
m_Name:
m_EditorClassIdentifier: MoreMountains.Tools::MoreMountains.Feedbacks.MMF_Player
Feedbacks: []
InitializationMode: 2
AutoInitialization: 1
SafeMode: 3
Direction: 0
AutoChangeDirectionOnEnd: 0
AutoPlayOnStart: 0
AutoPlayOnEnable: 0
ForceTimescaleMode: 0
ForcedTimescaleMode: 1
DurationMultiplier: 1
TimescaleMultiplier: 1
RandomizeDuration: 0
RandomDurationMultiplier: {x: 0.5, y: 1.5}
DisplayFullDurationDetails: 0
PlayerTimescaleMode: 0
OnlyPlayIfWithinRange: 0
RangeCenter: {fileID: 0}
RangeDistance: 5
UseRangeFalloff: 0
RangeFalloff:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
RemapRangeFalloff: {x: 0, y: 1}
IgnoreRangeEvents: 0
CooldownDuration: 0
InitialDelay: 0
CanPlay: 1
CanPlayWhileAlreadyPlaying: 1
ChanceToPlay: 100
FeedbacksIntensity: 1
Events:
TriggerMMFeedbacksEvents: 0
TriggerUnityEvents: 1
OnPlay:
m_PersistentCalls:
m_Calls: []
OnPause:
m_PersistentCalls:
m_Calls: []
OnStop:
m_PersistentCalls:
m_Calls: []
OnResume:
m_PersistentCalls:
m_Calls: []
OnChangeDirection:
m_PersistentCalls:
m_Calls: []
OnComplete:
m_PersistentCalls:
m_Calls: []
OnRestoreInitialValues:
m_PersistentCalls:
m_Calls: []
OnSkipToTheEnd:
m_PersistentCalls:
m_Calls: []
OnInitializationComplete:
m_PersistentCalls:
m_Calls: []
OnEnable:
m_PersistentCalls:
m_Calls: []
OnDisable:
m_PersistentCalls:
m_Calls: []
DebugActive: 0
InScriptDrivenPause: 0
FeedbacksList:
- rid: 8625086308803412065
KeepPlayModeChanges: 0
PerformanceMode: 0
RestoreInitialValuesOnDisable: 0
StopFeedbacksOnDisable: 0
PlayCount: 0
MMF_ChannelMode: 0
MMF_Channel: 0
MMF_ChannelDefinition: {fileID: 0}
references:
version: 2
RefIds:
- rid: 8625086308803412065
type: {class: MMF_CinemachineImpulse, ns: MoreMountains.FeedbacksForThirdParty, asm: MoreMountains.Tools}
data:
Active: 1
UniqueID: 690845512
Label: Cinemachine Impulse
OriginalLabel: Cinemachine Impulse
ChannelMode: 0
Channel: 0
MMChannelDefinition: {fileID: 0}
Chance: 100
Timing:
TimescaleMode: 0
ExcludeFromHoldingPauses: 0
ContributeToTotalDuration: 1
InitialDelay: 0
CooldownDuration: 0
InterruptsOnStop: 1
NumberOfRepeats: 0
RepeatForever: 0
DelayBetweenRepeats: 1
PlayCount: 14
LimitPlayCount: 0
MaxPlayCount: 3
SetPlayCountToZeroOnReset: 0
MMFeedbacksDirectionCondition: 0
PlayDirection: 0
ConstantIntensity: 0
UseIntensityInterval: 0
IntensityIntervalMin: 0
IntensityIntervalMax: 0
Sequence: {fileID: 0}
TrackID: 0
Quantized: 0
TargetBPM: 120
AutomatedTargetAcquisition:
Mode: 0
ChildIndex: 0
RandomizeOutput: 0
RandomMultiplier: {x: 0.8, y: 1}
RandomizeDuration: 0
RandomDurationMultiplier: {x: 0.5, y: 2}
UseRange: 0
RangeDistance: 5
UseRangeFalloff: 0
RangeFalloff:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
RemapRangeFalloff: {x: 0, y: 1}
AutomaticShakerSetupButton:
ButtonText: Automatic Shaker Setup
Owner: {fileID: 312065399629250141}
DebugActive: 0
m_ImpulseDefinition:
ImpulseChannel: 1
ImpulseShape: 0
CustomImpulseShape:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
ImpulseDuration: 0.2
ImpulseType: 3
DissipationRate: 0
RawSignal: {fileID: 11400000, guid: bcf6524ce6451f34cb7106d0c00da9a5, type: 2}
AmplitudeGain: 1
FrequencyGain: 1
RepeatMode: 0
Randomize: 1
TimeEnvelope:
AttackShape:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
DecayShape:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
AttackTime: 0
SustainTime: 0.1
DecayTime: 0.4
ScaleWithImpact: 1
HoldForever: 0
ImpactRadius: 100
DirectionMode: 0
DissipationMode: 2
DissipationDistance: 100
PropagationSpeed: 343
Velocity: {x: 3, y: 3, z: 0}
ClearImpulseOnStop: 0
DrawGizmos: 0
--- !u!114 &958555906425148618
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1556656459464491038}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e52de21a22b6dd44c9cc19f810c65059, type: 3}
m_Name:
m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.SignalReceiver
m_Events:
m_Signals:
- {fileID: 11400000, guid: f6e768cb2846e014897c467c13e9377a, type: 2}
m_Events:
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 312065399629250141}
m_TargetAssemblyTypeName: MoreMountains.Feedbacks.MMF_Player, MoreMountains.Tools
m_MethodName: PlayFeedbacks
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!1 &3317763283033734452
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4013966011268908366}
- component: {fileID: 8417332413312608776}
- component: {fileID: 741350484225047764}
m_Layer: 0
m_Name: LevelIntroDirector
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4013966011268908366
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3317763283033734452}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 2718684908169034320}
- {fileID: 3724208542493692578}
- {fileID: 3084735925300392939}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!320 &8417332413312608776
PlayableDirector:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3317763283033734452}
m_Enabled: 1
serializedVersion: 3
m_PlayableAsset: {fileID: 11400000, guid: 04513080f1b7ba446b8584d74f2a962c, type: 2}
m_InitialState: 0
m_WrapMode: 2
m_DirectorUpdateMode: 1
m_InitialTime: 0
m_SceneBindings:
- key: {fileID: 6171170372369797488, guid: 04513080f1b7ba446b8584d74f2a962c, type: 2}
value: {fileID: 1043806761108885725}
- key: {fileID: -727781528643406096, guid: 04513080f1b7ba446b8584d74f2a962c, type: 2}
value: {fileID: 0}
- key: {fileID: -3047534414781408496, guid: 04513080f1b7ba446b8584d74f2a962c, type: 2}
value: {fileID: 0}
- key: {fileID: 3174414979484781440, guid: 04513080f1b7ba446b8584d74f2a962c, type: 2}
value: {fileID: 0}
- key: {fileID: -482498204822702528, guid: 04513080f1b7ba446b8584d74f2a962c, type: 2}
value: {fileID: 0}
- key: {fileID: -6287170530102907080, guid: 04513080f1b7ba446b8584d74f2a962c, type: 2}
value: {fileID: 0}
- key: {fileID: 4011586813017667051, guid: 04513080f1b7ba446b8584d74f2a962c, type: 2}
value: {fileID: 958555906425148618}
m_ExposedReferences:
m_References:
- 4c6ffb9566bdddb47b161ebd4dea9ce3: {fileID: 400409417890847843}
- 860ba266c6b8cab4f9529fabe8f8f1e1: {fileID: 0}
- a684498915499c04b900cfe3c0192908: {fileID: 400409417890847843}
- b8c4445982b298446983c59e031f7889: {fileID: 0}
- 6283adbc9ff37874fb5f6c24d698acf5: {fileID: 4242692913154398155}
--- !u!114 &741350484225047764
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3317763283033734452}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b57bc17ff80ee534c93ed5676dd794ff, type: 3}
m_Name:
m_EditorClassIdentifier: '::'
playOnSceneReady: 1
dollyCam: {fileID: 400409417890847843}
focusCam: {fileID: 4242692913154398155}
introPlayableDirector: {fileID: 0}
--- !u!1 &3965318653236547925
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2718684908169034320}
- component: {fileID: 400409417890847843}
- component: {fileID: 1043806761108885725}
- component: {fileID: 8909655912440153611}
- component: {fileID: 4585083701468647236}
- component: {fileID: 4263630421291345975}
m_Layer: 0
m_Name: DollyCamera
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2718684908169034320
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3965318653236547925}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 35.05065, y: -46.560646, z: -100.0126}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4013966011268908366}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &400409417890847843
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3965318653236547925}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f9dfa5b682dcd46bda6128250e975f58, type: 3}
m_Name:
m_EditorClassIdentifier: Unity.Cinemachine::Unity.Cinemachine.CinemachineCamera
Priority:
Enabled: 1
m_Value: -1
OutputChannel: 1
StandbyUpdate: 2
m_StreamingVersion: 20241001
m_LegacyPriority: 0
Target:
TrackingTarget: {fileID: 0}
LookAtTarget: {fileID: 0}
CustomLookAtTarget: 0
Lens:
FieldOfView: 60
OrthographicSize: 40
NearClipPlane: 0.01
FarClipPlane: 1000
Dutch: 0
ModeOverride: 0
PhysicalProperties:
GateFit: 2
SensorSize: {x: 21.946, y: 16.002}
LensShift: {x: 0, y: 0}
FocusDistance: 10
Iso: 200
ShutterSpeed: 0.005
Aperture: 16
BladeCount: 5
Curvature: {x: 2, y: 11}
BarrelClipping: 0.25
Anamorphism: 0
BlendHint: 0
--- !u!95 &1043806761108885725
Animator:
serializedVersion: 7
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3965318653236547925}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: cb52439326f0dfd4081f11e37b78525e, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_AnimatePhysics: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!114 &8909655912440153611
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3965318653236547925}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 90eebaab98e4b44b0ba8c79821e554e1, type: 3}
m_Name:
m_EditorClassIdentifier: Unity.Cinemachine::Unity.Cinemachine.CinemachineSplineDolly
m_SplineSettings:
Spline: {fileID: 8910040638609767010}
Position: 0.75
Units: 1
SplineOffset: {x: 0, y: 0, z: 0}
CameraRotation: 0
Damping:
Enabled: 0
Position: {x: 0, y: 0, z: 0}
Angular: 0
AutomaticDolly:
Enabled: 0
Method:
rid: 8625086308268900352
m_LegacyPosition: -1
m_LegacyUnits: 0
m_LegacySpline: {fileID: 0}
references:
version: 2
RefIds:
- rid: 8625086308268900352
type: {class: SplineAutoDolly/FixedSpeed, ns: Unity.Cinemachine, asm: Unity.Cinemachine}
data:
Speed: 10
--- !u!114 &4585083701468647236
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3965318653236547925}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9d66462bf720d28469c8db4b2e52720c, type: 3}
m_Name:
m_EditorClassIdentifier: MoreMountains.Tools::MoreMountains.FeedbacksForThirdParty.MMCinemachineCameraShaker
ChannelMode: 0
Channel: 0
MMChannelDefinition: {fileID: 0}
DefaultShakeAmplitude: 0.5
DefaultShakeFrequency: 10
IdleAmplitude: 0
IdleFrequency: 1
LerpSpeed: 5
TestDuration: 0.3
TestAmplitude: 2
TestFrequency: 20
TestShakeButton: 0
--- !u!320 &4263630421291345975
PlayableDirector:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3965318653236547925}
m_Enabled: 1
serializedVersion: 3
m_PlayableAsset: {fileID: 11400000, guid: bc17ab9ccb0915d41921a5fade41205a, type: 2}
m_InitialState: 1
m_WrapMode: 2
m_DirectorUpdateMode: 1
m_InitialTime: 0
m_SceneBindings: []
m_ExposedReferences:
m_References: []
--- !u!1 &9142658970569072019
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3724208542493692578}
- component: {fileID: 8910040638609767010}
m_Layer: 0
m_Name: Spline
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3724208542493692578
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9142658970569072019}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -5.63329, y: -46.2662, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4013966011268908366}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &8910040638609767010
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9142658970569072019}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: dab5c7d4c32e743048dfca98e2d5914f, type: 3}
m_Name:
m_EditorClassIdentifier: Unity.Splines::UnityEngine.Splines.SplineContainer
m_Spline:
m_EditModeType: 1
m_Knots: []
m_MetaData: []
m_Closed: 0
m_IntData:
m_Data: []
m_FloatData:
m_Data: []
m_Float4Data:
m_Data: []
m_ObjectData:
m_Data: []
m_Splines:
- m_EditModeType: 1
m_Knots:
- Position:
x: 1.3332896
y: 21.6662
z: -100
TangentIn:
x: 0
y: 0
z: -10.19
TangentOut:
x: 0
y: 0
z: 10.19
Rotation:
value:
x: -0
y: 0
z: -0.70435727
w: 0.70984566
- Position:
x: -36.106712
y: -2.1537971
z: -100
TangentIn:
x: 0
y: 0
z: -27.15354
TangentOut:
x: 0
y: 0
z: 26.275179
Rotation:
value:
x: -0.5028137
y: -0.49717358
z: 0.5028111
w: -0.4971698
- Position:
x: -4.1667104
y: -25.033802
z: -100
TangentIn:
x: 0
y: 0
z: -0.27614236
TangentOut:
x: 0
y: 0
z: 0.27614236
Rotation:
value:
x: 0.70435727
y: 0.70984566
z: 0
w: 0
- Position:
x: 40.733288
y: -1.733799
z: -100
TangentIn:
x: 0
y: 0
z: -25.694523
TangentOut:
x: 0
y: 0
z: 24.060184
Rotation:
value:
x: 0.49985492
y: 0.5002092
z: 0.49979147
w: -0.50014424
m_MetaData:
- Mode: 3
Tension: 0.5
- Mode: 3
Tension: 0.5
- Mode: 3
Tension: 0.5
- Mode: 3
Tension: 0.5
m_Closed: 1
m_IntData:
m_Data: []
m_FloatData:
m_Data: []
m_Float4Data:
m_Data: []
m_ObjectData:
m_Data: []
m_Knots:
m_KnotsLink: []

View File

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

View File

@@ -8,10 +8,22 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 852327051512792946, guid: 9b2926886934b554f9a1727331d34787, type: 3}
propertyPath: m_LocalScale.x
value: -0.01
objectReference: {fileID: 0}
- target: {fileID: 852327051512792946, guid: 9b2926886934b554f9a1727331d34787, type: 3}
propertyPath: m_ConstrainProportionsScale
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1011363502278351410, guid: 9b2926886934b554f9a1727331d34787, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1434120740951793125, guid: 9b2926886934b554f9a1727331d34787, type: 3}
propertyPath: m_AnchoredPosition.x
value: 318
objectReference: {fileID: 0}
- target: {fileID: 2741639361616064442, guid: 9b2926886934b554f9a1727331d34787, type: 3}
propertyPath: dialogueGraph
value:
@@ -40,6 +52,10 @@ PrefabInstance:
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5242661563418348379, guid: 9b2926886934b554f9a1727331d34787, type: 3}
propertyPath: m_AnchoredPosition.x
value: 175
objectReference: {fileID: 0}
- target: {fileID: 5865112760908786186, guid: 9b2926886934b554f9a1727331d34787, type: 3}
propertyPath: m_AnchorMax.y
value: 0
@@ -68,6 +84,10 @@ PrefabInstance:
propertyPath: m_Name
value: AnneLiseBush_ChocolateBird
objectReference: {fileID: 0}
- target: {fileID: 7585418320376546109, guid: 9b2926886934b554f9a1727331d34787, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7816038554732339800, guid: 9b2926886934b554f9a1727331d34787, type: 3}
propertyPath: m_IsActive
value: 0

View File

@@ -8,6 +8,18 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 852327051512792946, guid: 9b2926886934b554f9a1727331d34787, type: 3}
propertyPath: m_LocalScale.x
value: -0.01
objectReference: {fileID: 0}
- target: {fileID: 852327051512792946, guid: 9b2926886934b554f9a1727331d34787, type: 3}
propertyPath: m_ConstrainProportionsScale
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1434120740951793125, guid: 9b2926886934b554f9a1727331d34787, type: 3}
propertyPath: m_AnchoredPosition.x
value: 314
objectReference: {fileID: 0}
- target: {fileID: 2596730244514108870, guid: 9b2926886934b554f9a1727331d34787, type: 3}
propertyPath: 'm_Materials.Array.data[0]'
value:
@@ -52,6 +64,10 @@ PrefabInstance:
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5242661563418348379, guid: 9b2926886934b554f9a1727331d34787, type: 3}
propertyPath: m_AnchoredPosition.x
value: 171
objectReference: {fileID: 0}
- target: {fileID: 5865112760908786186, guid: 9b2926886934b554f9a1727331d34787, type: 3}
propertyPath: m_AnchorMax.y
value: 0

View File

@@ -50,7 +50,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7447346505753002421, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
propertyPath: m_Name
value: BurgerBuns
value: BasePuzzlePickup
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -119,6 +119,17 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!114 &14324897 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1273721449607275699, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3}
m_PrefabInstance: {fileID: 7905701319677686381}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6f56763d30b94bf6873d395a6c116eb5, type: 3}
m_Name:
m_EditorClassIdentifier: AppleHillsScripts::Core.SaveLoad.AppleMachine
--- !u!1 &18882508
GameObject:
m_ObjectHideFlags: 0
@@ -463,6 +474,11 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &75496601 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 3965318653236547925, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3}
m_PrefabInstance: {fileID: 2301579471450207868}
m_PrefabAsset: {fileID: 0}
--- !u!1 &79920937
GameObject:
m_ObjectHideFlags: 0
@@ -1127,6 +1143,11 @@ Transform:
m_CorrespondingSourceObject: {fileID: 1972326095607888550, guid: 9fa755905f60f614b92dc39d401c53d9, type: 3}
m_PrefabInstance: {fileID: 137734306}
m_PrefabAsset: {fileID: 0}
--- !u!95 &139555513 stripped
Animator:
m_CorrespondingSourceObject: {fileID: 3395509120291905881, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3}
m_PrefabInstance: {fileID: 7905701319677686381}
m_PrefabAsset: {fileID: 0}
--- !u!1 &144081169
GameObject:
m_ObjectHideFlags: 0
@@ -2495,8 +2516,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 237315295}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 63.550255, y: -24.261951, z: -10}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -4.4, y: -88.5, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -6159,6 +6180,11 @@ SpriteRenderer:
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_SpriteSortPoint: 0
--- !u!1 &634910210 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7035779985758040736, guid: 1c956b50a36cb0d409d69df3a59377b2, type: 3}
m_PrefabInstance: {fileID: 2186331501986338647}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &637261721
PrefabInstance:
m_ObjectHideFlags: 0
@@ -7493,7 +7519,7 @@ MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 4844309227962071648, guid: 1c956b50a36cb0d409d69df3a59377b2, type: 3}
m_PrefabInstance: {fileID: 2186331501986338647}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_GameObject: {fileID: 634910210}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a56c71f58f682734187995e25bf53ff9, type: 3}
@@ -314661,11 +314687,6 @@ Transform:
m_CorrespondingSourceObject: {fileID: 1972326095607888550, guid: 9fa755905f60f614b92dc39d401c53d9, type: 3}
m_PrefabInstance: {fileID: 1551199836999933163}
m_PrefabAsset: {fileID: 0}
--- !u!1 &919797118 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 5011845812302690511, guid: 1c956b50a36cb0d409d69df3a59377b2, type: 3}
m_PrefabInstance: {fileID: 2186331501986338647}
m_PrefabAsset: {fileID: 0}
--- !u!1 &929407983
GameObject:
m_ObjectHideFlags: 0
@@ -314757,6 +314778,33 @@ SpriteRenderer:
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_SpriteSortPoint: 0
--- !u!1 &959043612 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7734932022557956073, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3}
m_PrefabInstance: {fileID: 7905701319677686381}
m_PrefabAsset: {fileID: 0}
--- !u!95 &959043616
Animator:
serializedVersion: 7
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 959043612}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 0}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_AnimatePhysics: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!1 &964051269
GameObject:
m_ObjectHideFlags: 0
@@ -315018,6 +315066,11 @@ SpriteRenderer:
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_SpriteSortPoint: 0
--- !u!1 &970104890 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 3633505916120700489, guid: fec1899a9a4c86e439f40065a2e37456, type: 3}
m_PrefabInstance: {fileID: 4379605726634850461}
m_PrefabAsset: {fileID: 0}
--- !u!1 &986571560
GameObject:
m_ObjectHideFlags: 0
@@ -316639,6 +316692,11 @@ SpriteRenderer:
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_SpriteSortPoint: 0
--- !u!1 &1132513019 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7820936471920159333, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3}
m_PrefabInstance: {fileID: 7905701319677686381}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1133819592
GameObject:
m_ObjectHideFlags: 0
@@ -318517,11 +318575,11 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 3823830588451517910, guid: 301b4e0735896334f8f6fb9a68a7e419, type: 3}
propertyPath: m_LocalPosition.x
value: 63.550255
value: -4.4
objectReference: {fileID: 0}
- target: {fileID: 3823830588451517910, guid: 301b4e0735896334f8f6fb9a68a7e419, type: 3}
propertyPath: m_LocalPosition.y
value: -24.261951
value: -88.5
objectReference: {fileID: 0}
- target: {fileID: 3823830588451517910, guid: 301b4e0735896334f8f6fb9a68a7e419, type: 3}
propertyPath: m_LocalPosition.z
@@ -318935,6 +318993,71 @@ SpriteRenderer:
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_SpriteSortPoint: 0
--- !u!1 &1375798233 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 8449696027466354713, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3}
m_PrefabInstance: {fileID: 7905701319677686381}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1375798237
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1375798233}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e52de21a22b6dd44c9cc19f810c65059, type: 3}
m_Name:
m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.SignalReceiver
m_Events:
m_Signals:
- {fileID: 11400000, guid: 624acdeeb1ef5d041945271eb29fb68f, type: 2}
- {fileID: 11400000, guid: 50cc58e8ee01bf841a920508fe336516, type: 2}
- {fileID: 11400000, guid: fc40e2ad40f81aa4595bdf7a53dc58b3, type: 2}
m_Events:
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 14324897}
m_TargetAssemblyTypeName: Core.SaveLoad.AppleMachine, AppleHillsScripts
m_MethodName: ChangeState
m_Mode: 5
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument: Exploding
m_BoolArgument: 0
m_CallState: 2
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 14324897}
m_TargetAssemblyTypeName: Core.SaveLoad.AppleMachine, AppleHillsScripts
m_MethodName: ChangeState
m_Mode: 5
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument: Broken
m_BoolArgument: 0
m_CallState: 2
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 14324897}
m_TargetAssemblyTypeName: Core.SaveLoad.AppleMachine, AppleHillsScripts
m_MethodName: ChangeState
m_Mode: 5
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument: Working
m_BoolArgument: 0
m_CallState: 2
--- !u!1001 &1376662052
PrefabInstance:
m_ObjectHideFlags: 0
@@ -320445,6 +320568,22 @@ SpriteRenderer:
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_SpriteSortPoint: 0
--- !u!1 &1487412684 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1556656459464491038, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3}
m_PrefabInstance: {fileID: 2301579471450207868}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1487412685 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 4242692913154398155, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3}
m_PrefabInstance: {fileID: 2301579471450207868}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1487412684}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f9dfa5b682dcd46bda6128250e975f58, type: 3}
m_Name:
m_EditorClassIdentifier: Unity.Cinemachine::Unity.Cinemachine.CinemachineCamera
--- !u!1 &1495504782
GameObject:
m_ObjectHideFlags: 0
@@ -322117,6 +322256,11 @@ SpriteRenderer:
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_SpriteSortPoint: 0
--- !u!95 &1618672387 stripped
Animator:
m_CorrespondingSourceObject: {fileID: 6571957639735467276, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3}
m_PrefabInstance: {fileID: 7905701319677686381}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1625218635
PrefabInstance:
m_ObjectHideFlags: 0
@@ -322674,7 +322818,7 @@ GameObject:
- component: {fileID: 1676982114}
- component: {fileID: 1676982113}
m_Layer: 0
m_Name: CinemachineCamera
m_Name: GameplayCamera
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -322771,7 +322915,7 @@ Transform:
m_GameObject: {fileID: 1676982112}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 63.550255, y: -24.261951, z: -10}
m_LocalPosition: {x: -4.4, y: -88.5, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -323010,11 +323154,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2264394306674147778, guid: 8ac0210dbf9d7754e9526d6d5c214f49, type: 3}
propertyPath: m_LocalPosition.x
value: 58.6
value: -9.350258
objectReference: {fileID: 0}
- target: {fileID: 2264394306674147778, guid: 8ac0210dbf9d7754e9526d6d5c214f49, type: 3}
propertyPath: m_LocalPosition.y
value: -26.9
value: -91.138054
objectReference: {fileID: 0}
- target: {fileID: 2264394306674147778, guid: 8ac0210dbf9d7754e9526d6d5c214f49, type: 3}
propertyPath: m_LocalPosition.z
@@ -324486,6 +324630,11 @@ Transform:
m_CorrespondingSourceObject: {fileID: 6604900824515982603, guid: 9dce1f3c032a64d48845eeb9acf87085, type: 3}
m_PrefabInstance: {fileID: 1883819381}
m_PrefabAsset: {fileID: 0}
--- !u!95 &1885945952 stripped
Animator:
m_CorrespondingSourceObject: {fileID: 7585097715845451051, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3}
m_PrefabInstance: {fileID: 7905701319677686381}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1897701642
GameObject:
m_ObjectHideFlags: 0
@@ -326872,6 +327021,10 @@ PrefabInstance:
propertyPath: m_SortingOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 469746994189165090, guid: 1c956b50a36cb0d409d69df3a59377b2, type: 3}
propertyPath: defaultState
value:
objectReference: {fileID: 634910210}
- target: {fileID: 522809001399822766, guid: 1c956b50a36cb0d409d69df3a59377b2, type: 3}
propertyPath: m_Name
value: ForkLiftInteraction
@@ -326884,6 +327037,10 @@ PrefabInstance:
propertyPath: m_LocalPosition.y
value: -3.3
objectReference: {fileID: 0}
- target: {fileID: 977010025969856028, guid: 1c956b50a36cb0d409d69df3a59377b2, type: 3}
propertyPath: m_SortingOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 1233009204864175835, guid: 1c956b50a36cb0d409d69df3a59377b2, type: 3}
propertyPath: m_LocalPosition.x
value: 46.59
@@ -326904,6 +327061,14 @@ PrefabInstance:
propertyPath: m_Name
value: AnchorB
objectReference: {fileID: 0}
- target: {fileID: 1593968097031746981, guid: 1c956b50a36cb0d409d69df3a59377b2, type: 3}
propertyPath: m_SortingOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 2282210918091966166, guid: 1c956b50a36cb0d409d69df3a59377b2, type: 3}
propertyPath: m_SortingOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 2296390005725141326, guid: 1c956b50a36cb0d409d69df3a59377b2, type: 3}
propertyPath: m_LocalPosition.x
value: 0
@@ -327056,66 +327221,14 @@ PrefabInstance:
propertyPath: m_SortingOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 4659980126378597919, guid: 1c956b50a36cb0d409d69df3a59377b2, type: 3}
propertyPath: m_SortingOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 4844309227962071648, guid: 1c956b50a36cb0d409d69df3a59377b2, type: 3}
propertyPath: workerBeltObject
value:
objectReference: {fileID: 1245824934}
- target: {fileID: 4883153820997006706, guid: 1c956b50a36cb0d409d69df3a59377b2, type: 3}
propertyPath: interactionComplete.m_PersistentCalls.m_Calls.Array.size
value: 2
objectReference: {fileID: 0}
- target: {fileID: 4883153820997006706, guid: 1c956b50a36cb0d409d69df3a59377b2, type: 3}
propertyPath: interactionComplete.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 2
objectReference: {fileID: 0}
- target: {fileID: 4883153820997006706, guid: 1c956b50a36cb0d409d69df3a59377b2, type: 3}
propertyPath: interactionComplete.m_PersistentCalls.m_Calls.Array.data[1].m_Mode
value: 6
objectReference: {fileID: 0}
- target: {fileID: 4883153820997006706, guid: 1c956b50a36cb0d409d69df3a59377b2, type: 3}
propertyPath: interactionComplete.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 454801178}
- target: {fileID: 4883153820997006706, guid: 1c956b50a36cb0d409d69df3a59377b2, type: 3}
propertyPath: interactionComplete.m_PersistentCalls.m_Calls.Array.data[1].m_Target
value:
objectReference: {fileID: 1295636262}
- target: {fileID: 4883153820997006706, guid: 1c956b50a36cb0d409d69df3a59377b2, type: 3}
propertyPath: interactionComplete.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 4883153820997006706, guid: 1c956b50a36cb0d409d69df3a59377b2, type: 3}
propertyPath: interactionComplete.m_PersistentCalls.m_Calls.Array.data[1].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 4883153820997006706, guid: 1c956b50a36cb0d409d69df3a59377b2, type: 3}
propertyPath: interactionComplete.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: ChangeState
objectReference: {fileID: 0}
- target: {fileID: 4883153820997006706, guid: 1c956b50a36cb0d409d69df3a59377b2, type: 3}
propertyPath: interactionComplete.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName
value: set_enabled
objectReference: {fileID: 0}
- target: {fileID: 4883153820997006706, guid: 1c956b50a36cb0d409d69df3a59377b2, type: 3}
propertyPath: interactionComplete.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: Core.SaveLoad.AppleMachine, AppleHillsScripts
objectReference: {fileID: 0}
- target: {fileID: 4883153820997006706, guid: 1c956b50a36cb0d409d69df3a59377b2, type: 3}
propertyPath: interactionComplete.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName
value: UnityEngine.Animator, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 4883153820997006706, guid: 1c956b50a36cb0d409d69df3a59377b2, type: 3}
propertyPath: interactionComplete.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgument
value:
objectReference: {fileID: 919797118}
- target: {fileID: 4883153820997006706, guid: 1c956b50a36cb0d409d69df3a59377b2, type: 3}
propertyPath: interactionComplete.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.GameObject, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 4883153820997006706, guid: 1c956b50a36cb0d409d69df3a59377b2, type: 3}
propertyPath: interactionComplete.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 4928472349675920202, guid: 1c956b50a36cb0d409d69df3a59377b2, type: 3}
propertyPath: m_LocalScale.x
value: 0.6
@@ -327176,6 +327289,10 @@ PrefabInstance:
propertyPath: m_Name
value: WalkingWorker
objectReference: {fileID: 0}
- target: {fileID: 5383043036581615591, guid: 1c956b50a36cb0d409d69df3a59377b2, type: 3}
propertyPath: m_Controller
value:
objectReference: {fileID: 9100000, guid: ee4c670ec56af694cad4fc30f78a057b, type: 2}
- target: {fileID: 6000867473922782922, guid: 1c956b50a36cb0d409d69df3a59377b2, type: 3}
propertyPath: approachDelay
value: 1
@@ -327345,6 +327462,151 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 1c956b50a36cb0d409d69df3a59377b2, type: 3}
--- !u!1001 &2301579471450207868
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 400409417890847843, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3}
propertyPath: Priority.Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2718684908169034320, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3}
propertyPath: m_LocalPosition.x
value: 35.05065
objectReference: {fileID: 0}
- target: {fileID: 2718684908169034320, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3}
propertyPath: m_LocalPosition.y
value: -46.560646
objectReference: {fileID: 0}
- target: {fileID: 2718684908169034320, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3}
propertyPath: m_LocalPosition.z
value: -100.0126
objectReference: {fileID: 0}
- target: {fileID: 3317763283033734452, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3}
propertyPath: m_Name
value: LevelIntroDirector
objectReference: {fileID: 0}
- target: {fileID: 4013966011268908366, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4013966011268908366, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4013966011268908366, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4013966011268908366, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4013966011268908366, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4013966011268908366, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4013966011268908366, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4013966011268908366, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4013966011268908366, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4013966011268908366, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4242692913154398155, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3}
propertyPath: Priority.Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8417332413312608776, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3}
propertyPath: m_InitialState
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8417332413312608776, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3}
propertyPath: m_SceneBindings.Array.size
value: 9
objectReference: {fileID: 0}
- target: {fileID: 8417332413312608776, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3}
propertyPath: m_SceneBindings.Array.data[7].key
value:
objectReference: {fileID: 4729252056977678481, guid: 04513080f1b7ba446b8584d74f2a962c, type: 2}
- target: {fileID: 8417332413312608776, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3}
propertyPath: m_SceneBindings.Array.data[8].key
value:
objectReference: {fileID: -6272534478882868843, guid: 04513080f1b7ba446b8584d74f2a962c, type: 2}
- target: {fileID: 8417332413312608776, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3}
propertyPath: m_SceneBindings.Array.data[1].value
value:
objectReference: {fileID: 237315297}
- target: {fileID: 8417332413312608776, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3}
propertyPath: m_SceneBindings.Array.data[2].value
value:
objectReference: {fileID: 1375798237}
- target: {fileID: 8417332413312608776, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3}
propertyPath: m_SceneBindings.Array.data[3].value
value:
objectReference: {fileID: 139555513}
- target: {fileID: 8417332413312608776, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3}
propertyPath: m_SceneBindings.Array.data[4].value
value:
objectReference: {fileID: 1618672387}
- target: {fileID: 8417332413312608776, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3}
propertyPath: m_SceneBindings.Array.data[5].value
value:
objectReference: {fileID: 1885945952}
- target: {fileID: 8417332413312608776, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3}
propertyPath: m_SceneBindings.Array.data[7].value
value:
objectReference: {fileID: 75496601}
- target: {fileID: 8417332413312608776, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3}
propertyPath: m_SceneBindings.Array.data[8].value
value:
objectReference: {fileID: 1487412684}
- target: {fileID: 8417332413312608776, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3}
propertyPath: m_ExposedReferences.m_References.Array.size
value: 6
objectReference: {fileID: 0}
- target: {fileID: 8417332413312608776, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3}
propertyPath: m_ExposedReferences.m_References.Array.data[4].first
value: d88b5310ac3f22a46a9c5f0ec05b2cc8
objectReference: {fileID: 0}
- target: {fileID: 8417332413312608776, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3}
propertyPath: m_ExposedReferences.m_References.Array.data[5].first
value: 6283adbc9ff37874fb5f6c24d698acf5
objectReference: {fileID: 0}
- target: {fileID: 8417332413312608776, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3}
propertyPath: m_ExposedReferences.m_References.Array.data[1].second
value:
objectReference: {fileID: 1676982115}
- target: {fileID: 8417332413312608776, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3}
propertyPath: m_ExposedReferences.m_References.Array.data[4].second
value:
objectReference: {fileID: 1676982115}
- target: {fileID: 8417332413312608776, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3}
propertyPath: m_ExposedReferences.m_References.Array.data[5].second
value:
objectReference: {fileID: 1487412685}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 54abc3f3bd7e3584dacefdbe6ea8f076, type: 3}
--- !u!1001 &2360027994006890769
PrefabInstance:
m_ObjectHideFlags: 0
@@ -327572,6 +327834,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8396925847862462484, guid: fec1899a9a4c86e439f40065a2e37456, type: 3}
propertyPath: cookieOutline
value:
objectReference: {fileID: 970104890}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
@@ -327890,6 +328156,10 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1273721449607275699, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3}
propertyPath: defaultState
value:
objectReference: {fileID: 1132513019}
- target: {fileID: 1858988612203349957, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3}
propertyPath: m_LocalPosition.x
value: 14.9
@@ -327930,6 +328200,18 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7191082675790375086, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7734932022557956073, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7820936471920159333, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8449696027466354713, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3}
propertyPath: m_Name
value: CardPrintingMachine
@@ -327937,7 +328219,13 @@ PrefabInstance:
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 8449696027466354713, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3}
insertIndex: -1
addedObject: {fileID: 1375798237}
- targetCorrespondingSourceObject: {fileID: 7734932022557956073, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3}
insertIndex: -1
addedObject: {fileID: 959043616}
m_SourcePrefab: {fileID: 100100000, guid: c3b7a180a84d22d4d9c25cfbb5a0d6dc, type: 3}
--- !u!1001 &7974433369916253896
PrefabInstance:
@@ -328032,3 +328320,4 @@ SceneRoots:
- {fileID: 1818803817}
- {fileID: 6671167903009625445}
- {fileID: 2003226694}
- {fileID: 2301579471450207868}

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,41 @@
using UnityEngine;
using Core;
using Core.Lifecycle;
using UnityEngine.Playables;
using Input;
using Unity.Cinemachine;
public class LevelIntroDirector : ManagedBehaviour
{
public bool playOnSceneReady;
[HideInInspector]
public PlayableDirector introPlayableDirector;
internal override void OnSceneReady()
{
base.OnSceneReady();
if (playOnSceneReady)
{
introPlayableDirector = GetComponent<PlayableDirector>();
introPlayableDirector.stopped += IntroTimelineStopped;
PlayIntroTimeline();
}
else { gameObject.SetActive(false); }
}
private void IntroTimelineStopped(PlayableDirector director)
{
InputManager.Instance.SetInputMode(InputMode.Game);
introPlayableDirector.stopped -= IntroTimelineStopped;
gameObject.SetActive(false);
}
public void PlayIntroTimeline()
{
introPlayableDirector.Play();
InputManager.Instance.SetInputMode(InputMode.InputDisabled);
}
}

View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: b57bc17ff80ee534c93ed5676dd794ff

View File

@@ -3,6 +3,7 @@ using UnityEngine;
using Pixelplacement;
using Pixelplacement.TweenSystem;
using System.Collections;
using System.Runtime.CompilerServices;
public class WorkerBeltRoamingBehaviour : AppleState
{
@@ -23,6 +24,7 @@ public class WorkerBeltRoamingBehaviour : AppleState
private TweenBase roamingTween;
void OnEnable()
{
if (workerAnimator != null)
@@ -39,6 +41,12 @@ public class WorkerBeltRoamingBehaviour : AppleState
// Store the returned TweenBase so we can control it later
roamingTween = Tween.Spline(RoamingSpline, workerObjectTransform, 0, 1, false, roamDuration, roamDelay, Tween.EaseLinear, Tween.LoopType.Loop);
pantsLess = true;
if (workerAnimator.GetBool("pantsDown?"))
{
pantsLess = true;
}
if (pantsLess)
{
pantsRoutine = StartCoroutine(RandomFallChance());
@@ -85,10 +93,11 @@ public class WorkerBeltRoamingBehaviour : AppleState
public void CheckForFall()
{
// 5% chance to fall each check
if (Random.value < 0.05f)
// 50% chance to fall each check
if (Random.value < 0.42f)
{
workerAnimator?.SetTrigger("shouldFall?");
}
}
@@ -101,4 +110,15 @@ public class WorkerBeltRoamingBehaviour : AppleState
}
}
public void ContinueRoaming()
{
roamingTween.Resume();
}
public void PauseRoaming()
{
roamingTween.Stop();
}
}

View File

@@ -13,6 +13,7 @@ public class WorkerBeltReturningBehaviour : AppleState
public GameObject roamingWorker;
public GameObject workerBeltObject;
public Animator workerAnimator;
public RuntimeAnimatorController pantslessController;
private TweenBase returnTween;
public AppleMachine workerBeltStateMAchineRef;
public Transform StartingAnchor;
@@ -20,6 +21,9 @@ public class WorkerBeltReturningBehaviour : AppleState
private void OnEnable()
{
workerAnimator.runtimeAnimatorController = pantslessController;
workerAnimator.SetBool("pantsDown?", true);
if (roamingWorker != null)
roamingWorker.SetActive(true);
@@ -67,7 +71,6 @@ public class WorkerBeltReturningBehaviour : AppleState
// callback implementations
void HandleReturnStarted()
{
// optional: play audio/anim etc.
}
void HandleReturnFinished()

View File

@@ -9,9 +9,10 @@ namespace Input
/// <summary>
/// Base class for player movement controllers.
/// Handles tap-to-move and hold-to-move input with pathfinding or direct movement.
/// Implements IInteractingCharacter to enable interaction with items.
/// Derived classes can override to add specialized behavior (e.g., shader updates).
/// </summary>
public abstract class BasePlayerMovementController : ManagedBehaviour, ITouchInputConsumer
public abstract class BasePlayerMovementController : ManagedBehaviour, ITouchInputConsumer, IInteractingCharacter
{
[Header("Movement")]
[SerializeField] protected float moveSpeed = 5f;
@@ -42,6 +43,12 @@ namespace Input
public event System.Action OnMovementStarted;
public event System.Action OnMovementStopped;
// IInteractingCharacter implementation - scripted movement for interactions
private Coroutine _moveToCoroutine;
private bool _interruptMoveTo;
public event System.Action OnArrivedAtTarget;
public event System.Action OnMoveToCancelled;
// Components
protected AIPath _aiPath;
protected Animator _animator;
@@ -67,13 +74,6 @@ namespace Input
{
base.OnManagedStart();
// Register with InputManager
if (InputManager.Instance != null)
{
InputManager.Instance.SetDefaultConsumer(this);
Logging.Debug($"[{GetType().Name}] Registered as default input consumer");
}
_logVerbosity = DeveloperSettingsProvider.Instance.GetSettings<DebugSettings>().inputLogVerbosity;
}
@@ -102,6 +102,7 @@ namespace Input
public virtual void OnTap(Vector2 worldPosition)
{
InterruptMoveTo(); // Cancel any scripted movement
Logging.Debug($"[{GetType().Name}] OnTap at {worldPosition}");
if (_aiPath != null)
{
@@ -116,6 +117,7 @@ namespace Input
public virtual void OnHoldStart(Vector2 worldPosition)
{
InterruptMoveTo(); // Cancel any scripted movement
Logging.Debug($"[{GetType().Name}] OnHoldStart at {worldPosition}");
_lastHoldPosition = worldPosition;
_isHolding = true;
@@ -325,6 +327,103 @@ namespace Input
}
#endregion
#region IInteractingCharacter Implementation
/// <summary>
/// Controller-driven interaction movement. Base implementation moves this controller to the interactable.
/// Override in derived classes for custom behavior (e.g., PlayerTouchController handles follower dispatch).
/// </summary>
public virtual async System.Threading.Tasks.Task<bool> MoveToInteractableAsync(Interactions.InteractableBase interactable)
{
// Default behavior: move self to interactable position
Vector3 targetPosition = interactable.transform.position;
// Check for custom CharacterMoveToTarget
var moveTargets = interactable.GetComponentsInChildren<Interactions.CharacterMoveToTarget>();
foreach (var target in moveTargets)
{
if (target.characterType == Interactions.CharacterToInteract.Trafalgar ||
target.characterType == Interactions.CharacterToInteract.Both)
{
targetPosition = target.GetTargetPosition();
break;
}
}
// Use MovementUtilities to handle movement
return await Utils.MovementUtilities.MoveToPositionAsync(this, targetPosition);
}
/// <summary>
/// Moves the character to a specific target position and notifies via events when arrived or cancelled.
/// This is used by systems like interactions to orchestrate scripted movement.
/// </summary>
public virtual void MoveToAndNotify(Vector3 target)
{
// Cancel any previous move-to coroutine
if (_moveToCoroutine != null)
{
StopCoroutine(_moveToCoroutine);
}
_interruptMoveTo = false;
// Ensure pathfinding is enabled for MoveToAndNotify
if (_aiPath != null)
{
_aiPath.enabled = true;
_aiPath.canMove = true;
_aiPath.isStopped = false;
}
_moveToCoroutine = StartCoroutine(MoveToTargetCoroutine(target));
}
/// <summary>
/// Cancels any in-progress MoveToAndNotify operation and fires the cancellation event.
/// </summary>
public virtual void InterruptMoveTo()
{
_interruptMoveTo = true;
_isHolding = false;
_directMoveVelocity = Vector3.zero;
if (Settings != null && Settings.DefaultHoldMovementMode == HoldMovementMode.Direct && _aiPath != null)
_aiPath.enabled = false;
OnMoveToCancelled?.Invoke();
}
/// <summary>
/// Coroutine for moving the character to a target position and firing arrival/cancel events.
/// </summary>
protected virtual System.Collections.IEnumerator MoveToTargetCoroutine(Vector3 target)
{
if (_aiPath != null)
{
_aiPath.destination = target;
_aiPath.maxSpeed = Settings.MoveSpeed;
_aiPath.maxAcceleration = Settings.MaxAcceleration;
}
while (!_interruptMoveTo)
{
Vector2 current2D = new Vector2(transform.position.x, transform.position.y);
Vector2 target2D = new Vector2(target.x, target.y);
float dist = Vector2.Distance(current2D, target2D);
if (dist <= Settings.StopDistance + 0.2f)
{
break;
}
yield return null;
}
_moveToCoroutine = null;
if (!_interruptMoveTo)
{
OnArrivedAtTarget?.Invoke();
}
}
#endregion
}
}

View File

@@ -0,0 +1,47 @@
using System.Threading.Tasks;
using UnityEngine;
namespace Input
{
/// <summary>
/// Interface for characters that can participate in scripted interactions.
/// Provides movement-to-target with arrival/cancellation notifications.
/// Implemented by BasePlayerMovementController to enable all controllers to interact with items.
/// </summary>
public interface IInteractingCharacter
{
/// <summary>
/// Controller-driven interaction movement. Each controller implements its own behavior
/// based on the interactable's settings (characterToInteract, CharacterMoveToTarget, etc.)
/// </summary>
/// <param name="interactable">The interactable to move to</param>
/// <returns>True if movement succeeded and character arrived, false if cancelled/failed</returns>
Task<bool> MoveToInteractableAsync(Interactions.InteractableBase interactable);
/// <summary>
/// Moves character to target position and notifies when arrived/cancelled
/// </summary>
void MoveToAndNotify(Vector3 target);
/// <summary>
/// Interrupts any in-progress MoveToAndNotify operation
/// </summary>
void InterruptMoveTo();
/// <summary>
/// Fired when character arrives at MoveToAndNotify target
/// </summary>
event System.Action OnArrivedAtTarget;
/// <summary>
/// Fired when MoveToAndNotify is cancelled/interrupted
/// </summary>
event System.Action OnMoveToCancelled;
/// <summary>
/// Character's transform (for position queries)
/// </summary>
Transform transform { get; }
}
}

View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 0d1b1be281334b9390cc96d7a8ff3132
timeCreated: 1765754798

View File

@@ -34,6 +34,9 @@ namespace Input
// Track which consumer is handling the current hold operation
private ITouchInputConsumer _activeHoldConsumer;
// Controller registration system
private readonly Dictionary<string, ITouchInputConsumer> _registeredControllers = new Dictionary<string, ITouchInputConsumer>();
/// <summary>
/// Singleton instance of the InputManager. No longer creates an instance if one doesn't exist.
/// </summary>
@@ -408,5 +411,126 @@ namespace Input
consumer.OnTap(worldPos);
return true;
}
#region Controller Registration System
/// <summary>
/// Registers a controller with a unique name for later switching.
/// </summary>
/// <param name="controllerName">Unique name for the controller</param>
/// <param name="controller">The controller instance to register</param>
/// <param name="setAsDefaultConsumer">If true, sets this controller as the default input consumer</param>
public void RegisterController(string controllerName, ITouchInputConsumer controller, bool setAsDefaultConsumer = false)
{
if (string.IsNullOrEmpty(controllerName))
{
Debug.LogError("[InputManager] Cannot register controller with null or empty name.");
return;
}
if (controller == null)
{
Debug.LogError($"[InputManager] Cannot register null controller for name: {controllerName}");
return;
}
if (_registeredControllers.ContainsKey(controllerName))
{
Debug.LogWarning($"[InputManager] Controller with name '{controllerName}' is already registered. Overwriting.");
}
_registeredControllers[controllerName] = controller;
Logging.Debug($"Controller registered: {controllerName}");
if (setAsDefaultConsumer)
{
SetDefaultConsumer(controller);
Logging.Debug($"Controller '{controllerName}' set as default consumer.");
}
}
/// <summary>
/// Unregisters a controller by name.
/// </summary>
/// <param name="controllerName">Name of the controller to unregister</param>
public void UnregisterController(string controllerName)
{
if (string.IsNullOrEmpty(controllerName))
{
Debug.LogError("[InputManager] Cannot unregister controller with null or empty name.");
return;
}
if (_registeredControllers.Remove(controllerName))
{
Logging.Debug($"Controller unregistered: {controllerName}");
}
else
{
Debug.LogWarning($"[InputManager] Attempted to unregister non-existent controller: {controllerName}");
}
}
/// <summary>
/// Gets a registered controller by name.
/// </summary>
/// <param name="controllerName">Name of the controller to retrieve</param>
/// <returns>The controller if found, null otherwise</returns>
public ITouchInputConsumer GetController(string controllerName)
{
if (string.IsNullOrEmpty(controllerName))
{
Debug.LogError("[InputManager] Cannot get controller with null or empty name.");
return null;
}
if (_registeredControllers.TryGetValue(controllerName, out ITouchInputConsumer controller))
{
return controller;
}
Debug.LogWarning($"[InputManager] Controller not found: {controllerName}");
return null;
}
/// <summary>
/// Switches to a registered controller by name, setting it as the default consumer.
/// </summary>
/// <param name="controllerName">Name of the controller to switch to</param>
/// <returns>True if the switch was successful, false otherwise</returns>
public bool SwitchToController(string controllerName)
{
ITouchInputConsumer controller = GetController(controllerName);
if (controller != null)
{
SetDefaultConsumer(controller);
Logging.Debug($"Switched to controller: {controllerName}");
return true;
}
return false;
}
/// <summary>
/// Checks if a controller with the given name is registered.
/// </summary>
/// <param name="controllerName">Name to check</param>
/// <returns>True if registered, false otherwise</returns>
public bool IsControllerRegistered(string controllerName)
{
return !string.IsNullOrEmpty(controllerName) && _registeredControllers.ContainsKey(controllerName);
}
/// <summary>
/// Gets the currently active controller (the default consumer).
/// This is the controller that currently has input control.
/// </summary>
/// <returns>The active controller, or null if no default consumer is set</returns>
public ITouchInputConsumer GetActiveController()
{
return defaultConsumer;
}
#endregion
}
}

View File

@@ -16,17 +16,12 @@ namespace Input
/// <summary>
/// Handles player movement in response to tap and hold input events.
/// Supports both direct and pathfinding movement modes, and provides event/callbacks for arrival/cancellation.
/// Extends BasePlayerMovementController with save/load and MoveToAndNotify functionality.
/// Supports both direct and pathfinding movement modes.
/// Extends BasePlayerMovementController with save/load functionality.
/// Interaction capability (MoveToAndNotify) is provided by base class.
/// </summary>
public class PlayerTouchController : BasePlayerMovementController
{
// --- PlayerTouchController-specific features (MoveToAndNotify) ---
public delegate void ArrivedAtTargetHandler();
private Coroutine _moveToCoroutine;
public event ArrivedAtTargetHandler OnArrivedAtTarget;
public event System.Action OnMoveToCancelled;
private bool _interruptMoveTo;
// Save system configuration
public override bool AutoRegisterForSave => true;
@@ -39,89 +34,126 @@ namespace Input
_movementSettings = configs.DefaultPlayerMovement;
}
#region ITouchInputConsumer Overrides (Add InterruptMoveTo)
public override void OnTap(Vector2 worldPosition)
internal override void OnManagedStart()
{
InterruptMoveTo();
base.OnTap(worldPosition);
base.OnManagedStart();
// Register with InputManager as default consumer
if (InputManager.Instance != null)
{
InputManager.Instance.RegisterController("trafalgar", this, setAsDefaultConsumer: true);
Logging.Debug($"[PlayerTouchController] Registered controller '{gameObject.name}' as default consumer");
}
}
public override void OnHoldStart(Vector2 worldPosition)
#region IInteractingCharacter Override
/// <summary>
/// PlayerTouchController-specific interaction movement.
/// Handles main character movement + follower dispatch based on interactable.characterToInteract setting.
/// </summary>
public override async System.Threading.Tasks.Task<bool> MoveToInteractableAsync(Interactions.InteractableBase interactable)
{
InterruptMoveTo();
base.OnHoldStart(worldPosition);
var characterToInteract = interactable.characterToInteract;
// If None, skip movement
if (characterToInteract == Interactions.CharacterToInteract.None)
{
return true;
}
// Determine stop distance based on interaction type
float stopDistance;
if (characterToInteract == Interactions.CharacterToInteract.Trafalgar)
{
// Move ONLY main character directly to item (close distance)
stopDistance = Core.GameManager.Instance.PlayerStopDistanceDirectInteraction;
}
else // Pulver or Both
{
// Move main character to radius (far distance)
stopDistance = Core.GameManager.Instance.PlayerStopDistance;
}
// Calculate stop position for main character
Vector3 stopPoint = interactable.transform.position;
bool customTargetFound = false;
// Check for custom CharacterMoveToTarget for main character
var moveTargets = interactable.GetComponentsInChildren<Interactions.CharacterMoveToTarget>();
foreach (var target in moveTargets)
{
if (target.characterType == Interactions.CharacterToInteract.Trafalgar ||
target.characterType == Interactions.CharacterToInteract.Both)
{
stopPoint = target.GetTargetPosition();
customTargetFound = true;
break;
}
}
// If no custom target, calculate based on distance
if (!customTargetFound)
{
stopPoint = Utils.MovementUtilities.CalculateStopPosition(
interactable.transform.position,
transform.position,
stopDistance
);
}
// Move main character
bool mainCharacterArrived = await Utils.MovementUtilities.MoveToPositionAsync(this, stopPoint);
if (!mainCharacterArrived)
{
return false; // Movement cancelled
}
// Handle follower dispatch based on interaction type
if (characterToInteract == Interactions.CharacterToInteract.Pulver ||
characterToInteract == Interactions.CharacterToInteract.Both)
{
// Find follower and dispatch to interactable
var followerController = FindFirstObjectByType<FollowerController>();
if (followerController != null)
{
// Determine follower target position
Vector3 followerTarget = interactable.transform.position;
// Check for custom target for Pulver
foreach (var target in moveTargets)
{
if (target.characterType == Interactions.CharacterToInteract.Pulver ||
target.characterType == Interactions.CharacterToInteract.Both)
{
followerTarget = target.GetTargetPosition();
break;
}
}
// Wait for follower to arrive
var tcs = new System.Threading.Tasks.TaskCompletionSource<bool>();
void OnFollowerArrived()
{
followerController.OnPickupArrived -= OnFollowerArrived;
followerController.ReturnToPlayer(transform);
tcs.TrySetResult(true);
}
followerController.OnPickupArrived += OnFollowerArrived;
followerController.GoToPoint(followerTarget);
await tcs.Task;
}
}
return true; // Success
}
#endregion
/// <summary>
/// Moves the player to a specific target position and notifies via events when arrived or cancelled.
/// This is used by systems like Pickup.cs to orchestrate movement.
/// </summary>
public void MoveToAndNotify(Vector3 target)
{
// Cancel any previous move-to coroutine
if (_moveToCoroutine != null)
{
StopCoroutine(_moveToCoroutine);
}
_interruptMoveTo = false;
// Ensure pathfinding is enabled for MoveToAndNotify
if (_aiPath != null)
{
_aiPath.enabled = true;
_aiPath.canMove = true;
_aiPath.isStopped = false;
}
_moveToCoroutine = StartCoroutine(MoveToTargetCoroutine(target));
}
/// <summary>
/// Cancels any in-progress MoveToAndNotify operation and fires the cancellation event.
/// </summary>
public void InterruptMoveTo()
{
_interruptMoveTo = true;
_isHolding = false;
_directMoveVelocity = Vector3.zero;
if (Settings.DefaultHoldMovementMode == HoldMovementMode.Direct && _aiPath != null)
_aiPath.enabled = false;
OnMoveToCancelled?.Invoke();
}
/// <summary>
/// Coroutine for moving the player to a target position and firing arrival/cancel events.
/// </summary>
private System.Collections.IEnumerator MoveToTargetCoroutine(Vector3 target)
{
if (_aiPath != null)
{
_aiPath.destination = target;
_aiPath.maxSpeed = Settings.MoveSpeed;
_aiPath.maxAcceleration = Settings.MaxAcceleration;
}
while (!_interruptMoveTo)
{
Vector2 current2D = new Vector2(transform.position.x, transform.position.y);
Vector2 target2D = new Vector2(target.x, target.y);
float dist = Vector2.Distance(current2D, target2D);
if (dist <= Settings.StopDistance + 0.2f)
{
break;
}
yield return null;
}
_moveToCoroutine = null;
if (!_interruptMoveTo)
{
OnArrivedAtTarget?.Invoke();
}
}
#region Save/Load Lifecycle Hooks

View File

@@ -0,0 +1,318 @@
using System;
using System.Collections;
using Core;
using Input;
using Interactions;
using Minigames.TrashMaze.Core;
using Minigames.TrashMaze.Data;
using Unity.Cinemachine;
using UnityEngine;
namespace Items
{
/// <summary>
/// Saveable data for ControllerSwitchItem state
/// </summary>
[Serializable]
public class ControllerSwitchItemSaveData
{
public bool hasBeenUsed;
}
/// <summary>
/// Camera switching mode for controller switch items
/// </summary>
public enum CameraSwitchMode
{
/// <summary>
/// No camera switching - controller switch only
/// </summary>
None,
/// <summary>
/// Use a direct reference to a Cinemachine camera
/// </summary>
DirectReference,
/// <summary>
/// Use TrashMazeCameraController state manager API
/// </summary>
TrashMazeCameraState
}
/// <summary>
/// An interactable item that switches control from one character controller to another.
/// When clicked:
/// 1. The selected character moves to this item's position
/// 2. Upon arrival, the current controller is disabled
/// 3. Camera blends to the target camera (based on camera mode)
/// 4. Once the blend completes, control switches to the target controller
/// </summary>
public class ControllerSwitchItem : SaveableInteractable
{
[Header("Controller Switch Settings")]
[Tooltip("Name of the controller to switch to (must match GameObject name of the controller)")]
[SerializeField] private string targetControllerName;
[Header("Camera Settings")]
[Tooltip("How to switch the camera when changing controllers")]
[SerializeField] private CameraSwitchMode cameraSwitchMode = CameraSwitchMode.None;
[Tooltip("Direct camera reference (only used if Camera Switch Mode is DirectReference)")]
[SerializeField] private CinemachineCamera targetVirtualCamera;
[Tooltip("Target camera state (only used if Camera Switch Mode is TrashMazeCameraState)")]
[SerializeField] private TrashMazeCameraState targetCameraState;
[Header("Visual Feedback")]
[Tooltip("Visual representation to hide after use (optional)")]
[SerializeField] private GameObject visualRepresentation;
// State
private bool _hasBeenUsed;
private PlayerTouchController _currentPlayerController;
private bool _isSwitching;
public override string SaveId => $"{gameObject.scene.name}/ControllerSwitchItem/{gameObject.name}";
internal override void OnManagedAwake()
{
base.OnManagedAwake();
if (string.IsNullOrEmpty(targetControllerName))
{
Debug.LogError($"[ControllerSwitchItem] {gameObject.name} has no target controller name specified!");
}
}
internal override void OnManagedStart()
{
base.OnManagedStart();
// Apply state after restoration
if (_hasBeenUsed && isOneTime)
{
DisableVisual();
}
}
protected override bool CanBeClicked()
{
// Cannot be clicked if already used (one-time) or if currently switching
if (_isSwitching)
return false;
if (isOneTime && _hasBeenUsed)
return false;
// Check if target controller is registered
if (!InputManager.Instance.IsControllerRegistered(targetControllerName))
{
Debug.LogWarning($"[ControllerSwitchItem] Target controller '{targetControllerName}' is not registered with InputManager.");
return false;
}
return base.CanBeClicked();
}
protected override bool DoInteraction()
{
if (_isSwitching)
return false;
// By the time this is called, the interacting character has already arrived at this item
// We just need to perform the controller/camera switch
Logging.Debug("[ControllerSwitchItem] Starting controller switch sequence");
// Start the async switch sequence (camera blend + controller switch)
StartCoroutine(SwitchControllerSequence());
// Return true immediately - interaction is considered successful
// The coroutine will handle the actual switching asynchronously
return true;
}
private IEnumerator SwitchControllerSequence()
{
_isSwitching = true;
// Step 1: Get current player controller (the one we're switching FROM)
_currentPlayerController = FindFirstObjectByType<PlayerTouchController>();
if (_currentPlayerController == null)
{
Debug.LogError("[ControllerSwitchItem] Could not find PlayerTouchController in scene!");
_isSwitching = false;
yield break;
}
Logging.Debug("[ControllerSwitchItem] Character has arrived, beginning switch");
// Step 2: Disable current player controller
_currentPlayerController.enabled = false;
Logging.Debug("[ControllerSwitchItem] Disabled current player controller");
// Step 3: Blend to target camera based on mode
yield return SwitchCamera();
// Step 4: Switch to target controller
ITouchInputConsumer targetController = InputManager.Instance.GetController(targetControllerName);
if (targetController != null)
{
// Enable the target controller if it's a MonoBehaviour
if (targetController is MonoBehaviour targetMono)
{
targetMono.enabled = true;
Logging.Debug($"[ControllerSwitchItem] Enabled target controller: {targetControllerName}");
}
// Switch input control to the target controller
bool switchSuccess = InputManager.Instance.SwitchToController(targetControllerName);
if (switchSuccess)
{
Logging.Debug($"[ControllerSwitchItem] Successfully switched input to controller: {targetControllerName}");
}
else
{
Debug.LogError($"[ControllerSwitchItem] Failed to switch to controller: {targetControllerName}");
}
}
else
{
Debug.LogError($"[ControllerSwitchItem] Target controller '{targetControllerName}' not found!");
}
// Step 5: Mark as used if one-time use
if (isOneTime)
{
_hasBeenUsed = true;
DisableVisual();
}
_isSwitching = false;
}
private IEnumerator SwitchCamera()
{
switch (cameraSwitchMode)
{
case CameraSwitchMode.None:
// No camera switching
Logging.Debug("[ControllerSwitchItem] No camera switching configured");
break;
case CameraSwitchMode.DirectReference:
if (targetVirtualCamera != null)
{
Logging.Debug($"[ControllerSwitchItem] Blending to camera: {targetVirtualCamera.name}");
// Set the target camera as highest priority
targetVirtualCamera.Priority = 100;
// Wait for camera blend to complete
yield return WaitForCameraBlend();
}
else
{
Debug.LogWarning("[ControllerSwitchItem] DirectReference mode selected but no camera assigned!");
}
break;
case CameraSwitchMode.TrashMazeCameraState:
if (TrashMazeCameraController.Instance != null)
{
Logging.Debug($"[ControllerSwitchItem] Switching to camera state: {targetCameraState}");
// Use the state manager API
if (targetCameraState == TrashMazeCameraState.Gameplay)
{
TrashMazeCameraController.Instance.SwitchToGameplay();
}
else if (targetCameraState == TrashMazeCameraState.Maze)
{
TrashMazeCameraController.Instance.SwitchToMaze();
}
// Wait for camera blend to complete
yield return WaitForCameraBlend();
}
else
{
Debug.LogError("[ControllerSwitchItem] TrashMazeCameraController instance not found in scene!");
}
break;
}
}
private IEnumerator WaitForCameraBlend()
{
CinemachineBrain brain = Camera.main?.GetComponent<CinemachineBrain>();
if (brain != null)
{
// Wait until blend is not active
while (brain.IsBlending)
{
yield return null;
}
Logging.Debug("[ControllerSwitchItem] Camera blend completed");
}
else
{
// If no brain, just wait a brief moment
yield return new WaitForSeconds(0.5f);
}
}
private void DisableVisual()
{
if (visualRepresentation != null)
{
visualRepresentation.SetActive(false);
}
}
#region Save/Load
protected override object GetSerializableState()
{
return new ControllerSwitchItemSaveData
{
hasBeenUsed = _hasBeenUsed
};
}
protected override void ApplySerializableState(string serializedData)
{
try
{
var data = JsonUtility.FromJson<ControllerSwitchItemSaveData>(serializedData);
_hasBeenUsed = data.hasBeenUsed;
Logging.Debug($"[ControllerSwitchItem] Restored state: hasBeenUsed={_hasBeenUsed}");
}
catch (Exception e)
{
Debug.LogError($"[ControllerSwitchItem] Failed to deserialize save data: {e.Message}");
}
}
#endregion
#if UNITY_EDITOR
private void OnValidate()
{
// Visual feedback in editor
if (string.IsNullOrEmpty(targetControllerName))
{
name = "ControllerSwitchItem (UNCONFIGURED)";
}
else
{
name = $"ControllerSwitchItem_To_{targetControllerName}";
}
}
#endif
}
}

View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 915abd653d714ea3ae11bbf14feafb1e
timeCreated: 1765747971

View File

@@ -17,6 +17,7 @@ public class GlowOutline : ManagedBehaviour
public float thiccness;
public GlowOutlineData.InteractionType interactionType;
public bool animatedSprite;
public Material outlineMaterial;
@@ -35,7 +36,6 @@ public class GlowOutline : ManagedBehaviour
// Get the transforms and spriterenderers of children
childrenTransforms = GetComponentsInChildren<Transform>();
childrenSprites = GetComponentsInChildren<SpriteRenderer>();
// childrenMaterials = GetComponentsInChildren<Material>();
// Set the color to use in this outline from the colors set in Interaction Settings
foreach (GlowOutlineData data in outlineColors)
@@ -56,9 +56,13 @@ public class GlowOutline : ManagedBehaviour
foreach (SpriteRenderer childSprite in childrenSprites)
{
if (itemSprite.sprite != null)
if (!itemSprite)
continue;
if (itemSprite?.sprite != null)
{
childSprite.sprite = itemSprite.sprite;
childSprite.material = outlineMaterial;
}
if (childSprite.sharedMaterial != null)

View File

@@ -34,7 +34,7 @@ namespace Interactions
public UnityEvent characterArrived;
public UnityEvent<bool> interactionComplete;
private PlayerTouchController playerRef;
private IInteractingCharacter _interactingCharacter;
protected FollowerController FollowerController;
private bool isActive = true;
@@ -69,7 +69,7 @@ namespace Interactions
/// <summary>
/// Dispatch an interaction event to all registered actions and await their completion
/// </summary>
private async Task DispatchEventAsync(InteractionEventType eventType)
private async Task DispatchEventAsync(InteractionEventType eventType, PlayerTouchController playerRef = null)
{
// Collect all tasks from actions that want to respond
List<Task<bool>> tasks = new List<Task<bool>>();
@@ -114,26 +114,52 @@ namespace Interactions
/// </summary>
private async Task StartInteractionFlowAsync()
{
// 2. Find characters
playerRef = FindFirstObjectByType<PlayerTouchController>();
// 2. Find characters - get the ACTIVE controller from InputManager
BasePlayerMovementController playerController = null;
if (InputManager.Instance != null)
{
// Get the controller that currently has input control
var activeController = InputManager.Instance.GetActiveController();
playerController = activeController as BasePlayerMovementController;
}
// Fallback: if InputManager doesn't have an active controller, try to find PlayerTouchController specifically
if (playerController == null)
{
playerController = FindFirstObjectByType<PlayerTouchController>();
Logging.Warning("[Interactable] No active controller from InputManager, falling back to FindFirstObjectByType<PlayerTouchController>");
}
_interactingCharacter = playerController;
FollowerController = FindFirstObjectByType<FollowerController>();
// For legacy event compatibility, try to get PlayerTouchController reference
var playerRef = playerController as PlayerTouchController;
// 3. Virtual hook: Setup
OnInteractionStarted();
// 4. Fire events
interactionStarted?.Invoke(playerRef, FollowerController);
await DispatchEventAsync(InteractionEventType.InteractionStarted);
await DispatchEventAsync(InteractionEventType.InteractionStarted, playerRef);
// 5. Orchestrate character movement
await MoveCharactersAsync();
bool movementSucceeded = await MoveCharactersAsync(playerRef);
// If movement was cancelled, stop the interaction flow
if (!movementSucceeded)
{
Logging.Debug($"[Interactable] Interaction cancelled due to movement failure on {gameObject.name}");
return;
}
// 6. Virtual hook: Arrival reaction
OnInteractingCharacterArrived();
// 7. Fire arrival events
characterArrived?.Invoke();
await DispatchEventAsync(InteractionEventType.InteractingCharacterArrived);
await DispatchEventAsync(InteractionEventType.InteractingCharacterArrived, playerRef);
// 8. Validation (base + child)
var (canProceed, errorMessage) = ValidateInteraction();
@@ -143,7 +169,7 @@ namespace Interactions
{
DebugUIMessage.Show(errorMessage, Color.yellow);
}
FinishInteraction(false);
FinishInteraction(false, playerRef);
return;
}
@@ -151,7 +177,7 @@ namespace Interactions
bool success = DoInteraction();
// 10. Finish up
FinishInteraction(success);
FinishInteraction(success, playerRef);
}
#region Virtual Lifecycle Methods
@@ -260,151 +286,46 @@ namespace Interactions
#region Character Movement Orchestration
/// <summary>
/// Orchestrates character movement based on characterToInteract setting.
/// Delegates movement to the interacting character's controller.
/// Each controller implements its own movement behavior based on this interactable's settings.
/// </summary>
private async Task MoveCharactersAsync()
/// <returns>True if movement succeeded, false if cancelled or failed</returns>
private async Task<bool> MoveCharactersAsync(PlayerTouchController playerRef = null)
{
if (playerRef == null)
if (_interactingCharacter == null)
{
Logging.Debug($"[Interactable] Player character could not be found. Aborting interaction.");
Logging.Debug($"[Interactable] No interacting character found. Aborting interaction.");
interactionInterrupted.Invoke();
await DispatchEventAsync(InteractionEventType.InteractionInterrupted);
return;
await DispatchEventAsync(InteractionEventType.InteractionInterrupted, playerRef);
return false;
}
// If characterToInteract is None, skip movement
if (characterToInteract == CharacterToInteract.None)
{
return; // Continue to arrival
return true; // Continue to arrival
}
// Move player and optionally follower based on characterToInteract setting
if (characterToInteract == CharacterToInteract.Trafalgar)
// Delegate to controller - let it decide how to handle the interaction
bool arrived = await _interactingCharacter.MoveToInteractableAsync(this);
if (!arrived)
{
await MovePlayerAsync();
}
else if (characterToInteract == CharacterToInteract.Pulver || characterToInteract == CharacterToInteract.Both)
{
await MovePlayerAsync(); // Move player to range first
await MoveFollowerAsync(); // Then move follower to interaction point
}
Logging.Debug($"[Interactable] Movement cancelled for {gameObject.name}");
await HandleInteractionCancelledAsync(playerRef);
return false;
}
/// <summary>
/// Moves the player to the interaction point or custom target.
/// </summary>
private async Task MovePlayerAsync()
{
Vector3 stopPoint = transform.position; // Default to interactable position
bool customTargetFound = false;
// Check for a CharacterMoveToTarget component for Trafalgar or Both
CharacterMoveToTarget[] moveTargets = GetComponentsInChildren<CharacterMoveToTarget>();
foreach (var target in moveTargets)
{
if (target.characterType == CharacterToInteract.Trafalgar || target.characterType == CharacterToInteract.Both)
{
stopPoint = target.GetTargetPosition();
customTargetFound = true;
break;
}
}
// If no custom target, use default distance
if (!customTargetFound)
{
Vector3 interactablePos = transform.position;
Vector3 playerPos = playerRef.transform.position;
float stopDistance = characterToInteract == CharacterToInteract.Pulver
? GameManager.Instance.PlayerStopDistance
: GameManager.Instance.PlayerStopDistanceDirectInteraction;
Vector3 toPlayer = (playerPos - interactablePos).normalized;
stopPoint = interactablePos + toPlayer * stopDistance;
}
// Wait for player to arrive
var tcs = new TaskCompletionSource<bool>();
void OnPlayerArrivedLocal()
{
if (playerRef != null)
{
playerRef.OnArrivedAtTarget -= OnPlayerArrivedLocal;
playerRef.OnMoveToCancelled -= OnPlayerMoveCancelledLocal;
}
tcs.TrySetResult(true);
}
void OnPlayerMoveCancelledLocal()
{
if (playerRef != null)
{
playerRef.OnArrivedAtTarget -= OnPlayerArrivedLocal;
playerRef.OnMoveToCancelled -= OnPlayerMoveCancelledLocal;
}
_ = HandleInteractionCancelledAsync();
tcs.TrySetResult(false);
}
playerRef.OnArrivedAtTarget += OnPlayerArrivedLocal;
playerRef.OnMoveToCancelled += OnPlayerMoveCancelledLocal;
playerRef.MoveToAndNotify(stopPoint);
await tcs.Task;
}
/// <summary>
/// Moves the follower to the interaction point or custom target.
/// </summary>
private async Task MoveFollowerAsync()
{
if (FollowerController == null)
return;
// Check for a CharacterMoveToTarget component for Pulver or Both
Vector3 targetPosition = transform.position;
CharacterMoveToTarget[] moveTargets = GetComponentsInChildren<CharacterMoveToTarget>();
foreach (var target in moveTargets)
{
if (target.characterType == CharacterToInteract.Pulver || target.characterType == CharacterToInteract.Both)
{
targetPosition = target.GetTargetPosition();
break;
}
}
// Wait for follower to arrive
var tcs = new TaskCompletionSource<bool>();
void OnFollowerArrivedLocal()
{
if (FollowerController != null)
{
FollowerController.OnPickupArrived -= OnFollowerArrivedLocal;
}
// Tell follower to return to player
if (FollowerController != null && playerRef != null)
{
FollowerController.ReturnToPlayer(playerRef.transform);
}
tcs.TrySetResult(true);
}
FollowerController.OnPickupArrived += OnFollowerArrivedLocal;
FollowerController.GoToPoint(targetPosition);
await tcs.Task;
return true;
}
/// <summary>
/// Handles interaction being cancelled (player stopped moving).
/// </summary>
private async Task HandleInteractionCancelledAsync()
private async Task HandleInteractionCancelledAsync(PlayerTouchController playerRef = null)
{
interactionInterrupted?.Invoke();
await DispatchEventAsync(InteractionEventType.InteractionInterrupted);
await DispatchEventAsync(InteractionEventType.InteractionInterrupted, playerRef);
}
#endregion
@@ -414,14 +335,14 @@ namespace Interactions
/// <summary>
/// Finalizes the interaction after DoInteraction completes.
/// </summary>
private async void FinishInteraction(bool success)
private async void FinishInteraction(bool success, PlayerTouchController playerRef = null)
{
// Virtual hook: Cleanup
OnInteractionFinished(success);
// Fire completion events
interactionComplete?.Invoke(success);
await DispatchEventAsync(InteractionEventType.InteractionComplete);
await DispatchEventAsync(InteractionEventType.InteractionComplete, playerRef);
// Handle one-time / cooldown
if (success)
@@ -437,7 +358,7 @@ namespace Interactions
}
// Reset state
playerRef = null;
_interactingCharacter = null;
FollowerController = null;
}

View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 44bf6c911c674dc98cc5a06ad14c7d56
timeCreated: 1765747971

View File

@@ -9,6 +9,7 @@ namespace Minigames.TrashMaze.Core
/// Controls Pulver character movement in the Trash Maze.
/// Inherits from BasePlayerMovementController for tap-to-move and hold-to-move.
/// Updates global shader properties for vision radius system.
/// Interaction capability (MoveToAndNotify) is provided by base class.
/// </summary>
public class PulverController : BasePlayerMovementController
{
@@ -52,6 +53,18 @@ namespace Minigames.TrashMaze.Core
Logging.Debug($"[PulverController] Loaded vision radius from settings: {_visionRadius}");
}
internal override void OnManagedStart()
{
base.OnManagedStart();
// Register with InputManager (not as default consumer)
if (InputManager.Instance != null)
{
InputManager.Instance.RegisterController("pulver", this, setAsDefaultConsumer: false);
Logging.Debug($"[PulverController] Registered controller '{gameObject.name}'");
}
}
protected override void Update()
{
base.Update(); // Call base for movement and animation
@@ -86,6 +99,33 @@ namespace Minigames.TrashMaze.Core
{
_visionRadius = Mathf.Max(0.1f, radius);
}
#region IInteractingCharacter Override
/// <summary>
/// PulverController-specific interaction movement.
/// Moves Pulver to the interactable using the main character's stop distance.
/// No follower logic since Pulver is alone in the maze.
/// </summary>
public override async System.Threading.Tasks.Task<bool> MoveToInteractableAsync(Interactions.InteractableBase interactable)
{
// Use the same stop distance as main character for consistency
float stopDistance = GameManager.Instance.PlayerStopDistance;
// Calculate stop position
Vector3 stopPoint = Utils.MovementUtilities.CalculateStopPosition(
interactable.transform.position,
transform.position,
stopDistance
);
Logging.Debug($"[PulverController] Moving to interactable {interactable.gameObject.name} at stop distance {stopDistance}");
// Use MovementUtilities to handle movement
return await Utils.MovementUtilities.MoveToPositionAsync(this, stopPoint);
}
#endregion
}
}

View File

@@ -0,0 +1,106 @@
using Common.Camera;
using Core;
using Minigames.TrashMaze.Data;
using Unity.Cinemachine;
namespace Minigames.TrashMaze.Core
{
/// <summary>
/// Manages camera states for the Trash Maze minigame.
/// Handles transitions between Gameplay (level exploration) and Maze (inside maze exploration) cameras.
/// Provides singleton access for easy camera switching from items and other systems.
/// </summary>
public class TrashMazeCameraController : CameraStateManager<TrashMazeCameraState>
{
#region Singleton
private static TrashMazeCameraController _instance;
/// <summary>
/// Singleton instance of the camera controller
/// </summary>
public static TrashMazeCameraController Instance => _instance;
#endregion
#region Lifecycle
internal override void OnManagedAwake()
{
// Base class handles InitializeCameraMap() and ValidateCameras()
base.OnManagedAwake();
// Set singleton
if (_instance != null && _instance != this)
{
Logging.Warning("[TrashMazeCameraController] Multiple instances detected! Destroying duplicate.");
Destroy(gameObject);
return;
}
_instance = this;
}
internal override void OnManagedStart()
{
base.OnManagedStart();
// Start in gameplay camera by default
SwitchToGameplay();
}
internal override void OnManagedDestroy()
{
base.OnManagedDestroy();
if (_instance == this)
{
_instance = null;
}
}
#endregion
#region Public API
/// <summary>
/// Switch to the main gameplay camera (level exploration)
/// </summary>
public void SwitchToGameplay()
{
SwitchToState(TrashMazeCameraState.Gameplay);
if (showDebugLogs)
Logging.Debug("[TrashMazeCameraController] Switched to Gameplay camera");
}
/// <summary>
/// Switch to the maze camera (inside maze exploration)
/// </summary>
public void SwitchToMaze()
{
SwitchToState(TrashMazeCameraState.Maze);
if (showDebugLogs)
Logging.Debug("[TrashMazeCameraController] Switched to Maze camera");
}
/// <summary>
/// Get the gameplay camera
/// </summary>
public CinemachineCamera GetGameplayCamera()
{
return GetCamera(TrashMazeCameraState.Gameplay);
}
/// <summary>
/// Get the maze camera
/// </summary>
public CinemachineCamera GetMazeCamera()
{
return GetCamera(TrashMazeCameraState.Maze);
}
#endregion
}
}

View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: d058b159d0aa43699eaba263b7b8c5a7
timeCreated: 1765749988

View File

@@ -13,8 +13,7 @@ namespace Minigames.TrashMaze.Core
public static TrashMazeController Instance { get; private set; }
[Header("Player")]
[SerializeField] private PulverController pulverPrefab;
[SerializeField] private Transform startPosition;
[SerializeField] private PulverController pulverController;
[Header("Background")]
[Tooltip("Background sprite renderer - world size and center are inferred from its bounds")]
@@ -27,7 +26,6 @@ namespace Minigames.TrashMaze.Core
private static readonly int WorldSizeID = Shader.PropertyToID("_WorldSize");
private static readonly int WorldCenterID = Shader.PropertyToID("_WorldCenter");
private PulverController _pulverInstance;
private bool _mazeCompleted;
internal override void OnManagedAwake()
@@ -59,8 +57,8 @@ namespace Minigames.TrashMaze.Core
// Infer world bounds from background renderer and set shader globals
ApplyBackgroundBoundsToShader();
// Spawn player
SpawnPulver();
// Validate player reference
InitializePulver();
Logging.Debug("[TrashMazeController] Trash Maze initialized");
}
@@ -108,18 +106,15 @@ namespace Minigames.TrashMaze.Core
$"Size=({worldSize.x:F2}, {worldSize.y:F2}), Center=({worldCenter.x:F2}, {worldCenter.y:F2})");
}
private void SpawnPulver()
private void InitializePulver()
{
if (pulverPrefab == null)
if (pulverController == null)
{
Logging.Error("[TrashMazeController] Pulver prefab not assigned!");
Logging.Error("[TrashMazeController] PulverController reference not assigned! Please assign it in the Inspector.");
return;
}
Vector3 spawnPosition = startPosition != null ? startPosition.position : Vector3.zero;
_pulverInstance = Instantiate(pulverPrefab, spawnPosition, Quaternion.identity);
Logging.Debug($"[TrashMazeController] Pulver spawned at {spawnPosition}");
Logging.Debug($"[TrashMazeController] Pulver controller initialized at {pulverController.transform.position}");
}
/// <summary>

View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: c1c86c04b4dc4dd5add77ba3bb17f95e
timeCreated: 1765749918

View File

@@ -0,0 +1,19 @@
namespace Minigames.TrashMaze.Data
{
/// <summary>
/// Camera states for Trash Maze minigame
/// </summary>
public enum TrashMazeCameraState
{
/// <summary>
/// Main gameplay camera following Trafalgar around the level
/// </summary>
Gameplay,
/// <summary>
/// Maze camera following Pulver when exploring the maze alone
/// </summary>
Maze
}
}

View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 4e26aed52b5e4597b3cbba9191fe463b
timeCreated: 1765749918

View File

@@ -0,0 +1,32 @@
using Core.SaveLoad;
using UnityEngine;
public class BeltSnatchBehaviour : MonoBehaviour
{
public GameObject beltObject;
public AppleMachine stateMachine;
public Animator walkingWorkerAnimator;
private Animator beltWorkerAnimator;
public void OnEnable()
{
beltWorkerAnimator = GetComponent<Animator>();
}
public void EnableBeltInteraction()
{
beltObject.SetActive(true);
}
public void TransitionToReturnState()
{
stateMachine.ChangeState("WorkerReturning");
}
public void BeltSnatched()
{
beltWorkerAnimator.SetBool("beltSnatched?", true);
}
}

View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: b744b8758f070614b976c431633925cb

View File

@@ -9,6 +9,7 @@ public class CookieEatingBehavior : AppleState
{
public SpriteRenderer cookieEatingSprites;
public SpriteRenderer consumedCookieSprites;
public GameObject cookieOutline;
private PlayableDirector cookieEatingDirector;
private SpriteRenderer playerSprites;
@@ -21,6 +22,7 @@ public class CookieEatingBehavior : AppleState
cookieEatingDirector = GetComponentInChildren<PlayableDirector>();
playerSprites.enabled = false;
consumedCookieSprites.enabled = false;
cookieOutline.SetActive(false);
cookieEatingDirector.enabled = true;
InputManager.Instance.SetInputMode(InputMode.InputDisabled);

View File

@@ -9,6 +9,6 @@ public class MachineWorkingBehavior : MonoBehaviour
public void WorkingAnimationDone()
{
stateMachine.ChangeState("Exploding");
//stateMachine.ChangeState("Exploding");
}
}

View File

@@ -0,0 +1,17 @@
using UnityEngine;
public class RoamingWorkerAnimationEvents : MonoBehaviour
{
public WorkerBeltRoamingBehaviour roamingBehaviour;
public void WorkerGotUp()
{
roamingBehaviour.ContinueRoaming();
}
public void PauseTween()
{
roamingBehaviour.PauseRoaming();
}
}

View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: a7c2bc850a85b1843bc20fd916d10650

View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 56c21fe8abef4887a819d02c0fbdb5d8
timeCreated: 1765753993

View File

@@ -0,0 +1,66 @@
using System.Threading.Tasks;
using Core;
using Input;
using UnityEngine;
namespace Utils
{
/// <summary>
/// Utility methods for character movement operations.
/// Extracted from interaction/controller code for reusability.
/// </summary>
public static class MovementUtilities
{
/// <summary>
/// Moves a character to a target position and waits for arrival.
/// Works with any controller implementing IInteractingCharacter.
/// </summary>
/// <param name="character">The character to move (must implement IInteractingCharacter)</param>
/// <param name="targetPosition">World position to move to</param>
/// <returns>Task that completes when the character arrives or movement is cancelled</returns>
public static async Task<bool> MoveToPositionAsync(IInteractingCharacter character, Vector3 targetPosition)
{
if (character == null)
{
Logging.Warning("[MovementUtilities] Cannot move null character");
return false;
}
var tcs = new TaskCompletionSource<bool>();
void OnArrivedLocal()
{
character.OnArrivedAtTarget -= OnArrivedLocal;
character.OnMoveToCancelled -= OnCancelledLocal;
tcs.TrySetResult(true);
}
void OnCancelledLocal()
{
character.OnArrivedAtTarget -= OnArrivedLocal;
character.OnMoveToCancelled -= OnCancelledLocal;
tcs.TrySetResult(false);
}
character.OnArrivedAtTarget += OnArrivedLocal;
character.OnMoveToCancelled += OnCancelledLocal;
character.MoveToAndNotify(targetPosition);
return await tcs.Task;
}
/// <summary>
/// Calculates a stop position at a given distance from a target position towards a character.
/// </summary>
/// <param name="targetPosition">The target position</param>
/// <param name="characterPosition">The character's current position</param>
/// <param name="stopDistance">Distance from target to stop at</param>
/// <returns>The calculated stop position</returns>
public static Vector3 CalculateStopPosition(Vector3 targetPosition, Vector3 characterPosition, float stopDistance)
{
Vector3 toCharacter = (characterPosition - targetPosition).normalized;
return targetPosition + toCharacter * stopDistance;
}
}
}

View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 29f4ca2c743f4890aab59e4ccdda2c79
timeCreated: 1765753993

View File

@@ -15,13 +15,13 @@ MonoBehaviour:
defaultPlayerMovement:
moveSpeed: 15
maxAcceleration: 10000
stopDistance: 0.1
stopDistance: 0.5
useRigidbody: 0
defaultHoldMovementMode: 1
trashMazeMovement:
moveSpeed: 15
maxAcceleration: 10000
stopDistance: 0.1
stopDistance: 0.5
useRigidbody: 0
defaultHoldMovementMode: 1
followerMovement: