From acde12b77a187e3f6746629c6e559841015b7da5 Mon Sep 17 00:00:00 2001 From: DominikB Date: Tue, 20 Jun 2023 15:01:31 +0200 Subject: [PATCH] =?UTF-8?q?Mini=20mikro=20=C3=A4nderungen=20ohne=20es=20ri?= =?UTF-8?q?chtig=20zu=20beschreiben.=20Es=20ist=20warm.=20OK=3F=3F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BigPressurePlate_normal Variant.prefab | 25 +++- .../SmallPressurePlate(N) Variant.prefab | 25 +++- .../Script/ObjPressurePlateMod.cs | 5 + .../Script/PlayerPressurePlateMod.cs | 6 + .../presurePlate_anderswelt_an.png | 3 + .../presurePlate_anderswelt_an.png.meta | 135 ++++++++++++++++++ .../presurePlate_anderswelt_aus.png | 3 + .../presurePlate_anderswelt_aus.png.meta | 135 ++++++++++++++++++ .../Level_Objects/presurePlate_normal_an.png | 3 + .../presurePlate_normal_an.png.meta | 135 ++++++++++++++++++ .../Level_Objects/presurePlate_normal_aus.png | 3 + .../presurePlate_normal_aus.png.meta | 135 ++++++++++++++++++ .../BigPressurePlate_normal2.png.meta | 6 +- .../BigPressurePlate_normal_pressed.png.meta | 2 +- .../presurePlate_normal_an.png.meta | 6 +- Assets/Scenes/ScenesInGame/3MeowlinTalk.unity | 2 +- Assets/Scenes/ScenesInGame/4DScene.unity | 18 +-- 17 files changed, 622 insertions(+), 25 deletions(-) create mode 100644 Assets/AssetsFORELLE/Sprites/Level_Objects/presurePlate_anderswelt_an.png create mode 100644 Assets/AssetsFORELLE/Sprites/Level_Objects/presurePlate_anderswelt_an.png.meta create mode 100644 Assets/AssetsFORELLE/Sprites/Level_Objects/presurePlate_anderswelt_aus.png create mode 100644 Assets/AssetsFORELLE/Sprites/Level_Objects/presurePlate_anderswelt_aus.png.meta create mode 100644 Assets/AssetsFORELLE/Sprites/Level_Objects/presurePlate_normal_an.png create mode 100644 Assets/AssetsFORELLE/Sprites/Level_Objects/presurePlate_normal_an.png.meta create mode 100644 Assets/AssetsFORELLE/Sprites/Level_Objects/presurePlate_normal_aus.png create mode 100644 Assets/AssetsFORELLE/Sprites/Level_Objects/presurePlate_normal_aus.png.meta diff --git a/Assets/AssetsFORELLE/Prefabs/BigPressurePlate_normal Variant.prefab b/Assets/AssetsFORELLE/Prefabs/BigPressurePlate_normal Variant.prefab index 58eced9..14f13a8 100644 --- a/Assets/AssetsFORELLE/Prefabs/BigPressurePlate_normal Variant.prefab +++ b/Assets/AssetsFORELLE/Prefabs/BigPressurePlate_normal Variant.prefab @@ -55,6 +55,18 @@ PrefabInstance: propertyPath: door value: objectReference: {fileID: 0} + - target: {fileID: 1496965085621171596, guid: 189bceaa7696fbf49b6630e96185e2cf, type: 3} + propertyPath: originalSprite + value: + objectReference: {fileID: 21300000, guid: cf2ee225ddfb4354ab72633b93351a5b, type: 3} + - target: {fileID: 1496965085621171596, guid: 189bceaa7696fbf49b6630e96185e2cf, type: 3} + propertyPath: spriteRenderer + value: + objectReference: {fileID: 6694380534905033865} + - target: {fileID: 1496965085621171596, guid: 189bceaa7696fbf49b6630e96185e2cf, type: 3} + propertyPath: activatedSprite + value: + objectReference: {fileID: 21300000, guid: 05df8c93d6e1cc845a1ec24aed20a2ac, type: 3} - target: {fileID: 1496965085621171597, guid: 189bceaa7696fbf49b6630e96185e2cf, type: 3} propertyPath: m_RootOrder value: 0 @@ -73,15 +85,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1496965085621171597, guid: 189bceaa7696fbf49b6630e96185e2cf, type: 3} propertyPath: m_LocalPosition.x - value: 65.5177 + value: 56.794807 objectReference: {fileID: 0} - target: {fileID: 1496965085621171597, guid: 189bceaa7696fbf49b6630e96185e2cf, type: 3} propertyPath: m_LocalPosition.y - value: -8.7341 + value: -6.9697647 objectReference: {fileID: 0} - target: {fileID: 1496965085621171597, guid: 189bceaa7696fbf49b6630e96185e2cf, type: 3} propertyPath: m_LocalPosition.z - value: 0.11194041 + value: -1.6782435 objectReference: {fileID: 0} - target: {fileID: 1496965085621171597, guid: 189bceaa7696fbf49b6630e96185e2cf, type: 3} propertyPath: m_LocalRotation.w @@ -117,7 +129,12 @@ PrefabInstance: objectReference: {fileID: 21300000, guid: cf2ee225ddfb4354ab72633b93351a5b, type: 3} - target: {fileID: 1496965085621171599, guid: 189bceaa7696fbf49b6630e96185e2cf, type: 3} propertyPath: m_Name - value: BigPressurePlate_normal + value: BigPressurePlate_normal Variant objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 189bceaa7696fbf49b6630e96185e2cf, type: 3} +--- !u!212 &6694380534905033865 stripped +SpriteRenderer: + m_CorrespondingSourceObject: {fileID: 1496965085621171598, guid: 189bceaa7696fbf49b6630e96185e2cf, type: 3} + m_PrefabInstance: {fileID: 5197574467279216903} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/AssetsFORELLE/Prefabs/SmallPressurePlate(N) Variant.prefab b/Assets/AssetsFORELLE/Prefabs/SmallPressurePlate(N) Variant.prefab index 49cf365..1ff0ff8 100644 --- a/Assets/AssetsFORELLE/Prefabs/SmallPressurePlate(N) Variant.prefab +++ b/Assets/AssetsFORELLE/Prefabs/SmallPressurePlate(N) Variant.prefab @@ -9,7 +9,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 3743697183328372273, guid: 703dddc0b1ed3464298fa5e1c7c25cf4, type: 3} propertyPath: m_Name - value: SmallPressurePlate(N) + value: SmallPressurePlate(N) Variant objectReference: {fileID: 0} - target: {fileID: 3743697183328372274, guid: 703dddc0b1ed3464298fa5e1c7c25cf4, type: 3} propertyPath: m_Sprite @@ -21,15 +21,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3743697183328372275, guid: 703dddc0b1ed3464298fa5e1c7c25cf4, type: 3} propertyPath: m_LocalPosition.x - value: 52.48058 + value: 4.294809 objectReference: {fileID: 0} - target: {fileID: 3743697183328372275, guid: 703dddc0b1ed3464298fa5e1c7c25cf4, type: 3} propertyPath: m_LocalPosition.y - value: -9.49435 + value: -0.9697646 objectReference: {fileID: 0} - target: {fileID: 3743697183328372275, guid: 703dddc0b1ed3464298fa5e1c7c25cf4, type: 3} propertyPath: m_LocalPosition.z - value: 0.11194041 + value: -1.6782435 objectReference: {fileID: 0} - target: {fileID: 3743697183328372275, guid: 703dddc0b1ed3464298fa5e1c7c25cf4, type: 3} propertyPath: m_LocalRotation.w @@ -59,5 +59,22 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3743697183328372287, guid: 703dddc0b1ed3464298fa5e1c7c25cf4, type: 3} + propertyPath: originalSprite + value: + objectReference: {fileID: 21300000, guid: b51c9438f816e0a42be69d6957537295, type: 3} + - target: {fileID: 3743697183328372287, guid: 703dddc0b1ed3464298fa5e1c7c25cf4, type: 3} + propertyPath: spriteRenderer + value: + objectReference: {fileID: 1940356979551777539} + - target: {fileID: 3743697183328372287, guid: 703dddc0b1ed3464298fa5e1c7c25cf4, type: 3} + propertyPath: activatedSprite + value: + objectReference: {fileID: 21300000, guid: dc19b5a3b36f9fe4fb4798db8a0ca25c, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 703dddc0b1ed3464298fa5e1c7c25cf4, type: 3} +--- !u!212 &1940356979551777539 stripped +SpriteRenderer: + m_CorrespondingSourceObject: {fileID: 3743697183328372274, guid: 703dddc0b1ed3464298fa5e1c7c25cf4, type: 3} + m_PrefabInstance: {fileID: 2961610043285910833} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/AssetsFORELLE/Script/ObjPressurePlateMod.cs b/Assets/AssetsFORELLE/Script/ObjPressurePlateMod.cs index 4ce074c..7745b9f 100644 --- a/Assets/AssetsFORELLE/Script/ObjPressurePlateMod.cs +++ b/Assets/AssetsFORELLE/Script/ObjPressurePlateMod.cs @@ -5,6 +5,9 @@ using UnityEngine; public class ObjPressurePlateMod: MonoBehaviour { public GameObject door; + public SpriteRenderer spriteRenderer; +public Sprite originalSprite; +public Sprite activatedSprite; // Start is called before the first frame update void Start() { @@ -20,6 +23,7 @@ public GameObject door; void OnTriggerEnter2D(Collider2D other) { if (other.CompareTag("PressurePlatable")){ door.SetActive(false); + spriteRenderer.sprite = activatedSprite; } } @@ -28,6 +32,7 @@ void OnTriggerEnter2D(Collider2D other) { void OnTriggerExit2D(Collider2D other) { if (other.CompareTag("PressurePlatable")) { door.SetActive(true); + spriteRenderer.sprite = originalSprite; } } */ diff --git a/Assets/AssetsFORELLE/Script/PlayerPressurePlateMod.cs b/Assets/AssetsFORELLE/Script/PlayerPressurePlateMod.cs index bc6c178..eaddb4f 100644 --- a/Assets/AssetsFORELLE/Script/PlayerPressurePlateMod.cs +++ b/Assets/AssetsFORELLE/Script/PlayerPressurePlateMod.cs @@ -4,6 +4,10 @@ using UnityEngine; public class PlayerPressurePlateMod: MonoBehaviour { + + public SpriteRenderer spriteRenderer; +public Sprite originalSprite; +public Sprite activatedSprite; public GameObject door; // Start is called before the first frame update void Start() @@ -21,6 +25,7 @@ void OnTriggerEnter2D(Collider2D other) { //if (other.CompareTag("Player")) { // spriteRenderer.sprite = activatedSprite; //} + spriteRenderer.sprite = activatedSprite; door.SetActive(false); } @@ -29,6 +34,7 @@ void OnTriggerExit2D(Collider2D other) { if (other.CompareTag("Player")) { spriteRenderer.sprite = originalSprite; } + spriteRenderer.sprite = originalSprite; } */ } diff --git a/Assets/AssetsFORELLE/Sprites/Level_Objects/presurePlate_anderswelt_an.png b/Assets/AssetsFORELLE/Sprites/Level_Objects/presurePlate_anderswelt_an.png new file mode 100644 index 0000000..da5c340 --- /dev/null +++ b/Assets/AssetsFORELLE/Sprites/Level_Objects/presurePlate_anderswelt_an.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7e64d970d19e0bac00c838e082f025e8f28c1db3becc9d97de883020b2319c8a +size 222 diff --git a/Assets/AssetsFORELLE/Sprites/Level_Objects/presurePlate_anderswelt_an.png.meta b/Assets/AssetsFORELLE/Sprites/Level_Objects/presurePlate_anderswelt_an.png.meta new file mode 100644 index 0000000..008741c --- /dev/null +++ b/Assets/AssetsFORELLE/Sprites/Level_Objects/presurePlate_anderswelt_an.png.meta @@ -0,0 +1,135 @@ +fileFormatVersion: 2 +guid: 4edb64fe4b38f47fb9db5f7c09374a3f +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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 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 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AssetsFORELLE/Sprites/Level_Objects/presurePlate_anderswelt_aus.png b/Assets/AssetsFORELLE/Sprites/Level_Objects/presurePlate_anderswelt_aus.png new file mode 100644 index 0000000..b3860bb --- /dev/null +++ b/Assets/AssetsFORELLE/Sprites/Level_Objects/presurePlate_anderswelt_aus.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b7f3a52a148470c41e2bf46f17ef0abac201ef8dad2405c42821fc14e9cb4382 +size 228 diff --git a/Assets/AssetsFORELLE/Sprites/Level_Objects/presurePlate_anderswelt_aus.png.meta b/Assets/AssetsFORELLE/Sprites/Level_Objects/presurePlate_anderswelt_aus.png.meta new file mode 100644 index 0000000..d1c9caa --- /dev/null +++ b/Assets/AssetsFORELLE/Sprites/Level_Objects/presurePlate_anderswelt_aus.png.meta @@ -0,0 +1,135 @@ +fileFormatVersion: 2 +guid: 1eb6008cad69d4639ab352ac19041ef2 +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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + 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: 16 + 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 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AssetsFORELLE/Sprites/Level_Objects/presurePlate_normal_an.png b/Assets/AssetsFORELLE/Sprites/Level_Objects/presurePlate_normal_an.png new file mode 100644 index 0000000..c8a0347 --- /dev/null +++ b/Assets/AssetsFORELLE/Sprites/Level_Objects/presurePlate_normal_an.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4ef8a10b4fc756c16ed97dfb212fb30e4e351b34a997ed860980929061162a9f +size 222 diff --git a/Assets/AssetsFORELLE/Sprites/Level_Objects/presurePlate_normal_an.png.meta b/Assets/AssetsFORELLE/Sprites/Level_Objects/presurePlate_normal_an.png.meta new file mode 100644 index 0000000..4d6df80 --- /dev/null +++ b/Assets/AssetsFORELLE/Sprites/Level_Objects/presurePlate_normal_an.png.meta @@ -0,0 +1,135 @@ +fileFormatVersion: 2 +guid: 57262be98d1dd471c85e966f5a2a9238 +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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + 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: 16 + 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 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AssetsFORELLE/Sprites/Level_Objects/presurePlate_normal_aus.png b/Assets/AssetsFORELLE/Sprites/Level_Objects/presurePlate_normal_aus.png new file mode 100644 index 0000000..b0d03bd --- /dev/null +++ b/Assets/AssetsFORELLE/Sprites/Level_Objects/presurePlate_normal_aus.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:89cb3a2269502222b5a619c04d7dd83ec5894aaa0ca5e12759142ce0d774f94e +size 228 diff --git a/Assets/AssetsFORELLE/Sprites/Level_Objects/presurePlate_normal_aus.png.meta b/Assets/AssetsFORELLE/Sprites/Level_Objects/presurePlate_normal_aus.png.meta new file mode 100644 index 0000000..6d247f7 --- /dev/null +++ b/Assets/AssetsFORELLE/Sprites/Level_Objects/presurePlate_normal_aus.png.meta @@ -0,0 +1,135 @@ +fileFormatVersion: 2 +guid: e02365f44e41a4502aa3b46fa0e93fbc +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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + 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: 16 + 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 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AssetsFORELLE/Vanessa Tiles/BigPressurePlate_normal2.png.meta b/Assets/AssetsFORELLE/Vanessa Tiles/BigPressurePlate_normal2.png.meta index 691433c..9de3917 100644 --- a/Assets/AssetsFORELLE/Vanessa Tiles/BigPressurePlate_normal2.png.meta +++ b/Assets/AssetsFORELLE/Vanessa Tiles/BigPressurePlate_normal2.png.meta @@ -33,7 +33,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 1 mipBias: 0 wrapU: 1 @@ -47,7 +47,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 70 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -70,7 +70,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/AssetsFORELLE/Vanessa Tiles/BigPressurePlate_normal_pressed.png.meta b/Assets/AssetsFORELLE/Vanessa Tiles/BigPressurePlate_normal_pressed.png.meta index ad0e6ec..4cefd57 100644 --- a/Assets/AssetsFORELLE/Vanessa Tiles/BigPressurePlate_normal_pressed.png.meta +++ b/Assets/AssetsFORELLE/Vanessa Tiles/BigPressurePlate_normal_pressed.png.meta @@ -47,7 +47,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 70 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/AssetsFORELLE/Vanessa Tiles/Geister_Luna/presurePlate_normal_an.png.meta b/Assets/AssetsFORELLE/Vanessa Tiles/Geister_Luna/presurePlate_normal_an.png.meta index b36185b..3aff251 100644 --- a/Assets/AssetsFORELLE/Vanessa Tiles/Geister_Luna/presurePlate_normal_an.png.meta +++ b/Assets/AssetsFORELLE/Vanessa Tiles/Geister_Luna/presurePlate_normal_an.png.meta @@ -33,7 +33,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 1 mipBias: 0 wrapU: 1 @@ -47,7 +47,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 16 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -70,7 +70,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Scenes/ScenesInGame/3MeowlinTalk.unity b/Assets/Scenes/ScenesInGame/3MeowlinTalk.unity index b8cb5eb..2bc44eb 100644 --- a/Assets/Scenes/ScenesInGame/3MeowlinTalk.unity +++ b/Assets/Scenes/ScenesInGame/3MeowlinTalk.unity @@ -2127,7 +2127,7 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 lineToStart: 1 - lineToBreak: 37 + lineToBreak: 59 txtToParse: {fileID: 4900000, guid: 7f185b9559d0d0047bbba8408794334c, type: 3} overwriteCallbackAfterTalk: m_PersistentCalls: diff --git a/Assets/Scenes/ScenesInGame/4DScene.unity b/Assets/Scenes/ScenesInGame/4DScene.unity index 8c4e045..dcfeb31 100644 --- a/Assets/Scenes/ScenesInGame/4DScene.unity +++ b/Assets/Scenes/ScenesInGame/4DScene.unity @@ -137,7 +137,7 @@ PrefabInstance: - target: {fileID: 3743697183328372274, guid: 703dddc0b1ed3464298fa5e1c7c25cf4, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 1085471055, guid: 2d911478df530d541a3773c3fb6852af, type: 3} + objectReference: {fileID: 21300000, guid: b51c9438f816e0a42be69d6957537295, type: 3} - target: {fileID: 3743697183328372275, guid: 703dddc0b1ed3464298fa5e1c7c25cf4, type: 3} propertyPath: m_RootOrder value: 4 @@ -774,8 +774,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: spriteRenderer: {fileID: 321396287} - originalSprite: {fileID: 1085471055, guid: 2d911478df530d541a3773c3fb6852af, type: 3} - activatedSprite: {fileID: -1522538655, guid: 2d911478df530d541a3773c3fb6852af, type: 3} + originalSprite: {fileID: 21300000, guid: b51c9438f816e0a42be69d6957537295, type: 3} + activatedSprite: {fileID: 21300000, guid: dc19b5a3b36f9fe4fb4798db8a0ca25c, type: 3} startActivated: 0 dreiAn: 0 --- !u!212 &321396287 stripped @@ -1065,7 +1065,7 @@ PrefabInstance: - target: {fileID: 3743697183328372274, guid: 703dddc0b1ed3464298fa5e1c7c25cf4, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 1085471055, guid: 2d911478df530d541a3773c3fb6852af, type: 3} + objectReference: {fileID: 21300000, guid: b51c9438f816e0a42be69d6957537295, type: 3} - target: {fileID: 3743697183328372275, guid: 703dddc0b1ed3464298fa5e1c7c25cf4, type: 3} propertyPath: m_RootOrder value: 6 @@ -1292,7 +1292,7 @@ PrefabInstance: - target: {fileID: 3743697183328372274, guid: 703dddc0b1ed3464298fa5e1c7c25cf4, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 1085471055, guid: 2d911478df530d541a3773c3fb6852af, type: 3} + objectReference: {fileID: 21300000, guid: b51c9438f816e0a42be69d6957537295, type: 3} - target: {fileID: 3743697183328372275, guid: 703dddc0b1ed3464298fa5e1c7c25cf4, type: 3} propertyPath: m_RootOrder value: 7 @@ -1607,8 +1607,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: spriteRenderer: {fileID: 1025485198} - originalSprite: {fileID: 1085471055, guid: 2d911478df530d541a3773c3fb6852af, type: 3} - activatedSprite: {fileID: -1522538655, guid: 2d911478df530d541a3773c3fb6852af, type: 3} + originalSprite: {fileID: 21300000, guid: b51c9438f816e0a42be69d6957537295, type: 3} + activatedSprite: {fileID: 21300000, guid: dc19b5a3b36f9fe4fb4798db8a0ca25c, type: 3} startActivated: 0 zweiAn: 0 --- !u!212 &1025485198 stripped @@ -15895,8 +15895,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: spriteRenderer: {fileID: 1954130086} - originalSprite: {fileID: 1085471055, guid: 2d911478df530d541a3773c3fb6852af, type: 3} - activatedSprite: {fileID: -1522538655, guid: 2d911478df530d541a3773c3fb6852af, type: 3} + originalSprite: {fileID: 21300000, guid: b51c9438f816e0a42be69d6957537295, type: 3} + activatedSprite: {fileID: 21300000, guid: dc19b5a3b36f9fe4fb4798db8a0ca25c, type: 3} movingPoint: {fileID: 801537424} activatedPointPosition: {x: 1.15, y: 2, z: 0} einsAn: 0