diff --git a/Assets/Art/Animations/Characters/Birds/Eyes/BirdEyes.controller b/Assets/Art/Animations/Characters/Birds/Eyes/BirdEyes.controller index a0a584c9..02ce375e 100644 --- a/Assets/Art/Animations/Characters/Birds/Eyes/BirdEyes.controller +++ b/Assets/Art/Animations/Characters/Birds/Eyes/BirdEyes.controller @@ -1,5 +1,30 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-8622141701191891965 +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: NoGuess + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 5993408738867988234} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &-7993130233709895848 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -37,6 +62,7 @@ AnimatorState: m_CycleOffset: 0 m_Transitions: - {fileID: -169883073761575190} + - {fileID: -953515106580102534} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -52,6 +78,31 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &-953515106580102534 +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: RightGuess + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -92837137932308198} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.87903225 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &-169883073761575190 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -59,7 +110,10 @@ AnimatorStateTransition: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: - m_Conditions: [] + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: NoGuess + m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 5993408738867988234} m_Solo: 0 @@ -84,7 +138,9 @@ AnimatorState: m_Name: ANIM_BirdEyes_Correct m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: -8622141701191891965} + - {fileID: 1249646924704393990} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -121,6 +177,12 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 9100000} + - m_Name: NoGuess + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -134,6 +196,31 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} +--- !u!1101 &1249646924704393990 +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: WrongGuess + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -2838832837941805979} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &4511680777278260622 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -201,10 +288,10 @@ AnimatorStateMachine: m_Position: {x: 40, y: 350, z: 0} - serializedVersion: 1 m_State: {fileID: -2838832837941805979} - m_Position: {x: -70, y: 450, z: 0} + m_Position: {x: -100, y: 450, z: 0} - serializedVersion: 1 m_State: {fileID: -92837137932308198} - m_Position: {x: 150, y: 450, z: 0} + m_Position: {x: 200, y: 450, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] diff --git a/Assets/Prefabs/Characters/PulverCharacter.prefab b/Assets/Prefabs/Characters/PulverCharacter.prefab index 890f49ab..d545ce4e 100644 --- a/Assets/Prefabs/Characters/PulverCharacter.prefab +++ b/Assets/Prefabs/Characters/PulverCharacter.prefab @@ -119,7 +119,7 @@ MonoBehaviour: traversableTags: -1 tagPenalties: 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 graphMask: - value: -1 + value: 2 --- !u!114 &7852204877518954380 MonoBehaviour: m_ObjectHideFlags: 0 @@ -137,7 +137,7 @@ MonoBehaviour: height: 2 canMove: 1 maxSpeed: 15 - gravity: {x: NaN, y: NaN, z: NaN} + gravity: {x: 0, y: 0, z: 0} groundMask: serializedVersion: 2 m_Bits: 4294967295 @@ -153,11 +153,11 @@ MonoBehaviour: maximumInterval: 2 visualizeSensitivity: 0 targetCompatibility: {fileID: 0} - maxAcceleration: -2.5 + maxAcceleration: 10000 rotationSpeed: 360 slowdownDistance: 3 pickNextWaypointDist: 2 - endReachedDistance: 1 + endReachedDistance: 0.5 alwaysDrawGizmos: 0 slowWhenNotFacingTarget: 1 whenCloseToDestination: 0 @@ -279,6 +279,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 2264394306674147778} m_Modifications: + - target: {fileID: 566650525959955209, guid: e3b439d398cffdd4194cdb360a46c5a6, type: 3} + propertyPath: m_SpriteSortPoint + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1102468210854536367, guid: e3b439d398cffdd4194cdb360a46c5a6, type: 3} propertyPath: m_Name value: Pulver diff --git a/Assets/Prefabs/Environment/Placeholders/LureSpotA.prefab b/Assets/Prefabs/Environment/Placeholders/LureSpotA.prefab index a58ab72a..65a4d1e3 100644 --- a/Assets/Prefabs/Environment/Placeholders/LureSpotA.prefab +++ b/Assets/Prefabs/Environment/Placeholders/LureSpotA.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 7442421452951837692} - component: {fileID: 4110666412151536905} m_Layer: 0 - m_Name: SlottedItem + m_Name: SlottedItemA m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -98,7 +98,6 @@ GameObject: - component: {fileID: 2045549771447434109} - component: {fileID: 6258593095132504700} - component: {fileID: 5475802662781903683} - - component: {fileID: 3906996712691464207} - component: {fileID: 8818689886719637838} - component: {fileID: 8578055200319571631} m_Layer: 10 @@ -226,20 +225,6 @@ BoxCollider2D: m_AutoTiling: 0 m_Size: {x: 5.75, y: 2.78} m_EdgeRadius: 0 ---- !u!114 &3906996712691464207 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7249528695393012044} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7846448751da4bdbaaa5cb87890dca42, type: 3} - m_Name: - m_EditorClassIdentifier: - itemData: {fileID: 11400000, guid: aaf36cd26cf74334e9c7db6c1b03b3fb, type: 2} - iconRenderer: {fileID: 6258593095132504700} --- !u!114 &8818689886719637838 MonoBehaviour: m_ObjectHideFlags: 0 @@ -252,6 +237,21 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 73d6494a73174ffabc6a7d3089d51e73, type: 3} m_Name: m_EditorClassIdentifier: + isOneTime: 0 + cooldown: -1 + characterToInteract: 1 + interactionStarted: + m_PersistentCalls: + m_Calls: [] + interactionInterrupted: + m_PersistentCalls: + m_Calls: [] + characterArrived: + m_PersistentCalls: + m_Calls: [] + interactionComplete: + m_PersistentCalls: + m_Calls: [] --- !u!114 &8578055200319571631 MonoBehaviour: m_ObjectHideFlags: 0 @@ -264,14 +264,24 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ec1a2e6e32f746c4990c579e13b79104, type: 3} m_Name: m_EditorClassIdentifier: - OnSuccess: + itemData: {fileID: 11400000, guid: aaf36cd26cf74334e9c7db6c1b03b3fb, type: 2} + iconRenderer: {fileID: 6258593095132504700} + onItemSlotted: m_PersistentCalls: m_Calls: [] - OnFailure: + onItemSlotRemoved: m_PersistentCalls: m_Calls: [] - currentlySlottedItem: {fileID: 0} - slottedItemRenderer: {fileID: 0} + onCorrectItemSlotted: + m_PersistentCalls: + m_Calls: [] + onIncorrectItemSlotted: + m_PersistentCalls: + m_Calls: [] + onForbiddenItemSlotted: + m_PersistentCalls: + m_Calls: [] + slottedItemRenderer: {fileID: 4110666412151536905} --- !u!1001 &7700829900874995671 PrefabInstance: m_ObjectHideFlags: 0 @@ -282,27 +292,27 @@ PrefabInstance: m_Modifications: - target: {fileID: 1370564349707122423, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} propertyPath: m_Name - value: BirdEyes + value: BirdEyesA objectReference: {fileID: 0} - target: {fileID: 2326086342663433936, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} propertyPath: m_LocalScale.x - value: 0.5 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2326086342663433936, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} propertyPath: m_LocalScale.y - value: 0.5 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2326086342663433936, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} propertyPath: m_LocalScale.z - value: 0.5 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2326086342663433936, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} propertyPath: m_LocalPosition.x - value: 5.47 + value: 6.25 objectReference: {fileID: 0} - target: {fileID: 2326086342663433936, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} propertyPath: m_LocalPosition.y - value: 8.65 + value: 8.87 objectReference: {fileID: 0} - target: {fileID: 2326086342663433936, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} propertyPath: m_LocalPosition.z @@ -336,10 +346,50 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2326086342663433936, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3013218424693156287, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + propertyPath: m_FlipX + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3532512445619884959, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7034773904088491925, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} propertyPath: m_FlipX value: 0 objectReference: {fileID: 0} + - target: {fileID: 7698905571408300091, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7698905571408300091, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + propertyPath: m_LocalScale.y + value: 0.99999994 + objectReference: {fileID: 0} + - target: {fileID: 7698905571408300091, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + propertyPath: m_LocalScale.z + value: 0.99999994 + objectReference: {fileID: 0} + - target: {fileID: 7698905571408300091, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + propertyPath: m_LocalPosition.x + value: -6.89 + objectReference: {fileID: 0} + - target: {fileID: 7698905571408300091, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + propertyPath: m_LocalPosition.y + value: -7.05 + objectReference: {fileID: 0} + - target: {fileID: 7698905571408300091, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8828658103663197825, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/Prefabs/Environment/Placeholders/LuringSpotB.prefab b/Assets/Prefabs/Environment/Placeholders/LuringSpotB.prefab index 30a807b0..a781dd58 100644 --- a/Assets/Prefabs/Environment/Placeholders/LuringSpotB.prefab +++ b/Assets/Prefabs/Environment/Placeholders/LuringSpotB.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 779234943217098985} - component: {fileID: 7990414055343410434} m_Layer: 0 - m_Name: SlottedItem + m_Name: SlottedItemB m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -26,7 +26,7 @@ Transform: m_GameObject: {fileID: 1985797937494910982} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: -0.279, y: -0.097, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} m_ConstrainProportionsScale: 0 m_Children: [] @@ -99,7 +99,6 @@ GameObject: - component: {fileID: 6583028881099676536} - component: {fileID: 8374056515464764762} - component: {fileID: 4289780218821574471} - - component: {fileID: 4191908717467096214} - component: {fileID: 3093816592344978065} - component: {fileID: 8758136668472096799} m_Layer: 10 @@ -238,20 +237,21 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 73d6494a73174ffabc6a7d3089d51e73, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &4191908717467096214 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5835735262203788332} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7846448751da4bdbaaa5cb87890dca42, type: 3} - m_Name: - m_EditorClassIdentifier: - itemData: {fileID: 11400000, guid: f97b9e24d6dceb145b56426c1152ebeb, type: 2} - iconRenderer: {fileID: 6583028881099676536} + isOneTime: 0 + cooldown: -1 + characterToInteract: 1 + interactionStarted: + m_PersistentCalls: + m_Calls: [] + interactionInterrupted: + m_PersistentCalls: + m_Calls: [] + characterArrived: + m_PersistentCalls: + m_Calls: [] + interactionComplete: + m_PersistentCalls: + m_Calls: [] --- !u!114 &3093816592344978065 MonoBehaviour: m_ObjectHideFlags: 0 @@ -264,14 +264,24 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ec1a2e6e32f746c4990c579e13b79104, type: 3} m_Name: m_EditorClassIdentifier: - OnSuccess: + itemData: {fileID: 11400000, guid: f97b9e24d6dceb145b56426c1152ebeb, type: 2} + iconRenderer: {fileID: 6583028881099676536} + onItemSlotted: m_PersistentCalls: m_Calls: [] - OnFailure: + onItemSlotRemoved: m_PersistentCalls: m_Calls: [] - currentlySlottedItem: {fileID: 0} - slottedItemRenderer: {fileID: 0} + onCorrectItemSlotted: + m_PersistentCalls: + m_Calls: [] + onIncorrectItemSlotted: + m_PersistentCalls: + m_Calls: [] + onForbiddenItemSlotted: + m_PersistentCalls: + m_Calls: [] + slottedItemRenderer: {fileID: 7990414055343410434} --- !u!114 &8758136668472096799 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Environment/Placeholders/LuringSpotC.prefab b/Assets/Prefabs/Environment/Placeholders/LuringSpotC.prefab index 8edc61a0..b375f50d 100644 --- a/Assets/Prefabs/Environment/Placeholders/LuringSpotC.prefab +++ b/Assets/Prefabs/Environment/Placeholders/LuringSpotC.prefab @@ -94,7 +94,7 @@ GameObject: - component: {fileID: 1828079450404796388} - component: {fileID: 3806274462998212361} m_Layer: 0 - m_Name: SlottedItem + m_Name: SlottedItemC m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -182,8 +182,8 @@ GameObject: - component: {fileID: 5015123355472106337} - component: {fileID: 1857323601952658682} - component: {fileID: 519585874127847016} - - component: {fileID: 3177191571756140058} - component: {fileID: 106497079666291966} + - component: {fileID: 3169137887822749614} m_Layer: 10 m_Name: LureSpotC m_TagString: Untagged @@ -321,20 +321,21 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 73d6494a73174ffabc6a7d3089d51e73, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &3177191571756140058 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7145022056631397938} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7846448751da4bdbaaa5cb87890dca42, type: 3} - m_Name: - m_EditorClassIdentifier: - itemData: {fileID: 11400000, guid: c68dea945fecbf44094359769db04f31, type: 2} - iconRenderer: {fileID: 5015123355472106337} + isOneTime: 0 + cooldown: -1 + characterToInteract: 1 + interactionStarted: + m_PersistentCalls: + m_Calls: [] + interactionInterrupted: + m_PersistentCalls: + m_Calls: [] + characterArrived: + m_PersistentCalls: + m_Calls: [] + interactionComplete: + m_PersistentCalls: + m_Calls: [] --- !u!114 &106497079666291966 MonoBehaviour: m_ObjectHideFlags: 0 @@ -347,11 +348,34 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ec1a2e6e32f746c4990c579e13b79104, type: 3} m_Name: m_EditorClassIdentifier: - OnSuccess: + itemData: {fileID: 11400000, guid: c68dea945fecbf44094359769db04f31, type: 2} + iconRenderer: {fileID: 5015123355472106337} + onItemSlotted: m_PersistentCalls: m_Calls: [] - OnFailure: + onItemSlotRemoved: m_PersistentCalls: m_Calls: [] - currentlySlottedItem: {fileID: 0} - slottedItemRenderer: {fileID: 0} + onCorrectItemSlotted: + m_PersistentCalls: + m_Calls: [] + onIncorrectItemSlotted: + m_PersistentCalls: + m_Calls: [] + onForbiddenItemSlotted: + m_PersistentCalls: + m_Calls: [] + slottedItemRenderer: {fileID: 3806274462998212361} +--- !u!114 &3169137887822749614 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7145022056631397938} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1101f6c4eb04423b89dc78dc7c9f1aae, type: 3} + m_Name: + m_EditorClassIdentifier: + stepData: {fileID: 11400000, guid: 28848561ff31fe24ea9f8590dee0bf8f, type: 2} diff --git a/Assets/Prefabs/Environment/Placeholders/SoundBird.prefab b/Assets/Prefabs/Environment/Placeholders/SoundBird.prefab index da016dbf..2200dbca 100644 --- a/Assets/Prefabs/Environment/Placeholders/SoundBird.prefab +++ b/Assets/Prefabs/Environment/Placeholders/SoundBird.prefab @@ -12,7 +12,6 @@ GameObject: - component: {fileID: 8875860401447896107} - component: {fileID: 5057760771402457000} - component: {fileID: 5387498764853775290} - - component: {fileID: 6499593962557772468} - component: {fileID: 2433130051631076285} m_Layer: 10 m_Name: SoundBird @@ -150,20 +149,21 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 73d6494a73174ffabc6a7d3089d51e73, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &6499593962557772468 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 588897581313790951} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7846448751da4bdbaaa5cb87890dca42, type: 3} - m_Name: - m_EditorClassIdentifier: - itemData: {fileID: 11400000, guid: d28f5774afad9d14f823601707150700, type: 2} - iconRenderer: {fileID: 8875860401447896107} + isOneTime: 0 + cooldown: -1 + characterToInteract: 1 + interactionStarted: + m_PersistentCalls: + m_Calls: [] + interactionInterrupted: + m_PersistentCalls: + m_Calls: [] + characterArrived: + m_PersistentCalls: + m_Calls: [] + interactionComplete: + m_PersistentCalls: + m_Calls: [] --- !u!114 &2433130051631076285 MonoBehaviour: m_ObjectHideFlags: 0 @@ -176,13 +176,23 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ec1a2e6e32f746c4990c579e13b79104, type: 3} m_Name: m_EditorClassIdentifier: - OnSuccess: + itemData: {fileID: 11400000, guid: d28f5774afad9d14f823601707150700, type: 2} + iconRenderer: {fileID: 8875860401447896107} + onItemSlotted: m_PersistentCalls: m_Calls: [] - OnFailure: + onItemSlotRemoved: + m_PersistentCalls: + m_Calls: [] + onCorrectItemSlotted: + m_PersistentCalls: + m_Calls: [] + onIncorrectItemSlotted: + m_PersistentCalls: + m_Calls: [] + onForbiddenItemSlotted: m_PersistentCalls: m_Calls: [] - currentlySlottedItem: {fileID: 0} slottedItemRenderer: {fileID: 6941190210788968874} --- !u!1 &4624889622840393752 GameObject: diff --git a/Assets/Prefabs/Items/BasePickup.prefab b/Assets/Prefabs/Items/BasePickup.prefab index 6a6f278a..98421cee 100644 --- a/Assets/Prefabs/Items/BasePickup.prefab +++ b/Assets/Prefabs/Items/BasePickup.prefab @@ -14,7 +14,7 @@ GameObject: - component: {fileID: 7616859841301711022} - component: {fileID: 592045584872845087} m_Layer: 10 - m_Name: BasePickup + m_Name: BurgerBuns m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -30,8 +30,8 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 3.405, y: 0, z: 0} - m_LocalScale: {x: 4, y: 4, z: 1} - m_ConstrainProportionsScale: 0 + m_LocalScale: {x: 2.5, y: 2.5, z: 0.625} + m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -79,15 +79,15 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 1 - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 4273613496703388379, guid: 1d2396d3a6e78544083da828beb20888, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 1, y: 1} + m_Size: {x: 1.76, y: 0.75} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 0 + m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!61 &3070149615425714466 @@ -127,14 +127,14 @@ BoxCollider2D: m_Offset: {x: 0, y: 0} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0, y: 0} - oldSize: {x: 0, y: 0} - newSize: {x: 0, y: 0} - adaptiveTilingThreshold: 0 + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1.76, y: 0.75} + newSize: {x: 1.76, y: 0.75} + adaptiveTilingThreshold: 0.5 drawMode: 0 adaptiveTiling: 0 m_AutoTiling: 0 - m_Size: {x: 1, y: 1} + m_Size: {x: 2, y: 1.5} m_EdgeRadius: 0 --- !u!114 &7616859841301711022 MonoBehaviour: @@ -148,6 +148,21 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 73d6494a73174ffabc6a7d3089d51e73, type: 3} m_Name: m_EditorClassIdentifier: + isOneTime: 0 + cooldown: -1 + characterToInteract: 1 + interactionStarted: + m_PersistentCalls: + m_Calls: [] + interactionInterrupted: + m_PersistentCalls: + m_Calls: [] + characterArrived: + m_PersistentCalls: + m_Calls: [] + interactionComplete: + m_PersistentCalls: + m_Calls: [] --- !u!114 &592045584872845087 MonoBehaviour: m_ObjectHideFlags: 0 @@ -160,5 +175,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7846448751da4bdbaaa5cb87890dca42, type: 3} m_Name: m_EditorClassIdentifier: - itemData: {fileID: 0} + itemData: {fileID: 11400000, guid: 0c6986639ca176a419c92f5a327d95ce, type: 2} iconRenderer: {fileID: 7494677664706785084} diff --git a/Assets/Prefabs/Items/PrefabsPLACEHOLDER/BurgerBuns.prefab b/Assets/Prefabs/Items/PrefabsPLACEHOLDER/BurgerBuns.prefab index afaf369a..2d05bc8c 100644 --- a/Assets/Prefabs/Items/PrefabsPLACEHOLDER/BurgerBuns.prefab +++ b/Assets/Prefabs/Items/PrefabsPLACEHOLDER/BurgerBuns.prefab @@ -127,31 +127,5 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 7447346505753002421, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} - insertIndex: -1 - addedObject: {fileID: 200688012287672078} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} ---- !u!1 &5336239774528417475 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7447346505753002421, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} - m_PrefabInstance: {fileID: 3266354364519034742} - m_PrefabAsset: {fileID: 0} ---- !u!114 &200688012287672078 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5336239774528417475} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 21401a3b30134380bb205964d9e5c67d, type: 3} - m_Name: - m_EditorClassIdentifier: - OnSuccess: - m_PersistentCalls: - m_Calls: [] - OnFailure: - m_PersistentCalls: - m_Calls: [] diff --git a/Assets/Prefabs/Items/PrefabsPLACEHOLDER/HeadBand.prefab b/Assets/Prefabs/Items/PrefabsPLACEHOLDER/HeadBand.prefab index 978ed270..6ee73924 100644 --- a/Assets/Prefabs/Items/PrefabsPLACEHOLDER/HeadBand.prefab +++ b/Assets/Prefabs/Items/PrefabsPLACEHOLDER/HeadBand.prefab @@ -128,9 +128,6 @@ PrefabInstance: m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 7447346505753002421, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} - insertIndex: -1 - addedObject: {fileID: 5935055277585311711} - targetCorrespondingSourceObject: {fileID: 7447346505753002421, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} insertIndex: -1 addedObject: {fileID: 5172306257923753614} @@ -140,24 +137,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 7447346505753002421, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} m_PrefabInstance: {fileID: 8543660602505065938} m_PrefabAsset: {fileID: 0} ---- !u!114 &5935055277585311711 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1282228733406082151} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 21401a3b30134380bb205964d9e5c67d, type: 3} - m_Name: - m_EditorClassIdentifier: - OnSuccess: - m_PersistentCalls: - m_Calls: [] - OnFailure: - m_PersistentCalls: - m_Calls: [] --- !u!114 &5172306257923753614 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Levels/Quarry.unity b/Assets/Scenes/Levels/Quarry.unity index e299ffe5..0d19c506 100644 --- a/Assets/Scenes/Levels/Quarry.unity +++ b/Assets/Scenes/Levels/Quarry.unity @@ -1492,33 +1492,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} m_PrefabInstance: {fileID: 207918331} m_PrefabAsset: {fileID: 0} ---- !u!1 &213463620 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1102400833121127473, guid: 8ac0210dbf9d7754e9526d6d5c214f49, type: 3} - m_PrefabInstance: {fileID: 1363194738} - m_PrefabAsset: {fileID: 0} ---- !u!114 &213463626 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 213463620} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cb6a34d769a1e4ac7b0b30e433aa443c, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 1 - smoothType: 0 - subdivisions: 2 - iterations: 2 - strength: 0.5 - uniformLength: 1 - maxSegmentLength: 2 - bezierTangentLength: 0.4 - offset: 0.2 - factor: 0.1 --- !u!1 &219531022 GameObject: m_ObjectHideFlags: 0 @@ -429461,7 +429434,8 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 5935055277585311711, guid: fde0c702b7c4ea3439502cfb575ac77a, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] @@ -434656,6 +434630,21 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 73d6494a73174ffabc6a7d3089d51e73, type: 3} m_Name: m_EditorClassIdentifier: + isOneTime: 0 + cooldown: -1 + characterToInteract: 1 + interactionStarted: + m_PersistentCalls: + m_Calls: [] + interactionInterrupted: + m_PersistentCalls: + m_Calls: [] + characterArrived: + m_PersistentCalls: + m_Calls: [] + interactionComplete: + m_PersistentCalls: + m_Calls: [] --- !u!114 &1182494937 MonoBehaviour: m_ObjectHideFlags: 0 @@ -435238,24 +435227,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 7.957} ---- !u!1 &1232192831 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7145022056631397938, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} - m_PrefabInstance: {fileID: 815620523195828801} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1232192838 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1232192831} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1101f6c4eb04423b89dc78dc7c9f1aae, type: 3} - m_Name: - m_EditorClassIdentifier: - stepData: {fileID: 11400000, guid: 28848561ff31fe24ea9f8590dee0bf8f, type: 2} --- !u!114 &1254302309 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 7602419655779381936, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} @@ -436053,7 +436024,8 @@ PrefabInstance: propertyPath: m_Name value: BurgerBuns objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 200688012287672078, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] @@ -436214,14 +436186,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 163496279268562402, guid: 8ac0210dbf9d7754e9526d6d5c214f49, type: 3} - propertyPath: m_SortingOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 163496279268562402, guid: 8ac0210dbf9d7754e9526d6d5c214f49, type: 3} - propertyPath: m_SpriteSortPoint - value: 1 - objectReference: {fileID: 0} - target: {fileID: 1102400833121127473, guid: 8ac0210dbf9d7754e9526d6d5c214f49, type: 3} propertyPath: m_Name value: PulverCharacter @@ -436266,29 +436230,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7852204877518954380, guid: 8ac0210dbf9d7754e9526d6d5c214f49, type: 3} - propertyPath: maxSpeed - value: 15 - objectReference: {fileID: 0} - - target: {fileID: 7852204877518954380, guid: 8ac0210dbf9d7754e9526d6d5c214f49, type: 3} - propertyPath: maxAcceleration - value: 10000 - objectReference: {fileID: 0} - - target: {fileID: 7852204877518954380, guid: 8ac0210dbf9d7754e9526d6d5c214f49, type: 3} - propertyPath: slowdownDistance - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 8947209170748834035, guid: 8ac0210dbf9d7754e9526d6d5c214f49, type: 3} - propertyPath: graphMask.value - value: 2 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 1102400833121127473, guid: 8ac0210dbf9d7754e9526d6d5c214f49, type: 3} - insertIndex: -1 - addedObject: {fileID: 213463626} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8ac0210dbf9d7754e9526d6d5c214f49, type: 3} --- !u!1 &1373293417 GameObject: @@ -440703,25 +440648,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f645a67c7970b124cacb6450fefdebad, type: 3} ---- !u!1 &2100278665 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7249528695393012044, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - m_PrefabInstance: {fileID: 8013274907828598643} - m_PrefabAsset: {fileID: 0} ---- !u!114 &2100278672 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2100278665} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2226aecbed4b1f143a5a5c5be4236957, type: 3} - m_Name: - m_EditorClassIdentifier: - playerDistanceToChange: 0 - birdEyes: {fileID: 1254302309} --- !u!1001 &2109163090 PrefabInstance: m_ObjectHideFlags: 0 @@ -441144,14 +441070,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 106497079666291966, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} - propertyPath: slottedItemRenderer - value: - objectReference: {fileID: 815620523195828802} - - target: {fileID: 4316370833098727305, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} - propertyPath: m_Name - value: SlottedItemC - objectReference: {fileID: 0} - target: {fileID: 6583016841553003224, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} propertyPath: m_LocalPosition.x value: 13.14 @@ -441199,16 +441117,8 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 7145022056631397938, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} - insertIndex: -1 - addedObject: {fileID: 1232192838} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} ---- !u!212 &815620523195828802 stripped -SpriteRenderer: - m_CorrespondingSourceObject: {fileID: 3806274462998212361, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} - m_PrefabInstance: {fileID: 815620523195828801} - m_PrefabAsset: {fileID: 0} --- !u!1001 &2428672463423402429 PrefabInstance: m_ObjectHideFlags: 0 @@ -441351,6 +441261,14 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 4901186366144297979, guid: 60fd8777c3180dd40be2d9e3ff56dd2c, type: 3} + propertyPath: isOneTime + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4901186366144297979, guid: 60fd8777c3180dd40be2d9e3ff56dd2c, type: 3} + propertyPath: characterToInteract + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4940025602237181209, guid: 60fd8777c3180dd40be2d9e3ff56dd2c, type: 3} propertyPath: m_Name value: Lawnmower @@ -441465,58 +441383,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 779234943217098985, guid: 3346526f3046f424196615241a307104, type: 3} - propertyPath: m_LocalPosition.x - value: -0.279 - objectReference: {fileID: 0} - - target: {fileID: 779234943217098985, guid: 3346526f3046f424196615241a307104, type: 3} - propertyPath: m_LocalPosition.y - value: -0.097 - objectReference: {fileID: 0} - - target: {fileID: 1985797937494910982, guid: 3346526f3046f424196615241a307104, type: 3} - propertyPath: m_Name - value: SlottedItemB - objectReference: {fileID: 0} - - target: {fileID: 3093816592344978065, guid: 3346526f3046f424196615241a307104, type: 3} - propertyPath: slottedItemRenderer - value: - objectReference: {fileID: 3708074769586677212} - - target: {fileID: 3093816592344978065, guid: 3346526f3046f424196615241a307104, type: 3} - propertyPath: OnFailure.m_PersistentCalls.m_Calls.Array.size - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3093816592344978065, guid: 3346526f3046f424196615241a307104, type: 3} - propertyPath: OnSuccess.m_PersistentCalls.m_Calls.Array.size - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3093816592344978065, guid: 3346526f3046f424196615241a307104, type: 3} - propertyPath: OnFailure.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3093816592344978065, guid: 3346526f3046f424196615241a307104, type: 3} - propertyPath: OnFailure.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 3093816592344978065, guid: 3346526f3046f424196615241a307104, type: 3} - propertyPath: OnFailure.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 3093816592344978065, guid: 3346526f3046f424196615241a307104, type: 3} - propertyPath: OnSuccess.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 3093816592344978065, guid: 3346526f3046f424196615241a307104, type: 3} - propertyPath: OnFailure.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Initialize - objectReference: {fileID: 0} - - target: {fileID: 3093816592344978065, guid: 3346526f3046f424196615241a307104, type: 3} - propertyPath: OnFailure.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: Pixelplacement.StateMachine, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 3093816592344978065, guid: 3346526f3046f424196615241a307104, type: 3} - propertyPath: OnFailure.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 5835735262203788332, guid: 3346526f3046f424196615241a307104, type: 3} propertyPath: m_Name value: LureSpotB @@ -441566,11 +441432,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3346526f3046f424196615241a307104, type: 3} ---- !u!212 &3708074769586677212 stripped -SpriteRenderer: - m_CorrespondingSourceObject: {fileID: 7990414055343410434, guid: 3346526f3046f424196615241a307104, type: 3} - m_PrefabInstance: {fileID: 3708074769586677211} - m_PrefabAsset: {fileID: 0} --- !u!1001 &4596770314561390347 PrefabInstance: m_ObjectHideFlags: 0 @@ -442133,18 +441994,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 828203175562293314, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: m_FlipX - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1020445172872290040, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: m_Name - value: SlottedItemA - objectReference: {fileID: 0} - - target: {fileID: 1178648129422731606, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 2045549771447434109, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} propertyPath: m_LocalPosition.x value: 66.69 @@ -442185,103 +442034,99 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4832307215058812520, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: m_FlipX - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5375394469162727687, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5375394469162727687, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5375394469162727687, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5375394469162727687, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: m_LocalPosition.x - value: 6.25 - objectReference: {fileID: 0} - - target: {fileID: 5375394469162727687, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: m_LocalPosition.y - value: 8.87 - objectReference: {fileID: 0} - - target: {fileID: 5375394469162727687, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: m_ConstrainProportionsScale - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6258593095132504700, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: m_FlipX - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6618275652561634376, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 7249528695393012044, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} propertyPath: m_Name value: LureSpotA objectReference: {fileID: 0} - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: slottedItemRenderer + propertyPath: onItemSlotRemoved.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: onIncorrectItemSlotted.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: onItemSlotRemoved.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: onItemSlotRemoved.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: - objectReference: {fileID: 8013274907828598644} + objectReference: {fileID: 1254302309} - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: OnFailure.m_PersistentCalls.m_Calls.Array.size - value: 0 + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 objectReference: {fileID: 0} - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: OnSuccess.m_PersistentCalls.m_Calls.Array.size - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: OnSuccess.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: OnSuccess.m_PersistentCalls.m_Calls.Array.data[0].m_Target + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: + objectReference: {fileID: 1254302309} + - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: onIncorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 objectReference: {fileID: 0} - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: OnFailure.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + propertyPath: onItemSlotRemoved.m_PersistentCalls.m_Calls.Array.data[0].m_CallState value: 2 objectReference: {fileID: 0} - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: OnSuccess.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + propertyPath: onItemSlotRemoved.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: NoItem + objectReference: {fileID: 0} + - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: onIncorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1254302309} + - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[0].m_CallState value: 2 objectReference: {fileID: 0} - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: OnSuccess.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: CorrectItem objectReference: {fileID: 0} - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: OnSuccess.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: + propertyPath: onIncorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 objectReference: {fileID: 0} - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: OnSuccess.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument - value: + propertyPath: onIncorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: IncorrectItem objectReference: {fileID: 0} - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: OnSuccess.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: + propertyPath: onItemSlotRemoved.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: BirdEyesBehavior, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: BirdEyesBehavior, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: onIncorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: BirdEyesBehavior, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: onItemSlotRemoved.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: onIncorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 7249528695393012044, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - insertIndex: -1 - addedObject: {fileID: 2100278672} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} ---- !u!212 &8013274907828598644 stripped -SpriteRenderer: - m_CorrespondingSourceObject: {fileID: 4110666412151536905, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - m_PrefabInstance: {fileID: 8013274907828598643} - m_PrefabAsset: {fileID: 0} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Animation/BirdEyesBehavior.cs b/Assets/Scripts/Animation/BirdEyesBehavior.cs index c9d60e55..916f56a4 100644 --- a/Assets/Scripts/Animation/BirdEyesBehavior.cs +++ b/Assets/Scripts/Animation/BirdEyesBehavior.cs @@ -15,19 +15,23 @@ public class BirdEyesBehavior : MonoBehaviour // Update is called once per frame void Update() { - + } - void CorrectItem() + public void CorrectItem() { animator.SetTrigger("RightGuess"); } - void IncorrectItem() + public void IncorrectItem() { - animator.SetTrigger("WrongGuess"); + animator.SetTrigger("WrongGuess"); } - void BirdReveal() + public void NoItem() + { + animator.SetTrigger("NoGuess"); + } + public void BirdReveal() { statemachine.ChangeState ("BirdSpawned"); } diff --git a/Assets/Scripts/DamianExperiments/DistanceMeasurer.cs b/Assets/Scripts/DamianExperiments/DistanceMeasurer.cs index 1aab52cb..916f2c88 100644 --- a/Assets/Scripts/DamianExperiments/DistanceMeasurer.cs +++ b/Assets/Scripts/DamianExperiments/DistanceMeasurer.cs @@ -2,23 +2,39 @@ using UnityEngine; public class Distancemeasurer : MonoBehaviour { - public float playerDistanceToChange; + public float playerDistanceFar; + public float playerDistanceClose; public BirdEyesBehavior birdEyes; private Vector2 eyesPosition; private Vector2 playerPosition; private float distance; + private GameObject player; // Start is called once before the first execution of Update after the MonoBehaviour is created void Start() { eyesPosition = transform.position; - playerPosition = transform.position; + player = GameObject.FindWithTag("Player"); + playerPosition = player.transform.position; + distance = Vector2.Distance(eyesPosition, playerPosition); } // Update is called once per frame void Update() { - + playerPosition = player.transform.position; + distance = Vector2.Distance(eyesPosition, playerPosition); + Debug.Log("Distance to player: " + distance); + if (distance > playerDistanceFar) + { + birdEyes.NoItem(); + } else if (distance > playerDistanceClose) + { + birdEyes.IncorrectItem(); + } else + { + birdEyes.CorrectItem(); + } } diff --git a/Assets/Scripts/DamianExperiments/ItemJudgement.cs b/Assets/Scripts/DamianExperiments/ItemJudgement.cs new file mode 100644 index 00000000..435a0bfe --- /dev/null +++ b/Assets/Scripts/DamianExperiments/ItemJudgement.cs @@ -0,0 +1,16 @@ +using UnityEngine; + +public class ItemJudgement : MonoBehaviour +{ + // Start is called once before the first execution of Update after the MonoBehaviour is created + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/Scripts/DamianExperiments/ItemJudgement.cs.meta b/Assets/Scripts/DamianExperiments/ItemJudgement.cs.meta new file mode 100644 index 00000000..f9f9b755 --- /dev/null +++ b/Assets/Scripts/DamianExperiments/ItemJudgement.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 166b84cf50de17846bceb3635482f612 \ No newline at end of file diff --git a/Assets/Scripts/Interactions/ItemSlot.cs b/Assets/Scripts/Interactions/ItemSlot.cs index b8b3009e..3ba2bfd8 100644 --- a/Assets/Scripts/Interactions/ItemSlot.cs +++ b/Assets/Scripts/Interactions/ItemSlot.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using UnityEngine; +using UnityEngine.Events; namespace Interactions { @@ -9,6 +10,11 @@ namespace Interactions [RequireComponent(typeof(Interactable))] public class ItemSlot : Pickup { + public UnityEvent onItemSlotted; + public UnityEvent onItemSlotRemoved; + public UnityEvent onCorrectItemSlotted; + public UnityEvent onIncorrectItemSlotted; + public UnityEvent onForbiddenItemSlotted; private PickupItemData _currentlySlottedItemData; public SpriteRenderer slottedItemRenderer; private GameObject _currentlySlottedItemObject = null; @@ -44,6 +50,7 @@ namespace Interactions FollowerController.TryPickupItem(_currentlySlottedItemObject, _currentlySlottedItemData); _currentlySlottedItemObject = null; _currentlySlottedItemData = null; + onItemSlotRemoved?.Invoke(); UpdateSlottedSprite(); return; } @@ -72,6 +79,7 @@ namespace Interactions if (forbidden.Contains(heldItemData)) { DebugUIMessage.Show("Can't place that here."); + onForbiddenItemSlotted?.Invoke(); Interactable.BroadcastInteractionComplete(false); return; } @@ -79,12 +87,14 @@ namespace Interactions SlotItem(heldItemObj, heldItemData); if (allowed.Contains(heldItemData)) { + onCorrectItemSlotted?.Invoke(); Interactable.BroadcastInteractionComplete(true); return; } else { DebugUIMessage.Show("I'm not sure this works."); + onIncorrectItemSlotted?.Invoke(); Interactable.BroadcastInteractionComplete(false); return; }