From dfdb47b94a8129979d301602f6c2ccd3388d0346 Mon Sep 17 00:00:00 2001 From: henrisel Date: Sat, 28 Feb 2026 15:42:15 +0200 Subject: [PATCH] change mic icon colour to grey/green --- 3d-generation-pipeline/README.md | 1 - Assets/_PROJECT/Images/mic_off_grey.png | 3 + Assets/_PROJECT/Images/mic_off_grey.png.meta | 148 ++++++++++++++++++ Assets/_PROJECT/Images/mic_on_green 1.png | 3 + .../_PROJECT/Images/mic_on_green 1.png.meta | 148 ++++++++++++++++++ .../ModelGeneration/MicrophoneStand.prefab | 24 +-- .../_PROJECT/Scenes/DeltaBuilding_base.unity | 4 +- .../MicrophoneProximityTrigger.cs | 2 - 8 files changed, 316 insertions(+), 17 deletions(-) create mode 100644 Assets/_PROJECT/Images/mic_off_grey.png create mode 100644 Assets/_PROJECT/Images/mic_off_grey.png.meta create mode 100644 Assets/_PROJECT/Images/mic_on_green 1.png create mode 100644 Assets/_PROJECT/Images/mic_on_green 1.png.meta diff --git a/3d-generation-pipeline/README.md b/3d-generation-pipeline/README.md index 94868474..0943979b 100644 --- a/3d-generation-pipeline/README.md +++ b/3d-generation-pipeline/README.md @@ -18,7 +18,6 @@ * shape scanner mitte lihtsalt ontriggerenter ja -exit, sest kui mitu objekti lähevad samal ajal sisse * shape scanneris prinditud objektid mõnikord ei kao ära kui config success * archery range: - * mute/unmute ikooni värv mitte must (muted kollane, roheline) * mikrofon peaks lõpetama protsessimise ka siis kui mängija läheb ära mikri juurest * võiks jääda kordama viimast instruktsiooni, kui mängija ei progressi edasi * kui archery range läbi, võiks npc öelda "good job, try again..." diff --git a/Assets/_PROJECT/Images/mic_off_grey.png b/Assets/_PROJECT/Images/mic_off_grey.png new file mode 100644 index 00000000..4518bc41 --- /dev/null +++ b/Assets/_PROJECT/Images/mic_off_grey.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:11d7ac578a1711a5316d784a6c93714d509d44805edcfe28363d80992add4103 +size 2105759 diff --git a/Assets/_PROJECT/Images/mic_off_grey.png.meta b/Assets/_PROJECT/Images/mic_off_grey.png.meta new file mode 100644 index 00000000..45cdad34 --- /dev/null +++ b/Assets/_PROJECT/Images/mic_off_grey.png.meta @@ -0,0 +1,148 @@ +fileFormatVersion: 2 +guid: 7d9a2d0479a3d2f4fb6ac783fb358703 +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: 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 + 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 + - serializedVersion: 3 + buildTarget: WebGL + 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: Windows Store Apps + 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/_PROJECT/Images/mic_on_green 1.png b/Assets/_PROJECT/Images/mic_on_green 1.png new file mode 100644 index 00000000..eb3c0c2d --- /dev/null +++ b/Assets/_PROJECT/Images/mic_on_green 1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:876aed18d0fbda5f089dfdabc26ffdd3dbe9816a64934167da1ca2583a22b832 +size 1559057 diff --git a/Assets/_PROJECT/Images/mic_on_green 1.png.meta b/Assets/_PROJECT/Images/mic_on_green 1.png.meta new file mode 100644 index 00000000..b745e9be --- /dev/null +++ b/Assets/_PROJECT/Images/mic_on_green 1.png.meta @@ -0,0 +1,148 @@ +fileFormatVersion: 2 +guid: b542f982d9872074ba861c98124f091b +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: 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 + 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 + - serializedVersion: 3 + buildTarget: WebGL + 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: Windows Store Apps + 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/_PROJECT/Prefabs/ModelGeneration/MicrophoneStand.prefab b/Assets/_PROJECT/Prefabs/ModelGeneration/MicrophoneStand.prefab index 0499cac3..1e142ff5 100644 --- a/Assets/_PROJECT/Prefabs/ModelGeneration/MicrophoneStand.prefab +++ b/Assets/_PROJECT/Prefabs/ModelGeneration/MicrophoneStand.prefab @@ -26,16 +26,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1228480816127797708} - m_LocalRotation: {x: -0, y: 0.999755, z: -0, w: 0.02213406} + m_LocalRotation: {x: 0, y: -1, z: 0, w: 0} m_LocalPosition: {x: 0, y: 0, z: 0.062999755} - m_LocalScale: {x: 0.0013671161, y: 0.0013671163, z: 0.0013671161} - m_ConstrainProportionsScale: 0 + m_LocalScale: {x: 0.001, y: 0.001, z: 0.001} + m_ConstrainProportionsScale: 1 m_Children: - {fileID: 5644920133390460661} - {fileID: 5533742576861006609} m_Father: {fileID: 6350200277953360468} m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: -182.537, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: -180, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0.008996681, y: 1.4561999} @@ -132,15 +132,15 @@ Transform: m_GameObject: {fileID: 4133399896732208162} m_LocalRotation: {x: 0, y: 0.7496666, z: 0, w: 0.6618157} m_LocalPosition: {x: -4.855707, y: -2.269, z: -3.767624} - m_LocalScale: {x: 1.0972, y: 1.0972, z: 1.0972} - m_ConstrainProportionsScale: 0 + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 1 m_Children: - {fileID: 2055615201434766442} - {fileID: 6631927537301099119} - {fileID: 4809606984572048444} - {fileID: 8298154793510291265} m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 97.123, z: 0} --- !u!33 &8212827426052675577 MeshFilter: @@ -425,7 +425,7 @@ RectTransform: m_GameObject: {fileID: 7008025959211898135} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 0.92045, y: 0.92045, z: 0.92045} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4809606984572048444} @@ -434,7 +434,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 80, y: 80} + m_SizeDelta: {x: 90, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2601996648403542267 CanvasRenderer: @@ -464,7 +464,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 3f2516f6ee1cb5c4ba7f85f24c3d4f43, type: 3} + m_Sprite: {fileID: 21300000, guid: b542f982d9872074ba861c98124f091b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -510,7 +510,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 80, y: 80} + m_SizeDelta: {x: 90, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6882382312215729145 CanvasRenderer: @@ -540,7 +540,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 68669679d082ba94bb4a39c08fa91e0d, type: 3} + m_Sprite: {fileID: 21300000, guid: 7d9a2d0479a3d2f4fb6ac783fb358703, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity index d00f15f2..30396401 100644 --- a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity +++ b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b437d93cc818f068311ba29872e20b1bf558e758825c09e2fa6d5a7f83589644 -size 68622277 +oid sha256:fa4addd609932273253c1fb56ebe9d4bbd8adf81241becbb407d7b2256feef47 +size 68623051 diff --git a/Assets/_PROJECT/Scripts/ModeGeneration/ArcheryRange/MicrophoneProximityTrigger.cs b/Assets/_PROJECT/Scripts/ModeGeneration/ArcheryRange/MicrophoneProximityTrigger.cs index e5d85de6..71335cf5 100644 --- a/Assets/_PROJECT/Scripts/ModeGeneration/ArcheryRange/MicrophoneProximityTrigger.cs +++ b/Assets/_PROJECT/Scripts/ModeGeneration/ArcheryRange/MicrophoneProximityTrigger.cs @@ -11,7 +11,6 @@ public class MicrophoneProximityTrigger : MonoBehaviour { if (isEnter && other.gameObject.tag == "Player Head") { - Debug.Log("collided with: " + other.gameObject.name); mic.OnPlayerApproach(); } } @@ -20,7 +19,6 @@ public class MicrophoneProximityTrigger : MonoBehaviour { if (!isEnter && other.gameObject.tag == "Player Head") { - Debug.Log("collider left with: " + other.gameObject.name); mic.OnPlayerLeave(); } }