diff --git a/Assets/Scenes/Brasslands.unity b/Assets/Scenes/Brasslands.unity index 82886fd..57c6ce6 100644 --- a/Assets/Scenes/Brasslands.unity +++ b/Assets/Scenes/Brasslands.unity @@ -21465,7 +21465,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1206589089063141587, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3} propertyPath: m_RootOrder - value: 11 + value: 12 objectReference: {fileID: 0} - target: {fileID: 1206589089063141587, guid: ecbe9d625a3954206bc8d3d6361ad9b2, type: 3} propertyPath: m_LocalScale.x @@ -30899,6 +30899,103 @@ Transform: m_CorrespondingSourceObject: {fileID: 3781786539254097561, guid: 9230d7cbf1bbf0046a4d642090b875f3, type: 3} m_PrefabInstance: {fileID: 277296667} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1821314227 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 902593536366452992, guid: fff4dbc75abf546fe8c72b078d034f73, type: 3} + propertyPath: m_Name + value: VictoryObject + objectReference: {fileID: 0} + - target: {fileID: 4922823812539002641, guid: fff4dbc75abf546fe8c72b078d034f73, type: 3} + propertyPath: m_LocalScale.x + value: 0.09 + objectReference: {fileID: 0} + - target: {fileID: 4922823812539002641, guid: fff4dbc75abf546fe8c72b078d034f73, type: 3} + propertyPath: m_LocalScale.y + value: 0.09 + objectReference: {fileID: 0} + - target: {fileID: 4922823812539002641, guid: fff4dbc75abf546fe8c72b078d034f73, type: 3} + propertyPath: m_LocalScale.z + value: 0.09 + objectReference: {fileID: 0} + - target: {fileID: 4922823812539002641, guid: fff4dbc75abf546fe8c72b078d034f73, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7451084690627063635, guid: fff4dbc75abf546fe8c72b078d034f73, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: b5f64a07787ea48ad8d00b3ec2d138e4, type: 3} + - target: {fileID: 7938030115108489908, guid: fff4dbc75abf546fe8c72b078d034f73, type: 3} + propertyPath: m_RootOrder + value: 11 + objectReference: {fileID: 0} + - target: {fileID: 7938030115108489908, guid: fff4dbc75abf546fe8c72b078d034f73, type: 3} + propertyPath: m_LocalScale.x + value: 1.57 + objectReference: {fileID: 0} + - target: {fileID: 7938030115108489908, guid: fff4dbc75abf546fe8c72b078d034f73, type: 3} + propertyPath: m_LocalScale.y + value: 1.57 + objectReference: {fileID: 0} + - target: {fileID: 7938030115108489908, guid: fff4dbc75abf546fe8c72b078d034f73, type: 3} + propertyPath: m_LocalScale.z + value: 1.57 + objectReference: {fileID: 0} + - target: {fileID: 7938030115108489908, guid: fff4dbc75abf546fe8c72b078d034f73, type: 3} + propertyPath: m_LocalPosition.x + value: 87.19 + objectReference: {fileID: 0} + - target: {fileID: 7938030115108489908, guid: fff4dbc75abf546fe8c72b078d034f73, type: 3} + propertyPath: m_LocalPosition.y + value: -0.26 + objectReference: {fileID: 0} + - target: {fileID: 7938030115108489908, guid: fff4dbc75abf546fe8c72b078d034f73, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7938030115108489908, guid: fff4dbc75abf546fe8c72b078d034f73, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7938030115108489908, guid: fff4dbc75abf546fe8c72b078d034f73, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7938030115108489908, guid: fff4dbc75abf546fe8c72b078d034f73, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7938030115108489908, guid: fff4dbc75abf546fe8c72b078d034f73, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7938030115108489908, guid: fff4dbc75abf546fe8c72b078d034f73, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7938030115108489908, guid: fff4dbc75abf546fe8c72b078d034f73, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7938030115108489908, guid: fff4dbc75abf546fe8c72b078d034f73, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7938030115108489908, guid: fff4dbc75abf546fe8c72b078d034f73, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: fff4dbc75abf546fe8c72b078d034f73, type: 3} --- !u!1 &1822701441 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/GrappleScene.unity b/Assets/Scenes/GrappleScene.unity index 6009c83..c4baeeb 100644 --- a/Assets/Scenes/GrappleScene.unity +++ b/Assets/Scenes/GrappleScene.unity @@ -34582,8 +34582,8 @@ Tilemap: - first: {x: -13, y: -5, z: 0} second: serializedVersion: 2 - m_TileIndex: 15 - m_TileSpriteIndex: 17 + m_TileIndex: 13 + m_TileSpriteIndex: 13 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -110677,11 +110677,11 @@ Tilemap: m_Data: {fileID: 11400000, guid: 2de3761d0d3f54997a83ceffdbb3bbcd, type: 2} - m_RefCount: 21 m_Data: {fileID: 11400000, guid: e132c56212211409ebf3c45237fb91d0, type: 2} - - m_RefCount: 8214 + - m_RefCount: 8215 m_Data: {fileID: 11400000, guid: 10c6c09567fd741749552afbe7b1e7af, type: 2} - m_RefCount: 11 m_Data: {fileID: 11400000, guid: 8f14b335becfc4145a7b2e4ec44de328, type: 2} - - m_RefCount: 35 + - m_RefCount: 34 m_Data: {fileID: 11400000, guid: 56c25bc9cbf7748b19be318937ce1466, type: 2} - m_RefCount: 34 m_Data: {fileID: 11400000, guid: b36f78d48523449de83bf0c68026a91b, type: 2} @@ -110764,7 +110764,7 @@ Tilemap: m_Data: {fileID: 431461063, guid: 2097266264e574d71a38da279b45c7c0, type: 3} - m_RefCount: 21 m_Data: {fileID: -1828034864, guid: 2097266264e574d71a38da279b45c7c0, type: 3} - - m_RefCount: 8214 + - m_RefCount: 8215 m_Data: {fileID: -622248163, guid: 2097266264e574d71a38da279b45c7c0, type: 3} - m_RefCount: 28 m_Data: {fileID: -1728563952, guid: 2097266264e574d71a38da279b45c7c0, type: 3} @@ -110772,7 +110772,7 @@ Tilemap: m_Data: {fileID: 2028675851, guid: 2097266264e574d71a38da279b45c7c0, type: 3} - m_RefCount: 364 m_Data: {fileID: 1336928453, guid: 2097266264e574d71a38da279b45c7c0, type: 3} - - m_RefCount: 35 + - m_RefCount: 34 m_Data: {fileID: -345751969, guid: 2097266264e574d71a38da279b45c7c0, type: 3} - m_RefCount: 34 m_Data: {fileID: 1191579864, guid: 2097266264e574d71a38da279b45c7c0, type: 3} diff --git a/Assets/Scenes/OpeningMessage.unity b/Assets/Scenes/OpeningMessage.unity index 5c9f2cf..0d520a7 100644 --- a/Assets/Scenes/OpeningMessage.unity +++ b/Assets/Scenes/OpeningMessage.unity @@ -756,6 +756,13 @@ MonoBehaviour: Sir Jacques. - In Grenouille Village, Claude was the only musician in town. - And currently, Claude was running late for his performance . . . + backgroundImageObject: {fileID: 619461775} + images: + - {fileID: 21300000, guid: 3f137cb9700c7413c9b01b8511ede548, type: 3} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} --- !u!114 &1404700850 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/PerformanceisRuined.unity b/Assets/Scenes/PerformanceisRuined.unity index 47594e3..b1ded9d 100644 --- a/Assets/Scenes/PerformanceisRuined.unity +++ b/Assets/Scenes/PerformanceisRuined.unity @@ -766,6 +766,9 @@ MonoBehaviour: - '"Let us hear you play again, once more with pride!"' - And so Claude began his journey to leave Grenouille village. - First, he went into the Brasslands to retrieve what had been pillaged... + backgroundImageObject: {fileID: 619461775} + images: + - {fileID: 21300000, guid: 3f137cb9700c7413c9b01b8511ede548, type: 3} --- !u!114 &1404700850 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/TransitionToClarinet.unity b/Assets/Scenes/TransitionToClarinet.unity index bf2b9a3..1b7d9a2 100644 --- a/Assets/Scenes/TransitionToClarinet.unity +++ b/Assets/Scenes/TransitionToClarinet.unity @@ -626,6 +626,9 @@ MonoBehaviour: - Press [ACTION] to Clarinet Dash at a downwards angle in the direction you're facing. - If you hit water, you'll be launched back up! + backgroundImageObject: {fileID: 619461775} + images: + - {fileID: 21300000, guid: 3f137cb9700c7413c9b01b8511ede548, type: 3} --- !u!114 &1404700850 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/TransitionToTambourine.unity b/Assets/Scenes/TransitionToTambourine.unity index 6d22c4d..f2d0dd5 100644 --- a/Assets/Scenes/TransitionToTambourine.unity +++ b/Assets/Scenes/TransitionToTambourine.unity @@ -622,10 +622,18 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: dialogMessages: - - You found the tambourine! + - 'You found the tambourine! ' - Press K to throw a tambourine in the direction you're facing. - If it hits an enemy or projectile, it will pin them in place! - Then, you can throw Sir Jacques to grapple from it! + - Then, you can throw Sir Jacques to grapple from it! + backgroundImageObject: {fileID: 619461775} + images: + - {fileID: 21300000, guid: 7705e2bf46e60499da80ed915e40a608, type: 3} + - {fileID: 0} + - {fileID: 21300000, guid: 70dfc04fb0d3745cdbe4beba30a5bb63, type: 3} + - {fileID: 21300000, guid: 6c141bafb981a4aea94c60fe1239bb0c, type: 3} + - {fileID: 21300000, guid: 3174afa9508004cecb7fb4c0dfb015c4, type: 3} --- !u!114 &1404700850 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/DialogBoxes.cs b/Assets/Scripts/DialogBoxes.cs index 03df62a..53e54f4 100644 --- a/Assets/Scripts/DialogBoxes.cs +++ b/Assets/Scripts/DialogBoxes.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.InputSystem; using TMPro; +using UnityEngine.UI; public class DialogBoxes : MonoBehaviour { @@ -12,19 +13,46 @@ public class DialogBoxes : MonoBehaviour private TMP_Text textField; private int messageCount = 0; + [Header("Images:")] + [SerializeField] Image backgroundImageObject; + [SerializeField] Sprite[] images; + + // Start is called before the first frame update void Start() { textField = this.gameObject.GetComponent(); + ReconfigureSpriteArray(); textField.text = dialogMessages[0]; + backgroundImageObject.sprite = images[0]; } void OnAdvanceDialog() { messageCount += 1; if (messageCount < dialogMessages.Length) { textField.text = dialogMessages[messageCount]; + backgroundImageObject.sprite = images[messageCount]; } else { // no more dialog messages, advance the scene GameObject.Find("SceneManager").GetComponent().NextScene(); } } + + void ReconfigureSpriteArray() { + // resize if need to + if (images.Length != dialogMessages.Length) { + Sprite[] newImagesArray = new Sprite[dialogMessages.Length]; + for (int i = 0; i < newImagesArray.Length; i++) { + newImagesArray[i] = images[i]; + } + images = newImagesArray; + } + + // update empty slots + for (int i = 1; i < images.Length; i++) { + if (images[i] == null ) { + images[i] = images[i-1]; + } + } + + } } diff --git a/Assets/Sprites/Items/.DS_Store b/Assets/Sprites/Items/.DS_Store index 86c6e18..446ec83 100644 Binary files a/Assets/Sprites/Items/.DS_Store and b/Assets/Sprites/Items/.DS_Store differ diff --git a/Assets/Sprites/UI/.DS_Store b/Assets/Sprites/UI/.DS_Store new file mode 100644 index 0000000..2db710c Binary files /dev/null and b/Assets/Sprites/UI/.DS_Store differ diff --git a/Assets/Sprites/UI/TransitionImages.meta b/Assets/Sprites/UI/TransitionImages.meta new file mode 100644 index 0000000..1cd36b2 --- /dev/null +++ b/Assets/Sprites/UI/TransitionImages.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8d39a6b9db50e48ada7c68faf0bc602b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/UI/TransitionImages/.DS_Store b/Assets/Sprites/UI/TransitionImages/.DS_Store new file mode 100644 index 0000000..9cf09c4 Binary files /dev/null and b/Assets/Sprites/UI/TransitionImages/.DS_Store differ diff --git a/Assets/Sprites/UI/TransitionImages/ToTambourine.meta b/Assets/Sprites/UI/TransitionImages/ToTambourine.meta new file mode 100644 index 0000000..fc3c9bd --- /dev/null +++ b/Assets/Sprites/UI/TransitionImages/ToTambourine.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d12dc6a41ec094e98b03eb08f78250de +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/UI/TransitionImages/ToTambourine/Grapple.png b/Assets/Sprites/UI/TransitionImages/ToTambourine/Grapple.png new file mode 100644 index 0000000..807ad2f Binary files /dev/null and b/Assets/Sprites/UI/TransitionImages/ToTambourine/Grapple.png differ diff --git a/Assets/Sprites/UI/TransitionImages/ToTambourine/Grapple.png.meta b/Assets/Sprites/UI/TransitionImages/ToTambourine/Grapple.png.meta new file mode 100644 index 0000000..62d1350 --- /dev/null +++ b/Assets/Sprites/UI/TransitionImages/ToTambourine/Grapple.png.meta @@ -0,0 +1,124 @@ +fileFormatVersion: 2 +guid: 6c141bafb981a4aea94c60fe1239bb0c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + 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: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/UI/TransitionImages/ToTambourine/Pin.png b/Assets/Sprites/UI/TransitionImages/ToTambourine/Pin.png new file mode 100644 index 0000000..21369d0 Binary files /dev/null and b/Assets/Sprites/UI/TransitionImages/ToTambourine/Pin.png differ diff --git a/Assets/Sprites/UI/TransitionImages/ToTambourine/Pin.png.meta b/Assets/Sprites/UI/TransitionImages/ToTambourine/Pin.png.meta new file mode 100644 index 0000000..a8ff8dd --- /dev/null +++ b/Assets/Sprites/UI/TransitionImages/ToTambourine/Pin.png.meta @@ -0,0 +1,124 @@ +fileFormatVersion: 2 +guid: 70dfc04fb0d3745cdbe4beba30a5bb63 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + 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: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/UI/TransitionImages/ToTambourine/Swing.png b/Assets/Sprites/UI/TransitionImages/ToTambourine/Swing.png new file mode 100644 index 0000000..bcf833b Binary files /dev/null and b/Assets/Sprites/UI/TransitionImages/ToTambourine/Swing.png differ diff --git a/Assets/Sprites/UI/TransitionImages/ToTambourine/Swing.png.meta b/Assets/Sprites/UI/TransitionImages/ToTambourine/Swing.png.meta new file mode 100644 index 0000000..00f1b04 --- /dev/null +++ b/Assets/Sprites/UI/TransitionImages/ToTambourine/Swing.png.meta @@ -0,0 +1,124 @@ +fileFormatVersion: 2 +guid: 3174afa9508004cecb7fb4c0dfb015c4 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + 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: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/UI/TransitionImages/ToTambourine/Throw.png b/Assets/Sprites/UI/TransitionImages/ToTambourine/Throw.png new file mode 100644 index 0000000..86fb7d6 Binary files /dev/null and b/Assets/Sprites/UI/TransitionImages/ToTambourine/Throw.png differ diff --git a/Assets/Sprites/UI/TransitionImages/ToTambourine/Throw.png.meta b/Assets/Sprites/UI/TransitionImages/ToTambourine/Throw.png.meta new file mode 100644 index 0000000..f0b3c49 --- /dev/null +++ b/Assets/Sprites/UI/TransitionImages/ToTambourine/Throw.png.meta @@ -0,0 +1,124 @@ +fileFormatVersion: 2 +guid: 7705e2bf46e60499da80ed915e40a608 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + 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: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index c5593f8..66a71d5 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -26,6 +26,9 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/GrappleScene.unity guid: 448086d7e4e5643efb9aa6c436632072 + - enabled: 1 + path: Assets/Scenes/TransitionToClarinet.unity + guid: ceaf7c9806ccc4437a2435895d86eaf5 - enabled: 1 path: Assets/Scenes/ClarinetScene.unity guid: 92afc354c694b744eaf9279e7a8d5c29