diff --git a/Assets/Scenes/level2.unity b/Assets/Scenes/level2.unity index f13005ec..8c110df8 100644 --- a/Assets/Scenes/level2.unity +++ b/Assets/Scenes/level2.unity @@ -42384,7 +42384,7 @@ Transform: m_GameObject: {fileID: 453084649433182548} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0.5092667, z: 0, w: 0.86060876} - m_LocalPosition: {x: -31.964, y: -2.39, z: -51.177} + m_LocalPosition: {x: -53.21, y: -19.067, z: -58.87} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -43051,7 +43051,7 @@ Transform: m_GameObject: {fileID: 2862278904514699907} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -31.963997, y: -0.64000034, z: -51.17699} + m_LocalPosition: {x: -53.209995, y: -17.317, z: -58.869995} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -43945,7 +43945,7 @@ Transform: m_GameObject: {fileID: 5126527960396286038} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0.5092667, z: 0, w: 0.86060876} - m_LocalPosition: {x: -31.963997, y: -0.64000034, z: -51.17699} + m_LocalPosition: {x: -53.209995, y: -17.317, z: -58.869995} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/Assets/Scripts/ScriptableObjects/GasTank.asset b/Assets/Scripts/ScriptableObjects/GasTank.asset index a692b8f1..97c833c8 100644 --- a/Assets/Scripts/ScriptableObjects/GasTank.asset +++ b/Assets/Scripts/ScriptableObjects/GasTank.asset @@ -13,5 +13,6 @@ MonoBehaviour: m_Name: GasTank m_EditorClassIdentifier: itemName: GasTank - itemIcon: {fileID: 21300084, guid: bbf1608df437159458ebfa96e34067ae, type: 3} + itemIcon: {fileID: 21300000, guid: e9c23d415763f5e429fa16d0b1dadbd6, type: 3} itemPrefab: {fileID: 1215395421967941289, guid: 3028bdafdc13c1c4a911990395bbbce8, type: 3} + isKeyCard: 0 diff --git a/Assets/Scripts/ScriptableObjects/pipe.asset b/Assets/Scripts/ScriptableObjects/pipe.asset index e209a2c6..50680ec5 100644 --- a/Assets/Scripts/ScriptableObjects/pipe.asset +++ b/Assets/Scripts/ScriptableObjects/pipe.asset @@ -13,5 +13,6 @@ MonoBehaviour: m_Name: pipe m_EditorClassIdentifier: itemName: Pipe - itemIcon: {fileID: 21300000, guid: 1d5d46cffb17f694987ced466c5888e3, type: 3} + itemIcon: {fileID: 21300000, guid: 7a32f4e3fb633634185e55cea5f66c35, type: 3} itemPrefab: {fileID: 1236261788099784, guid: 27879f38628a5a84ba8c478897f4ac7e, type: 3} + isKeyCard: 0 diff --git a/Assets/Unity UI Samples/Models/Materials/vehicle_rcLand_clean_dome_mat.mat b/Assets/Unity UI Samples/Models/Materials/vehicle_rcLand_clean_dome_mat.mat index 3f7a2981..f097f5a8 100644 --- a/Assets/Unity UI Samples/Models/Materials/vehicle_rcLand_clean_dome_mat.mat +++ b/Assets/Unity UI Samples/Models/Materials/vehicle_rcLand_clean_dome_mat.mat @@ -123,3 +123,16 @@ Material: - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] m_AllowLocking: 1 +--- !u!114 &2791648103932592735 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 diff --git a/Assets/pngs/MediumPipe2.png b/Assets/pngs/MediumPipe2.png new file mode 100644 index 00000000..c57bdbe8 Binary files /dev/null and b/Assets/pngs/MediumPipe2.png differ diff --git a/Assets/pngs/MediumPipe2.png.meta b/Assets/pngs/MediumPipe2.png.meta new file mode 100644 index 00000000..bb48bd9e --- /dev/null +++ b/Assets/pngs/MediumPipe2.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: 7a32f4e3fb633634185e55cea5f66c35 +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: 4 + 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: 4 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/pngs/Tank.png b/Assets/pngs/Tank.png new file mode 100644 index 00000000..b6759b38 Binary files /dev/null and b/Assets/pngs/Tank.png differ diff --git a/Assets/pngs/Tank.png.meta b/Assets/pngs/Tank.png.meta new file mode 100644 index 00000000..0627e27a --- /dev/null +++ b/Assets/pngs/Tank.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: e9c23d415763f5e429fa16d0b1dadbd6 +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: 4 + 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: 4 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: