From bc2d6ccea6d26f8a6f9b5123e93cda8486be346f Mon Sep 17 00:00:00 2001 From: hyperion51 Date: Thu, 14 May 2020 02:47:07 +0100 Subject: [PATCH] Preliminary Logos --- Assets/Resources/Sprites/Attribution.txt | 3 + Assets/Resources/Sprites/Icons/Logos.meta | 8 ++ .../Resources/Sprites/Icons/Logos/colferv.png | 3 + .../Sprites/Icons/Logos/colferv.png.meta | 88 +++++++++++++++++++ .../Resources/Sprites/Icons/Logos/finch.png | 3 + .../Sprites/Icons/Logos/finch.png.meta | 88 +++++++++++++++++++ .../Resources/Sprites/Icons/Logos/lucent.png | 3 + .../Sprites/Icons/Logos/lucent.png.meta | 88 +++++++++++++++++++ .../Sprites/Icons/Logos/miss_terri.png | 3 + .../Sprites/Icons/Logos/miss_terri.png.meta | 88 +++++++++++++++++++ Assets/Scenes/Main.unity | 12 +-- Assets/Scripts/ServerShared/DatabaseItems.cs | 20 +++-- 12 files changed, 395 insertions(+), 12 deletions(-) create mode 100644 Assets/Resources/Sprites/Icons/Logos.meta create mode 100644 Assets/Resources/Sprites/Icons/Logos/colferv.png create mode 100644 Assets/Resources/Sprites/Icons/Logos/colferv.png.meta create mode 100644 Assets/Resources/Sprites/Icons/Logos/finch.png create mode 100644 Assets/Resources/Sprites/Icons/Logos/finch.png.meta create mode 100644 Assets/Resources/Sprites/Icons/Logos/lucent.png create mode 100644 Assets/Resources/Sprites/Icons/Logos/lucent.png.meta create mode 100644 Assets/Resources/Sprites/Icons/Logos/miss_terri.png create mode 100644 Assets/Resources/Sprites/Icons/Logos/miss_terri.png.meta diff --git a/Assets/Resources/Sprites/Attribution.txt b/Assets/Resources/Sprites/Attribution.txt index eca58db22..1ab982805 100644 --- a/Assets/Resources/Sprites/Attribution.txt +++ b/Assets/Resources/Sprites/Attribution.txt @@ -39,6 +39,9 @@ Planet by Eliricon Planet by Vicons Design Moon by Smalllike spaceship by Thomas +origami bird by bjkow +knowledge by Erik Arndt +candy by Vectors Point Other diff --git a/Assets/Resources/Sprites/Icons/Logos.meta b/Assets/Resources/Sprites/Icons/Logos.meta new file mode 100644 index 000000000..3caecf2b6 --- /dev/null +++ b/Assets/Resources/Sprites/Icons/Logos.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 291da2fe40220414bb6298a0e46d134c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Icons/Logos/colferv.png b/Assets/Resources/Sprites/Icons/Logos/colferv.png new file mode 100644 index 000000000..a9e2a957e --- /dev/null +++ b/Assets/Resources/Sprites/Icons/Logos/colferv.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2c1efae7941c881a0c368e86dd204997985c2b30896574e1179001cdce1933ce +size 7350 diff --git a/Assets/Resources/Sprites/Icons/Logos/colferv.png.meta b/Assets/Resources/Sprites/Icons/Logos/colferv.png.meta new file mode 100644 index 000000000..f4faedb94 --- /dev/null +++ b/Assets/Resources/Sprites/Icons/Logos/colferv.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 18ecd693c1e703745984d699c2542682 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 665cbe9ff7e3f144a905d4df776cd486 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Icons/Logos/finch.png b/Assets/Resources/Sprites/Icons/Logos/finch.png new file mode 100644 index 000000000..7929dc41c --- /dev/null +++ b/Assets/Resources/Sprites/Icons/Logos/finch.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9c958e3a8b2d8bc8c00a6f57217582a508f73c69a9a9170623b20d53408f1109 +size 11204 diff --git a/Assets/Resources/Sprites/Icons/Logos/finch.png.meta b/Assets/Resources/Sprites/Icons/Logos/finch.png.meta new file mode 100644 index 000000000..9e283920f --- /dev/null +++ b/Assets/Resources/Sprites/Icons/Logos/finch.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: eba973a1e402dad4ea19c062b29157a3 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: efc3d121973402a4f9d61314a883a387 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Icons/Logos/lucent.png b/Assets/Resources/Sprites/Icons/Logos/lucent.png new file mode 100644 index 000000000..4192cc390 --- /dev/null +++ b/Assets/Resources/Sprites/Icons/Logos/lucent.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:20b67527fe7b6ea4efaede8285a9248b792e9df2db65c57513f9c281984b0296 +size 11019 diff --git a/Assets/Resources/Sprites/Icons/Logos/lucent.png.meta b/Assets/Resources/Sprites/Icons/Logos/lucent.png.meta new file mode 100644 index 000000000..925b9c202 --- /dev/null +++ b/Assets/Resources/Sprites/Icons/Logos/lucent.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 5e5979081a3f5a94383583b76bace062 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: b7c007490e8d0044a99dba41afacf249 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Icons/Logos/miss_terri.png b/Assets/Resources/Sprites/Icons/Logos/miss_terri.png new file mode 100644 index 000000000..b3d7e5fe3 --- /dev/null +++ b/Assets/Resources/Sprites/Icons/Logos/miss_terri.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d96206b8530d4f0066e12ba86b7610cb99d4d2d3b2ceb4f498dc72127cd5b9f9 +size 21782 diff --git a/Assets/Resources/Sprites/Icons/Logos/miss_terri.png.meta b/Assets/Resources/Sprites/Icons/Logos/miss_terri.png.meta new file mode 100644 index 000000000..0b6eff4d8 --- /dev/null +++ b/Assets/Resources/Sprites/Icons/Logos/miss_terri.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: bfd6806d246fe8741bf919f0b859d845 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: b38e193375dd6444989d2e2e5023a192 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index bd9fd37bd..5b9e16248 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -302,7 +302,7 @@ PrefabInstance: - target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 83.65 objectReference: {fileID: 0} - target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} @@ -5007,7 +5007,7 @@ PrefabInstance: - target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 78.765 objectReference: {fileID: 0} - target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} @@ -5764,7 +5764,7 @@ PrefabInstance: - target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 80.130005 objectReference: {fileID: 0} - target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} @@ -11052,7 +11052,7 @@ PrefabInstance: - target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 115.185 objectReference: {fileID: 0} - target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} @@ -17585,7 +17585,7 @@ PrefabInstance: - target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 81.759995 objectReference: {fileID: 0} - target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} @@ -19600,7 +19600,7 @@ PrefabInstance: - target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 119.765 objectReference: {fileID: 0} - target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} diff --git a/Assets/Scripts/ServerShared/DatabaseItems.cs b/Assets/Scripts/ServerShared/DatabaseItems.cs index 26cd686c0..d48db988b 100644 --- a/Assets/Scripts/ServerShared/DatabaseItems.cs +++ b/Assets/Scripts/ServerShared/DatabaseItems.cs @@ -43,20 +43,25 @@ public interface INamedEntry //[Union(22, typeof(Station))] public abstract class DatabaseEntry { - [JsonProperty("id"), Key(0)] public Guid ID = Guid.NewGuid(); + [JsonProperty("id"), Key(0)] + public Guid ID = Guid.NewGuid(); [IgnoreMember] public GameContext Context { get; set; } } [RethinkTable("Users"), MessagePackObject, JsonObject(MemberSerialization.OptIn)] public class Player : DatabaseEntry, INamedEntry { - [JsonProperty("email"), Key(1)] public string Email; + [JsonProperty("email"), Key(1)] + public string Email; - [JsonProperty("password"), Key(2)] public string Password; + [JsonProperty("password"), Key(2)] + public string Password; - [JsonProperty("username"), Key(3)] public string Username; + [JsonProperty("username"), Key(3)] + public string Username; - [JsonProperty("corporation"), Key(4)] public Guid Corporation; + [JsonProperty("corporation"), Key(4)] + public Guid Corporation; [IgnoreMember] public string EntryName { @@ -70,8 +75,11 @@ public class Corporation : DatabaseEntry, INamedEntry { [JsonProperty("name"), Key(1)] public string Name; + + [JsonProperty("parent"), Key(2)] + public Guid Parent; - [JsonProperty("tasks"), Key(2)] + [JsonProperty("tasks"), Key(3)] public List Tasks = new List(); [IgnoreMember] public string EntryName