diff --git a/Assets/Art/Sprites/UI/.SpeakerOption.png-autosave.kra b/Assets/Art/Sprites/UI/.SpeakerOption.png-autosave.kra new file mode 100644 index 00000000..ea496220 Binary files /dev/null and b/Assets/Art/Sprites/UI/.SpeakerOption.png-autosave.kra differ diff --git a/Assets/Art/Sprites/UI/SpeakerOption_question.png b/Assets/Art/Sprites/UI/SpeakerOption_question.png new file mode 100644 index 00000000..0ce63ad2 Binary files /dev/null and b/Assets/Art/Sprites/UI/SpeakerOption_question.png differ diff --git a/Assets/Art/Sprites/UI/SpeakerOption_question.png.meta b/Assets/Art/Sprites/UI/SpeakerOption_question.png.meta new file mode 100644 index 00000000..686de0e7 --- /dev/null +++ b/Assets/Art/Sprites/UI/SpeakerOption_question.png.meta @@ -0,0 +1,169 @@ +fileFormatVersion: 2 +guid: 4e5d5a9dd24adad4f80facf870ec454c +TextureImporter: + internalIDToNameTable: + - first: + 213: 6821686978506991011 + second: SpeakerOption_question_0 + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 80 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: SpeakerOption_question_0 + rect: + serializedVersion: 2 + x: 12 + y: 2 + width: 245 + height: 148 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 3a521d20a208bae50800000000000000 + internalID: 6821686978506991011 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + SpeakerOption_question_0: 6821686978506991011 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Characters/Gardener.prefab b/Assets/Prefabs/Characters/Gardener.prefab index dd085221..32da8394 100644 --- a/Assets/Prefabs/Characters/Gardener.prefab +++ b/Assets/Prefabs/Characters/Gardener.prefab @@ -2096,6 +2096,14 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2913690643654480743, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3} + propertyPath: m_AnchoredPosition.x + value: 292.34677 + objectReference: {fileID: 0} + - target: {fileID: 2913690643654480743, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3} + propertyPath: m_AnchoredPosition.y + value: 166.88583 + objectReference: {fileID: 0} - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -2238,11 +2246,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8307219291215824345, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3} propertyPath: m_AnchoredPosition.x - value: -131.34683 + value: 18 objectReference: {fileID: 0} - target: {fileID: 8307219291215824345, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3} propertyPath: m_AnchoredPosition.y - value: -183.88577 + value: -91 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] diff --git a/Assets/Prefabs/Puzzles/AnneLise/AnneLiseBush_ChocolateBird.prefab b/Assets/Prefabs/Puzzles/AnneLise/AnneLiseBush_ChocolateBird.prefab index ca3b7555..62a96c4d 100644 --- a/Assets/Prefabs/Puzzles/AnneLise/AnneLiseBush_ChocolateBird.prefab +++ b/Assets/Prefabs/Puzzles/AnneLise/AnneLiseBush_ChocolateBird.prefab @@ -8,10 +8,22 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 852327051512792946, guid: 9b2926886934b554f9a1727331d34787, type: 3} + propertyPath: m_LocalScale.x + value: -0.01 + objectReference: {fileID: 0} + - target: {fileID: 852327051512792946, guid: 9b2926886934b554f9a1727331d34787, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1011363502278351410, guid: 9b2926886934b554f9a1727331d34787, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 1434120740951793125, guid: 9b2926886934b554f9a1727331d34787, type: 3} + propertyPath: m_AnchoredPosition.x + value: 318 + objectReference: {fileID: 0} - target: {fileID: 2741639361616064442, guid: 9b2926886934b554f9a1727331d34787, type: 3} propertyPath: dialogueGraph value: @@ -40,6 +52,10 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5242661563418348379, guid: 9b2926886934b554f9a1727331d34787, type: 3} + propertyPath: m_AnchoredPosition.x + value: 175 + objectReference: {fileID: 0} - target: {fileID: 5865112760908786186, guid: 9b2926886934b554f9a1727331d34787, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -68,6 +84,10 @@ PrefabInstance: propertyPath: m_Name value: AnneLiseBush_ChocolateBird objectReference: {fileID: 0} + - target: {fileID: 7585418320376546109, guid: 9b2926886934b554f9a1727331d34787, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7816038554732339800, guid: 9b2926886934b554f9a1727331d34787, type: 3} propertyPath: m_IsActive value: 0 diff --git a/Assets/Prefabs/Puzzles/AnneLise/AnneLiseBush_HammerBird.prefab b/Assets/Prefabs/Puzzles/AnneLise/AnneLiseBush_HammerBird.prefab index 91f3d45c..d424bda1 100644 --- a/Assets/Prefabs/Puzzles/AnneLise/AnneLiseBush_HammerBird.prefab +++ b/Assets/Prefabs/Puzzles/AnneLise/AnneLiseBush_HammerBird.prefab @@ -8,6 +8,18 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 852327051512792946, guid: 9b2926886934b554f9a1727331d34787, type: 3} + propertyPath: m_LocalScale.x + value: -0.01 + objectReference: {fileID: 0} + - target: {fileID: 852327051512792946, guid: 9b2926886934b554f9a1727331d34787, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1434120740951793125, guid: 9b2926886934b554f9a1727331d34787, type: 3} + propertyPath: m_AnchoredPosition.x + value: 314 + objectReference: {fileID: 0} - target: {fileID: 2596730244514108870, guid: 9b2926886934b554f9a1727331d34787, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -52,6 +64,10 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5242661563418348379, guid: 9b2926886934b554f9a1727331d34787, type: 3} + propertyPath: m_AnchoredPosition.x + value: 171 + objectReference: {fileID: 0} - target: {fileID: 5865112760908786186, guid: 9b2926886934b554f9a1727331d34787, type: 3} propertyPath: m_AnchorMax.y value: 0 diff --git a/Assets/Prefabs/UI/DialogueCanvas.prefab b/Assets/Prefabs/UI/DialogueCanvas.prefab index 097839da..17eb5029 100644 --- a/Assets/Prefabs/UI/DialogueCanvas.prefab +++ b/Assets/Prefabs/UI/DialogueCanvas.prefab @@ -1627,7 +1627,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 143, y: 74} - m_SizeDelta: {x: 245, y: 148} + m_SizeDelta: {x: 394.5, y: 235.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5237027710007059819 CanvasRenderer: @@ -1657,7 +1657,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: -1369078500869033561, guid: d52355bd23697ac4eaad116fb0aec19d, type: 3} + m_Sprite: {fileID: 6821686978506991011, guid: 4e5d5a9dd24adad4f80facf870ec454c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/Scenes/Levels/Quarry.unity b/Assets/Scenes/Levels/Quarry.unity index 7af7de03..cb72e2b2 100644 --- a/Assets/Scenes/Levels/Quarry.unity +++ b/Assets/Scenes/Levels/Quarry.unity @@ -471855,30 +471855,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1935449646596426784, guid: 0c2275f0a1451a142b686a049a2ebcec, type: 3} - propertyPath: FeedbacksList.Array.size - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 1935449646596426784, guid: 0c2275f0a1451a142b686a049a2ebcec, type: 3} - propertyPath: 'FeedbacksList.Array.data[1]' - value: 8625086286513569903 - objectReference: {fileID: 0} - - target: {fileID: 1935449646596426784, guid: 0c2275f0a1451a142b686a049a2ebcec, type: 3} - propertyPath: 'FeedbacksList.Array.data[2]' - value: 8625086286513569898 - objectReference: {fileID: 0} - - target: {fileID: 1935449646596426784, guid: 0c2275f0a1451a142b686a049a2ebcec, type: 3} - propertyPath: 'FeedbacksList.Array.data[3]' - value: 8625086286513569909 - objectReference: {fileID: 0} - - target: {fileID: 1935449646596426784, guid: 0c2275f0a1451a142b686a049a2ebcec, type: 3} - propertyPath: 'FeedbacksList.Array.data[4]' - value: 8625086286513569901 - objectReference: {fileID: 0} - - target: {fileID: 1935449646596426784, guid: 0c2275f0a1451a142b686a049a2ebcec, type: 3} - propertyPath: 'FeedbacksList.Array.data[5]' - value: 8625086286513569904 - objectReference: {fileID: 0} - target: {fileID: 1935449646596426784, guid: 0c2275f0a1451a142b686a049a2ebcec, type: 3} propertyPath: 'managedReferences[8625086286513569903]' value: MoreMountains.Tools MoreMountains.Feedbacks.MMF_LooperStart