diff --git a/Assets/Images/Adverts/Egypt Crusade ad.png b/Assets/Images/Adverts/Egypt Crusade ad.png deleted file mode 100644 index 944000e..0000000 Binary files a/Assets/Images/Adverts/Egypt Crusade ad.png and /dev/null differ diff --git a/Assets/Images/Adverts/Egypt_Crusade_ad.png b/Assets/Images/Adverts/Egypt_Crusade_ad.png new file mode 100644 index 0000000..105bdf0 Binary files /dev/null and b/Assets/Images/Adverts/Egypt_Crusade_ad.png differ diff --git a/Assets/Images/Adverts/Over the watch ad.png.meta b/Assets/Images/Adverts/Egypt_Crusade_ad.png.meta similarity index 97% rename from Assets/Images/Adverts/Over the watch ad.png.meta rename to Assets/Images/Adverts/Egypt_Crusade_ad.png.meta index 8f443b6..b7edeeb 100644 --- a/Assets/Images/Adverts/Over the watch ad.png.meta +++ b/Assets/Images/Adverts/Egypt_Crusade_ad.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 76058b5a9bf44a9478ab31804ab9d2df +guid: 3b3c029f5765bc646a0660decc8792c8 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -50,7 +50,7 @@ TextureImporter: spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 0 + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 diff --git a/Assets/Images/Adverts/Gabagool ad.png b/Assets/Images/Adverts/Gabagool ad.png deleted file mode 100644 index 4f5692e..0000000 Binary files a/Assets/Images/Adverts/Gabagool ad.png and /dev/null differ diff --git a/Assets/Images/Adverts/Gabagool_ad.png b/Assets/Images/Adverts/Gabagool_ad.png new file mode 100644 index 0000000..146df30 Binary files /dev/null and b/Assets/Images/Adverts/Gabagool_ad.png differ diff --git a/Assets/Images/Adverts/Egypt Crusade ad.png.meta b/Assets/Images/Adverts/Gabagool_ad.png.meta similarity index 97% rename from Assets/Images/Adverts/Egypt Crusade ad.png.meta rename to Assets/Images/Adverts/Gabagool_ad.png.meta index f007089..3d24157 100644 --- a/Assets/Images/Adverts/Egypt Crusade ad.png.meta +++ b/Assets/Images/Adverts/Gabagool_ad.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cfef516196b2c1d4b9a2ec018cfe6a53 +guid: b87d5a2e78ba57d48880bf58ef05a7da TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -50,7 +50,7 @@ TextureImporter: spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 0 + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 diff --git a/Assets/Images/Adverts/Over the watch ad.png b/Assets/Images/Adverts/Over the watch ad.png deleted file mode 100644 index b7d51c8..0000000 Binary files a/Assets/Images/Adverts/Over the watch ad.png and /dev/null differ diff --git a/Assets/Images/Adverts/Over_the_watch_ad.png b/Assets/Images/Adverts/Over_the_watch_ad.png new file mode 100644 index 0000000..c7897b0 Binary files /dev/null and b/Assets/Images/Adverts/Over_the_watch_ad.png differ diff --git a/Assets/Images/Adverts/Red bread redemption ad.png.meta b/Assets/Images/Adverts/Over_the_watch_ad.png.meta similarity index 97% rename from Assets/Images/Adverts/Red bread redemption ad.png.meta rename to Assets/Images/Adverts/Over_the_watch_ad.png.meta index 9a80278..ca86947 100644 --- a/Assets/Images/Adverts/Red bread redemption ad.png.meta +++ b/Assets/Images/Adverts/Over_the_watch_ad.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8841696fbfeb4cb49aa2e65c44c8f2a4 +guid: 256f02e0170653145ad5a1b6ed208426 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -50,7 +50,7 @@ TextureImporter: spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 0 + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 diff --git a/Assets/Images/Adverts/Red bread redemption ad.png b/Assets/Images/Adverts/Red bread redemption ad.png deleted file mode 100644 index f95d290..0000000 Binary files a/Assets/Images/Adverts/Red bread redemption ad.png and /dev/null differ diff --git a/Assets/Images/Adverts/Red_bread_no_cross.png b/Assets/Images/Adverts/Red_bread_no_cross.png new file mode 100644 index 0000000..7fe5d0a Binary files /dev/null and b/Assets/Images/Adverts/Red_bread_no_cross.png differ diff --git a/Assets/Images/Adverts/Gabagool ad.png.meta b/Assets/Images/Adverts/Red_bread_no_cross.png.meta similarity index 97% rename from Assets/Images/Adverts/Gabagool ad.png.meta rename to Assets/Images/Adverts/Red_bread_no_cross.png.meta index 359bafb..c03e221 100644 --- a/Assets/Images/Adverts/Gabagool ad.png.meta +++ b/Assets/Images/Adverts/Red_bread_no_cross.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e34bfec25f7947f4e936bb8adc01a8f0 +guid: c817f5694a7303c428fb37306045fc9b TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -50,7 +50,7 @@ TextureImporter: spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 0 + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 diff --git a/Assets/Images/Adverts/The codfather ad.png b/Assets/Images/Adverts/The codfather ad.png deleted file mode 100644 index 0788ebb..0000000 Binary files a/Assets/Images/Adverts/The codfather ad.png and /dev/null differ diff --git a/Assets/Images/Adverts/The codfather ad.png.meta b/Assets/Images/Adverts/The codfather ad.png.meta deleted file mode 100644 index 373d3fb..0000000 --- a/Assets/Images/Adverts/The codfather ad.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: 210bdc7c31d9da3408d6c71877e64d7b -TextureImporter: - internalIDToNameTable: [] - 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: 0 - 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: 0 - 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 - ignorePlatformSupport: 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 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: WebGL - 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: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Images/Adverts/The_codfather_ad.png b/Assets/Images/Adverts/The_codfather_ad.png new file mode 100644 index 0000000..6b53bb8 Binary files /dev/null and b/Assets/Images/Adverts/The_codfather_ad.png differ diff --git a/Assets/Images/Adverts/The_codfather_ad.png.meta b/Assets/Images/Adverts/The_codfather_ad.png.meta new file mode 100644 index 0000000..e23d1d0 --- /dev/null +++ b/Assets/Images/Adverts/The_codfather_ad.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 96c0dcfbf5358154aa8077a5909739ac +TextureImporter: + internalIDToNameTable: [] + 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: 0 + 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 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/Adverts/bepsi rora ad.png b/Assets/Images/Adverts/bepsi rora ad.png deleted file mode 100644 index 52deb29..0000000 Binary files a/Assets/Images/Adverts/bepsi rora ad.png and /dev/null differ diff --git a/Assets/Images/Adverts/bepsi rora ad.png.meta b/Assets/Images/Adverts/bepsi rora ad.png.meta deleted file mode 100644 index 552f7a3..0000000 --- a/Assets/Images/Adverts/bepsi rora ad.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: a16f47cf69d6cac4aa6283e32df807b4 -TextureImporter: - internalIDToNameTable: [] - 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: 0 - 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: 0 - 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 - ignorePlatformSupport: 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 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: WebGL - 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: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Images/Adverts/bepsi_rora_ad.png b/Assets/Images/Adverts/bepsi_rora_ad.png new file mode 100644 index 0000000..1482ae7 Binary files /dev/null and b/Assets/Images/Adverts/bepsi_rora_ad.png differ diff --git a/Assets/Images/Adverts/bepsi_rora_ad.png.meta b/Assets/Images/Adverts/bepsi_rora_ad.png.meta new file mode 100644 index 0000000..4bf8534 --- /dev/null +++ b/Assets/Images/Adverts/bepsi_rora_ad.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: fb9ee9417f676274087e318dff5c2b73 +TextureImporter: + internalIDToNameTable: [] + 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: 0 + 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 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Registeries/AdvertRegistry.cs b/Assets/Scripts/Registeries/AdvertRegistry.cs index 7511211..c6a63f4 100644 --- a/Assets/Scripts/Registeries/AdvertRegistry.cs +++ b/Assets/Scripts/Registeries/AdvertRegistry.cs @@ -2,16 +2,23 @@ namespace InterfaceOff { + [System.Serializable] + public struct Advert + { + [field: SerializeField] public string Name { get; private set; } + [field: SerializeField] public Sprite Image { get; private set; } + } + [CreateAssetMenu(fileName = "Advert Registry", menuName = "Custom/Create Advert Registry")] public class AdvertRegistry : ScriptableObject { - [field: SerializeField] public Sprite[] m_Adverts; + [field: SerializeField] public Advert[] m_Adverts; private static AdvertRegistry Instance; [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)] private static void LoadRegistry() => Instance = Resources.Load("AdvertRegistry"); - public static Sprite GetRandomAdvert() + public static Advert GetRandomAdvert() { int index = Random.Range(0, Instance.m_Adverts.Length); return Instance.m_Adverts[index]; diff --git a/Assets/Scripts/Windows/BasicWindow.cs b/Assets/Scripts/Windows/BasicWindow.cs index 037bc32..275efcd 100644 --- a/Assets/Scripts/Windows/BasicWindow.cs +++ b/Assets/Scripts/Windows/BasicWindow.cs @@ -7,7 +7,9 @@ namespace InterfaceOff public override void OnWindowInstantiation() { /* Adds a random advert to the display */ - Components.WindowImage.sprite = AdvertRegistry.GetRandomAdvert(); + Advert advert = AdvertRegistry.GetRandomAdvert(); + Components.WindowImage.sprite = advert.Image; + Components.InfoText.text = advert.Name; Components.WindowImage.color = new Color(1, 1, 1, 1); } diff --git a/Assets/Scripts/Windows/MovingWindow.cs b/Assets/Scripts/Windows/MovingWindow.cs index dc0b996..9808272 100644 --- a/Assets/Scripts/Windows/MovingWindow.cs +++ b/Assets/Scripts/Windows/MovingWindow.cs @@ -7,7 +7,9 @@ namespace InterfaceOff public override void OnWindowInstantiation() { /* Adds a random advert to the display */ - Components.WindowImage.sprite = AdvertRegistry.GetRandomAdvert(); + Advert advert = AdvertRegistry.GetRandomAdvert(); + Components.WindowImage.sprite = advert.Image; + Components.InfoText.text = advert.Name; Components.WindowImage.color = new Color(1, 1, 1, 1); /* Calculates a random velocity direction */ diff --git a/Assets/Scripts/Windows/TrollWindow.cs b/Assets/Scripts/Windows/TrollWindow.cs index 6d0ba79..46a2a1a 100644 --- a/Assets/Scripts/Windows/TrollWindow.cs +++ b/Assets/Scripts/Windows/TrollWindow.cs @@ -10,7 +10,9 @@ namespace InterfaceOff public override void OnWindowInstantiation() { /* Adds a random advert to the display */ - Components.WindowImage.sprite = AdvertRegistry.GetRandomAdvert(); + Advert advert = AdvertRegistry.GetRandomAdvert(); + Components.WindowImage.sprite = advert.Image; + Components.InfoText.text = advert.Name; Components.WindowImage.color = new Color(1, 1, 1, 1); /* Calculates a random health value */