From 8ce4627e977b15452db39e2f7549d75fc3127ada Mon Sep 17 00:00:00 2001 From: AlexanderT Date: Fri, 12 Dec 2025 14:36:39 +0100 Subject: [PATCH] Outlines added to quarry --- .../Butterfly/Butterfly_Trapped.anim | 956 +---- .../Playables/PulverCucumberSmack1.playable | 356 +- Assets/Prefabs/Characters/Gardener.prefab | 276 +- Assets/Prefabs/Environment/BallTree.prefab | 94 +- Assets/Prefabs/Environment/LureSpotA.prefab | 89 +- ...ringSpotB.prefab => LureSpotB_Slot.prefab} | 98 +- ...prefab.meta => LureSpotB_Slot.prefab.meta} | 0 ...ringSpotC.prefab => LureSpotC_Slot.prefab} | 120 +- ...prefab.meta => LureSpotC_Slot.prefab.meta} | 0 Assets/Prefabs/Environment/SoundBird.prefab | 117 +- Assets/Prefabs/FX/GlowOutline.prefab | 128 +- Assets/Prefabs/Items/Basketball.prefab | 105 +- Assets/Prefabs/Items/BlueBall.prefab | 105 +- Assets/Prefabs/Items/BowlingBall.prefab | 105 +- Assets/Prefabs/Items/Bunflers.prefab | 12 + Assets/Prefabs/Items/Football.prefab | 12 + Assets/Prefabs/Items/FootballBird.prefab | 16 + Assets/Prefabs/Items/HammerBird.prefab | 23 +- Assets/Prefabs/Items/Meat Variant.prefab | 12 + Assets/Prefabs/Items/Nails.prefab | 169 +- Assets/Prefabs/Items/Yellowball.prefab | 105 +- .../Levels/DivingForPictures Variant.prefab | 121 +- .../AnneLise/AnneLiseBush_FootballBird.prefab | 216 +- .../AnneLise/AnneLiseBush_SoundBird.prefab | 80 + Assets/Scenes/Levels/Quarry.unity | 3191 +++-------------- .../LawnmowerStateMachine.prefab | 107 +- Assets/Scripts/Interactions/GlowOutline.cs | 40 +- .../Quarry/AnneLise/AnneLiseBushBehaviour.cs | 9 + Assets/Settings/InteractionSettings.asset | 2 +- ProjectSettings/ProjectSettings.asset | 2 +- 30 files changed, 2290 insertions(+), 4376 deletions(-) rename Assets/Prefabs/Environment/{LuringSpotB.prefab => LureSpotB_Slot.prefab} (93%) rename Assets/Prefabs/Environment/{LuringSpotB.prefab.meta => LureSpotB_Slot.prefab.meta} (100%) rename Assets/Prefabs/Environment/{LuringSpotC.prefab => LureSpotC_Slot.prefab} (87%) rename Assets/Prefabs/Environment/{LuringSpotC.prefab.meta => LureSpotC_Slot.prefab.meta} (100%) diff --git a/Assets/Art/Animations/Characters/Butterfly/Butterfly_Trapped.anim b/Assets/Art/Animations/Characters/Butterfly/Butterfly_Trapped.anim index 2a48064d..d8555721 100644 --- a/Assets/Art/Animations/Characters/Butterfly/Butterfly_Trapped.anim +++ b/Assets/Art/Animations/Characters/Butterfly/Butterfly_Trapped.anim @@ -27,16 +27,16 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.1 + time: 0.2 value: {x: 0, y: 0, z: 21.435} - inSlope: {x: 0, y: 0, z: 131.092} - outSlope: {x: 0, y: 0, z: 131.092} + inSlope: {x: 0, y: 0, z: 65.546} + outSlope: {x: 0, y: 0, z: 65.546} 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: 0.25 + time: 0.5 value: {x: 0, y: 0, z: 32.773} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -45,16 +45,16 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.33333334 + time: 0.6666667 value: {x: 0, y: 0, z: 9.69} - inSlope: {x: 0, y: 0, z: -249.384} - outSlope: {x: 0, y: 0, z: -249.384} + inSlope: {x: 0, y: 0, z: -124.692} + outSlope: {x: 0, y: 0, z: -124.692} 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: 0.41666666 + time: 0.8333333 value: {x: 0, y: 0, z: -8.791} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -63,7 +63,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.53333336 + time: 1.0666667 value: {x: 0, y: 0, z: 16.805} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -72,7 +72,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.6666667 + time: 1.3333334 value: {x: 0, y: 0, z: 4.273} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -81,7 +81,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.76666665 + time: 1.5333333 value: {x: 0, y: 0, z: 23.489} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -90,7 +90,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.8833333 + time: 1.7666667 value: {x: 0, y: 0, z: 6.303} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -99,7 +99,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.98333335 + time: 1.9666667 value: {x: 0, y: 0, z: 28.23} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -108,16 +108,16 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 1.1333333 + time: 2.2666667 value: {x: 0, y: 0, z: 3.925} - inSlope: {x: 0, y: 0, z: -234.26765} - outSlope: {x: 0, y: 0, z: -234.26765} + inSlope: {x: 0, y: 0, z: -117.13383} + outSlope: {x: 0, y: 0, z: -117.13383} 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: 1.2 + time: 2.4 value: {x: 0, y: 0, z: -22.528} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -126,7 +126,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 1.3166667 + time: 2.6333334 value: {x: 0, y: 0, z: 32.362} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -138,176 +138,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: - m_PositionCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: 0, y: 0, z: 0} - 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: 0.1 - value: {x: 0, y: 0.1, z: 0} - inSlope: {x: 0, y: 1.3846154, z: 0} - outSlope: {x: 0, y: 1.3846154, 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: 0.21666667 - value: {x: 0, y: 0.3, z: 0} - inSlope: {x: 0, y: 3.3333333, z: 0} - outSlope: {x: 0, y: 3.3333333, 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: 0.25 - value: {x: 0, y: 0.6, z: 0} - 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: 0.31666666 - value: {x: 0, y: 0.3, z: 0} - inSlope: {x: 0, y: -3.6000004, z: 0} - outSlope: {x: 0, y: -3.6000004, 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: 0.41666666 - value: {x: 0, y: 0, z: 0} - 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: 0.43333334 - value: {x: 0, y: 0, z: 0} - 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: 0.53333336 - value: {x: 0, y: 0.1, z: 0} - inSlope: {x: 0, y: 1.3846157, z: 0} - outSlope: {x: 0, y: 1.3846157, 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: 0.65 - value: {x: 0, y: 0.3, z: 0} - inSlope: {x: 0, y: 3.333334, z: 0} - outSlope: {x: 0, y: 3.333334, 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: 0.68333334 - value: {x: 0, y: 0.6, z: 0} - 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: 0.75 - value: {x: 0, y: 0.3, z: 0} - inSlope: {x: 0, y: -3.5999997, z: 0} - outSlope: {x: 0, y: -3.5999997, 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: 0.85 - value: {x: 0, y: 0, z: 0} - 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: 0.8833333 - value: {x: 0, y: 0, z: 0} - 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: 0.98333335 - value: {x: 0, y: 0.1, z: 0} - inSlope: {x: 0, y: 1.3846152, z: 0} - outSlope: {x: 0, y: 1.3846152, 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: 1.1 - value: {x: 0, y: 0.3, z: 0} - inSlope: {x: 0, y: 3.333334, z: 0} - outSlope: {x: 0, y: 3.333334, 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: 1.1333333 - value: {x: 0, y: 0.6, z: 0} - 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: 1.2 - value: {x: 0, y: 0.3, z: 0} - inSlope: {x: 0, y: -3.600001, z: 0} - outSlope: {x: 0, y: -3.600001, 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: 1.3 - value: {x: 0, y: 0, z: 0} - 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_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: @@ -315,55 +146,46 @@ AnimationClip: curve: - time: 0 value: {fileID: 4530433918361379743, guid: d5bbe5b893ed9bc43b303a0e5c712a09, type: 3} - - time: 0.1 + - time: 0.2 value: {fileID: 4699623745766655208, guid: d5bbe5b893ed9bc43b303a0e5c712a09, type: 3} - - time: 0.21666667 - value: {fileID: -265841166610147798, guid: d5bbe5b893ed9bc43b303a0e5c712a09, type: 3} - - time: 0.31666666 - value: {fileID: 4699623745766655208, guid: d5bbe5b893ed9bc43b303a0e5c712a09, type: 3} - - time: 0.41666666 - value: {fileID: 4530433918361379743, guid: d5bbe5b893ed9bc43b303a0e5c712a09, type: 3} - time: 0.43333334 - value: {fileID: 4530433918361379743, guid: d5bbe5b893ed9bc43b303a0e5c712a09, type: 3} - - time: 0.53333336 - value: {fileID: 4699623745766655208, guid: d5bbe5b893ed9bc43b303a0e5c712a09, type: 3} - - time: 0.65 value: {fileID: -265841166610147798, guid: d5bbe5b893ed9bc43b303a0e5c712a09, type: 3} - - time: 0.75 + - time: 0.6333333 value: {fileID: 4699623745766655208, guid: d5bbe5b893ed9bc43b303a0e5c712a09, type: 3} - - time: 0.85 + - time: 0.8333333 value: {fileID: 4530433918361379743, guid: d5bbe5b893ed9bc43b303a0e5c712a09, type: 3} - - time: 0.8833333 + - time: 0.8666667 value: {fileID: 4530433918361379743, guid: d5bbe5b893ed9bc43b303a0e5c712a09, type: 3} - - time: 0.98333335 - value: {fileID: 4699623745766655208, guid: d5bbe5b893ed9bc43b303a0e5c712a09, type: 3} - - time: 1.1 - value: {fileID: -265841166610147798, guid: d5bbe5b893ed9bc43b303a0e5c712a09, type: 3} - - time: 1.2 + - time: 1.0666667 value: {fileID: 4699623745766655208, guid: d5bbe5b893ed9bc43b303a0e5c712a09, type: 3} - time: 1.3 + value: {fileID: -265841166610147798, guid: d5bbe5b893ed9bc43b303a0e5c712a09, type: 3} + - time: 1.5 + value: {fileID: 4699623745766655208, guid: d5bbe5b893ed9bc43b303a0e5c712a09, type: 3} + - time: 1.7 + value: {fileID: 4530433918361379743, guid: d5bbe5b893ed9bc43b303a0e5c712a09, type: 3} + - time: 1.7666667 + value: {fileID: 4530433918361379743, guid: d5bbe5b893ed9bc43b303a0e5c712a09, type: 3} + - time: 1.9666667 + value: {fileID: 4699623745766655208, guid: d5bbe5b893ed9bc43b303a0e5c712a09, type: 3} + - time: 2.2 + value: {fileID: -265841166610147798, guid: d5bbe5b893ed9bc43b303a0e5c712a09, type: 3} + - time: 2.4 + value: {fileID: 4699623745766655208, guid: d5bbe5b893ed9bc43b303a0e5c712a09, type: 3} + - time: 2.6 value: {fileID: 4530433918361379743, guid: d5bbe5b893ed9bc43b303a0e5c712a09, type: 3} attribute: m_Sprite path: classID: 212 script: {fileID: 0} flags: 2 - m_SampleRate: 60 + 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 - serializedVersion: 2 path: 0 attribute: 4 @@ -403,7 +225,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1.3166667 + m_StopTime: 2.6333334 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -433,7 +255,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.1 + time: 0.2 value: 0 inSlope: 0 outSlope: 0 @@ -442,556 +264,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.21666667 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.25 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.31666666 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.41666666 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.43333334 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.53333336 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.65 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.68333334 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.75 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.85 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.8833333 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.98333335 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.1333333 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.2 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.3 - value: 0 - 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: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.1 - value: 0.1 - inSlope: 1.3846154 - outSlope: 1.3846154 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.21666667 - value: 0.3 - inSlope: 3.3333333 - outSlope: 3.3333333 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.25 - value: 0.6 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.31666666 - value: 0.3 - inSlope: -3.6000004 - outSlope: -3.6000004 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.41666666 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.43333334 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.53333336 - value: 0.1 - inSlope: 1.3846157 - outSlope: 1.3846157 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.65 - value: 0.3 - inSlope: 3.333334 - outSlope: 3.333334 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.68333334 - value: 0.6 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.75 - value: 0.3 - inSlope: -3.5999997 - outSlope: -3.5999997 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.85 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.8833333 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.98333335 - value: 0.1 - inSlope: 1.3846152 - outSlope: 1.3846152 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.1 - value: 0.3 - inSlope: 3.333334 - outSlope: 3.333334 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.1333333 - value: 0.6 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.2 - value: 0.3 - inSlope: -3.600001 - outSlope: -3.600001 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.3 - value: 0 - 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: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.21666667 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.25 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.31666666 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.41666666 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.43333334 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.53333336 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.65 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.68333334 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.75 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.85 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.8833333 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.98333335 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.1333333 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.2 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.3 - value: 0 - 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 - - 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: 0.1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.25 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.33333334 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.41666666 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.53333336 + time: 0.5 value: 0 inSlope: 0 outSlope: 0 @@ -1009,7 +282,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.76666665 + time: 0.8333333 value: 0 inSlope: 0 outSlope: 0 @@ -1018,7 +291,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.8833333 + time: 1.0666667 value: 0 inSlope: 0 outSlope: 0 @@ -1027,7 +300,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.98333335 + time: 1.3333334 value: 0 inSlope: 0 outSlope: 0 @@ -1036,7 +309,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.1333333 + time: 1.5333333 value: 0 inSlope: 0 outSlope: 0 @@ -1045,7 +318,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.2 + time: 1.7666667 value: 0 inSlope: 0 outSlope: 0 @@ -1054,7 +327,34 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.3166667 + time: 1.9666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2.2666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2.4 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2.6333334 value: 0 inSlope: 0 outSlope: 0 @@ -1084,7 +384,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.1 + time: 0.2 value: 0 inSlope: 0 outSlope: 0 @@ -1093,34 +393,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.25 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.33333334 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.41666666 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.53333336 + time: 0.5 value: 0 inSlope: 0 outSlope: 0 @@ -1138,7 +411,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.76666665 + time: 0.8333333 value: 0 inSlope: 0 outSlope: 0 @@ -1147,7 +420,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.8833333 + time: 1.0666667 value: 0 inSlope: 0 outSlope: 0 @@ -1156,7 +429,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.98333335 + time: 1.3333334 value: 0 inSlope: 0 outSlope: 0 @@ -1165,7 +438,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.1333333 + time: 1.5333333 value: 0 inSlope: 0 outSlope: 0 @@ -1174,7 +447,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.2 + time: 1.7666667 value: 0 inSlope: 0 outSlope: 0 @@ -1183,7 +456,34 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.3166667 + time: 1.9666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2.2666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2.4 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2.6333334 value: 0 inSlope: 0 outSlope: 0 @@ -1213,16 +513,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.1 + time: 0.2 value: 21.435 - inSlope: 131.092 - outSlope: 131.092 + inSlope: 65.546 + outSlope: 65.546 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.25 + time: 0.5 value: 32.773 inSlope: 0 outSlope: 0 @@ -1231,16 +531,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.33333334 + time: 0.6666667 value: 9.69 - inSlope: -249.384 - outSlope: -249.384 + inSlope: -124.692 + outSlope: -124.692 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.41666666 + time: 0.8333333 value: -8.791 inSlope: 0 outSlope: 0 @@ -1249,7 +549,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.53333336 + time: 1.0666667 value: 16.805 inSlope: 0 outSlope: 0 @@ -1258,7 +558,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6666667 + time: 1.3333334 value: 4.273 inSlope: 0 outSlope: 0 @@ -1267,7 +567,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.76666665 + time: 1.5333333 value: 23.489 inSlope: 0 outSlope: 0 @@ -1276,7 +576,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.8833333 + time: 1.7666667 value: 6.303 inSlope: 0 outSlope: 0 @@ -1285,7 +585,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.98333335 + time: 1.9666667 value: 28.23 inSlope: 0 outSlope: 0 @@ -1294,16 +594,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.1333333 + time: 2.2666667 value: 3.925 - inSlope: -234.26765 - outSlope: -234.26765 + inSlope: -117.13383 + outSlope: -117.13383 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.2 + time: 2.4 value: -22.528 inSlope: 0 outSlope: 0 @@ -1312,7 +612,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.3166667 + time: 2.6333334 value: 32.362 inSlope: 0 outSlope: 0 diff --git a/Assets/Playables/PulverCucumberSmack1.playable b/Assets/Playables/PulverCucumberSmack1.playable index 4703094c..95794609 100644 --- a/Assets/Playables/PulverCucumberSmack1.playable +++ b/Assets/Playables/PulverCucumberSmack1.playable @@ -1,17 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!114 &-8141883812729867331 -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: fde0d25a170598d46a0b9dc16b4527a5, type: 3} - m_Name: ActivationPlayableAsset - m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.ActivationPlayableAsset --- !u!114 &-7800811525781169865 MonoBehaviour: m_ObjectHideFlags: 1 @@ -293,99 +281,6 @@ MonoBehaviour: m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1} m_Rotation: {x: 0, y: 0, z: 0, w: 1} m_ApplyOffsets: 0 ---- !u!114 &-2306502989242081801 -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: 21bf7f712d84d26478ebe6a299f21738, type: 3} - m_Name: Activation Track (2) - m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.ActivationTrack - m_Version: 3 - m_AnimClip: {fileID: 0} - m_Locked: 0 - m_Muted: 0 - m_CustomPlayableFullTypename: - m_Curves: {fileID: 0} - m_Parent: {fileID: 11400000} - m_Children: [] - m_Clips: - - m_Version: 1 - m_Start: 2.1333333333333333 - m_ClipIn: 0 - m_Asset: {fileID: 8869473753107552233} - m_Duration: 1.1500000000000004 - m_TimeScale: 1 - m_ParentTrack: {fileID: -2306502989242081801} - m_EaseInDuration: 0 - m_EaseOutDuration: 0 - m_BlendInDuration: 0 - m_BlendOutDuration: 0 - m_MixInCurve: - 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: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - m_MixOutCurve: - 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 - m_BlendInCurveMode: 0 - m_BlendOutCurveMode: 0 - m_ExposedParameterNames: [] - m_AnimationCurves: {fileID: 0} - m_Recordable: 0 - m_PostExtrapolationMode: 0 - m_PreExtrapolationMode: 0 - m_PostExtrapolationTime: 0 - m_PreExtrapolationTime: 0 - m_DisplayName: Active - m_Markers: - m_Objects: [] - m_PostPlaybackState: 3 --- !u!114 &-2070454477998879764 MonoBehaviour: m_ObjectHideFlags: 1 @@ -408,99 +303,6 @@ MonoBehaviour: m_Loop: 0 m_Version: 1 m_Rotation: {x: 0, y: 0, z: 0, w: 1} ---- !u!114 &-1942705774920494342 -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: 21bf7f712d84d26478ebe6a299f21738, type: 3} - m_Name: Activation Track (1) - m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.ActivationTrack - m_Version: 3 - m_AnimClip: {fileID: 0} - m_Locked: 0 - m_Muted: 0 - m_CustomPlayableFullTypename: - m_Curves: {fileID: 0} - m_Parent: {fileID: 11400000} - m_Children: [] - m_Clips: - - m_Version: 1 - m_Start: 2.1333333333333333 - m_ClipIn: 0 - m_Asset: {fileID: 6919411930490113052} - m_Duration: 1.1500000000000004 - m_TimeScale: 1 - m_ParentTrack: {fileID: -1942705774920494342} - m_EaseInDuration: 0 - m_EaseOutDuration: 0 - m_BlendInDuration: 0 - m_BlendOutDuration: 0 - m_MixInCurve: - 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: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - m_MixOutCurve: - 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 - m_BlendInCurveMode: 0 - m_BlendOutCurveMode: 0 - m_ExposedParameterNames: [] - m_AnimationCurves: {fileID: 0} - m_Recordable: 0 - m_PostExtrapolationMode: 0 - m_PreExtrapolationMode: 0 - m_PostExtrapolationTime: 0 - m_PreExtrapolationTime: 0 - m_DisplayName: Active - m_Markers: - m_Objects: [] - m_PostPlaybackState: 3 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -518,12 +320,9 @@ MonoBehaviour: - {fileID: -7584736085941489071} - {fileID: -2395336864975438248} - {fileID: 3942302933360259000} - - {fileID: -1942705774920494342} - - {fileID: -2306502989242081801} - - {fileID: 5194333105783184030} - - {fileID: 8484886637748558501} - {fileID: 8776627858148209300} - {fileID: 6964431640287062015} + - {fileID: 6955792371262468379} m_FixedDuration: 0 m_EditorSettings: m_Framerate: 60 @@ -569,18 +368,6 @@ MonoBehaviour: m_Loop: 2 m_Version: 1 m_Rotation: {x: 0, y: 0, z: 0, w: 1} ---- !u!114 &3404527565291525971 -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: fde0d25a170598d46a0b9dc16b4527a5, type: 3} - m_Name: ActivationPlayableAsset - m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.ActivationPlayableAsset --- !u!114 &3942302933360259000 MonoBehaviour: m_ObjectHideFlags: 1 @@ -674,7 +461,19 @@ MonoBehaviour: m_Markers: m_Objects: [] m_PostPlaybackState: 3 ---- !u!114 &5194333105783184030 +--- !u!114 &5595572907110678552 +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: fde0d25a170598d46a0b9dc16b4527a5, type: 3} + m_Name: ActivationPlayableAsset + m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.ActivationPlayableAsset +--- !u!114 &6955792371262468379 MonoBehaviour: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -684,7 +483,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 21bf7f712d84d26478ebe6a299f21738, type: 3} - m_Name: Activation Track (3) + m_Name: Activation Track (5) m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.ActivationTrack m_Version: 3 m_AnimClip: {fileID: 0} @@ -696,12 +495,12 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 2.1333333333333333 + m_Start: 0 m_ClipIn: 0 - m_Asset: {fileID: 3404527565291525971} - m_Duration: 1.1500000000000004 + m_Asset: {fileID: 5595572907110678552} + m_Duration: 0.43333333333333335 m_TimeScale: 1 - m_ParentTrack: {fileID: 5194333105783184030} + m_ParentTrack: {fileID: 6955792371262468379} m_EaseInDuration: 0 m_EaseOutDuration: 0 m_BlendInDuration: 0 @@ -767,18 +566,6 @@ MonoBehaviour: m_Markers: m_Objects: [] m_PostPlaybackState: 3 ---- !u!114 &6919411930490113052 -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: fde0d25a170598d46a0b9dc16b4527a5, type: 3} - m_Name: ActivationPlayableAsset - m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.ActivationPlayableAsset --- !u!114 &6964431640287062015 MonoBehaviour: m_ObjectHideFlags: 1 @@ -827,99 +614,6 @@ MonoBehaviour: m_Clips: [] m_Markers: m_Objects: [] ---- !u!114 &8484886637748558501 -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: 21bf7f712d84d26478ebe6a299f21738, type: 3} - m_Name: Activation Track (4) - m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.ActivationTrack - m_Version: 3 - m_AnimClip: {fileID: 0} - m_Locked: 0 - m_Muted: 0 - m_CustomPlayableFullTypename: - m_Curves: {fileID: 0} - m_Parent: {fileID: 11400000} - m_Children: [] - m_Clips: - - m_Version: 1 - m_Start: 2.1333333333333333 - m_ClipIn: 0 - m_Asset: {fileID: -8141883812729867331} - m_Duration: 1.1500000000000004 - m_TimeScale: 1 - m_ParentTrack: {fileID: 8484886637748558501} - m_EaseInDuration: 0 - m_EaseOutDuration: 0 - m_BlendInDuration: 0 - m_BlendOutDuration: 0 - m_MixInCurve: - 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: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - m_MixOutCurve: - 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 - m_BlendInCurveMode: 0 - m_BlendOutCurveMode: 0 - m_ExposedParameterNames: [] - m_AnimationCurves: {fileID: 0} - m_Recordable: 0 - m_PostExtrapolationMode: 0 - m_PreExtrapolationMode: 0 - m_PostExtrapolationTime: 0 - m_PreExtrapolationTime: 0 - m_DisplayName: Active - m_Markers: - m_Objects: [] - m_PostPlaybackState: 3 --- !u!114 &8776627858148209300 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1085,15 +779,3 @@ MonoBehaviour: volume: 1 stereoPan: 0 spatialBlend: 0 ---- !u!114 &8869473753107552233 -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: fde0d25a170598d46a0b9dc16b4527a5, type: 3} - m_Name: ActivationPlayableAsset - m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.ActivationPlayableAsset diff --git a/Assets/Prefabs/Characters/Gardener.prefab b/Assets/Prefabs/Characters/Gardener.prefab index 61e571eb..dd085221 100644 --- a/Assets/Prefabs/Characters/Gardener.prefab +++ b/Assets/Prefabs/Characters/Gardener.prefab @@ -17,7 +17,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &2269489375423604720 Transform: m_ObjectHideFlags: 0 @@ -947,6 +947,26 @@ PrefabInstance: propertyPath: m_Name value: Nails objectReference: {fileID: 0} + - target: {fileID: 3331684441032619985, guid: 0b255c6ea64a74240a8db4d9e8f820be, type: 3} + propertyPath: m_LocalPosition.y + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 3654588977911873588, guid: 0b255c6ea64a74240a8db4d9e8f820be, type: 3} + propertyPath: thiccness + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 3654588977911873588, guid: 0b255c6ea64a74240a8db4d9e8f820be, type: 3} + propertyPath: interactionType + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4554198047616339659, guid: 0b255c6ea64a74240a8db4d9e8f820be, type: 3} + propertyPath: m_LocalPosition.x + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 4914470753971955724, guid: 0b255c6ea64a74240a8db4d9e8f820be, type: 3} + propertyPath: m_LocalPosition.y + value: -0.2 + objectReference: {fileID: 0} - target: {fileID: 7465517589433942351, guid: 0b255c6ea64a74240a8db4d9e8f820be, type: 3} propertyPath: m_LocalPosition.x value: 5.7399993 @@ -987,6 +1007,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 9100111724701468000, guid: 0b255c6ea64a74240a8db4d9e8f820be, type: 3} + propertyPath: m_LocalPosition.x + value: -0.2 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -1195,6 +1219,144 @@ Transform: m_CorrespondingSourceObject: {fileID: 7902426247424835304, guid: e958998c2a0c82246b6269c32eb2a297, type: 3} m_PrefabInstance: {fileID: 3558687171017687088} m_PrefabAsset: {fileID: 0} +--- !u!1001 &3605351572900387629 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6418503932309983819} + 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_FlipX + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1852608221241404454, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: -1674588785, guid: fd8520daf9c2a644a94d0afa1a5b7f4d, type: 3} + - target: {fileID: 1852608221241404454, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: m_SortingOrder + value: 1 + objectReference: {fileID: 0} + - 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_FlipX + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5094223041467069679, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: -1674588785, guid: fd8520daf9c2a644a94d0afa1a5b7f4d, type: 3} + - target: {fileID: 5094223041467069679, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: m_SortingOrder + value: 1 + 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_FlipX + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5692747743727126428, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: -1674588785, guid: fd8520daf9c2a644a94d0afa1a5b7f4d, type: 3} + - target: {fileID: 5692747743727126428, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: m_SortingOrder + value: 1 + objectReference: {fileID: 0} + - 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_FlipX + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6093743105869044773, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: -1674588785, guid: fd8520daf9c2a644a94d0afa1a5b7f4d, type: 3} + - target: {fileID: 6093743105869044773, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: m_SortingOrder + value: 1 + objectReference: {fileID: 0} + - 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: 163496279268562402} + - target: {fileID: 6900224008763310802, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: interactionType + value: 2 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} +--- !u!4 &8808970132351017634 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5203759348480833935, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + m_PrefabInstance: {fileID: 3605351572900387629} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4321930761866593469 PrefabInstance: m_ObjectHideFlags: 0 @@ -1361,17 +1523,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 7902426247424835304, guid: e958998c2a0c82246b6269c32eb2a297, type: 3} - insertIndex: -1 - addedObject: {fileID: 32826779822282012} + m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e958998c2a0c82246b6269c32eb2a297, type: 3} ---- !u!212 &4532377608670572613 stripped -SpriteRenderer: - m_CorrespondingSourceObject: {fileID: 368354309418136824, guid: e958998c2a0c82246b6269c32eb2a297, type: 3} - m_PrefabInstance: {fileID: 4321930761866593469} - m_PrefabAsset: {fileID: 0} --- !u!4 &6219924000464616021 stripped Transform: m_CorrespondingSourceObject: {fileID: 7902426247424835304, guid: e958998c2a0c82246b6269c32eb2a297, type: 3} @@ -1464,92 +1618,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 5383276844808284485, guid: afbb486e5456a20479aee4cf8bc949b6, type: 3} m_PrefabInstance: {fileID: 4568997545047462388} m_PrefabAsset: {fileID: 0} ---- !u!1001 &5207260984749337747 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 6219924000464616021} - m_Modifications: - - target: {fileID: 1852608221241404454, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 6976008740052792033, guid: 9e2ad1f6164048843adaa2580db80d76, 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_Sprite - value: - objectReference: {fileID: 6976008740052792033, guid: 9e2ad1f6164048843adaa2580db80d76, 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: 6976008740052792033, guid: 9e2ad1f6164048843adaa2580db80d76, type: 3} - - target: {fileID: 6093743105869044773, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 6976008740052792033, guid: 9e2ad1f6164048843adaa2580db80d76, type: 3} - - target: {fileID: 6900224008763310802, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} - propertyPath: itemSprite - value: - objectReference: {fileID: 4532377608670572613} - - target: {fileID: 6900224008763310802, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} - propertyPath: interactionType - value: 2 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} ---- !u!4 &32826779822282012 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5203759348480833935, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} - m_PrefabInstance: {fileID: 5207260984749337747} - m_PrefabAsset: {fileID: 0} --- !u!1001 &5695708696169621194 PrefabInstance: m_ObjectHideFlags: 0 @@ -1614,6 +1682,10 @@ PrefabInstance: propertyPath: m_FlipX value: 1 objectReference: {fileID: 0} + - target: {fileID: 5570919883172852520, guid: 7be57ba4ecd292f4c90169045a2d69e4, type: 3} + propertyPath: m_SortingOrder + value: 2 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: @@ -1623,6 +1695,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 1592061707390547073, guid: 7be57ba4ecd292f4c90169045a2d69e4, type: 3} insertIndex: -1 addedObject: {fileID: 6219924000464616021} + - targetCorrespondingSourceObject: {fileID: 1592061707390547073, guid: 7be57ba4ecd292f4c90169045a2d69e4, type: 3} + insertIndex: -1 + addedObject: {fileID: 8808970132351017634} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 5034469437909578894, guid: 7be57ba4ecd292f4c90169045a2d69e4, type: 3} insertIndex: -1 @@ -1643,6 +1718,11 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 6830600382841233720} m_SourcePrefab: {fileID: 100100000, guid: 7be57ba4ecd292f4c90169045a2d69e4, type: 3} +--- !u!212 &163496279268562402 stripped +SpriteRenderer: + m_CorrespondingSourceObject: {fileID: 5570919883172852520, guid: 7be57ba4ecd292f4c90169045a2d69e4, type: 3} + m_PrefabInstance: {fileID: 5695708696169621194} + m_PrefabAsset: {fileID: 0} --- !u!1 &780600094299918916 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5034469437909578894, guid: 7be57ba4ecd292f4c90169045a2d69e4, type: 3} @@ -1874,11 +1954,11 @@ PrefabInstance: m_Modifications: - target: {fileID: 1592061707390547073, guid: 7be57ba4ecd292f4c90169045a2d69e4, type: 3} propertyPath: m_LocalPosition.x - value: 7.439999 + value: 7.4399986 objectReference: {fileID: 0} - target: {fileID: 1592061707390547073, guid: 7be57ba4ecd292f4c90169045a2d69e4, type: 3} propertyPath: m_LocalPosition.y - value: 11.47 + value: 11.469999 objectReference: {fileID: 0} - target: {fileID: 1592061707390547073, guid: 7be57ba4ecd292f4c90169045a2d69e4, type: 3} propertyPath: m_LocalPosition.z diff --git a/Assets/Prefabs/Environment/BallTree.prefab b/Assets/Prefabs/Environment/BallTree.prefab index 63531d6f..8254c18f 100644 --- a/Assets/Prefabs/Environment/BallTree.prefab +++ b/Assets/Prefabs/Environment/BallTree.prefab @@ -200,10 +200,12 @@ Transform: - {fileID: 2084964592986606867} - {fileID: 6631072601870453588} - {fileID: 7371967679236352629} + - {fileID: 4211107264420393892} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &2720557426779044373 SpriteRenderer: + serializedVersion: 2 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -249,6 +251,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 1 + m_MaskInteraction: 0 m_Sprite: {fileID: 768869974157336279, guid: ab1e8f5d45ee00247af9314b56f4af91, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -258,7 +261,6 @@ SpriteRenderer: m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 m_SpriteSortPoint: 1 --- !u!61 &8897661028274890141 BoxCollider2D: @@ -529,3 +531,93 @@ Transform: m_CorrespondingSourceObject: {fileID: 5507990123417429516, guid: afbb486e5456a20479aee4cf8bc949b6, type: 3} m_PrefabInstance: {fileID: 5210361341888085501} m_PrefabAsset: {fileID: 0} +--- !u!1001 &8234739767305652779 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4937390562043858043} + m_Modifications: + - target: {fileID: 1852608221241404454, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 768869974157336279, guid: ab1e8f5d45ee00247af9314b56f4af91, 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_Sprite + value: + objectReference: {fileID: 768869974157336279, guid: ab1e8f5d45ee00247af9314b56f4af91, 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: 768869974157336279, guid: ab1e8f5d45ee00247af9314b56f4af91, type: 3} + - target: {fileID: 6093743105869044773, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 768869974157336279, guid: ab1e8f5d45ee00247af9314b56f4af91, type: 3} + - target: {fileID: 6900224008763310802, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: itemSprite + value: + objectReference: {fileID: 2720557426779044373} + - target: {fileID: 6900224008763310802, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: animatedSprite + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6900224008763310802, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: interactionType + value: 2 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} +--- !u!4 &4211107264420393892 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5203759348480833935, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + m_PrefabInstance: {fileID: 8234739767305652779} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Environment/LureSpotA.prefab b/Assets/Prefabs/Environment/LureSpotA.prefab index 78070c64..e1ef6c04 100644 --- a/Assets/Prefabs/Environment/LureSpotA.prefab +++ b/Assets/Prefabs/Environment/LureSpotA.prefab @@ -128,6 +128,7 @@ Transform: - {fileID: 7442421452951837692} - {fileID: 2784061204862661225} - {fileID: 5375394469162727687} + - {fileID: 2687726686040067934} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &6258593095132504700 @@ -177,7 +178,7 @@ SpriteRenderer: m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: 1 m_MaskInteraction: 0 m_Sprite: {fileID: -8438005379329254897, guid: fe735eb4f8856904caec179520dcb92f, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -645,3 +646,89 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 13d59d3c42170824b8f92557822d9bf0, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &7889126362081982161 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2045549771447434109} + m_Modifications: + - target: {fileID: 1852608221241404454, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: -8438005379329254897, guid: fe735eb4f8856904caec179520dcb92f, 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_Sprite + value: + objectReference: {fileID: -8438005379329254897, guid: fe735eb4f8856904caec179520dcb92f, 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: -8438005379329254897, guid: fe735eb4f8856904caec179520dcb92f, type: 3} + - target: {fileID: 6093743105869044773, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: -8438005379329254897, guid: fe735eb4f8856904caec179520dcb92f, type: 3} + - target: {fileID: 6900224008763310802, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: itemSprite + value: + objectReference: {fileID: 6258593095132504700} + - target: {fileID: 6900224008763310802, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: interactionType + value: 2 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} +--- !u!4 &2687726686040067934 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5203759348480833935, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + m_PrefabInstance: {fileID: 7889126362081982161} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Environment/LuringSpotB.prefab b/Assets/Prefabs/Environment/LureSpotB_Slot.prefab similarity index 93% rename from Assets/Prefabs/Environment/LuringSpotB.prefab rename to Assets/Prefabs/Environment/LureSpotB_Slot.prefab index 0b62ac0d..f1f5018b 100644 --- a/Assets/Prefabs/Environment/LuringSpotB.prefab +++ b/Assets/Prefabs/Environment/LureSpotB_Slot.prefab @@ -165,7 +165,8 @@ Transform: m_LocalPosition: {x: 0.244, y: 2.327, z: 0} m_LocalScale: {x: 0.27, y: 0.27, z: 0.27} m_ConstrainProportionsScale: 1 - m_Children: [] + m_Children: + - {fileID: 8516442207205568480} m_Father: {fileID: 6078012632802010276} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &2343214996212089369 @@ -1212,10 +1213,10 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: AnneLiseBushBehaviour, AppleHillsScripts - m_MethodName: TakePhoto - m_Mode: 1 + - m_Target: {fileID: 431037421781347020} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -1933,3 +1934,90 @@ Transform: m_CorrespondingSourceObject: {fileID: 7967906181784854063, guid: fde0c702b7c4ea3439502cfb575ac77a, type: 3} m_PrefabInstance: {fileID: 4445337424770836952} m_PrefabAsset: {fileID: 0} +--- !u!1001 &4469555028879791727 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2585070003294903208} + m_Modifications: + - target: {fileID: 1852608221241404454, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: -1125559343802010594, guid: 46b2fe6896b27cc4c8bd9f0da3f0de50, 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_Sprite + value: + objectReference: {fileID: -1125559343802010594, guid: 46b2fe6896b27cc4c8bd9f0da3f0de50, 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: -1125559343802010594, guid: 46b2fe6896b27cc4c8bd9f0da3f0de50, type: 3} + - target: {fileID: 6093743105869044773, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: -1125559343802010594, guid: 46b2fe6896b27cc4c8bd9f0da3f0de50, type: 3} + - target: {fileID: 6900224008763310802, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: itemSprite + value: + objectReference: {fileID: 2343214996212089369} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} +--- !u!1 &431037421781347020 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4322425255501872291, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + m_PrefabInstance: {fileID: 4469555028879791727} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8516442207205568480 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5203759348480833935, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + m_PrefabInstance: {fileID: 4469555028879791727} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Environment/LuringSpotB.prefab.meta b/Assets/Prefabs/Environment/LureSpotB_Slot.prefab.meta similarity index 100% rename from Assets/Prefabs/Environment/LuringSpotB.prefab.meta rename to Assets/Prefabs/Environment/LureSpotB_Slot.prefab.meta diff --git a/Assets/Prefabs/Environment/LuringSpotC.prefab b/Assets/Prefabs/Environment/LureSpotC_Slot.prefab similarity index 87% rename from Assets/Prefabs/Environment/LuringSpotC.prefab rename to Assets/Prefabs/Environment/LureSpotC_Slot.prefab index d797ca0b..f2de8ecd 100644 --- a/Assets/Prefabs/Environment/LuringSpotC.prefab +++ b/Assets/Prefabs/Environment/LureSpotC_Slot.prefab @@ -30,7 +30,8 @@ Transform: m_LocalPosition: {x: 0, y: 2.124, z: 0} m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} m_ConstrainProportionsScale: 1 - m_Children: [] + m_Children: + - {fileID: 2559160361433709842} m_Father: {fileID: 6583016841553003224} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!60 &8218367545477079613 @@ -372,9 +373,9 @@ MonoBehaviour: onCorrectItemSlotted: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 6973682693496150699} - m_TargetAssemblyTypeName: BirdEyesBehavior, Assembly-CSharp - m_MethodName: CorrectItem + - m_Target: {fileID: 5785110781239031870} + m_TargetAssemblyTypeName: AnneLiseBushBehaviour, AppleHillsScripts + m_MethodName: m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -384,10 +385,10 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: AnneLiseBushBehaviour, AppleHillsScripts - m_MethodName: TakePhoto - m_Mode: 1 + - m_Target: {fileID: 5785110781239031870} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -980,3 +981,106 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 13d59d3c42170824b8f92557822d9bf0, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &7760970189815235741 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 7964773102256504836} + m_Modifications: + - target: {fileID: 1852608221241404454, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: -642587728066523507, guid: 95d6dbee5cb1f694c971791ee60cad14, 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_Sprite + value: + objectReference: {fileID: -642587728066523507, guid: 95d6dbee5cb1f694c971791ee60cad14, type: 3} + - target: {fileID: 5203759348480833935, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5203759348480833935, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5203759348480833935, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: m_LocalScale.z + value: 1 + 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: -642587728066523507, guid: 95d6dbee5cb1f694c971791ee60cad14, type: 3} + - target: {fileID: 6093743105869044773, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: -642587728066523507, guid: 95d6dbee5cb1f694c971791ee60cad14, type: 3} + - target: {fileID: 6900224008763310802, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: itemSprite + value: + objectReference: {fileID: 2825253017896168654} + - target: {fileID: 6900224008763310802, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: interactionType + value: 2 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} +--- !u!4 &2559160361433709842 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5203759348480833935, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + m_PrefabInstance: {fileID: 7760970189815235741} + m_PrefabAsset: {fileID: 0} +--- !u!1 &5785110781239031870 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4322425255501872291, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + m_PrefabInstance: {fileID: 7760970189815235741} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Environment/LuringSpotC.prefab.meta b/Assets/Prefabs/Environment/LureSpotC_Slot.prefab.meta similarity index 100% rename from Assets/Prefabs/Environment/LuringSpotC.prefab.meta rename to Assets/Prefabs/Environment/LureSpotC_Slot.prefab.meta diff --git a/Assets/Prefabs/Environment/SoundBird.prefab b/Assets/Prefabs/Environment/SoundBird.prefab index 364381fc..31d0977f 100644 --- a/Assets/Prefabs/Environment/SoundBird.prefab +++ b/Assets/Prefabs/Environment/SoundBird.prefab @@ -67,10 +67,12 @@ Transform: - {fileID: 3907351184805552114} - {fileID: 1702819536151974707} - {fileID: 2513116580733004004} + - {fileID: 3137650519282509002} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &8875860401447896107 SpriteRenderer: + serializedVersion: 2 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -94,7 +96,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + - {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -115,7 +117,8 @@ SpriteRenderer: m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: 1 + m_MaskInteraction: 0 m_Sprite: {fileID: 7446805773477066560, guid: a74f9c023604a5745bf509a011dc12cf, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -125,7 +128,6 @@ SpriteRenderer: m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!114 &7290110366808972859 MonoBehaviour: @@ -210,6 +212,7 @@ Transform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: -8.651} --- !u!212 &6941190210788968874 SpriteRenderer: + serializedVersion: 2 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -255,6 +258,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 @@ -264,7 +268,6 @@ SpriteRenderer: m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 0 - m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!1 &6117389795918759898 GameObject: @@ -360,3 +363,109 @@ Transform: m_CorrespondingSourceObject: {fileID: 5507990123417429516, guid: afbb486e5456a20479aee4cf8bc949b6, type: 3} m_PrefabInstance: {fileID: 814760252274833115} m_PrefabAsset: {fileID: 0} +--- !u!1001 &7186719210091191621 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2523333015159032981} + 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: 7446805773477066560, guid: a74f9c023604a5745bf509a011dc12cf, 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: 7446805773477066560, guid: a74f9c023604a5745bf509a011dc12cf, 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: 7446805773477066560, guid: a74f9c023604a5745bf509a011dc12cf, 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: 7446805773477066560, guid: a74f9c023604a5745bf509a011dc12cf, 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: 8875860401447896107} + - target: {fileID: 6900224008763310802, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: interactionType + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} +--- !u!4 &3137650519282509002 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5203759348480833935, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + m_PrefabInstance: {fileID: 7186719210091191621} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/FX/GlowOutline.prefab b/Assets/Prefabs/FX/GlowOutline.prefab index 05228be0..87291042 100644 --- a/Assets/Prefabs/FX/GlowOutline.prefab +++ b/Assets/Prefabs/FX/GlowOutline.prefab @@ -245,8 +245,7 @@ MonoBehaviour: m_Calls: [] DebugActive: 0 InScriptDrivenPause: 0 - FeedbacksList: - - rid: 8625086241380499647 + FeedbacksList: [] KeepPlayModeChanges: 0 PerformanceMode: 0 RestoreInitialValuesOnDisable: 0 @@ -257,130 +256,7 @@ MonoBehaviour: MMF_ChannelDefinition: {fileID: 0} references: version: 2 - RefIds: - - rid: 8625086241380499647 - type: {class: MMF_ScaleShake, ns: MoreMountains.Feedbacks, asm: MoreMountains.Tools} - data: - Active: 1 - UniqueID: -1802995354 - Label: Scale Shake - OriginalLabel: Scale Shake - 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 - TargetShaker: {fileID: 0} - Duration: 0.5 - ResetShakerValuesAfterShake: 1 - ResetTargetValuesAfterShake: 1 - ShakeSpeed: 20 - ShakeRange: 0.1 - ShakeMainDirection: {x: 1, y: 1, z: 0} - RandomizeDirection: 0 - ShakeAltDirection: {x: 0, y: 1, z: 0} - RandomizeDirectionOnPlay: 0 - AddDirectionalNoise: 1 - DirectionalNoiseStrengthMin: {x: 0.25, y: 0.25, z: 0.25} - DirectionalNoiseStrengthMax: {x: 0.25, y: 0.25, z: 0.25} - RandomnessSeed: {x: 0, y: 0, z: 0} - RandomizeSeedOnShake: 1 - UseAttenuation: 1 - AttenuationCurve: - 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.5 - 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 + RefIds: [] --- !u!1 &4516817821029416964 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Items/Basketball.prefab b/Assets/Prefabs/Items/Basketball.prefab index f08b6831..92ce653e 100644 --- a/Assets/Prefabs/Items/Basketball.prefab +++ b/Assets/Prefabs/Items/Basketball.prefab @@ -31,7 +31,8 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 3934426928764562872} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &3696625264308890211 @@ -143,3 +144,105 @@ MonoBehaviour: m_Calls: [] itemData: {fileID: 11400000, guid: 43f22dbbb4c0eec4f8108d0f0eea43c2, type: 2} iconRenderer: {fileID: 4055726361761331703} +--- !u!1001 &9128396208445805623 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6133778293368838189} + m_Modifications: + - target: {fileID: 1386870209246758790, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: m_LocalPosition.x + value: -0.05 + objectReference: {fileID: 0} + - target: {fileID: 1852608221241404454, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: -3019416885370694485, guid: ed57eef56cafff0428d08bce28798f58, type: 3} + - target: {fileID: 2974211257881602794, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: m_LocalPosition.y + value: -0.05 + 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.05 + objectReference: {fileID: 0} + - target: {fileID: 5094223041467069679, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: -3019416885370694485, guid: ed57eef56cafff0428d08bce28798f58, 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: -3019416885370694485, guid: ed57eef56cafff0428d08bce28798f58, type: 3} + - target: {fileID: 5928692606425386029, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: m_LocalPosition.x + value: 0.05 + objectReference: {fileID: 0} + - target: {fileID: 6093743105869044773, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: -3019416885370694485, guid: ed57eef56cafff0428d08bce28798f58, type: 3} + - target: {fileID: 6900224008763310802, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: thiccness + value: 0.05 + objectReference: {fileID: 0} + - target: {fileID: 6900224008763310802, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: itemSprite + value: + objectReference: {fileID: 4055726361761331703} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} +--- !u!4 &3934426928764562872 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5203759348480833935, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + m_PrefabInstance: {fileID: 9128396208445805623} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Items/BlueBall.prefab b/Assets/Prefabs/Items/BlueBall.prefab index b298329b..a0f78762 100644 --- a/Assets/Prefabs/Items/BlueBall.prefab +++ b/Assets/Prefabs/Items/BlueBall.prefab @@ -31,7 +31,8 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 2041763781482512417} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &8812271188036963294 @@ -143,3 +144,105 @@ MonoBehaviour: m_Calls: [] itemData: {fileID: 11400000, guid: a8baa800efa25a344a95b190cf349e2d, type: 2} iconRenderer: {fileID: 4774534086162962138} +--- !u!1001 &6080627891972307374 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 9162571094694503926} + m_Modifications: + - target: {fileID: 1386870209246758790, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: m_LocalPosition.x + value: -0.05 + objectReference: {fileID: 0} + - target: {fileID: 1852608221241404454, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 4799961156935096247, guid: 74289c1614ce2b2439a5d3ff60a90d66, type: 3} + - target: {fileID: 2974211257881602794, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: m_LocalPosition.y + value: -0.05 + 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.05 + objectReference: {fileID: 0} + - target: {fileID: 5094223041467069679, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 4799961156935096247, guid: 74289c1614ce2b2439a5d3ff60a90d66, 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: 4799961156935096247, guid: 74289c1614ce2b2439a5d3ff60a90d66, type: 3} + - target: {fileID: 5928692606425386029, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: m_LocalPosition.x + value: 0.05 + objectReference: {fileID: 0} + - target: {fileID: 6093743105869044773, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 4799961156935096247, guid: 74289c1614ce2b2439a5d3ff60a90d66, type: 3} + - target: {fileID: 6900224008763310802, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: thiccness + value: 0.05 + objectReference: {fileID: 0} + - target: {fileID: 6900224008763310802, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: itemSprite + value: + objectReference: {fileID: 4774534086162962138} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} +--- !u!4 &2041763781482512417 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5203759348480833935, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + m_PrefabInstance: {fileID: 6080627891972307374} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Items/BowlingBall.prefab b/Assets/Prefabs/Items/BowlingBall.prefab index 4d14c502..68330566 100644 --- a/Assets/Prefabs/Items/BowlingBall.prefab +++ b/Assets/Prefabs/Items/BowlingBall.prefab @@ -31,7 +31,8 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 3898551359179391947} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &4272383251773444855 @@ -143,3 +144,105 @@ MonoBehaviour: m_Calls: [] itemData: {fileID: 11400000, guid: 560ba2059ce14dc4da580e2f43b2e65f, type: 2} iconRenderer: {fileID: 4986096986936361008} +--- !u!1001 &9091949889114372676 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1099560239978781683} + m_Modifications: + - target: {fileID: 1386870209246758790, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: m_LocalPosition.x + value: -0.05 + objectReference: {fileID: 0} + - target: {fileID: 1852608221241404454, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: -2082989857396687135, guid: f106ad45f67e9e74895c64edbc1e4614, type: 3} + - target: {fileID: 2974211257881602794, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: m_LocalPosition.y + value: -0.05 + 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.05 + objectReference: {fileID: 0} + - target: {fileID: 5094223041467069679, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: -2082989857396687135, guid: f106ad45f67e9e74895c64edbc1e4614, 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: -2082989857396687135, guid: f106ad45f67e9e74895c64edbc1e4614, type: 3} + - target: {fileID: 5928692606425386029, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: m_LocalPosition.x + value: 0.05 + objectReference: {fileID: 0} + - target: {fileID: 6093743105869044773, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: -2082989857396687135, guid: f106ad45f67e9e74895c64edbc1e4614, type: 3} + - target: {fileID: 6900224008763310802, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: thiccness + value: 0.05 + objectReference: {fileID: 0} + - target: {fileID: 6900224008763310802, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: itemSprite + value: + objectReference: {fileID: 4986096986936361008} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} +--- !u!4 &3898551359179391947 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5203759348480833935, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + m_PrefabInstance: {fileID: 9091949889114372676} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Items/Bunflers.prefab b/Assets/Prefabs/Items/Bunflers.prefab index f5003238..b6841465 100644 --- a/Assets/Prefabs/Items/Bunflers.prefab +++ b/Assets/Prefabs/Items/Bunflers.prefab @@ -108,6 +108,18 @@ PrefabInstance: propertyPath: m_SpriteTilingProperty.adaptiveTilingThreshold value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 5078975868737205361, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: -8708864169719643066, guid: 92bfafb0980617745b46c3f881d9ec1e, type: 3} + - target: {fileID: 6079620253016579259, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: -8708864169719643066, guid: 92bfafb0980617745b46c3f881d9ec1e, type: 3} + - target: {fileID: 6768282815341588424, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: -8708864169719643066, guid: 92bfafb0980617745b46c3f881d9ec1e, type: 3} - target: {fileID: 7447346505753002421, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} propertyPath: m_Name value: Bunfflers diff --git a/Assets/Prefabs/Items/Football.prefab b/Assets/Prefabs/Items/Football.prefab index 71ccf4d2..5cc833ce 100644 --- a/Assets/Prefabs/Items/Football.prefab +++ b/Assets/Prefabs/Items/Football.prefab @@ -108,6 +108,18 @@ PrefabInstance: propertyPath: m_SpriteTilingProperty.adaptiveTilingThreshold value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 5078975868737205361, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: -454384845472657506, guid: bbfabe7e36be4f341a775b4323900b5b, type: 3} + - target: {fileID: 6079620253016579259, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: -454384845472657506, guid: bbfabe7e36be4f341a775b4323900b5b, type: 3} + - target: {fileID: 6768282815341588424, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: -454384845472657506, guid: bbfabe7e36be4f341a775b4323900b5b, type: 3} - target: {fileID: 7447346505753002421, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} propertyPath: m_Name value: FootballBall diff --git a/Assets/Prefabs/Items/FootballBird.prefab b/Assets/Prefabs/Items/FootballBird.prefab index 7f39fb2f..1995eeaa 100644 --- a/Assets/Prefabs/Items/FootballBird.prefab +++ b/Assets/Prefabs/Items/FootballBird.prefab @@ -12,6 +12,10 @@ PrefabInstance: propertyPath: itemData value: objectReference: {fileID: 11400000, guid: ab57c8237aac144439a18d69f56d36c6, type: 2} + - target: {fileID: 817614342233785458, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 804776353370782802, guid: b187e41d8728aba4b90917cc22005463, type: 3} - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} propertyPath: m_LocalScale.x value: 0.8000001 @@ -104,6 +108,18 @@ PrefabInstance: propertyPath: m_SpriteTilingProperty.adaptiveTilingThreshold value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 5078975868737205361, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 804776353370782802, guid: b187e41d8728aba4b90917cc22005463, type: 3} + - target: {fileID: 6079620253016579259, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 804776353370782802, guid: b187e41d8728aba4b90917cc22005463, type: 3} + - target: {fileID: 6768282815341588424, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 804776353370782802, guid: b187e41d8728aba4b90917cc22005463, type: 3} - target: {fileID: 7447346505753002421, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} propertyPath: m_Name value: FootballBird diff --git a/Assets/Prefabs/Items/HammerBird.prefab b/Assets/Prefabs/Items/HammerBird.prefab index 30c4908d..2018fc60 100644 --- a/Assets/Prefabs/Items/HammerBird.prefab +++ b/Assets/Prefabs/Items/HammerBird.prefab @@ -12,6 +12,10 @@ PrefabInstance: propertyPath: itemData value: objectReference: {fileID: 11400000, guid: ab57c8237aac144439a18d69f56d36c6, type: 2} + - target: {fileID: 817614342233785458, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: -5464640192890044756, guid: 1bf1b8625c66fa142a1ac7ce275cd4a6, type: 3} - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} propertyPath: m_LocalScale.x value: 0.8000001 @@ -104,10 +108,26 @@ PrefabInstance: propertyPath: m_SpriteTilingProperty.adaptiveTilingThreshold value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 5078975868737205361, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: -5464640192890044756, guid: 1bf1b8625c66fa142a1ac7ce275cd4a6, type: 3} + - target: {fileID: 6079620253016579259, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: -5464640192890044756, guid: 1bf1b8625c66fa142a1ac7ce275cd4a6, type: 3} + - target: {fileID: 6768282815341588424, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: -5464640192890044756, guid: 1bf1b8625c66fa142a1ac7ce275cd4a6, type: 3} - target: {fileID: 7447346505753002421, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} propertyPath: m_Name value: HammerBird objectReference: {fileID: 0} + - target: {fileID: 7447346505753002421, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7494677664706785084, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} propertyPath: m_Size.x value: 2.24 @@ -158,7 +178,8 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 592045584872845087, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} - m_RemovedGameObjects: [] + m_RemovedGameObjects: + - {fileID: 2959182075792348407, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} m_AddedGameObjects: [] m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 7447346505753002421, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} diff --git a/Assets/Prefabs/Items/Meat Variant.prefab b/Assets/Prefabs/Items/Meat Variant.prefab index 20863df6..80d30f7f 100644 --- a/Assets/Prefabs/Items/Meat Variant.prefab +++ b/Assets/Prefabs/Items/Meat Variant.prefab @@ -84,6 +84,18 @@ PrefabInstance: propertyPath: m_SpriteTilingProperty.adaptiveTilingThreshold value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 5078975868737205361, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 6282751622250221668, guid: 204325ac88be74d4d882a078c64cf5e1, type: 3} + - target: {fileID: 6079620253016579259, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 6282751622250221668, guid: 204325ac88be74d4d882a078c64cf5e1, type: 3} + - target: {fileID: 6768282815341588424, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 6282751622250221668, guid: 204325ac88be74d4d882a078c64cf5e1, type: 3} - target: {fileID: 7447346505753002421, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} propertyPath: m_Name value: Meat diff --git a/Assets/Prefabs/Items/Nails.prefab b/Assets/Prefabs/Items/Nails.prefab index 4b62df30..0a9d9b40 100644 --- a/Assets/Prefabs/Items/Nails.prefab +++ b/Assets/Prefabs/Items/Nails.prefab @@ -1,107 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1001 &5924276066280149414 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 7465517589433942351} - 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: 21300000, guid: 34b9ddb77aae2df4ab489b7bb8f16cff, 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: 21300000, guid: 34b9ddb77aae2df4ab489b7bb8f16cff, 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: 21300000, guid: 34b9ddb77aae2df4ab489b7bb8f16cff, 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: 21300000, guid: 34b9ddb77aae2df4ab489b7bb8f16cff, 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: 1700732733220603278} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} ---- !u!4 &1873557090122557481 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5203759348480833935, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} - m_PrefabInstance: {fileID: 5924276066280149414} - m_PrefabAsset: {fileID: 0} --- !u!1001 &9194176465486785202 PrefabInstance: m_ObjectHideFlags: 0 @@ -110,6 +8,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 131257149004869586, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_LocalPosition.x + value: -0.1 + objectReference: {fileID: 0} - target: {fileID: 592045584872845087, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} propertyPath: itemData value: @@ -118,6 +20,10 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 21300000, guid: 34b9ddb77aae2df4ab489b7bb8f16cff, type: 3} + - target: {fileID: 817614342233785458, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 5971a6dc0428a6e4b9d9718e9e97359e, type: 2} - target: {fileID: 859535282245879918, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} propertyPath: m_SortingOrder value: 1 @@ -226,6 +132,50 @@ PrefabInstance: propertyPath: m_SpriteTilingProperty.adaptiveTilingThreshold value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 4299798363497546430, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_LocalPosition.y + value: -0.1 + objectReference: {fileID: 0} + - target: {fileID: 4659963609381315705, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_LocalPosition.x + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 5078975868737205361, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 34b9ddb77aae2df4ab489b7bb8f16cff, type: 3} + - target: {fileID: 5078975868737205361, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 5971a6dc0428a6e4b9d9718e9e97359e, type: 2} + - target: {fileID: 5561931900461148806, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: thiccness + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 5561931900461148806, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: interactionType + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5883042038792412515, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_LocalPosition.y + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 6079620253016579259, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 34b9ddb77aae2df4ab489b7bb8f16cff, type: 3} + - target: {fileID: 6079620253016579259, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 5971a6dc0428a6e4b9d9718e9e97359e, type: 2} + - target: {fileID: 6768282815341588424, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 34b9ddb77aae2df4ab489b7bb8f16cff, type: 3} + - target: {fileID: 6768282815341588424, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 5971a6dc0428a6e4b9d9718e9e97359e, type: 2} - target: {fileID: 7447346505753002421, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} propertyPath: m_Name value: Nails @@ -253,20 +203,12 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: - {fileID: 90068231481037707, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} - insertIndex: -1 - addedObject: {fileID: 1873557090122557481} + m_AddedGameObjects: [] m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 7447346505753002421, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} insertIndex: -1 addedObject: {fileID: -378546162603553325} m_SourcePrefab: {fileID: 100100000, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} ---- !u!212 &1700732733220603278 stripped -SpriteRenderer: - m_CorrespondingSourceObject: {fileID: 7494677664706785084, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} - m_PrefabInstance: {fileID: 9194176465486785202} - m_PrefabAsset: {fileID: 0} --- !u!1 &1784002662241348359 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7447346505753002421, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} @@ -287,8 +229,3 @@ MonoBehaviour: stepData: {fileID: 11400000, guid: f9da68caaae2a244885a13cf2e2e45c0, type: 2} puzzleIndicator: {fileID: 0} drawPromptRangeGizmo: 1 ---- !u!4 &7465517589433942351 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} - m_PrefabInstance: {fileID: 9194176465486785202} - m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Items/Yellowball.prefab b/Assets/Prefabs/Items/Yellowball.prefab index ab34fe3a..2bc72c51 100644 --- a/Assets/Prefabs/Items/Yellowball.prefab +++ b/Assets/Prefabs/Items/Yellowball.prefab @@ -31,7 +31,8 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 8188320274666090916} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &8318004605383042340 @@ -143,3 +144,105 @@ MonoBehaviour: m_Calls: [] itemData: {fileID: 11400000, guid: 3b1f3472171abc943bb099ce31d6fc7c, type: 2} iconRenderer: {fileID: 4266110216568578813} +--- !u!1001 &4149423195797620779 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 25208727450420889} + m_Modifications: + - target: {fileID: 1386870209246758790, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: m_LocalPosition.x + value: -0.05 + objectReference: {fileID: 0} + - target: {fileID: 1852608221241404454, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: -4183208330383030991, guid: 26abd62d79d435f438c281aa83ee274a, type: 3} + - target: {fileID: 2974211257881602794, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: m_LocalPosition.y + value: -0.05 + 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.05 + objectReference: {fileID: 0} + - target: {fileID: 5094223041467069679, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: -4183208330383030991, guid: 26abd62d79d435f438c281aa83ee274a, 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: -4183208330383030991, guid: 26abd62d79d435f438c281aa83ee274a, type: 3} + - target: {fileID: 5928692606425386029, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: m_LocalPosition.x + value: 0.05 + objectReference: {fileID: 0} + - target: {fileID: 6093743105869044773, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: -4183208330383030991, guid: 26abd62d79d435f438c281aa83ee274a, type: 3} + - target: {fileID: 6900224008763310802, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: thiccness + value: 0.05 + objectReference: {fileID: 0} + - target: {fileID: 6900224008763310802, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: itemSprite + value: + objectReference: {fileID: 4266110216568578813} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} +--- !u!4 &8188320274666090916 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5203759348480833935, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + m_PrefabInstance: {fileID: 4149423195797620779} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Levels/DivingForPictures Variant.prefab b/Assets/Prefabs/Levels/DivingForPictures Variant.prefab index da035977..044cfcd6 100644 --- a/Assets/Prefabs/Levels/DivingForPictures Variant.prefab +++ b/Assets/Prefabs/Levels/DivingForPictures Variant.prefab @@ -128,6 +128,10 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 2730440365418504821, guid: 55ac8382720be7e4c856d9fc8864902c, type: 3} + - target: {fileID: 5374700348512867011, guid: 7f0745739e84b73439c2fac1d3c3884c, type: 3} + propertyPath: m_SortingOrder + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5374700348512867011, guid: 7f0745739e84b73439c2fac1d3c3884c, type: 3} propertyPath: m_WasSpriteAssigned value: 1 @@ -138,6 +142,121 @@ PrefabInstance: objectReference: {fileID: 11400000, guid: 5861b0a3b22b57f43a00cab7c7faafaa, type: 2} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 4428217320659622763, guid: 7f0745739e84b73439c2fac1d3c3884c, type: 3} + insertIndex: -1 + addedObject: {fileID: 3759928168912412826} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7f0745739e84b73439c2fac1d3c3884c, type: 3} +--- !u!212 &4080194752436190636 stripped +SpriteRenderer: + m_CorrespondingSourceObject: {fileID: 5374700348512867011, guid: 7f0745739e84b73439c2fac1d3c3884c, type: 3} + m_PrefabInstance: {fileID: 8217106691260952431} + m_PrefabAsset: {fileID: 0} +--- !u!4 &5727794563305583620 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4428217320659622763, guid: 7f0745739e84b73439c2fac1d3c3884c, type: 3} + m_PrefabInstance: {fileID: 8217106691260952431} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &8942606456399796501 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5727794563305583620} + m_Modifications: + - target: {fileID: 1386870209246758790, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: m_LocalPosition.x + value: -0.4 + objectReference: {fileID: 0} + - target: {fileID: 1852608221241404454, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 2730440365418504821, guid: 55ac8382720be7e4c856d9fc8864902c, type: 3} + - target: {fileID: 2974211257881602794, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: m_LocalPosition.y + value: -0.4 + 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.4 + objectReference: {fileID: 0} + - target: {fileID: 5094223041467069679, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 2730440365418504821, guid: 55ac8382720be7e4c856d9fc8864902c, 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: 2730440365418504821, guid: 55ac8382720be7e4c856d9fc8864902c, type: 3} + - target: {fileID: 5928692606425386029, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: m_LocalPosition.x + value: 0.4 + objectReference: {fileID: 0} + - target: {fileID: 6093743105869044773, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 2730440365418504821, guid: 55ac8382720be7e4c856d9fc8864902c, type: 3} + - target: {fileID: 6900224008763310802, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: thiccness + value: 0.4 + objectReference: {fileID: 0} + - target: {fileID: 6900224008763310802, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: itemSprite + value: + objectReference: {fileID: 4080194752436190636} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} +--- !u!4 &3759928168912412826 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5203759348480833935, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + m_PrefabInstance: {fileID: 8942606456399796501} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Puzzles/AnneLise/AnneLiseBush_FootballBird.prefab b/Assets/Prefabs/Puzzles/AnneLise/AnneLiseBush_FootballBird.prefab index 1081fc7c..fe83b542 100644 --- a/Assets/Prefabs/Puzzles/AnneLise/AnneLiseBush_FootballBird.prefab +++ b/Assets/Prefabs/Puzzles/AnneLise/AnneLiseBush_FootballBird.prefab @@ -130,220 +130,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 976257903575166007, guid: 9b2926886934b554f9a1727331d34787, type: 3} - insertIndex: -1 - addedObject: {fileID: 2985655152639197426} - - targetCorrespondingSourceObject: {fileID: 763096397695369605, guid: 9b2926886934b554f9a1727331d34787, type: 3} - insertIndex: -1 - addedObject: {fileID: 6240075148289262266} + m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9b2926886934b554f9a1727331d34787, type: 3} ---- !u!4 &1432079040915405782 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 763096397695369605, guid: 9b2926886934b554f9a1727331d34787, type: 3} - m_PrefabInstance: {fileID: 1821939616807664211} - m_PrefabAsset: {fileID: 0} ---- !u!4 &1496471650656048740 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 976257903575166007, guid: 9b2926886934b554f9a1727331d34787, type: 3} - m_PrefabInstance: {fileID: 1821939616807664211} - m_PrefabAsset: {fileID: 0} ---- !u!212 &2385462042193338287 stripped -SpriteRenderer: - m_CorrespondingSourceObject: {fileID: 4058316638570980860, guid: 9b2926886934b554f9a1727331d34787, type: 3} - m_PrefabInstance: {fileID: 1821939616807664211} - m_PrefabAsset: {fileID: 0} ---- !u!212 &7345147195923165007 stripped -SpriteRenderer: - m_CorrespondingSourceObject: {fileID: 8982394379624568092, guid: 9b2926886934b554f9a1727331d34787, type: 3} - m_PrefabInstance: {fileID: 1821939616807664211} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &2210780091784837941 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1432079040915405782} - m_Modifications: - - target: {fileID: 1852608221241404454, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 3133575184495163976, guid: 291c0087f801de443b3945ba37720a46, 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_Sprite - value: - objectReference: {fileID: 3133575184495163976, guid: 291c0087f801de443b3945ba37720a46, 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: 3133575184495163976, guid: 291c0087f801de443b3945ba37720a46, type: 3} - - target: {fileID: 6093743105869044773, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 3133575184495163976, guid: 291c0087f801de443b3945ba37720a46, type: 3} - - target: {fileID: 6900224008763310802, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} - propertyPath: itemSprite - value: - objectReference: {fileID: 7345147195923165007} - - target: {fileID: 6900224008763310802, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} - propertyPath: interactionType - value: 2 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} ---- !u!4 &6240075148289262266 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5203759348480833935, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} - m_PrefabInstance: {fileID: 2210780091784837941} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &7014455394668820861 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1496471650656048740} - m_Modifications: - - target: {fileID: 1852608221241404454, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 1389104422143044133, guid: 88a896c19d8ef454e999af7d3b492dd9, type: 3} - - target: {fileID: 1852608221241404454, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} - propertyPath: m_SortingOrder - value: -1 - 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: 1389104422143044133, guid: 88a896c19d8ef454e999af7d3b492dd9, type: 3} - - target: {fileID: 5094223041467069679, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} - propertyPath: m_SortingOrder - value: -1 - 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: 1389104422143044133, guid: 88a896c19d8ef454e999af7d3b492dd9, type: 3} - - target: {fileID: 5692747743727126428, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} - propertyPath: m_SortingOrder - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 6093743105869044773, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 1389104422143044133, guid: 88a896c19d8ef454e999af7d3b492dd9, type: 3} - - target: {fileID: 6093743105869044773, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} - propertyPath: m_SortingOrder - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 6900224008763310802, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} - propertyPath: itemSprite - value: - objectReference: {fileID: 2385462042193338287} - - target: {fileID: 6900224008763310802, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} - propertyPath: interactionType - value: 2 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} ---- !u!4 &2985655152639197426 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5203759348480833935, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} - m_PrefabInstance: {fileID: 7014455394668820861} - m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Puzzles/AnneLise/AnneLiseBush_SoundBird.prefab b/Assets/Prefabs/Puzzles/AnneLise/AnneLiseBush_SoundBird.prefab index 257d3286..a3d9ab37 100644 --- a/Assets/Prefabs/Puzzles/AnneLise/AnneLiseBush_SoundBird.prefab +++ b/Assets/Prefabs/Puzzles/AnneLise/AnneLiseBush_SoundBird.prefab @@ -12,10 +12,82 @@ PrefabInstance: propertyPath: reactionClipToPlay value: objectReference: {fileID: 8300000, guid: 0ca909ee49d83134d9040e527ba94af4, type: 3} + - target: {fileID: 2596730244514108870, guid: 9b2926886934b554f9a1727331d34787, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 5971a6dc0428a6e4b9d9718e9e97359e, type: 2} + - target: {fileID: 3295389536041100981, guid: 9b2926886934b554f9a1727331d34787, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 5971a6dc0428a6e4b9d9718e9e97359e, type: 2} + - target: {fileID: 3375080074965791743, guid: 9b2926886934b554f9a1727331d34787, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3375080074965791743, guid: 9b2926886934b554f9a1727331d34787, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3375080074965791743, guid: 9b2926886934b554f9a1727331d34787, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3375080074965791743, guid: 9b2926886934b554f9a1727331d34787, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3375080074965791743, guid: 9b2926886934b554f9a1727331d34787, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4516919945138563655, guid: 9b2926886934b554f9a1727331d34787, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 5971a6dc0428a6e4b9d9718e9e97359e, type: 2} + - target: {fileID: 4582571633235627647, guid: 9b2926886934b554f9a1727331d34787, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 5971a6dc0428a6e4b9d9718e9e97359e, type: 2} + - target: {fileID: 5242661563418348379, guid: 9b2926886934b554f9a1727331d34787, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5865112760908786186, guid: 9b2926886934b554f9a1727331d34787, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5865112760908786186, guid: 9b2926886934b554f9a1727331d34787, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5865112760908786186, guid: 9b2926886934b554f9a1727331d34787, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5865112760908786186, guid: 9b2926886934b554f9a1727331d34787, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5865112760908786186, guid: 9b2926886934b554f9a1727331d34787, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5865112760908786186, guid: 9b2926886934b554f9a1727331d34787, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5943355783477523754, guid: 9b2926886934b554f9a1727331d34787, type: 3} propertyPath: m_Name value: AnneLiseBush_SoundBird objectReference: {fileID: 0} + - target: {fileID: 7037097906768360078, guid: 9b2926886934b554f9a1727331d34787, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 5971a6dc0428a6e4b9d9718e9e97359e, type: 2} + - target: {fileID: 7501352624848929277, guid: 9b2926886934b554f9a1727331d34787, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 5971a6dc0428a6e4b9d9718e9e97359e, type: 2} - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3} propertyPath: m_LocalPosition.x value: -71.04 @@ -56,6 +128,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8267494921494740604, guid: 9b2926886934b554f9a1727331d34787, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 5971a6dc0428a6e4b9d9718e9e97359e, type: 2} + - target: {fileID: 8325968853269797444, guid: 9b2926886934b554f9a1727331d34787, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 5971a6dc0428a6e4b9d9718e9e97359e, type: 2} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/Scenes/Levels/Quarry.unity b/Assets/Scenes/Levels/Quarry.unity index 1b4d1d0d..44766935 100644 --- a/Assets/Scenes/Levels/Quarry.unity +++ b/Assets/Scenes/Levels/Quarry.unity @@ -934,55 +934,6 @@ Material: - _Colour: {r: 0.9341286, g: 1, b: 0, a: 1} m_BuildTextureStacks: [] m_AllowLocking: 1 ---- !u!21 &44839958 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Mesh2D-Lit-Default (Instance) - m_Shader: {fileID: 4800000, guid: 4e90a8289da1f3943885176e4f83e35c, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _AlphaTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MaskTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _NormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _EnableExternalAlpha: 0 - m_Colors: - - _Color: {r: 1, g: 0.87843144, b: 0.57254905, a: 1} - - _Flip: {r: 1, g: 1, b: 1, a: 1} - - _RendererColor: {r: 1, g: 1, b: 1, a: 1} - - _White: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!1 &50177308 GameObject: m_ObjectHideFlags: 0 @@ -1365,120 +1316,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} m_PrefabInstance: {fileID: 94815899} m_PrefabAsset: {fileID: 0} ---- !u!1 &103436379 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 103436380} - - component: {fileID: 103436382} - - component: {fileID: 103436381} - m_Layer: 10 - m_Name: Glow (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &103436380 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 103436379} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.120000005, y: 0.120000005, z: 0.030000001} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 487113963} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!95 &103436381 -Animator: - serializedVersion: 7 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 103436379} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 625c4cf5003c069478057729a67f9f65, 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!212 &103436382 -SpriteRenderer: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 103436379} - 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: a97c105638bdf8b4a8650670310a4cd3, 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: 1 - m_MaskInteraction: 0 - m_Sprite: {fileID: -8836962644236845764, guid: c5cc7367a37a7944abb3876352b0e0ff, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 9.61, y: 8.51} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_SpriteSortPoint: 0 --- !u!1001 &104952029 PrefabInstance: m_ObjectHideFlags: 0 @@ -2606,99 +2443,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 135189317} m_Mesh: {fileID: 4300000, guid: eae229cde7c374059a09c8052360682c, type: 3} ---- !u!1001 &152724146 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 898680540} - m_Modifications: - - target: {fileID: 4774534086162962138, guid: 4694d95ffaa4a4343ae04db32b13cbcc, type: 3} - propertyPath: m_SortingOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 5070378814342643473, guid: 4694d95ffaa4a4343ae04db32b13cbcc, type: 3} - propertyPath: m_Name - value: BlueBall - objectReference: {fileID: 0} - - target: {fileID: 5070378814342643473, guid: 4694d95ffaa4a4343ae04db32b13cbcc, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9162571094694503926, guid: 4694d95ffaa4a4343ae04db32b13cbcc, type: 3} - propertyPath: m_LocalScale.x - value: 2.7 - objectReference: {fileID: 0} - - target: {fileID: 9162571094694503926, guid: 4694d95ffaa4a4343ae04db32b13cbcc, type: 3} - propertyPath: m_LocalScale.y - value: 2.7 - objectReference: {fileID: 0} - - target: {fileID: 9162571094694503926, guid: 4694d95ffaa4a4343ae04db32b13cbcc, type: 3} - propertyPath: m_LocalScale.z - value: 2.7 - objectReference: {fileID: 0} - - target: {fileID: 9162571094694503926, guid: 4694d95ffaa4a4343ae04db32b13cbcc, type: 3} - propertyPath: m_LocalPosition.x - value: 2.059 - objectReference: {fileID: 0} - - target: {fileID: 9162571094694503926, guid: 4694d95ffaa4a4343ae04db32b13cbcc, type: 3} - propertyPath: m_LocalPosition.y - value: -5.1500015 - objectReference: {fileID: 0} - - target: {fileID: 9162571094694503926, guid: 4694d95ffaa4a4343ae04db32b13cbcc, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9162571094694503926, guid: 4694d95ffaa4a4343ae04db32b13cbcc, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 9162571094694503926, guid: 4694d95ffaa4a4343ae04db32b13cbcc, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 9162571094694503926, guid: 4694d95ffaa4a4343ae04db32b13cbcc, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 9162571094694503926, guid: 4694d95ffaa4a4343ae04db32b13cbcc, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 9162571094694503926, guid: 4694d95ffaa4a4343ae04db32b13cbcc, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9162571094694503926, guid: 4694d95ffaa4a4343ae04db32b13cbcc, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9162571094694503926, guid: 4694d95ffaa4a4343ae04db32b13cbcc, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9162571094694503926, guid: 4694d95ffaa4a4343ae04db32b13cbcc, type: 3} - propertyPath: m_ConstrainProportionsScale - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 8812271188036963294, guid: 4694d95ffaa4a4343ae04db32b13cbcc, type: 3} - m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 9162571094694503926, guid: 4694d95ffaa4a4343ae04db32b13cbcc, type: 3} - insertIndex: -1 - addedObject: {fileID: 925413038} - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 5070378814342643473, guid: 4694d95ffaa4a4343ae04db32b13cbcc, type: 3} - insertIndex: -1 - addedObject: {fileID: 1600314237} - m_SourcePrefab: {fileID: 100100000, guid: 4694d95ffaa4a4343ae04db32b13cbcc, type: 3} ---- !u!4 &152724147 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 9162571094694503926, guid: 4694d95ffaa4a4343ae04db32b13cbcc, type: 3} - m_PrefabInstance: {fileID: 152724146} - m_PrefabAsset: {fileID: 0} --- !u!114 &159432895 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 1246697221241124994, guid: fc42c3bdda1c86d49b0bf80c28e5d372, type: 3} @@ -2710,6 +2454,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 603ecc4a6ab6bb84c8cb9773fa310b69, type: 3} m_Name: m_EditorClassIdentifier: '::' +--- !u!1 &159495802 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5313116086501439112, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3} + m_PrefabInstance: {fileID: 7530821580781571560} + m_PrefabAsset: {fileID: 0} --- !u!1 &161119590 GameObject: m_ObjectHideFlags: 0 @@ -3048,55 +2797,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 168745959} m_Mesh: {fileID: 4300000, guid: eae229cde7c374059a09c8052360682c, type: 3} ---- !u!21 &174607463 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Mesh2D-Lit-Default (Instance) - m_Shader: {fileID: 4800000, guid: 4e90a8289da1f3943885176e4f83e35c, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _AlphaTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MaskTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _NormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _EnableExternalAlpha: 0 - m_Colors: - - _Color: {r: 0.62352943, g: 0.62352943, b: 0.8078432, a: 1} - - _Flip: {r: 1, g: 1, b: 1, a: 1} - - _RendererColor: {r: 1, g: 1, b: 1, a: 1} - - _White: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!1001 &179621988 PrefabInstance: m_ObjectHideFlags: 0 @@ -3820,6 +3520,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} m_PrefabInstance: {fileID: 209289485} m_PrefabAsset: {fileID: 0} +--- !u!1 &217127977 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5785110781239031870, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} + m_PrefabInstance: {fileID: 3978117984697153445} + m_PrefabAsset: {fileID: 0} --- !u!1 &217207251 GameObject: m_ObjectHideFlags: 0 @@ -3954,55 +3659,6 @@ Transform: m_Children: [] m_Father: {fileID: 1657455509} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!21 &217917171 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Mesh2D-Lit-Default (Instance) - m_Shader: {fileID: 4800000, guid: 4e90a8289da1f3943885176e4f83e35c, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _AlphaTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MaskTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _NormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _EnableExternalAlpha: 0 - m_Colors: - - _Color: {r: 0.62352943, g: 0.62352943, b: 0.8078432, a: 1} - - _Flip: {r: 1, g: 1, b: 1, a: 1} - - _RendererColor: {r: 1, g: 1, b: 1, a: 1} - - _White: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!1 &219531022 GameObject: m_ObjectHideFlags: 0 @@ -430178,55 +429834,6 @@ PolygonCollider2D: - {x: 91.60302, y: -63.161953} - {x: 87.38972, y: 66.09816} m_UseDelaunayMesh: 0 ---- !u!21 &224006988 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Mesh2D-Lit-Default (Instance) - m_Shader: {fileID: 4800000, guid: 4e90a8289da1f3943885176e4f83e35c, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _AlphaTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MaskTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _NormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _EnableExternalAlpha: 0 - m_Colors: - - _Color: {r: 0.62352943, g: 0.62352943, b: 0.8078432, a: 1} - - _Flip: {r: 1, g: 1, b: 1, a: 1} - - _RendererColor: {r: 1, g: 1, b: 1, a: 1} - - _White: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!1 &226914277 GameObject: m_ObjectHideFlags: 0 @@ -430667,7 +430274,7 @@ Material: - _Thickness: 0.01 m_Colors: - White: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 0.62352943, g: 0.62352943, b: 0.8078432, 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 @@ -430715,7 +430322,7 @@ Material: - _Thickness: 0.01 m_Colors: - White: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 0.62352943, g: 0.62352943, b: 0.8078432, 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 @@ -433296,6 +432903,11 @@ MonoBehaviour: audioSource: {fileID: 0} clipPriority: 0 sourcePriority: 0 +--- !u!1 &304297328 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7817325254149721954, guid: 3fa494ec083cbe54a86c3a1b107a90c0, type: 3} + m_PrefabInstance: {fileID: 6535840132433368489} + m_PrefabAsset: {fileID: 0} --- !u!1001 &304536401 PrefabInstance: m_ObjectHideFlags: 0 @@ -434218,10 +433830,15 @@ Material: - _Thickness: 0.01 m_Colors: - White: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 0.62352943, g: 0.62352943, b: 0.8078432, 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 +--- !u!1 &349596344 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1020684836869011534, guid: 21444cac99fc9944a85884eccbc8b78d, type: 3} + m_PrefabInstance: {fileID: 8058740013708592448} + m_PrefabAsset: {fileID: 0} --- !u!1001 &357509430 PrefabInstance: m_ObjectHideFlags: 0 @@ -434725,6 +434342,11 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] customSaveId: +--- !u!1 &369509385 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2337350576865450841, guid: 3fa494ec083cbe54a86c3a1b107a90c0, type: 3} + m_PrefabInstance: {fileID: 6535840132433368489} + m_PrefabAsset: {fileID: 0} --- !u!1 &369578433 GameObject: m_ObjectHideFlags: 0 @@ -435075,55 +434697,6 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_SpriteSortPoint: 0 ---- !u!21 &385600703 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Mesh2D-Lit-Default (Instance) - m_Shader: {fileID: 4800000, guid: 4e90a8289da1f3943885176e4f83e35c, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _AlphaTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MaskTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _NormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _EnableExternalAlpha: 0 - m_Colors: - - _Color: {r: 0.62352943, g: 0.62352943, b: 0.8078432, a: 1} - - _Flip: {r: 1, g: 1, b: 1, a: 1} - - _RendererColor: {r: 1, g: 1, b: 1, a: 1} - - _White: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!1001 &404856605 PrefabInstance: m_ObjectHideFlags: 0 @@ -435266,7 +434839,7 @@ Material: - _Thickness: 0.01 m_Colors: - White: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 0.62352943, g: 0.62352943, b: 0.8078432, 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 @@ -435393,54 +434966,6 @@ MonoBehaviour: BarrelClipping: 0.25 Anamorphism: 0 BlendHint: 0 ---- !u!21 &416906544 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: SimpleOutlineMaterial (Instance) (Instance) (Instance) - m_Shader: {fileID: -6465566751694194690, guid: ec68bffbfd711284ba7968cf1b8ae340, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 2800000, guid: ae6ce5ebb60e1504ea6c9983c822e0cf, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_Lightmaps: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_LightmapsInd: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_ShadowMasks: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _Thickness: 0.01 - m_Colors: - - White: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 0.62352943, g: 0.62352943, b: 0.8078432, a: 1} - - _Colour: {r: 0.9341286, g: 1, b: 0, a: 1} - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!1001 &421801946 PrefabInstance: m_ObjectHideFlags: 0 @@ -435752,55 +435277,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 5203759348480833935, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} m_PrefabInstance: {fileID: 8267218454102507448} m_PrefabAsset: {fileID: 0} ---- !u!21 &436989864 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Mesh2D-Lit-Default (Instance) - m_Shader: {fileID: 4800000, guid: 4e90a8289da1f3943885176e4f83e35c, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _AlphaTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MaskTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _NormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _EnableExternalAlpha: 0 - m_Colors: - - _Color: {r: 0.62352943, g: 0.62352943, b: 0.8078432, a: 1} - - _Flip: {r: 1, g: 1, b: 1, a: 1} - - _RendererColor: {r: 1, g: 1, b: 1, a: 1} - - _White: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!1 &437446538 GameObject: m_ObjectHideFlags: 0 @@ -436551,42 +436027,10 @@ Material: - _Thickness: 0.01 m_Colors: - White: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 0.62352943, g: 0.62352943, b: 0.8078432, 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 ---- !u!1 &456329680 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 456329681} - m_Layer: 10 - m_Name: GlowEffect - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &456329681 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 456329680} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.15, y: 0.15, z: 0.15} - m_ConstrainProportionsScale: 1 - m_Children: - - {fileID: 1934418039} - m_Father: {fileID: 1838334756} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &457896102 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3606875748053192296, guid: 30285f2632211504484661965ed61c57, type: 3} @@ -436597,107 +436041,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 5572894649736340512, guid: 30285f2632211504484661965ed61c57, type: 3} m_PrefabInstance: {fileID: 1295249126} m_PrefabAsset: {fileID: 0} ---- !u!1001 &459290200 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 898680540} - m_Modifications: - - target: {fileID: 1099560239978781683, guid: d677a46297a07994fa1b551de27f821c, type: 3} - propertyPath: m_LocalScale.x - value: 2.7 - objectReference: {fileID: 0} - - target: {fileID: 1099560239978781683, guid: d677a46297a07994fa1b551de27f821c, type: 3} - propertyPath: m_LocalScale.y - value: 2.7 - objectReference: {fileID: 0} - - target: {fileID: 1099560239978781683, guid: d677a46297a07994fa1b551de27f821c, type: 3} - propertyPath: m_LocalScale.z - value: 2.7 - objectReference: {fileID: 0} - - target: {fileID: 1099560239978781683, guid: d677a46297a07994fa1b551de27f821c, type: 3} - propertyPath: m_LocalPosition.x - value: -25.800999 - objectReference: {fileID: 0} - - target: {fileID: 1099560239978781683, guid: d677a46297a07994fa1b551de27f821c, type: 3} - propertyPath: m_LocalPosition.y - value: 2.8419952 - objectReference: {fileID: 0} - - target: {fileID: 1099560239978781683, guid: d677a46297a07994fa1b551de27f821c, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1099560239978781683, guid: d677a46297a07994fa1b551de27f821c, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1099560239978781683, guid: d677a46297a07994fa1b551de27f821c, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1099560239978781683, guid: d677a46297a07994fa1b551de27f821c, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1099560239978781683, guid: d677a46297a07994fa1b551de27f821c, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1099560239978781683, guid: d677a46297a07994fa1b551de27f821c, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1099560239978781683, guid: d677a46297a07994fa1b551de27f821c, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1099560239978781683, guid: d677a46297a07994fa1b551de27f821c, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1099560239978781683, guid: d677a46297a07994fa1b551de27f821c, type: 3} - propertyPath: m_ConstrainProportionsScale - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2331806108796329904, guid: d677a46297a07994fa1b551de27f821c, type: 3} - propertyPath: m_Name - value: BoelingBall - objectReference: {fileID: 0} - - target: {fileID: 2331806108796329904, guid: d677a46297a07994fa1b551de27f821c, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4272383251773444855, guid: d677a46297a07994fa1b551de27f821c, type: 3} - propertyPath: m_Size.x - value: 1.33 - objectReference: {fileID: 0} - - target: {fileID: 4272383251773444855, guid: d677a46297a07994fa1b551de27f821c, type: 3} - propertyPath: m_Size.y - value: 1.36 - objectReference: {fileID: 0} - - target: {fileID: 4986096986936361008, guid: d677a46297a07994fa1b551de27f821c, type: 3} - propertyPath: m_SortingOrder - value: 2 - objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 4272383251773444855, guid: d677a46297a07994fa1b551de27f821c, type: 3} - m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 1099560239978781683, guid: d677a46297a07994fa1b551de27f821c, type: 3} - insertIndex: -1 - addedObject: {fileID: 941637536} - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 2331806108796329904, guid: d677a46297a07994fa1b551de27f821c, type: 3} - insertIndex: -1 - addedObject: {fileID: 1576907804} - m_SourcePrefab: {fileID: 100100000, guid: d677a46297a07994fa1b551de27f821c, type: 3} ---- !u!4 &459290201 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1099560239978781683, guid: d677a46297a07994fa1b551de27f821c, type: 3} - m_PrefabInstance: {fileID: 459290200} - m_PrefabAsset: {fileID: 0} --- !u!1001 &459948550 PrefabInstance: m_ObjectHideFlags: 0 @@ -436796,120 +436139,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} m_PrefabInstance: {fileID: 459948550} m_PrefabAsset: {fileID: 0} ---- !u!1 &460684199 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 460684200} - - component: {fileID: 460684202} - - component: {fileID: 460684201} - m_Layer: 10 - m_Name: Glow (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &460684200 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 460684199} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.120000005, y: 0.120000005, z: 0.030000001} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 941637536} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!95 &460684201 -Animator: - serializedVersion: 7 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 460684199} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 625c4cf5003c069478057729a67f9f65, 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!212 &460684202 -SpriteRenderer: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 460684199} - 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: a97c105638bdf8b4a8650670310a4cd3, 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: 1 - m_MaskInteraction: 0 - m_Sprite: {fileID: -8836962644236845764, guid: c5cc7367a37a7944abb3876352b0e0ff, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 9.61, y: 8.51} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_SpriteSortPoint: 0 --- !u!1001 &463828468 PrefabInstance: m_ObjectHideFlags: 0 @@ -437091,55 +436320,6 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_SpriteSortPoint: 0 ---- !u!21 &473127165 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Mesh2D-Lit-Default (Instance) - m_Shader: {fileID: 4800000, guid: 4e90a8289da1f3943885176e4f83e35c, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _AlphaTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MaskTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _NormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _EnableExternalAlpha: 0 - m_Colors: - - _Color: {r: 1, g: 0.87843144, b: 0.57254905, a: 1} - - _Flip: {r: 1, g: 1, b: 1, a: 1} - - _RendererColor: {r: 1, g: 1, b: 1, a: 1} - - _White: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!1001 &474389476 PrefabInstance: m_ObjectHideFlags: 0 @@ -437481,38 +436661,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} m_PrefabInstance: {fileID: 486936930} m_PrefabAsset: {fileID: 0} ---- !u!1 &487113962 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 487113963} - m_Layer: 10 - m_Name: GlowEffect - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &487113963 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 487113962} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} - m_ConstrainProportionsScale: 1 - m_Children: - - {fileID: 103436380} - m_Father: {fileID: 2030009511} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &487455851 GameObject: m_ObjectHideFlags: 0 @@ -438229,6 +437377,11 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_SpriteSortPoint: 0 +--- !u!1 &502962904 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5313474864027292842, guid: fc42c3bdda1c86d49b0bf80c28e5d372, type: 3} + m_PrefabInstance: {fileID: 2558461749605481847} + m_PrefabAsset: {fileID: 0} --- !u!1001 &506020921 PrefabInstance: m_ObjectHideFlags: 0 @@ -438405,55 +437558,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} m_PrefabInstance: {fileID: 506226582} m_PrefabAsset: {fileID: 0} ---- !u!21 &506352424 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Mesh2D-Lit-Default (Instance) - m_Shader: {fileID: 4800000, guid: 4e90a8289da1f3943885176e4f83e35c, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _AlphaTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MaskTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _NormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _EnableExternalAlpha: 0 - m_Colors: - - _Color: {r: 1, g: 0.87843144, b: 0.57254905, a: 1} - - _Flip: {r: 1, g: 1, b: 1, a: 1} - - _RendererColor: {r: 1, g: 1, b: 1, a: 1} - - _White: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!1001 &514383803 PrefabInstance: m_ObjectHideFlags: 0 @@ -438619,7 +437723,7 @@ Material: - _Thickness: 0.01 m_Colors: - White: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 0.62352943, g: 0.62352943, b: 0.8078432, 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 @@ -438851,7 +437955,7 @@ Material: - _Thickness: 0.01 m_Colors: - White: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 0.62352943, g: 0.62352943, b: 0.8078432, 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 @@ -439400,7 +438504,7 @@ Material: - _Thickness: 0.01 m_Colors: - White: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 0.62352943, g: 0.62352943, b: 0.8078432, 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 @@ -439512,7 +438616,7 @@ Material: - _Thickness: 0.01 m_Colors: - White: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 0.62352943, g: 0.62352943, b: 0.8078432, 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 @@ -441032,6 +440136,11 @@ Transform: m_Children: [] m_Father: {fileID: 1794862441} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &652941302 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 431037421781347020, guid: 3346526f3046f424196615241a307104, type: 3} + m_PrefabInstance: {fileID: 3708074769586677211} + m_PrefabAsset: {fileID: 0} --- !u!4 &661675798 stripped Transform: m_CorrespondingSourceObject: {fileID: 7775613298932159589, guid: fc42c3bdda1c86d49b0bf80c28e5d372, type: 3} @@ -442758,7 +441867,7 @@ Material: - _Thickness: 0.01 m_Colors: - White: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 0.62352943, g: 0.62352943, b: 0.8078432, 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 @@ -442935,7 +442044,7 @@ Material: - _Thickness: 0.01 m_Colors: - White: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 0.62352943, g: 0.62352943, b: 0.8078432, 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 @@ -443258,55 +442367,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 6078012632802010276, guid: 3346526f3046f424196615241a307104, type: 3} m_PrefabInstance: {fileID: 3708074769586677211} m_PrefabAsset: {fileID: 0} ---- !u!21 &747754968 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Mesh2D-Lit-Default (Instance) - m_Shader: {fileID: 4800000, guid: 4e90a8289da1f3943885176e4f83e35c, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _AlphaTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MaskTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _NormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _EnableExternalAlpha: 0 - m_Colors: - - _Color: {r: 1, g: 0.87843144, b: 0.57254905, a: 1} - - _Flip: {r: 1, g: 1, b: 1, a: 1} - - _RendererColor: {r: 1, g: 1, b: 1, a: 1} - - _White: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!114 &749554733 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2290887787543438258, guid: 1fda7fccaa5fbd04695f4c98d29bcbe0, type: 3} @@ -443976,54 +443036,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!21 &774079517 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: SimpleOutlineMaterial (Instance) (Instance) (Instance) - m_Shader: {fileID: -6465566751694194690, guid: ec68bffbfd711284ba7968cf1b8ae340, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 2800000, guid: ae6ce5ebb60e1504ea6c9983c822e0cf, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_Lightmaps: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_LightmapsInd: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_ShadowMasks: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _Thickness: 0.01 - m_Colors: - - White: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 0.62352943, g: 0.62352943, b: 0.8078432, a: 1} - - _Colour: {r: 0.9341286, g: 1, b: 0, a: 1} - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!21 &775790995 Material: serializedVersion: 8 @@ -444479,7 +443491,7 @@ Material: - _Thickness: 0.01 m_Colors: - White: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 0.62352943, g: 0.62352943, b: 0.8078432, 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 @@ -445559,55 +444571,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} ---- !u!21 &849732802 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Mesh2D-Lit-Default (Instance) - m_Shader: {fileID: 4800000, guid: 4e90a8289da1f3943885176e4f83e35c, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _AlphaTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MaskTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _NormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _EnableExternalAlpha: 0 - m_Colors: - - _Color: {r: 1, g: 0.87843144, b: 0.57254905, a: 1} - - _Flip: {r: 1, g: 1, b: 1, a: 1} - - _RendererColor: {r: 1, g: 1, b: 1, a: 1} - - _White: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!1 &859765886 GameObject: m_ObjectHideFlags: 0 @@ -446451,10 +445414,6 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1838334756} - - {fileID: 152724147} - - {fileID: 459290201} - - {fileID: 2030009511} - {fileID: 457896108} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -446938,7 +445897,7 @@ Material: - _Thickness: 0.01 m_Colors: - White: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 0.62352943, g: 0.62352943, b: 0.8078432, 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 @@ -447077,7 +446036,7 @@ Material: - _Thickness: 0.01 m_Colors: - White: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 0.62352943, g: 0.62352943, b: 0.8078432, 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 @@ -447175,38 +446134,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} m_PrefabInstance: {fileID: 923779306} m_PrefabAsset: {fileID: 0} ---- !u!1 &925413037 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 925413038} - m_Layer: 10 - m_Name: GlowEffect - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &925413038 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 925413037} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.12, y: 0.12, z: 0.12} - m_ConstrainProportionsScale: 1 - m_Children: - - {fileID: 1826363465} - m_Father: {fileID: 152724147} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &937132183 PrefabInstance: m_ObjectHideFlags: 0 @@ -447378,38 +446305,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} m_PrefabInstance: {fileID: 937429911} m_PrefabAsset: {fileID: 0} ---- !u!1 &941637535 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 941637536} - m_Layer: 10 - m_Name: GlowEffect - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &941637536 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 941637535} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.15, y: 0.15, z: 0.15} - m_ConstrainProportionsScale: 1 - m_Children: - - {fileID: 460684200} - m_Father: {fileID: 459290201} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &942648382 stripped Transform: m_CorrespondingSourceObject: {fileID: 2064225848720495177, guid: 0bbded61e58193848ac59c8eea761bcc, type: 3} @@ -448086,55 +446981,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 588897581313790951, guid: 9ad58c5e86338824db8a6daebdb432b5, type: 3} m_PrefabInstance: {fileID: 1399567329} m_PrefabAsset: {fileID: 0} ---- !u!21 &985399379 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Mesh2D-Lit-Default (Instance) - m_Shader: {fileID: 4800000, guid: 4e90a8289da1f3943885176e4f83e35c, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _AlphaTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MaskTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _NormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _EnableExternalAlpha: 0 - m_Colors: - - _Color: {r: 1, g: 0.87843144, b: 0.57254905, a: 1} - - _Flip: {r: 1, g: 1, b: 1, a: 1} - - _RendererColor: {r: 1, g: 1, b: 1, a: 1} - - _White: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!1 &987881564 GameObject: m_ObjectHideFlags: 0 @@ -449677,55 +448523,6 @@ BoxCollider2D: m_AutoTiling: 0 m_Size: {x: 4.43, y: 4.39} m_EdgeRadius: 0 ---- !u!21 &1047268407 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Mesh2D-Lit-Default (Instance) - m_Shader: {fileID: 4800000, guid: 4e90a8289da1f3943885176e4f83e35c, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _AlphaTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MaskTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _NormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _EnableExternalAlpha: 0 - m_Colors: - - _Color: {r: 0.62352943, g: 0.62352943, b: 0.8078432, a: 1} - - _Flip: {r: 1, g: 1, b: 1, a: 1} - - _RendererColor: {r: 1, g: 1, b: 1, a: 1} - - _White: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!1 &1052177242 GameObject: m_ObjectHideFlags: 0 @@ -451204,55 +450001,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!21 &1096525925 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Mesh2D-Lit-Default (Instance) - m_Shader: {fileID: 4800000, guid: 4e90a8289da1f3943885176e4f83e35c, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _AlphaTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MaskTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _NormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _EnableExternalAlpha: 0 - m_Colors: - - _Color: {r: 0.62352943, g: 0.62352943, b: 0.8078432, a: 1} - - _Flip: {r: 1, g: 1, b: 1, a: 1} - - _RendererColor: {r: 1, g: 1, b: 1, a: 1} - - _White: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!1001 &1098846674 PrefabInstance: m_ObjectHideFlags: 0 @@ -451545,14 +450293,22 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 21300000, guid: 34b9ddb77aae2df4ab489b7bb8f16cff, type: 3} + - target: {fileID: 211828079586347865, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} + propertyPath: m_SortingOrder + value: 2 + objectReference: {fileID: 0} - target: {fileID: 211828079586347865, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: - objectReference: {fileID: 1659662620} + objectReference: {fileID: 2100000, guid: 5971a6dc0428a6e4b9d9718e9e97359e, type: 2} - target: {fileID: 405704647706278677, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 507628559444544129, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} + propertyPath: m_LocalPosition.y + value: 0.1 + objectReference: {fileID: 0} - target: {fileID: 523362791373875983, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -451561,10 +450317,14 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 21300000, guid: 34b9ddb77aae2df4ab489b7bb8f16cff, type: 3} + - target: {fileID: 811338086401226794, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} + propertyPath: m_SortingOrder + value: 2 + objectReference: {fileID: 0} - target: {fileID: 811338086401226794, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: - objectReference: {fileID: 473127165} + objectReference: {fileID: 2100000, guid: 5971a6dc0428a6e4b9d9718e9e97359e, type: 2} - target: {fileID: 1076844763555895420, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -451577,10 +450337,22 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 21300000, guid: 34b9ddb77aae2df4ab489b7bb8f16cff, type: 3} + - target: {fileID: 1212474662907077523, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} + propertyPath: m_SortingOrder + value: 2 + objectReference: {fileID: 0} - target: {fileID: 1212474662907077523, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: - objectReference: {fileID: 747754968} + objectReference: {fileID: 2100000, guid: 5971a6dc0428a6e4b9d9718e9e97359e, type: 2} + - target: {fileID: 1586448881163170715, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} + propertyPath: m_LocalPosition.x + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 1981660204395543908, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} + propertyPath: thiccness + value: 0.1 + objectReference: {fileID: 0} - target: {fileID: 2019273081359489604, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -451649,6 +450421,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3412918936342637748, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} + propertyPath: m_SortingOrder + value: 3 + objectReference: {fileID: 0} - target: {fileID: 3427769851338141907, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -451657,10 +450433,18 @@ PrefabInstance: propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 1807967130} + - target: {fileID: 3782556851483571400, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} + propertyPath: m_SortingOrder + value: 2 + objectReference: {fileID: 0} - target: {fileID: 4445863485687191577, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 546566966} + - target: {fileID: 4516485130915068126, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} + propertyPath: m_SortingOrder + value: 3 + objectReference: {fileID: 0} - target: {fileID: 5181221738455605092, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} propertyPath: m_Camera value: @@ -451669,6 +450453,10 @@ PrefabInstance: propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 1771467714} + - target: {fileID: 6304449327528556592, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} + propertyPath: m_LocalPosition.x + value: -0.1 + objectReference: {fileID: 0} - target: {fileID: 6510906053583315767, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} propertyPath: mowerAudioPlayer value: @@ -451677,10 +450465,14 @@ PrefabInstance: propertyPath: gardenerRunningAudioPlayer value: objectReference: {fileID: 749554733} + - target: {fileID: 6770890482449666960, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} + propertyPath: m_SortingOrder + value: 2 + objectReference: {fileID: 0} - target: {fileID: 6770890482449666960, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: - objectReference: {fileID: 506352424} + objectReference: {fileID: 2100000, guid: 5971a6dc0428a6e4b9d9718e9e97359e, type: 2} - target: {fileID: 7112723994508067024, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -451705,13 +450497,21 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7855479757892457820, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} + propertyPath: m_LocalPosition.y + value: -0.1 + objectReference: {fileID: 0} + - target: {fileID: 7911220400806828543, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} + propertyPath: interactionType + value: 2 + objectReference: {fileID: 0} - target: {fileID: 8361739881193827101, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} propertyPath: m_LocalPosition.x - value: 7.439999 + value: 7.4399986 objectReference: {fileID: 0} - target: {fileID: 8361739881193827101, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} propertyPath: m_LocalPosition.y - value: 11.47 + value: 11.469999 objectReference: {fileID: 0} - target: {fileID: 9074453772172382270, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} propertyPath: lawnMowerRef @@ -453909,54 +452709,6 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_SpriteSortPoint: 0 ---- !u!21 &1194616634 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: SimpleOutlineMaterial (Instance) (Instance) (Instance) - m_Shader: {fileID: -6465566751694194690, guid: ec68bffbfd711284ba7968cf1b8ae340, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 2800000, guid: ae6ce5ebb60e1504ea6c9983c822e0cf, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_Lightmaps: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_LightmapsInd: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_ShadowMasks: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _Thickness: 0.01 - m_Colors: - - White: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 0.62352943, g: 0.62352943, b: 0.8078432, a: 1} - - _Colour: {r: 0.9341286, g: 1, b: 0, a: 1} - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!1 &1195627202 GameObject: m_ObjectHideFlags: 0 @@ -454231,55 +452983,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0bbded61e58193848ac59c8eea761bcc, type: 3} ---- !u!21 &1212170368 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Mesh2D-Lit-Default (Instance) - m_Shader: {fileID: 4800000, guid: 4e90a8289da1f3943885176e4f83e35c, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _AlphaTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MaskTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _NormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _EnableExternalAlpha: 0 - m_Colors: - - _Color: {r: 0.62352943, g: 0.62352943, b: 0.8078432, a: 1} - - _Flip: {r: 1, g: 1, b: 1, a: 1} - - _RendererColor: {r: 1, g: 1, b: 1, a: 1} - - _White: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!21 &1213275983 Material: serializedVersion: 8 @@ -454882,7 +453585,7 @@ Material: - _Thickness: 0.01 m_Colors: - White: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 0.62352943, g: 0.62352943, b: 0.8078432, 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 @@ -455190,55 +453893,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} m_PrefabInstance: {fileID: 1269931623} m_PrefabAsset: {fileID: 0} ---- !u!21 &1273392479 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} +--- !u!1 &1273792069 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 409292299139678353, guid: fc42c3bdda1c86d49b0bf80c28e5d372, type: 3} + m_PrefabInstance: {fileID: 2558461749605481847} m_PrefabAsset: {fileID: 0} - m_Name: Mesh2D-Lit-Default (Instance) - m_Shader: {fileID: 4800000, guid: 4e90a8289da1f3943885176e4f83e35c, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _AlphaTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MaskTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _NormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _EnableExternalAlpha: 0 - m_Colors: - - _Color: {r: 0.62352943, g: 0.62352943, b: 0.8078432, a: 1} - - _Flip: {r: 1, g: 1, b: 1, a: 1} - - _RendererColor: {r: 1, g: 1, b: 1, a: 1} - - _White: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!1001 &1282112587 PrefabInstance: m_ObjectHideFlags: 0 @@ -455650,7 +454309,7 @@ PrefabInstance: - target: {fileID: 75257418281112422, guid: 30285f2632211504484661965ed61c57, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: - objectReference: {fileID: 849732802} + objectReference: {fileID: 2100000, guid: 5971a6dc0428a6e4b9d9718e9e97359e, type: 2} - target: {fileID: 628741490265939989, guid: 30285f2632211504484661965ed61c57, type: 3} propertyPath: m_Sprite value: @@ -455658,7 +454317,7 @@ PrefabInstance: - target: {fileID: 628741490265939989, guid: 30285f2632211504484661965ed61c57, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: - objectReference: {fileID: 44839958} + objectReference: {fileID: 2100000, guid: 5971a6dc0428a6e4b9d9718e9e97359e, type: 2} - target: {fileID: 856934202473432377, guid: 30285f2632211504484661965ed61c57, type: 3} propertyPath: m_LocalScale.x value: 0.15 @@ -455682,7 +454341,7 @@ PrefabInstance: - target: {fileID: 1380456592970202028, guid: 30285f2632211504484661965ed61c57, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: - objectReference: {fileID: 1332827274} + objectReference: {fileID: 2100000, guid: 5971a6dc0428a6e4b9d9718e9e97359e, type: 2} - target: {fileID: 3606875748053192296, guid: 30285f2632211504484661965ed61c57, type: 3} propertyPath: m_Name value: FootballBall @@ -455766,7 +454425,7 @@ PrefabInstance: - target: {fileID: 6777011132861582255, guid: 30285f2632211504484661965ed61c57, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: - objectReference: {fileID: 985399379} + objectReference: {fileID: 2100000, guid: 5971a6dc0428a6e4b9d9718e9e97359e, type: 2} - target: {fileID: 6825722660981786547, guid: 30285f2632211504484661965ed61c57, type: 3} propertyPath: m_SortingOrder value: 1 @@ -455873,55 +454532,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} m_PrefabInstance: {fileID: 1313372821} m_PrefabAsset: {fileID: 0} ---- !u!21 &1313606622 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Mesh2D-Lit-Default (Instance) - m_Shader: {fileID: 4800000, guid: 4e90a8289da1f3943885176e4f83e35c, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _AlphaTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MaskTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _NormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _EnableExternalAlpha: 0 - m_Colors: - - _Color: {r: 0.62352943, g: 0.62352943, b: 0.8078432, a: 1} - - _Flip: {r: 1, g: 1, b: 1, a: 1} - - _RendererColor: {r: 1, g: 1, b: 1, a: 1} - - _White: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!1001 &1316711668 PrefabInstance: m_ObjectHideFlags: 0 @@ -456118,6 +454728,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} m_PrefabInstance: {fileID: 1318048849} m_PrefabAsset: {fileID: 0} +--- !u!1 &1321743059 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6235119878774016626, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + m_PrefabInstance: {fileID: 8013274907828598643} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1322112645 PrefabInstance: m_ObjectHideFlags: 0 @@ -456337,7 +454952,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 1657210492334632392, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} propertyPath: m_LocalPosition.y - value: -0.3 + value: -0.4 objectReference: {fileID: 0} - target: {fileID: 1864359520112583114, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} propertyPath: m_SortingOrder @@ -456361,7 +454976,7 @@ PrefabInstance: objectReference: {fileID: -8520225520565161345, guid: 34bd87b3ddf2a094c8b6e4700837321b, type: 3} - target: {fileID: 3208315914501898404, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} propertyPath: m_LocalPosition.x - value: -0.3 + value: -0.4 objectReference: {fileID: 0} - target: {fileID: 3843529282689729675, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} propertyPath: m_LocalPosition.x @@ -456433,11 +455048,7 @@ PrefabInstance: objectReference: {fileID: 682433405} - target: {fileID: 6952318010414745072, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} propertyPath: thiccness - value: 0.3 - objectReference: {fileID: 0} - - target: {fileID: 6952318010414745072, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} - propertyPath: interactionType - value: 1 + value: 0.4 objectReference: {fileID: 0} - target: {fileID: 7721507707591105287, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} propertyPath: m_Sprite @@ -456453,7 +455064,7 @@ PrefabInstance: objectReference: {fileID: 2117667596} - target: {fileID: 7926317526582004495, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} propertyPath: m_LocalPosition.x - value: 0.3 + value: 0.4 objectReference: {fileID: 0} - target: {fileID: 8122715410599821502, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} propertyPath: m_Sprite @@ -456481,7 +455092,7 @@ PrefabInstance: objectReference: {fileID: 1756401971} - target: {fileID: 9002880843892224533, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} propertyPath: m_LocalPosition.y - value: 0.3 + value: 0.4 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -456591,55 +455202,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1332387987} m_Mesh: {fileID: 4300000, guid: eae229cde7c374059a09c8052360682c, type: 3} ---- !u!21 &1332827274 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Mesh2D-Lit-Default (Instance) - m_Shader: {fileID: 4800000, guid: 4e90a8289da1f3943885176e4f83e35c, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _AlphaTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MaskTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _NormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _EnableExternalAlpha: 0 - m_Colors: - - _Color: {r: 1, g: 0.87843144, b: 0.57254905, a: 1} - - _Flip: {r: 1, g: 1, b: 1, a: 1} - - _RendererColor: {r: 1, g: 1, b: 1, a: 1} - - _White: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!1 &1338145738 GameObject: m_ObjectHideFlags: 0 @@ -456845,55 +455407,6 @@ MonoBehaviour: m_EditorClassIdentifier: '::' butterflyRef: {fileID: 1486039842} picnicRef: {fileID: 2035142374} ---- !u!21 &1342564393 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Mesh2D-Lit-Default (Instance) - m_Shader: {fileID: 4800000, guid: 4e90a8289da1f3943885176e4f83e35c, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _AlphaTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MaskTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _NormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _EnableExternalAlpha: 0 - m_Colors: - - _Color: {r: 0.62352943, g: 0.62352943, b: 0.8078432, a: 1} - - _Flip: {r: 1, g: 1, b: 1, a: 1} - - _RendererColor: {r: 1, g: 1, b: 1, a: 1} - - _White: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!1001 &1347210919 PrefabInstance: m_ObjectHideFlags: 0 @@ -457323,55 +455836,7 @@ Material: - _Thickness: 0.01 m_Colors: - White: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 0.62352943, g: 0.62352943, b: 0.8078432, a: 1} - - _Colour: {r: 0.9341286, g: 1, b: 0, a: 1} - m_BuildTextureStacks: [] - m_AllowLocking: 1 ---- !u!21 &1361340966 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: SimpleOutlineMaterial (Instance) (Instance) (Instance) - m_Shader: {fileID: -6465566751694194690, guid: ec68bffbfd711284ba7968cf1b8ae340, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 2800000, guid: ae6ce5ebb60e1504ea6c9983c822e0cf, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_Lightmaps: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_LightmapsInd: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_ShadowMasks: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _Thickness: 0.01 - m_Colors: - - White: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 0.62352943, g: 0.62352943, b: 0.8078432, 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 @@ -457437,6 +455902,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 7815739457642955130, guid: f645a67c7970b124cacb6450fefdebad, type: 3} m_PrefabInstance: {fileID: 4596770314561390347} m_PrefabAsset: {fileID: 0} +--- !u!1 &1372318292 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3511893383823353436, guid: f15bf96f88d21b14191ad80200912775, type: 3} + m_PrefabInstance: {fileID: 3917799031583628180} + m_PrefabAsset: {fileID: 0} --- !u!1 &1373293417 GameObject: m_ObjectHideFlags: 0 @@ -457516,6 +455986,11 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1373299888 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4771963350368267381, guid: 21444cac99fc9944a85884eccbc8b78d, type: 3} + m_PrefabInstance: {fileID: 8058740013708592448} + m_PrefabAsset: {fileID: 0} --- !u!1 &1373587132 GameObject: m_ObjectHideFlags: 0 @@ -458076,55 +456551,6 @@ MonoBehaviour: audioSource: {fileID: 0} clipPriority: 0 sourcePriority: 0 ---- !u!21 &1380489970 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Mesh2D-Lit-Default (Instance) - m_Shader: {fileID: 4800000, guid: 4e90a8289da1f3943885176e4f83e35c, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _AlphaTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MaskTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _NormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _EnableExternalAlpha: 0 - m_Colors: - - _Color: {r: 0.62352943, g: 0.62352943, b: 0.8078432, a: 1} - - _Flip: {r: 1, g: 1, b: 1, a: 1} - - _RendererColor: {r: 1, g: 1, b: 1, a: 1} - - _White: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!1 &1386095854 GameObject: m_ObjectHideFlags: 0 @@ -458516,6 +456942,10 @@ PrefabInstance: propertyPath: m_Name value: SoundBird_Slot objectReference: {fileID: 0} + - target: {fileID: 2375066264105953394, guid: 9ad58c5e86338824db8a6daebdb432b5, type: 3} + propertyPath: m_LocalPosition.y + value: 0.1 + objectReference: {fileID: 0} - target: {fileID: 2523333015159032981, guid: 9ad58c5e86338824db8a6daebdb432b5, type: 3} propertyPath: m_LocalPosition.x value: 0.04 @@ -458556,10 +456986,30 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3601377257468088680, guid: 9ad58c5e86338824db8a6daebdb432b5, type: 3} + propertyPath: m_LocalPosition.x + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 4359165744685227927, guid: 9ad58c5e86338824db8a6daebdb432b5, type: 3} + propertyPath: thiccness + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 4359165744685227927, guid: 9ad58c5e86338824db8a6daebdb432b5, type: 3} + propertyPath: animatedSprite + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5402875254009116591, guid: 9ad58c5e86338824db8a6daebdb432b5, type: 3} + propertyPath: m_LocalPosition.y + value: -0.1 + objectReference: {fileID: 0} - target: {fileID: 7004860270194965002, guid: 9ad58c5e86338824db8a6daebdb432b5, type: 3} propertyPath: itemSlot value: objectReference: {fileID: 1923065567} + - target: {fileID: 8107460162531334851, guid: 9ad58c5e86338824db8a6daebdb432b5, type: 3} + propertyPath: m_LocalPosition.x + value: -0.1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -458623,55 +457073,6 @@ Material: - _Colour: {r: 0.9341286, g: 1, b: 0, a: 1} m_BuildTextureStacks: [] m_AllowLocking: 1 ---- !u!21 &1405794334 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Mesh2D-Lit-Default (Instance) - m_Shader: {fileID: 4800000, guid: 4e90a8289da1f3943885176e4f83e35c, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _AlphaTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MaskTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _NormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _EnableExternalAlpha: 0 - m_Colors: - - _Color: {r: 0.62352943, g: 0.62352943, b: 0.8078432, a: 1} - - _Flip: {r: 1, g: 1, b: 1, a: 1} - - _RendererColor: {r: 1, g: 1, b: 1, a: 1} - - _White: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!4 &1413812638 stripped Transform: m_CorrespondingSourceObject: {fileID: 2064225848720495177, guid: 0bbded61e58193848ac59c8eea761bcc, type: 3} @@ -459035,7 +457436,7 @@ Material: - _Thickness: 0.01 m_Colors: - White: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 0.62352943, g: 0.62352943, b: 0.8078432, 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 @@ -461155,11 +459556,6 @@ Material: - _White: {r: 1, g: 1, b: 1, a: 1} m_BuildTextureStacks: [] m_AllowLocking: 1 ---- !u!1 &1519887120 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 825072831861764844, guid: 3beba8513eb20af4493d170a3203efb0, type: 3} - m_PrefabInstance: {fileID: 2030009510} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1524271510 PrefabInstance: m_ObjectHideFlags: 0 @@ -462269,57 +460665,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} m_PrefabInstance: {fileID: 1567929234} m_PrefabAsset: {fileID: 0} ---- !u!1 &1576907799 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2331806108796329904, guid: d677a46297a07994fa1b551de27f821c, type: 3} - m_PrefabInstance: {fileID: 459290200} - m_PrefabAsset: {fileID: 0} ---- !u!61 &1576907804 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1576907799} - 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, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1.28, y: 1.31} - newSize: {x: 1.28, y: 1.31} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - m_Size: {x: 1.5, y: 1.5} - m_EdgeRadius: 0 --- !u!1 &1581417750 GameObject: m_ObjectHideFlags: 0 @@ -462618,57 +460963,6 @@ Transform: m_Children: [] m_Father: {fileID: 2115320175} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1600314232 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 5070378814342643473, guid: 4694d95ffaa4a4343ae04db32b13cbcc, type: 3} - m_PrefabInstance: {fileID: 152724146} - m_PrefabAsset: {fileID: 0} ---- !u!61 &1600314237 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1600314232} - 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, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 0.95, y: 0.94} - newSize: {x: 0.95, y: 0.94} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - m_Size: {x: 1, y: 1} - m_EdgeRadius: 0 --- !u!1001 &1604046727 PrefabInstance: m_ObjectHideFlags: 0 @@ -463924,55 +462218,6 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_SpriteSortPoint: 0 ---- !u!21 &1659662620 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Mesh2D-Lit-Default (Instance) - m_Shader: {fileID: 4800000, guid: 4e90a8289da1f3943885176e4f83e35c, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _AlphaTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MaskTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _NormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _EnableExternalAlpha: 0 - m_Colors: - - _Color: {r: 1, g: 0.87843144, b: 0.57254905, a: 1} - - _Flip: {r: 1, g: 1, b: 1, a: 1} - - _RendererColor: {r: 1, g: 1, b: 1, a: 1} - - _White: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!1001 &1663156570 PrefabInstance: m_ObjectHideFlags: 0 @@ -465467,59 +463712,10 @@ Material: - _Thickness: 0.01 m_Colors: - White: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 0.62352943, g: 0.62352943, b: 0.8078432, 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 ---- !u!21 &1750734786 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Mesh2D-Lit-Default (Instance) - m_Shader: {fileID: 4800000, guid: 4e90a8289da1f3943885176e4f83e35c, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _AlphaTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MaskTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _NormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _EnableExternalAlpha: 0 - m_Colors: - - _Color: {r: 0.62352943, g: 0.62352943, b: 0.8078432, a: 1} - - _Flip: {r: 1, g: 1, b: 1, a: 1} - - _RendererColor: {r: 1, g: 1, b: 1, a: 1} - - _White: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!1001 &1753842381 PrefabInstance: m_ObjectHideFlags: 0 @@ -466152,10 +464348,15 @@ Material: - _Thickness: 0.01 m_Colors: - White: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 0.62352943, g: 0.62352943, b: 0.8078432, 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 +--- !u!1 &1779583354 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8984567445020979815, guid: f15bf96f88d21b14191ad80200912775, type: 3} + m_PrefabInstance: {fileID: 3917799031583628180} + m_PrefabAsset: {fileID: 0} --- !u!1 &1785388104 GameObject: m_ObjectHideFlags: 0 @@ -467293,120 +465494,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} m_PrefabInstance: {fileID: 1824578623} m_PrefabAsset: {fileID: 0} ---- !u!1 &1826363464 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1826363465} - - component: {fileID: 1826363467} - - component: {fileID: 1826363466} - m_Layer: 10 - m_Name: Glow (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1826363465 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1826363464} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.120000005, y: 0.120000005, z: 0.030000001} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 925413038} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!95 &1826363466 -Animator: - serializedVersion: 7 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1826363464} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 625c4cf5003c069478057729a67f9f65, 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!212 &1826363467 -SpriteRenderer: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1826363464} - 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: a97c105638bdf8b4a8650670310a4cd3, 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: 1 - m_MaskInteraction: 0 - m_Sprite: {fileID: -8836962644236845764, guid: c5cc7367a37a7944abb3876352b0e0ff, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 9.61, y: 8.51} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_SpriteSortPoint: 0 --- !u!1001 &1827605008 PrefabInstance: m_ObjectHideFlags: 0 @@ -467531,99 +465618,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 2064225848720495177, guid: 0bbded61e58193848ac59c8eea761bcc, type: 3} m_PrefabInstance: {fileID: 488084028} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1838334755 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 898680540} - m_Modifications: - - target: {fileID: 2755476303005018105, guid: 015a2865b4d5f6f45a9835b0117d9944, type: 3} - propertyPath: m_Name - value: Basketball - objectReference: {fileID: 0} - - target: {fileID: 2755476303005018105, guid: 015a2865b4d5f6f45a9835b0117d9944, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4055726361761331703, guid: 015a2865b4d5f6f45a9835b0117d9944, type: 3} - propertyPath: m_SortingOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 6133778293368838189, guid: 015a2865b4d5f6f45a9835b0117d9944, type: 3} - propertyPath: m_LocalScale.x - value: 2.7 - objectReference: {fileID: 0} - - target: {fileID: 6133778293368838189, guid: 015a2865b4d5f6f45a9835b0117d9944, type: 3} - propertyPath: m_LocalScale.y - value: 2.7 - objectReference: {fileID: 0} - - target: {fileID: 6133778293368838189, guid: 015a2865b4d5f6f45a9835b0117d9944, type: 3} - propertyPath: m_LocalScale.z - value: 2.7 - objectReference: {fileID: 0} - - target: {fileID: 6133778293368838189, guid: 015a2865b4d5f6f45a9835b0117d9944, type: 3} - propertyPath: m_LocalPosition.x - value: -35.364 - objectReference: {fileID: 0} - - target: {fileID: 6133778293368838189, guid: 015a2865b4d5f6f45a9835b0117d9944, type: 3} - propertyPath: m_LocalPosition.y - value: -4.734001 - objectReference: {fileID: 0} - - target: {fileID: 6133778293368838189, guid: 015a2865b4d5f6f45a9835b0117d9944, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6133778293368838189, guid: 015a2865b4d5f6f45a9835b0117d9944, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6133778293368838189, guid: 015a2865b4d5f6f45a9835b0117d9944, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6133778293368838189, guid: 015a2865b4d5f6f45a9835b0117d9944, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6133778293368838189, guid: 015a2865b4d5f6f45a9835b0117d9944, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6133778293368838189, guid: 015a2865b4d5f6f45a9835b0117d9944, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6133778293368838189, guid: 015a2865b4d5f6f45a9835b0117d9944, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6133778293368838189, guid: 015a2865b4d5f6f45a9835b0117d9944, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6133778293368838189, guid: 015a2865b4d5f6f45a9835b0117d9944, type: 3} - propertyPath: m_ConstrainProportionsScale - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 3696625264308890211, guid: 015a2865b4d5f6f45a9835b0117d9944, type: 3} - m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 6133778293368838189, guid: 015a2865b4d5f6f45a9835b0117d9944, type: 3} - insertIndex: -1 - addedObject: {fileID: 456329681} - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 2755476303005018105, guid: 015a2865b4d5f6f45a9835b0117d9944, type: 3} - insertIndex: -1 - addedObject: {fileID: 1974401597} - m_SourcePrefab: {fileID: 100100000, guid: 015a2865b4d5f6f45a9835b0117d9944, type: 3} ---- !u!4 &1838334756 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6133778293368838189, guid: 015a2865b4d5f6f45a9835b0117d9944, type: 3} - m_PrefabInstance: {fileID: 1838334755} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1843994268 PrefabInstance: m_ObjectHideFlags: 0 @@ -468524,7 +466518,7 @@ Material: - _Thickness: 0.01 m_Colors: - White: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 0.62352943, g: 0.62352943, b: 0.8078432, 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 @@ -469423,6 +467417,42 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 1946835271} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + 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 + - m_Target: {fileID: 304297328} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + 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 + - m_Target: {fileID: 369509385} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + 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 onIncorrectItemSlotted: m_PersistentCalls: m_Calls: [] @@ -469657,169 +467687,6 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_SpriteSortPoint: 0 ---- !u!1 &1934418038 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1934418039} - - component: {fileID: 1934418041} - - component: {fileID: 1934418040} - m_Layer: 10 - m_Name: Glow (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1934418039 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1934418038} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.120000005, y: 0.120000005, z: 0.030000001} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 456329681} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!95 &1934418040 -Animator: - serializedVersion: 7 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1934418038} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 625c4cf5003c069478057729a67f9f65, 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!212 &1934418041 -SpriteRenderer: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1934418038} - 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: a97c105638bdf8b4a8650670310a4cd3, 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: 1 - m_MaskInteraction: 0 - m_Sprite: {fileID: -8836962644236845764, guid: c5cc7367a37a7944abb3876352b0e0ff, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 9.61, y: 8.51} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_SpriteSortPoint: 0 ---- !u!21 &1934927512 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Mesh2D-Lit-Default (Instance) - m_Shader: {fileID: 4800000, guid: 4e90a8289da1f3943885176e4f83e35c, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _AlphaTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MaskTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _NormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _EnableExternalAlpha: 0 - m_Colors: - - _Color: {r: 0.62352943, g: 0.62352943, b: 0.8078432, a: 1} - - _Flip: {r: 1, g: 1, b: 1, a: 1} - - _RendererColor: {r: 1, g: 1, b: 1, a: 1} - - _White: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!1 &1939263931 GameObject: m_ObjectHideFlags: 0 @@ -469997,7 +467864,7 @@ Material: - _Thickness: 0.01 m_Colors: - White: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 0.62352943, g: 0.62352943, b: 0.8078432, 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 @@ -470099,6 +467966,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} m_PrefabInstance: {fileID: 1944202997} m_PrefabAsset: {fileID: 0} +--- !u!1 &1946835271 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6359097882656350694, guid: 9ad58c5e86338824db8a6daebdb432b5, type: 3} + m_PrefabInstance: {fileID: 1399567329} + m_PrefabAsset: {fileID: 0} --- !u!4 &1954363768 stripped Transform: m_CorrespondingSourceObject: {fileID: 2064225848720495177, guid: 0bbded61e58193848ac59c8eea761bcc, type: 3} @@ -470246,7 +468118,7 @@ Material: - _Thickness: 0.01 m_Colors: - White: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 0.62352943, g: 0.62352943, b: 0.8078432, 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 @@ -471151,57 +469023,6 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_SpriteSortPoint: 0 ---- !u!1 &1974401592 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2755476303005018105, guid: 015a2865b4d5f6f45a9835b0117d9944, type: 3} - m_PrefabInstance: {fileID: 1838334755} - m_PrefabAsset: {fileID: 0} ---- !u!61 &1974401597 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1974401592} - 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, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1.2, y: 1.21} - newSize: {x: 1.2, y: 1.21} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - m_Size: {x: 1.5, y: 1.5} - m_EdgeRadius: 0 --- !u!1 &1976234653 GameObject: m_ObjectHideFlags: 0 @@ -471427,7 +469248,7 @@ Material: - _Thickness: 0.01 m_Colors: - White: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 0.62352943, g: 0.62352943, b: 0.8078432, 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 @@ -472153,145 +469974,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 2064225848720495177, guid: 0bbded61e58193848ac59c8eea761bcc, type: 3} m_PrefabInstance: {fileID: 2026329068} m_PrefabAsset: {fileID: 0} ---- !u!1001 &2030009510 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 898680540} - m_Modifications: - - target: {fileID: 25208727450420889, guid: 3beba8513eb20af4493d170a3203efb0, type: 3} - propertyPath: m_LocalScale.x - value: 2.7 - objectReference: {fileID: 0} - - target: {fileID: 25208727450420889, guid: 3beba8513eb20af4493d170a3203efb0, type: 3} - propertyPath: m_LocalScale.y - value: 2.7 - objectReference: {fileID: 0} - - target: {fileID: 25208727450420889, guid: 3beba8513eb20af4493d170a3203efb0, type: 3} - propertyPath: m_LocalScale.z - value: 2.7 - objectReference: {fileID: 0} - - target: {fileID: 25208727450420889, guid: 3beba8513eb20af4493d170a3203efb0, type: 3} - propertyPath: m_LocalPosition.x - value: -30.34 - objectReference: {fileID: 0} - - target: {fileID: 25208727450420889, guid: 3beba8513eb20af4493d170a3203efb0, type: 3} - propertyPath: m_LocalPosition.y - value: 2.2229996 - objectReference: {fileID: 0} - - target: {fileID: 25208727450420889, guid: 3beba8513eb20af4493d170a3203efb0, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 25208727450420889, guid: 3beba8513eb20af4493d170a3203efb0, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 25208727450420889, guid: 3beba8513eb20af4493d170a3203efb0, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 25208727450420889, guid: 3beba8513eb20af4493d170a3203efb0, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 25208727450420889, guid: 3beba8513eb20af4493d170a3203efb0, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 25208727450420889, guid: 3beba8513eb20af4493d170a3203efb0, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 25208727450420889, guid: 3beba8513eb20af4493d170a3203efb0, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 25208727450420889, guid: 3beba8513eb20af4493d170a3203efb0, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 25208727450420889, guid: 3beba8513eb20af4493d170a3203efb0, type: 3} - propertyPath: m_ConstrainProportionsScale - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 825072831861764844, guid: 3beba8513eb20af4493d170a3203efb0, type: 3} - propertyPath: m_Name - value: YellowBall - objectReference: {fileID: 0} - - target: {fileID: 825072831861764844, guid: 3beba8513eb20af4493d170a3203efb0, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4266110216568578813, guid: 3beba8513eb20af4493d170a3203efb0, type: 3} - propertyPath: m_SortingOrder - value: 2 - objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 8318004605383042340, guid: 3beba8513eb20af4493d170a3203efb0, type: 3} - m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 25208727450420889, guid: 3beba8513eb20af4493d170a3203efb0, type: 3} - insertIndex: -1 - addedObject: {fileID: 487113963} - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 825072831861764844, guid: 3beba8513eb20af4493d170a3203efb0, type: 3} - insertIndex: -1 - addedObject: {fileID: 2030009516} - m_SourcePrefab: {fileID: 100100000, guid: 3beba8513eb20af4493d170a3203efb0, type: 3} ---- !u!4 &2030009511 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 25208727450420889, guid: 3beba8513eb20af4493d170a3203efb0, type: 3} - m_PrefabInstance: {fileID: 2030009510} - m_PrefabAsset: {fileID: 0} ---- !u!61 &2030009516 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1519887120} - 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, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 0.76, y: 0.76} - newSize: {x: 0.76, y: 0.76} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - m_Size: {x: 1, y: 1} - m_EdgeRadius: 0 --- !u!1 &2034162695 GameObject: m_ObjectHideFlags: 0 @@ -473107,7 +470789,7 @@ Material: - _Thickness: 0.01 m_Colors: - White: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 0.62352943, g: 0.62352943, b: 0.8078432, 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 @@ -473231,55 +470913,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2066567151} m_Mesh: {fileID: 4300000, guid: c0de5c847168f47b48791e9f1912e7c0, type: 3} ---- !u!21 &2067465357 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Mesh2D-Lit-Default (Instance) - m_Shader: {fileID: 4800000, guid: 4e90a8289da1f3943885176e4f83e35c, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _AlphaTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MaskTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _NormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _EnableExternalAlpha: 0 - m_Colors: - - _Color: {r: 0.62352943, g: 0.62352943, b: 0.8078432, a: 1} - - _Flip: {r: 1, g: 1, b: 1, a: 1} - - _RendererColor: {r: 1, g: 1, b: 1, a: 1} - - _White: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!21 &2075918424 Material: serializedVersion: 8 @@ -474394,10 +472027,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8830198103045877017, guid: 0c2275f0a1451a142b686a049a2ebcec, type: 3} - propertyPath: interactionType - value: 2 - objectReference: {fileID: 0} - target: {fileID: 8974834156043916995, guid: 0c2275f0a1451a142b686a049a2ebcec, type: 3} propertyPath: m_SizeDelta.y value: 0 @@ -475609,11 +473238,11 @@ PrefabInstance: - target: {fileID: 2796811180587529260, guid: fc42c3bdda1c86d49b0bf80c28e5d372, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: - objectReference: {fileID: 1405794334} + objectReference: {fileID: 2100000, guid: 5971a6dc0428a6e4b9d9718e9e97359e, type: 2} - target: {fileID: 2875414975538810900, guid: fc42c3bdda1c86d49b0bf80c28e5d372, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: - objectReference: {fileID: 1342564393} + objectReference: {fileID: 2100000, guid: 5971a6dc0428a6e4b9d9718e9e97359e, type: 2} - target: {fileID: 2876123242463989138, guid: fc42c3bdda1c86d49b0bf80c28e5d372, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -475625,7 +473254,7 @@ PrefabInstance: - target: {fileID: 3815471647004876006, guid: fc42c3bdda1c86d49b0bf80c28e5d372, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: - objectReference: {fileID: 1096525925} + objectReference: {fileID: 2100000, guid: 5971a6dc0428a6e4b9d9718e9e97359e, type: 2} - target: {fileID: 3875638944251110744, guid: fc42c3bdda1c86d49b0bf80c28e5d372, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -475653,7 +473282,7 @@ PrefabInstance: - target: {fileID: 4413989479498313621, guid: fc42c3bdda1c86d49b0bf80c28e5d372, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: - objectReference: {fileID: 174607463} + objectReference: {fileID: 2100000, guid: 5971a6dc0428a6e4b9d9718e9e97359e, type: 2} - target: {fileID: 5201029295750516825, guid: fc42c3bdda1c86d49b0bf80c28e5d372, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -475701,7 +473330,7 @@ PrefabInstance: - target: {fileID: 7693024347750195223, guid: fc42c3bdda1c86d49b0bf80c28e5d372, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: - objectReference: {fileID: 1313606622} + objectReference: {fileID: 2100000, guid: 5971a6dc0428a6e4b9d9718e9e97359e, type: 2} - target: {fileID: 7775613298932159589, guid: fc42c3bdda1c86d49b0bf80c28e5d372, type: 3} propertyPath: m_LocalScale.x value: 1 @@ -475749,15 +473378,15 @@ PrefabInstance: - target: {fileID: 7779087365410260015, guid: fc42c3bdda1c86d49b0bf80c28e5d372, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: - objectReference: {fileID: 1212170368} + objectReference: {fileID: 2100000, guid: 5971a6dc0428a6e4b9d9718e9e97359e, type: 2} - target: {fileID: 8165866264134728622, guid: fc42c3bdda1c86d49b0bf80c28e5d372, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: - objectReference: {fileID: 436989864} + objectReference: {fileID: 2100000, guid: 5971a6dc0428a6e4b9d9718e9e97359e, type: 2} - target: {fileID: 8709995964860631261, guid: fc42c3bdda1c86d49b0bf80c28e5d372, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: - objectReference: {fileID: 1380489970} + objectReference: {fileID: 2100000, guid: 5971a6dc0428a6e4b9d9718e9e97359e, type: 2} - target: {fileID: 8713782864409351515, guid: fc42c3bdda1c86d49b0bf80c28e5d372, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -476010,10 +473639,102 @@ PrefabInstance: propertyPath: slottedItemRenderers.Array.data[0].renderer value: objectReference: {fileID: 3708074769586677214} + - target: {fileID: 3093816592344978065, guid: 3346526f3046f424196615241a307104, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.size + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3093816592344978065, guid: 3346526f3046f424196615241a307104, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3093816592344978065, guid: 3346526f3046f424196615241a307104, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[2].m_Mode + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 3093816592344978065, guid: 3346526f3046f424196615241a307104, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[3].m_Mode + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 3093816592344978065, guid: 3346526f3046f424196615241a307104, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[4].m_Mode + value: 6 + objectReference: {fileID: 0} - target: {fileID: 3093816592344978065, guid: 3346526f3046f424196615241a307104, type: 3} propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[1].m_Target value: objectReference: {fileID: 2126981195} + - target: {fileID: 3093816592344978065, guid: 3346526f3046f424196615241a307104, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[2].m_Target + value: + objectReference: {fileID: 652941302} + - target: {fileID: 3093816592344978065, guid: 3346526f3046f424196615241a307104, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[3].m_Target + value: + objectReference: {fileID: 1372318292} + - target: {fileID: 3093816592344978065, guid: 3346526f3046f424196615241a307104, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[4].m_Target + value: + objectReference: {fileID: 1779583354} + - target: {fileID: 3093816592344978065, guid: 3346526f3046f424196615241a307104, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[2].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3093816592344978065, guid: 3346526f3046f424196615241a307104, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[3].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3093816592344978065, guid: 3346526f3046f424196615241a307104, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[4].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3093816592344978065, guid: 3346526f3046f424196615241a307104, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: TakePhoto + objectReference: {fileID: 0} + - target: {fileID: 3093816592344978065, guid: 3346526f3046f424196615241a307104, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[2].m_MethodName + value: SetActive + objectReference: {fileID: 0} + - target: {fileID: 3093816592344978065, guid: 3346526f3046f424196615241a307104, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[3].m_MethodName + value: SetActive + objectReference: {fileID: 0} + - target: {fileID: 3093816592344978065, guid: 3346526f3046f424196615241a307104, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[4].m_MethodName + value: SetActive + objectReference: {fileID: 0} + - target: {fileID: 3093816592344978065, guid: 3346526f3046f424196615241a307104, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: StateMachines.Quarry.AnneLise.AnneLiseBushBehaviour, AppleHillsScripts + objectReference: {fileID: 0} + - target: {fileID: 3093816592344978065, guid: 3346526f3046f424196615241a307104, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[2].m_TargetAssemblyTypeName + value: UnityEngine.GameObject, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 3093816592344978065, guid: 3346526f3046f424196615241a307104, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[3].m_TargetAssemblyTypeName + value: UnityEngine.GameObject, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 3093816592344978065, guid: 3346526f3046f424196615241a307104, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[4].m_TargetAssemblyTypeName + value: UnityEngine.GameObject, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 3093816592344978065, guid: 3346526f3046f424196615241a307104, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 3093816592344978065, guid: 3346526f3046f424196615241a307104, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 3093816592344978065, guid: 3346526f3046f424196615241a307104, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[3].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 3093816592344978065, guid: 3346526f3046f424196615241a307104, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[4].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 4645624856241199224, guid: 3346526f3046f424196615241a307104, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -476149,10 +473870,6 @@ PrefabInstance: propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 1991946609} - - target: {fileID: 1770279202322091030, guid: f15bf96f88d21b14191ad80200912775, type: 3} - propertyPath: interactionType - value: 2 - objectReference: {fileID: 0} - target: {fileID: 2800568559834674100, guid: f15bf96f88d21b14191ad80200912775, type: 3} propertyPath: m_Camera value: @@ -476173,10 +473890,6 @@ PrefabInstance: propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 810929313} - - target: {fileID: 6089451223226636333, guid: f15bf96f88d21b14191ad80200912775, type: 3} - propertyPath: interactionType - value: 2 - objectReference: {fileID: 0} - target: {fileID: 6838161879635976930, guid: f15bf96f88d21b14191ad80200912775, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -476283,9 +473996,73 @@ PrefabInstance: value: objectReference: {fileID: 3978117984697153446} - target: {fileID: 106497079666291966, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} - propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[1].m_Target + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.size + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 106497079666291966, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[2].m_Mode + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 106497079666291966, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[3].m_Mode + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 106497079666291966, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 1516406291} + - target: {fileID: 106497079666291966, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 217127977} + - target: {fileID: 106497079666291966, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[2].m_Target + value: + objectReference: {fileID: 349596344} + - target: {fileID: 106497079666291966, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[3].m_Target + value: + objectReference: {fileID: 1373299888} + - target: {fileID: 106497079666291966, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[2].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 106497079666291966, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[3].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 106497079666291966, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: TakePhoto + objectReference: {fileID: 0} + - target: {fileID: 106497079666291966, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[2].m_MethodName + value: SetActive + objectReference: {fileID: 0} + - target: {fileID: 106497079666291966, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[3].m_MethodName + value: SetActive + objectReference: {fileID: 0} + - target: {fileID: 106497079666291966, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: StateMachines.Quarry.AnneLise.AnneLiseBushBehaviour, AppleHillsScripts + objectReference: {fileID: 0} + - target: {fileID: 106497079666291966, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[2].m_TargetAssemblyTypeName + value: UnityEngine.GameObject, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 106497079666291966, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[3].m_TargetAssemblyTypeName + value: UnityEngine.GameObject, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 106497079666291966, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 106497079666291966, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[3].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 1828079450404796388, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} propertyPath: m_LocalPosition.x value: -0.404 @@ -476302,6 +474079,10 @@ PrefabInstance: propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 5971a6dc0428a6e4b9d9718e9e97359e, type: 2} + - target: {fileID: 2953574522440118698, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} + propertyPath: m_LocalPosition.y + value: 0.2 + objectReference: {fileID: 0} - target: {fileID: 3122645394836770352, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} propertyPath: m_Sprite value: @@ -476310,6 +474091,10 @@ PrefabInstance: propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 5971a6dc0428a6e4b9d9718e9e97359e, type: 2} + - target: {fileID: 3780213790480582223, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} + propertyPath: thiccness + value: 0.2 + objectReference: {fileID: 0} - target: {fileID: 4140741811252438778, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} propertyPath: m_Sprite value: @@ -476318,6 +474103,14 @@ PrefabInstance: propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 5971a6dc0428a6e4b9d9718e9e97359e, type: 2} + - target: {fileID: 4175527104004032688, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} + propertyPath: m_LocalPosition.x + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 4823922708453879415, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} + propertyPath: m_LocalPosition.y + value: -0.2 + objectReference: {fileID: 0} - target: {fileID: 6583016841553003224, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} propertyPath: m_LocalPosition.x value: 7.37 @@ -476370,6 +474163,10 @@ PrefabInstance: propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 5971a6dc0428a6e4b9d9718e9e97359e, type: 2} + - target: {fileID: 8686219236888855323, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} + propertyPath: m_LocalPosition.x + value: -0.2 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -476603,6 +474400,10 @@ PrefabInstance: propertyPath: gardenerAudioController value: objectReference: {fileID: 430675504} + - target: {fileID: 3862262096061523613, guid: 1fda7fccaa5fbd04695f4c98d29bcbe0, type: 3} + propertyPath: interactionType + value: 2 + objectReference: {fileID: 0} - target: {fileID: 3878369439964005511, guid: 1fda7fccaa5fbd04695f4c98d29bcbe0, type: 3} propertyPath: defaultState value: @@ -476819,7 +474620,7 @@ PrefabInstance: - target: {fileID: 154934888037665756, guid: 3fa494ec083cbe54a86c3a1b107a90c0, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: - objectReference: {fileID: 1934927512} + objectReference: {fileID: 2100000, guid: 5971a6dc0428a6e4b9d9718e9e97359e, type: 2} - target: {fileID: 160486722158287766, guid: 3fa494ec083cbe54a86c3a1b107a90c0, type: 3} propertyPath: m_LocalScale.x value: 1 @@ -476867,15 +474668,27 @@ PrefabInstance: - target: {fileID: 221153747640397796, guid: 3fa494ec083cbe54a86c3a1b107a90c0, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: - objectReference: {fileID: 385600703} + objectReference: {fileID: 2100000, guid: 5971a6dc0428a6e4b9d9718e9e97359e, type: 2} + - target: {fileID: 416041711159820268, guid: 3fa494ec083cbe54a86c3a1b107a90c0, type: 3} + propertyPath: m_LocalPosition.x + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 595148144839291155, guid: 3fa494ec083cbe54a86c3a1b107a90c0, type: 3} + propertyPath: thiccness + value: 0.2 + objectReference: {fileID: 0} - target: {fileID: 1239248446067853102, guid: 3fa494ec083cbe54a86c3a1b107a90c0, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: - objectReference: {fileID: 1273392479} + objectReference: {fileID: 2100000, guid: 5971a6dc0428a6e4b9d9718e9e97359e, type: 2} + - target: {fileID: 1497820836737828598, guid: 3fa494ec083cbe54a86c3a1b107a90c0, type: 3} + propertyPath: m_LocalPosition.y + value: 0.2 + objectReference: {fileID: 0} - target: {fileID: 1765502114313172061, guid: 3fa494ec083cbe54a86c3a1b107a90c0, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: - objectReference: {fileID: 1750734786} + objectReference: {fileID: 2100000, guid: 5971a6dc0428a6e4b9d9718e9e97359e, type: 2} - target: {fileID: 2449793671979261866, guid: 3fa494ec083cbe54a86c3a1b107a90c0, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -476908,6 +474721,10 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 4953895971083580487, guid: 3fa494ec083cbe54a86c3a1b107a90c0, type: 3} + propertyPath: m_LocalPosition.x + value: -0.2 + objectReference: {fileID: 0} - target: {fileID: 5415533004257413878, guid: 3fa494ec083cbe54a86c3a1b107a90c0, type: 3} propertyPath: m_LocalPosition.x value: -4.57 @@ -476915,15 +474732,15 @@ PrefabInstance: - target: {fileID: 5635454920398905319, guid: 3fa494ec083cbe54a86c3a1b107a90c0, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: - objectReference: {fileID: 1047268407} + objectReference: {fileID: 2100000, guid: 5971a6dc0428a6e4b9d9718e9e97359e, type: 2} - target: {fileID: 5693370408310176735, guid: 3fa494ec083cbe54a86c3a1b107a90c0, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: - objectReference: {fileID: 217917171} + objectReference: {fileID: 2100000, guid: 5971a6dc0428a6e4b9d9718e9e97359e, type: 2} - target: {fileID: 6094226542508908646, guid: 3fa494ec083cbe54a86c3a1b107a90c0, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: - objectReference: {fileID: 2067465357} + objectReference: {fileID: 2100000, guid: 5971a6dc0428a6e4b9d9718e9e97359e, type: 2} - target: {fileID: 6239236866170444314, guid: 3fa494ec083cbe54a86c3a1b107a90c0, type: 3} propertyPath: dialogueGraph value: @@ -476931,7 +474748,7 @@ PrefabInstance: - target: {fileID: 6710902156263822101, guid: 3fa494ec083cbe54a86c3a1b107a90c0, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: - objectReference: {fileID: 224006988} + objectReference: {fileID: 2100000, guid: 5971a6dc0428a6e4b9d9718e9e97359e, type: 2} - target: {fileID: 6795030051102606943, guid: 3fa494ec083cbe54a86c3a1b107a90c0, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -476960,6 +474777,10 @@ PrefabInstance: propertyPath: reactionClipToPlay value: objectReference: {fileID: 8300000, guid: 0ca909ee49d83134d9040e527ba94af4, type: 3} + - target: {fileID: 9135099229597161771, guid: 3fa494ec083cbe54a86c3a1b107a90c0, type: 3} + propertyPath: m_LocalPosition.y + value: -0.2 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -477046,6 +474867,38 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 1569498917964935965, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3} + propertyPath: m_SceneBindings.Array.size + value: 11 + objectReference: {fileID: 0} + - target: {fileID: 1569498917964935965, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3} + propertyPath: m_SceneBindings.Array.data[8].key + value: + objectReference: {fileID: 8776627858148209300, guid: 1791fd5a24a3142418ed441a2a25b374, type: 2} + - target: {fileID: 1569498917964935965, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3} + propertyPath: m_SceneBindings.Array.data[9].key + value: + objectReference: {fileID: 6964431640287062015, guid: 1791fd5a24a3142418ed441a2a25b374, type: 2} + - target: {fileID: 1569498917964935965, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3} + propertyPath: m_SceneBindings.Array.data[10].key + value: + objectReference: {fileID: 6955792371262468379, guid: 1791fd5a24a3142418ed441a2a25b374, type: 2} + - target: {fileID: 1569498917964935965, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3} + propertyPath: m_SceneBindings.Array.data[11].key + value: + objectReference: {fileID: 6955792371262468379, guid: 1791fd5a24a3142418ed441a2a25b374, type: 2} + - target: {fileID: 1569498917964935965, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3} + propertyPath: m_SceneBindings.Array.data[12].key + value: + objectReference: {fileID: 6955792371262468379, guid: 1791fd5a24a3142418ed441a2a25b374, type: 2} + - target: {fileID: 1569498917964935965, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3} + propertyPath: m_SceneBindings.Array.data[13].key + value: + objectReference: {fileID: 6955792371262468379, guid: 1791fd5a24a3142418ed441a2a25b374, type: 2} + - target: {fileID: 1569498917964935965, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3} + propertyPath: m_SceneBindings.Array.data[14].key + value: + objectReference: {fileID: 6955792371262468379, guid: 1791fd5a24a3142418ed441a2a25b374, type: 2} - target: {fileID: 1569498917964935965, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3} propertyPath: m_SceneBindings.Array.data[4].value value: @@ -477061,23 +474914,31 @@ PrefabInstance: - target: {fileID: 1569498917964935965, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3} propertyPath: m_SceneBindings.Array.data[8].value value: - objectReference: {fileID: 1519887120} + objectReference: {fileID: 0} - target: {fileID: 1569498917964935965, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3} propertyPath: m_SceneBindings.Array.data[9].value value: - objectReference: {fileID: 1576907799} + objectReference: {fileID: 1760588396} - target: {fileID: 1569498917964935965, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3} propertyPath: m_SceneBindings.Array.data[10].value value: - objectReference: {fileID: 1600314232} + objectReference: {fileID: 159495802} - target: {fileID: 1569498917964935965, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3} propertyPath: m_SceneBindings.Array.data[11].value value: - objectReference: {fileID: 1974401592} + objectReference: {fileID: 159495802} + - target: {fileID: 1569498917964935965, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3} + propertyPath: m_SceneBindings.Array.data[12].value + value: + objectReference: {fileID: 159495802} - target: {fileID: 1569498917964935965, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3} propertyPath: m_SceneBindings.Array.data[13].value value: - objectReference: {fileID: 1760588396} + objectReference: {fileID: 159495802} + - target: {fileID: 1569498917964935965, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3} + propertyPath: m_SceneBindings.Array.data[14].value + value: + objectReference: {fileID: 159495802} - target: {fileID: 4937390562043858043, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3} propertyPath: m_LocalPosition.x value: -38.7 @@ -477425,32 +475286,104 @@ PrefabInstance: objectReference: {fileID: 8013274907828598645} - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.size - value: 2 + value: 5 objectReference: {fileID: 0} - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[1].m_Mode value: 1 objectReference: {fileID: 0} + - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[2].m_Mode + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[3].m_Mode + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[4].m_Mode + value: 6 + objectReference: {fileID: 0} - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[1].m_Target value: objectReference: {fileID: 159432895} + - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[2].m_Target + value: + objectReference: {fileID: 1321743059} + - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[3].m_Target + value: + objectReference: {fileID: 1273792069} + - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[4].m_Target + value: + objectReference: {fileID: 502962904} - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[1].m_CallState value: 2 objectReference: {fileID: 0} + - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[2].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[3].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[4].m_CallState + value: 2 + objectReference: {fileID: 0} - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName value: TakePhoto objectReference: {fileID: 0} + - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[2].m_MethodName + value: SetActive + objectReference: {fileID: 0} + - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[3].m_MethodName + value: SetActive + objectReference: {fileID: 0} + - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[4].m_MethodName + value: SetActive + objectReference: {fileID: 0} - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName value: AnneLiseBushBehaviour, AppleHillsScripts objectReference: {fileID: 0} + - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[2].m_TargetAssemblyTypeName + value: UnityEngine.GameObject, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[3].m_TargetAssemblyTypeName + value: UnityEngine.GameObject, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[4].m_TargetAssemblyTypeName + value: UnityEngine.GameObject, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[1].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[2].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[3].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[4].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 8818689886719637838, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} propertyPath: isOneTime value: 1 @@ -477640,6 +475573,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 768267914} m_Modifications: + - target: {fileID: 1852608221241404454, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: -1317397836, guid: 88ebd40823d503a44af6d726c6b5aab5, type: 3} - target: {fileID: 1852608221241404454, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} propertyPath: m_SortingOrder value: 0 @@ -477647,7 +475584,7 @@ PrefabInstance: - target: {fileID: 1852608221241404454, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: - objectReference: {fileID: 416906544} + objectReference: {fileID: 2100000, guid: 5971a6dc0428a6e4b9d9718e9e97359e, type: 2} - target: {fileID: 2525679661197630634, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} propertyPath: FeedbacksList.Array.size value: 0 @@ -477656,6 +475593,10 @@ PrefabInstance: propertyPath: m_Name value: GlowOutline objectReference: {fileID: 0} + - target: {fileID: 5094223041467069679, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: -1317397836, guid: 88ebd40823d503a44af6d726c6b5aab5, type: 3} - target: {fileID: 5094223041467069679, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} propertyPath: m_SortingOrder value: 0 @@ -477663,7 +475604,7 @@ PrefabInstance: - target: {fileID: 5094223041467069679, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: - objectReference: {fileID: 1361340966} + objectReference: {fileID: 2100000, guid: 5971a6dc0428a6e4b9d9718e9e97359e, type: 2} - target: {fileID: 5203759348480833935, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -477704,6 +475645,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5692747743727126428, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: -1317397836, guid: 88ebd40823d503a44af6d726c6b5aab5, type: 3} - target: {fileID: 5692747743727126428, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} propertyPath: m_SortingOrder value: 0 @@ -477711,7 +475656,11 @@ PrefabInstance: - target: {fileID: 5692747743727126428, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: - objectReference: {fileID: 774079517} + objectReference: {fileID: 2100000, guid: 5971a6dc0428a6e4b9d9718e9e97359e, type: 2} + - target: {fileID: 6093743105869044773, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: -1317397836, guid: 88ebd40823d503a44af6d726c6b5aab5, type: 3} - target: {fileID: 6093743105869044773, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} propertyPath: m_SortingOrder value: 0 @@ -477719,7 +475668,7 @@ PrefabInstance: - target: {fileID: 6093743105869044773, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: - objectReference: {fileID: 1194616634} + objectReference: {fileID: 2100000, guid: 5971a6dc0428a6e4b9d9718e9e97359e, type: 2} - target: {fileID: 6900224008763310802, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} propertyPath: itemSprite value: diff --git a/Assets/Scripts/DamianExperiments/Quarry/LawnMowerPuzzle/LawnmowerStateMachine.prefab b/Assets/Scripts/DamianExperiments/Quarry/LawnMowerPuzzle/LawnmowerStateMachine.prefab index bcd177b4..5b9cfade 100644 --- a/Assets/Scripts/DamianExperiments/Quarry/LawnMowerPuzzle/LawnmowerStateMachine.prefab +++ b/Assets/Scripts/DamianExperiments/Quarry/LawnMowerPuzzle/LawnmowerStateMachine.prefab @@ -19,7 +19,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &68470730839161369 Transform: m_ObjectHideFlags: 0 @@ -282,6 +282,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!114 &6407014757843176454 MonoBehaviour: @@ -541,6 +542,7 @@ Animator: m_WriteDefaultValuesOnDisable: 0 --- !u!212 &2397974294601466633 SpriteRenderer: + serializedVersion: 2 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -586,6 +588,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_Sprite: {fileID: -8189809603051793254, guid: 64965726962afa94b88cefeb179bc573, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -595,7 +598,6 @@ SpriteRenderer: m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!1 &2882415700974115882 GameObject: @@ -1049,6 +1051,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!114 &7793638615220209122 MonoBehaviour: @@ -1183,6 +1186,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!114 &9040376305951000489 MonoBehaviour: @@ -1288,6 +1292,7 @@ SkinnedMeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 serializedVersion: 2 m_Quality: 0 m_UpdateWhenOffscreen: 0 @@ -1407,6 +1412,7 @@ SkinnedMeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 serializedVersion: 2 m_Quality: 0 m_UpdateWhenOffscreen: 0 @@ -1585,6 +1591,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!114 &4362079983360807751 MonoBehaviour: @@ -1598,6 +1605,92 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5980d28f81eb545d78e1d84e1449a10f, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &7663727731875931215 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 106062057957134378} + m_Modifications: + - target: {fileID: 1852608221241404454, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 1487011052474782424, guid: f489e2c9ce64ff34aa3c7a91a4edbd77, 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_Sprite + value: + objectReference: {fileID: 1487011052474782424, guid: f489e2c9ce64ff34aa3c7a91a4edbd77, 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: 1487011052474782424, guid: f489e2c9ce64ff34aa3c7a91a4edbd77, type: 3} + - target: {fileID: 6093743105869044773, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 1487011052474782424, guid: f489e2c9ce64ff34aa3c7a91a4edbd77, type: 3} + - target: {fileID: 6900224008763310802, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: itemSprite + value: + objectReference: {fileID: 3156508682930277421} + - target: {fileID: 6900224008763310802, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + propertyPath: interactionType + value: 2 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} +--- !u!4 &2480480958425800128 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5203759348480833935, guid: 231f994d50ad2cc42a9d03a39e45c4ff, type: 3} + m_PrefabInstance: {fileID: 7663727731875931215} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7984152337586070562 PrefabInstance: m_ObjectHideFlags: 0 @@ -1716,7 +1809,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4940025602237181209, guid: 60fd8777c3180dd40be2d9e3ff56dd2c, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4972892989515032591, guid: 60fd8777c3180dd40be2d9e3ff56dd2c, type: 3} propertyPath: m_Sprite @@ -1784,6 +1877,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 8049523385480426504, guid: 60fd8777c3180dd40be2d9e3ff56dd2c, type: 3} insertIndex: 0 addedObject: {fileID: 2901638171899200938} + - targetCorrespondingSourceObject: {fileID: 8049523385480426504, guid: 60fd8777c3180dd40be2d9e3ff56dd2c, type: 3} + insertIndex: -1 + addedObject: {fileID: 2480480958425800128} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 4940025602237181209, guid: 60fd8777c3180dd40be2d9e3ff56dd2c, type: 3} insertIndex: -1 @@ -1811,6 +1907,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 95e46aacea5b42888ee7881894193c11, type: 3} m_Name: m_EditorClassIdentifier: AppleHillsScripts::Core.SaveLoad.SaveableState +--- !u!212 &3156508682930277421 stripped +SpriteRenderer: + m_CorrespondingSourceObject: {fileID: 4972892989515032591, guid: 60fd8777c3180dd40be2d9e3ff56dd2c, type: 3} + m_PrefabInstance: {fileID: 7984152337586070562} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8911052060583241195 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Interactions/GlowOutline.cs b/Assets/Scripts/Interactions/GlowOutline.cs index 578176b4..45895429 100644 --- a/Assets/Scripts/Interactions/GlowOutline.cs +++ b/Assets/Scripts/Interactions/GlowOutline.cs @@ -2,6 +2,7 @@ using AppleHills; using System.Collections.Generic; using UnityEngine; using Core.Lifecycle; +using JetBrains.Annotations; public class GlowOutline : ManagedBehaviour { @@ -15,6 +16,7 @@ public class GlowOutline : ManagedBehaviour public SpriteRenderer itemSprite; public float thiccness; public GlowOutlineData.InteractionType interactionType; + public bool animatedSprite; @@ -35,7 +37,7 @@ public class GlowOutline : ManagedBehaviour childrenSprites = GetComponentsInChildren(); // childrenMaterials = GetComponentsInChildren(); - // Set the color overlay of the sprites to colour our outline with the colors set in Interaction Settings + // Set the color to use in this outline from the colors set in Interaction Settings foreach (GlowOutlineData data in outlineColors) { if (data.interaction == interactionType) @@ -44,8 +46,6 @@ public class GlowOutline : ManagedBehaviour } } - - // Find the spriterenderer in parent gameobject, but ignore our own spriterenderer // Set the scale and sprite of each child. Skip first child because that's the outline object. @@ -56,11 +56,41 @@ public class GlowOutline : ManagedBehaviour foreach (SpriteRenderer childSprite in childrenSprites) { - childSprite.sprite = itemSprite.sprite; - childSprite.sharedMaterial.color = outlineColor; + if (itemSprite.sprite != null) + { + childSprite.sprite = itemSprite.sprite; + + } + if (childSprite.sharedMaterial != null) + { + childSprite.sharedMaterial.color = outlineColor; + } + if (itemSprite == null) + { + Debug.Log($"Outline {name} is missing an item sprite!"); + } + + } } + public void Update() + { + if (animatedSprite) + { + foreach (SpriteRenderer childSprite in childrenSprites) + { + if (itemSprite.sprite != null) + { + childSprite.sprite = itemSprite.sprite; + + } + } + } + + } + + #if UNITY_EDITOR // Update outline in editor private void OnValidate() diff --git a/Assets/Scripts/StateMachines/Quarry/AnneLise/AnneLiseBushBehaviour.cs b/Assets/Scripts/StateMachines/Quarry/AnneLise/AnneLiseBushBehaviour.cs index c9905088..329a1d19 100644 --- a/Assets/Scripts/StateMachines/Quarry/AnneLise/AnneLiseBushBehaviour.cs +++ b/Assets/Scripts/StateMachines/Quarry/AnneLise/AnneLiseBushBehaviour.cs @@ -20,6 +20,15 @@ namespace StateMachines.Quarry.AnneLise { dialogueCanvas?.SetActive(false); _anneLiseBushStateMachine.ChangeState("TakePhoto"); + + foreach (GlowOutline outline in GetComponentsInChildren()) + { + if (outline != null) + { + outline.gameObject.SetActive(false); + } + } + } } } diff --git a/Assets/Settings/InteractionSettings.asset b/Assets/Settings/InteractionSettings.asset index 42b50d7b..c68e6b78 100644 --- a/Assets/Settings/InteractionSettings.asset +++ b/Assets/Settings/InteractionSettings.asset @@ -21,7 +21,7 @@ MonoBehaviour: - interaction: 1 outlineColour: {r: 0.5058824, g: 0.7803922, b: 0.8862746, a: 1} - interaction: 2 - outlineColour: {r: 0.62352943, g: 0.62352943, b: 0.8078432, a: 1} + outlineColour: {r: 1, g: 0.8784314, b: 0.57254905, a: 1} interactableLayerMask: serializedVersion: 2 m_Bits: 1024 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 3067ade1..286fb132 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -849,7 +849,7 @@ PlayerSettings: webWasm2023: 0 webEnableSubmoduleStrippingCompatibility: 0 scriptingDefineSymbols: - Android: ENABLE_LOG;DOTWEEN + Android: ENABLE_LOG;DOTWEEN;MOREMOUNTAINS_NICEVIBRATIONS_INSTALLED EmbeddedLinux: DOTWEEN GameCoreScarlett: DOTWEEN GameCoreXboxOne: DOTWEEN