From f1ae9d62c17fcc2b55d2793134f1ff7900deb46f Mon Sep 17 00:00:00 2001 From: Jan Kaupp Date: Mon, 19 Jun 2023 12:04:47 +0200 Subject: [PATCH] adding igloo tiles --- .vsconfig | 6 + .../Sprites/Tilesets/BasicLevel.png | 4 +- .../bröckelige platform_radioaktiv.png | 3 + .../bröckelige platform_radioaktiv.png.meta | 123 ++++++++++++++++++ .../floating_platform_radioaktive.png | 3 + .../floating_platform_radioaktive.png.meta | 123 ++++++++++++++++++ .../Tilesets/water and pressure plate.pyxel | Bin 15950 -> 14876 bytes .../Testdialog.txt | 1 + .../Testdialog.txt.meta | 7 + Assets/Scenes/Prototype.unity | 32 +++-- ProjectSettings/TimelineSettings.asset | 16 +++ 11 files changed, 307 insertions(+), 11 deletions(-) create mode 100644 .vsconfig create mode 100644 Assets/AssetsFORELLE/Sprites/Tilesets/Tiles/FloatingTiles/bröckelige platform_radioaktiv.png create mode 100644 Assets/AssetsFORELLE/Sprites/Tilesets/Tiles/FloatingTiles/bröckelige platform_radioaktiv.png.meta create mode 100644 Assets/AssetsFORELLE/Sprites/Tilesets/Tiles/FloatingTiles/floating_platform_radioaktive.png create mode 100644 Assets/AssetsFORELLE/Sprites/Tilesets/Tiles/FloatingTiles/floating_platform_radioaktive.png.meta create mode 100644 Assets/RPGTALK/Scripts/Editor/Node Editor/Node_Editor_Framework-develop/Testdialog.txt create mode 100644 Assets/RPGTALK/Scripts/Editor/Node Editor/Node_Editor_Framework-develop/Testdialog.txt.meta create mode 100644 ProjectSettings/TimelineSettings.asset diff --git a/.vsconfig b/.vsconfig new file mode 100644 index 0000000..d70cd98 --- /dev/null +++ b/.vsconfig @@ -0,0 +1,6 @@ +{ + "version": "1.0", + "components": [ + "Microsoft.VisualStudio.Workload.ManagedGame" + ] +} diff --git a/Assets/AssetsFORELLE/Sprites/Tilesets/BasicLevel.png b/Assets/AssetsFORELLE/Sprites/Tilesets/BasicLevel.png index 1da8fc5..30653f1 100644 --- a/Assets/AssetsFORELLE/Sprites/Tilesets/BasicLevel.png +++ b/Assets/AssetsFORELLE/Sprites/Tilesets/BasicLevel.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c6725ab09d6d72abb5ee43cdd2c9c052787ba7df36c366a2a5afb6f8f82e9053 -size 3398 +oid sha256:72a4ef49b7a2961fee658101d1a0a9775ecec81c151b088fb38fe6e3c750b4e3 +size 3598 diff --git a/Assets/AssetsFORELLE/Sprites/Tilesets/Tiles/FloatingTiles/bröckelige platform_radioaktiv.png b/Assets/AssetsFORELLE/Sprites/Tilesets/Tiles/FloatingTiles/bröckelige platform_radioaktiv.png new file mode 100644 index 0000000..e3cdb2c --- /dev/null +++ b/Assets/AssetsFORELLE/Sprites/Tilesets/Tiles/FloatingTiles/bröckelige platform_radioaktiv.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5a74e262bb39b743528d96f00af12087dc9b060cb9d20c5ebb03957ae310d800 +size 250 diff --git a/Assets/AssetsFORELLE/Sprites/Tilesets/Tiles/FloatingTiles/bröckelige platform_radioaktiv.png.meta b/Assets/AssetsFORELLE/Sprites/Tilesets/Tiles/FloatingTiles/bröckelige platform_radioaktiv.png.meta new file mode 100644 index 0000000..7b0435f --- /dev/null +++ b/Assets/AssetsFORELLE/Sprites/Tilesets/Tiles/FloatingTiles/bröckelige platform_radioaktiv.png.meta @@ -0,0 +1,123 @@ +fileFormatVersion: 2 +guid: acf6d8f7fa37a3342846598466394d93 +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 + 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/Tilesets/Tiles/FloatingTiles/floating_platform_radioaktive.png b/Assets/AssetsFORELLE/Sprites/Tilesets/Tiles/FloatingTiles/floating_platform_radioaktive.png new file mode 100644 index 0000000..25736b3 --- /dev/null +++ b/Assets/AssetsFORELLE/Sprites/Tilesets/Tiles/FloatingTiles/floating_platform_radioaktive.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ad9b3dbb10461beba29bd8524335b95e7911970a8ca43998a9ff2f110e985b58 +size 401 diff --git a/Assets/AssetsFORELLE/Sprites/Tilesets/Tiles/FloatingTiles/floating_platform_radioaktive.png.meta b/Assets/AssetsFORELLE/Sprites/Tilesets/Tiles/FloatingTiles/floating_platform_radioaktive.png.meta new file mode 100644 index 0000000..faf2489 --- /dev/null +++ b/Assets/AssetsFORELLE/Sprites/Tilesets/Tiles/FloatingTiles/floating_platform_radioaktive.png.meta @@ -0,0 +1,123 @@ +fileFormatVersion: 2 +guid: aa8d3ecdaeb3d9b42ad168a221384390 +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 + 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/Tilesets/water and pressure plate.pyxel b/Assets/AssetsFORELLE/Sprites/Tilesets/water and pressure plate.pyxel index db468bb032e2ad4afef4bb7c462f60e85bed104e..4e1f5c527bd282174e85b98ce1f9c6922a9772f3 100644 GIT binary patch delta 5508 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 A0{{R3 delta 6951 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 diff --git a/Assets/RPGTALK/Scripts/Editor/Node Editor/Node_Editor_Framework-develop/Testdialog.txt b/Assets/RPGTALK/Scripts/Editor/Node Editor/Node_Editor_Framework-develop/Testdialog.txt new file mode 100644 index 0000000..63f893c --- /dev/null +++ b/Assets/RPGTALK/Scripts/Editor/Node Editor/Node_Editor_Framework-develop/Testdialog.txt @@ -0,0 +1 @@ +MEOWLIN THE PURRTASTIC: I AM AWESOME AND I WANT FISHH \ No newline at end of file diff --git a/Assets/RPGTALK/Scripts/Editor/Node Editor/Node_Editor_Framework-develop/Testdialog.txt.meta b/Assets/RPGTALK/Scripts/Editor/Node Editor/Node_Editor_Framework-develop/Testdialog.txt.meta new file mode 100644 index 0000000..500cde6 --- /dev/null +++ b/Assets/RPGTALK/Scripts/Editor/Node Editor/Node_Editor_Framework-develop/Testdialog.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f199606f9a757c643b028e6170e23d20 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Prototype.unity b/Assets/Scenes/Prototype.unity index 19995c1..a0c0d0d 100644 --- a/Assets/Scenes/Prototype.unity +++ b/Assets/Scenes/Prototype.unity @@ -2014,6 +2014,7 @@ GameObject: - component: {fileID: 170098610} - component: {fileID: 170098609} - component: {fileID: 170098617} + - component: {fileID: 170098618} m_Layer: 0 m_Name: Frank m_TagString: Player @@ -2204,6 +2205,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: inFirstDim: 1 +--- !u!114 &170098618 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 170098608} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 751a28d482d8ba345b9156a7f8e19f66, type: 3} + m_Name: + m_EditorClassIdentifier: + person: {fileID: 170098608} --- !u!1 &192372226 GameObject: m_ObjectHideFlags: 0 @@ -2260,9 +2274,9 @@ MonoBehaviour: callbackBeforeTalk: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: - m_MethodName: CancelControls + - m_Target: {fileID: 170098618} + m_TargetAssemblyTypeName: stopFrank, Assembly-CSharp + m_MethodName: stopFrankFast m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -2274,13 +2288,13 @@ MonoBehaviour: m_CallState: 2 lineToStart: 1 lineToBreak: 37 - txtToParse: {fileID: 4900000, guid: 7f185b9559d0d0047bbba8408794334c, type: 3} + txtToParse: {fileID: 4900000, guid: f199606f9a757c643b028e6170e23d20, type: 3} overwriteCallbackAfterTalk: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: - m_MethodName: WhoAreYou + - m_Target: {fileID: 170098618} + m_TargetAssemblyTypeName: stopFrank, Assembly-CSharp + m_MethodName: stopFrankFast m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -4127,7 +4141,7 @@ SpriteRenderer: m_Size: {x: 1, y: 1} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 + m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!4 &835580476 @@ -46490,7 +46504,7 @@ SpriteRenderer: m_Size: {x: 2, y: 2} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 + m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!4 &2067597304 diff --git a/ProjectSettings/TimelineSettings.asset b/ProjectSettings/TimelineSettings.asset new file mode 100644 index 0000000..cfaebd7 --- /dev/null +++ b/ProjectSettings/TimelineSettings.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 61 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a287be6c49135cd4f9b2b8666c39d999, type: 3} + m_Name: + m_EditorClassIdentifier: + assetDefaultFramerate: 60 + m_DefaultFrameRate: 60