diff --git a/Assets/Resources/Games/Tram&Pauline.prefab b/Assets/Resources/Games/Tram&Pauline.prefab index 4366d5097..b6751c805 100644 --- a/Assets/Resources/Games/Tram&Pauline.prefab +++ b/Assets/Resources/Games/Tram&Pauline.prefab @@ -5903,8 +5903,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5010283073473909041} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -0.006999969, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalPosition: {x: 0.006, y: -0.005, z: 0} + m_LocalScale: {x: 0.16582195, y: 0.16522354, z: 1} m_Children: [] m_Father: {fileID: 8402913511160207679} m_RootOrder: 4 @@ -5949,7 +5949,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 20 - m_Sprite: {fileID: -8824703393603543150, guid: 5280b6a66810a2743b2e6d4e82c8c4a0, type: 3} + m_Sprite: {fileID: 8482155391518828239, guid: 6e3b25df70ede8a4dbcc59fce9dc43cc, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 diff --git a/Assets/Resources/Sprites/Games/Tram&Pauline/Tram&Pauline/Tram-&-Pauline-Sprite-Sheet.png b/Assets/Resources/Sprites/Games/Tram&Pauline/Tram&Pauline/Tram-&-Pauline-Sprite-Sheet.png new file mode 100644 index 000000000..3feffe442 Binary files /dev/null and b/Assets/Resources/Sprites/Games/Tram&Pauline/Tram&Pauline/Tram-&-Pauline-Sprite-Sheet.png differ diff --git a/Assets/Resources/Sprites/Games/Tram&Pauline/Tram&Pauline/Tram-&-Pauline-Sprite-Sheet.png.meta b/Assets/Resources/Sprites/Games/Tram&Pauline/Tram&Pauline/Tram-&-Pauline-Sprite-Sheet.png.meta new file mode 100644 index 000000000..d0fb8369f --- /dev/null +++ b/Assets/Resources/Sprites/Games/Tram&Pauline/Tram&Pauline/Tram-&-Pauline-Sprite-Sheet.png.meta @@ -0,0 +1,207 @@ +fileFormatVersion: 2 +guid: 6e3b25df70ede8a4dbcc59fce9dc43cc +TextureImporter: + internalIDToNameTable: + - first: + 213: 8482155391518828239 + second: Tram-&-Pauline-Sprite-Sheet_0 + - first: + 213: -8712966793261129840 + second: Tram Head 1 + externalObjects: {} + serializedVersion: 11 + 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 + 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: 2 + 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 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + 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: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Lumin + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + 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: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: tvOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + 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: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: Tram-&-Pauline-Sprite-Sheet_0 + rect: + serializedVersion: 2 + x: 15 + y: 4190 + width: 401 + height: 399 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: fc6e421636ba6b570800000000000000 + internalID: 8482155391518828239 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/manifest.json b/Packages/manifest.json index baa430907..c8737c040 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -2,7 +2,7 @@ "dependencies": { "com.unity.2d.sprite": "1.0.0", "com.unity.assetbundlebrowser": "https://github.com/Unity-Technologies/AssetBundles-Browser.git", - "com.unity.collab-proxy": "1.15.4", + "com.unity.collab-proxy": "1.15.12", "com.unity.ide.rider": "3.0.14", "com.unity.ide.visualstudio": "2.0.15", "com.unity.ide.vscode": "1.2.5", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 630a9002a..cbd51aff0 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -14,11 +14,10 @@ "hash": "b7c279278d1a343c6957c9f15b45173d3211f01c" }, "com.unity.collab-proxy": { - "version": "1.15.4", + "version": "1.15.12", "depth": 0, "source": "registry", "dependencies": { - "com.unity.nuget.newtonsoft-json": "2.0.0", "com.unity.services.core": "1.0.1" }, "url": "https://packages.unity.com" diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 4c9401b91..14a36b8c5 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2020.3.25f1 -m_EditorVersionWithRevision: 2020.3.25f1 (9b9180224418) +m_EditorVersion: 2020.3.30f1 +m_EditorVersionWithRevision: 2020.3.30f1 (1fb1bf06830e)