From ae97405ec54c55bfafba5f9d0330babfd5ed5cb7 Mon Sep 17 00:00:00 2001
From: BenniHome <benjamin.boesl@studium.fau.de>
Date: Sat, 29 Feb 2020 16:22:29 +0100
Subject: [PATCH] changed icons according to the Visualization
---
Assets/Graphics.meta | 8 +
Assets/InventoryStuff/DisplayFacts.cs | 8 +-
Assets/InventoryStuff/Inventory.meta | 8 +
.../InventoryStuff/Items/images/Angle 1.png | 3 +
.../Items/images/Angle 1.png.meta | 99 +++++++++++
.../Items/images/Distance 1.png | 3 +
.../Items/images/Distance 1.png.meta | 99 +++++++++++
Assets/InventoryStuff/Items/images/Line.png | 3 +
.../InventoryStuff/Items/images/Line.png.meta | 99 +++++++++++
.../InventoryStuff/Items/images/Point 1.png | 3 +
.../Items/images/Point 1.png.meta | 99 +++++++++++
.../InventoryStuff/Items/images/PointLine.png | 3 +
.../Items/images/PointLine.png.meta | 99 +++++++++++
.../Items/images/ScrollBackground 1.png | 3 +
.../Items/images/ScrollBackground 1.png.meta | 99 +++++++++++
Assets/Resources/Prefabs/AngleDisplay.prefab | 3 +-
Assets/Resources/Prefabs/DisplayLine.prefab | 160 +-----------------
Assets/Resources/Prefabs/DisplayOnLine.prefab | 14 +-
Assets/Resources/Prefabs/DisplayPoint.prefab | 3 +-
.../Resources/Prefabs/DistanceDisplay.prefab | 2 +-
Assets/Resources/Prefabs/ScrollDisplay.prefab | 7 +-
Assets/Scenes.meta | 8 +
22 files changed, 656 insertions(+), 177 deletions(-)
create mode 100644 Assets/Graphics.meta
create mode 100644 Assets/InventoryStuff/Inventory.meta
create mode 100644 Assets/InventoryStuff/Items/images/Angle 1.png
create mode 100644 Assets/InventoryStuff/Items/images/Angle 1.png.meta
create mode 100644 Assets/InventoryStuff/Items/images/Distance 1.png
create mode 100644 Assets/InventoryStuff/Items/images/Distance 1.png.meta
create mode 100644 Assets/InventoryStuff/Items/images/Line.png
create mode 100644 Assets/InventoryStuff/Items/images/Line.png.meta
create mode 100644 Assets/InventoryStuff/Items/images/Point 1.png
create mode 100644 Assets/InventoryStuff/Items/images/Point 1.png.meta
create mode 100644 Assets/InventoryStuff/Items/images/PointLine.png
create mode 100644 Assets/InventoryStuff/Items/images/PointLine.png.meta
create mode 100644 Assets/InventoryStuff/Items/images/ScrollBackground 1.png
create mode 100644 Assets/InventoryStuff/Items/images/ScrollBackground 1.png.meta
create mode 100644 Assets/Scenes.meta
diff --git a/Assets/Graphics.meta b/Assets/Graphics.meta
new file mode 100644
index 00000000..2f27852d
--- /dev/null
+++ b/Assets/Graphics.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: eec83b50c1e0c604aa91430f72c8dbb0
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/InventoryStuff/DisplayFacts.cs b/Assets/InventoryStuff/DisplayFacts.cs
index 1f97579b..d877a9ff 100644
--- a/Assets/InventoryStuff/DisplayFacts.cs
+++ b/Assets/InventoryStuff/DisplayFacts.cs
@@ -73,8 +73,8 @@ private GameObject CreateDisplay(Transform transform, Fact fact)
case RayFact f:
{
var obj = Instantiate(prefab_Line, Vector3.zero, Quaternion.identity, transform);
- obj.transform.GetChild(0).gameObject.GetComponent<TextMeshProUGUI>().text = "" + getLetter(CommunicationEvents.Facts[f.Pid1].Id);
- obj.transform.GetChild(1).gameObject.GetComponent<TextMeshProUGUI>().text = "" + getLetter(CommunicationEvents.Facts[f.Pid2].Id);
+ obj.transform.GetChild(0).gameObject.GetComponent<TextMeshProUGUI>().text = "" + getLetter(f.Id);
+ //obj.transform.GetChild(1).gameObject.GetComponent<TextMeshProUGUI>().text = "" + getLetter(CommunicationEvents.Facts[f.Pid2].Id);
obj.GetComponent<FactWrapper>().fact = f;
return obj;
}
@@ -99,8 +99,8 @@ private GameObject CreateDisplay(Transform transform, Fact fact)
case OnLineFact f:
{
var obj = Instantiate(prefab_OnLine, Vector3.zero, Quaternion.identity, transform);
- obj.transform.GetChild(0).gameObject.GetComponent<TextMeshProUGUI>().text = "" + getLetter(CommunicationEvents.Facts[f.Lid].Id);
- obj.transform.GetChild(1).gameObject.GetComponent<TextMeshProUGUI>().text = "" + getLetter(CommunicationEvents.Facts[f.Pid].Id);
+ obj.transform.GetChild(0).gameObject.GetComponent<TextMeshProUGUI>().text = "" + getLetter(CommunicationEvents.Facts[f.Pid].Id);
+ obj.transform.GetChild(1).gameObject.GetComponent<TextMeshProUGUI>().text = "" + getLetter(CommunicationEvents.Facts[f.Lid].Id);
obj.GetComponent<FactWrapper>().fact = f;
return obj;
}
diff --git a/Assets/InventoryStuff/Inventory.meta b/Assets/InventoryStuff/Inventory.meta
new file mode 100644
index 00000000..9818e1d1
--- /dev/null
+++ b/Assets/InventoryStuff/Inventory.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b543d9677cbde534ab69c0a229bfdb06
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/InventoryStuff/Items/images/Angle 1.png b/Assets/InventoryStuff/Items/images/Angle 1.png
new file mode 100644
index 00000000..40ccabbb
--- /dev/null
+++ b/Assets/InventoryStuff/Items/images/Angle 1.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:376fd372fe28e9de277775e82357cb9d7c7df372cb8752959171b7bc94fcdb66
+size 2840
diff --git a/Assets/InventoryStuff/Items/images/Angle 1.png.meta b/Assets/InventoryStuff/Items/images/Angle 1.png.meta
new file mode 100644
index 00000000..02d968f2
--- /dev/null
+++ b/Assets/InventoryStuff/Items/images/Angle 1.png.meta
@@ -0,0 +1,99 @@
+fileFormatVersion: 2
+guid: e31f435cefe277041b681d289c465224
+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
+ - serializedVersion: 2
+ buildTarget: Standalone
+ 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: d4f4205a03277624fbd9fb2e487ad193
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/InventoryStuff/Items/images/Distance 1.png b/Assets/InventoryStuff/Items/images/Distance 1.png
new file mode 100644
index 00000000..6395ca89
--- /dev/null
+++ b/Assets/InventoryStuff/Items/images/Distance 1.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e84b12d560e1f26794d7a830b326b9d6f1f99aebbdb952b4d5d650e1a2ea7c34
+size 3017
diff --git a/Assets/InventoryStuff/Items/images/Distance 1.png.meta b/Assets/InventoryStuff/Items/images/Distance 1.png.meta
new file mode 100644
index 00000000..a166c031
--- /dev/null
+++ b/Assets/InventoryStuff/Items/images/Distance 1.png.meta
@@ -0,0 +1,99 @@
+fileFormatVersion: 2
+guid: d43e0d48ae1597b4ab15e7e1cf58def6
+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
+ - serializedVersion: 2
+ buildTarget: Standalone
+ 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: 89efa06cb05e30140b9c876124184c1e
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/InventoryStuff/Items/images/Line.png b/Assets/InventoryStuff/Items/images/Line.png
new file mode 100644
index 00000000..9500584e
--- /dev/null
+++ b/Assets/InventoryStuff/Items/images/Line.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ce4c9067d0e8ba2e1e1bdfa9030f7cb3a26a9d0974773cde9e2120a66209636d
+size 2128
diff --git a/Assets/InventoryStuff/Items/images/Line.png.meta b/Assets/InventoryStuff/Items/images/Line.png.meta
new file mode 100644
index 00000000..3c5d28e1
--- /dev/null
+++ b/Assets/InventoryStuff/Items/images/Line.png.meta
@@ -0,0 +1,99 @@
+fileFormatVersion: 2
+guid: fa8323d8b52054c46b24fc9a0040caa3
+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
+ - serializedVersion: 2
+ buildTarget: Standalone
+ 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: 0744f89ac833fac46a57f89ead1c86df
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/InventoryStuff/Items/images/Point 1.png b/Assets/InventoryStuff/Items/images/Point 1.png
new file mode 100644
index 00000000..37441511
--- /dev/null
+++ b/Assets/InventoryStuff/Items/images/Point 1.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5edff5a7bfe369e1e553bb9703775a4cc7dbf64b27ac936dace80dd355becd93
+size 2182
diff --git a/Assets/InventoryStuff/Items/images/Point 1.png.meta b/Assets/InventoryStuff/Items/images/Point 1.png.meta
new file mode 100644
index 00000000..623a58ab
--- /dev/null
+++ b/Assets/InventoryStuff/Items/images/Point 1.png.meta
@@ -0,0 +1,99 @@
+fileFormatVersion: 2
+guid: 9b6210b1c7fa3cf449095c35f42e8dd6
+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
+ - serializedVersion: 2
+ buildTarget: Standalone
+ 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: 05bedd84bff01104f9be7203d242d693
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/InventoryStuff/Items/images/PointLine.png b/Assets/InventoryStuff/Items/images/PointLine.png
new file mode 100644
index 00000000..32c2cb46
--- /dev/null
+++ b/Assets/InventoryStuff/Items/images/PointLine.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5f6d0f763d5277bffa97fdd31f3a31b19897a9176434d6a1cb9a5a8ea399a50d
+size 2249
diff --git a/Assets/InventoryStuff/Items/images/PointLine.png.meta b/Assets/InventoryStuff/Items/images/PointLine.png.meta
new file mode 100644
index 00000000..003ddc20
--- /dev/null
+++ b/Assets/InventoryStuff/Items/images/PointLine.png.meta
@@ -0,0 +1,99 @@
+fileFormatVersion: 2
+guid: 3e5d64d50e2c9ca45bff9569a9239b4a
+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
+ - serializedVersion: 2
+ buildTarget: Standalone
+ 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: 07f911373da0c6742bb9894ad9c5b2b3
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/InventoryStuff/Items/images/ScrollBackground 1.png b/Assets/InventoryStuff/Items/images/ScrollBackground 1.png
new file mode 100644
index 00000000..490b1e95
--- /dev/null
+++ b/Assets/InventoryStuff/Items/images/ScrollBackground 1.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5ebcc11060d2dad1778d75799095d59539d849ae2cb96f9ec15f4a4c0da04b12
+size 5062
diff --git a/Assets/InventoryStuff/Items/images/ScrollBackground 1.png.meta b/Assets/InventoryStuff/Items/images/ScrollBackground 1.png.meta
new file mode 100644
index 00000000..119abb53
--- /dev/null
+++ b/Assets/InventoryStuff/Items/images/ScrollBackground 1.png.meta
@@ -0,0 +1,99 @@
+fileFormatVersion: 2
+guid: 95333afd9e1a8a34a880986470a5dcc8
+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
+ - serializedVersion: 2
+ buildTarget: Standalone
+ 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: 7434df38b40b3b54daef69f74c9f04ae
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Prefabs/AngleDisplay.prefab b/Assets/Resources/Prefabs/AngleDisplay.prefab
index d98dc8b7..1d4624c1 100644
--- a/Assets/Resources/Prefabs/AngleDisplay.prefab
+++ b/Assets/Resources/Prefabs/AngleDisplay.prefab
@@ -534,7 +534,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: 644edf8b3fa05da418500a0e9dd10820, type: 3}
+ m_Sprite: {fileID: 21300000, guid: e31f435cefe277041b681d289c465224, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -579,4 +579,3 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3}
m_Name:
m_EditorClassIdentifier:
- fact: {fileID: 0}
diff --git a/Assets/Resources/Prefabs/DisplayLine.prefab b/Assets/Resources/Prefabs/DisplayLine.prefab
index 377435d2..e8a92366 100644
--- a/Assets/Resources/Prefabs/DisplayLine.prefab
+++ b/Assets/Resources/Prefabs/DisplayLine.prefab
@@ -1,160 +1,5 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
---- !u!1 &394695603809760982
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 8624697515134135149}
- - component: {fileID: 1153308803322101615}
- - component: {fileID: 9057784525474689809}
- m_Layer: 5
- m_Name: point (1)
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &8624697515134135149
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 394695603809760982}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children: []
- m_Father: {fileID: 8643015897288315615}
- m_RootOrder: 1
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0.5, y: 0.5}
- m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 31.8, y: 2.7}
- m_SizeDelta: {x: 100, y: 50}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &1153308803322101615
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 394695603809760982}
- m_CullTransparentMesh: 0
---- !u!114 &9057784525474689809
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 394695603809760982}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_text: A
- m_isRightToLeft: 0
- m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
- m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
- m_fontSharedMaterials: []
- m_fontMaterial: {fileID: 0}
- m_fontMaterials: []
- m_fontColor32:
- serializedVersion: 2
- rgba: 4278190080
- m_fontColor: {r: 0, g: 0, b: 0, a: 1}
- m_enableVertexGradient: 0
- m_colorMode: 3
- m_fontColorGradient:
- topLeft: {r: 1, g: 1, b: 1, a: 1}
- topRight: {r: 1, g: 1, b: 1, a: 1}
- bottomLeft: {r: 1, g: 1, b: 1, a: 1}
- bottomRight: {r: 1, g: 1, b: 1, a: 1}
- m_fontColorGradientPreset: {fileID: 0}
- m_spriteAsset: {fileID: 0}
- m_tintAllSprites: 0
- m_overrideHtmlColors: 0
- m_faceColor:
- serializedVersion: 2
- rgba: 4294967295
- m_outlineColor:
- serializedVersion: 2
- rgba: 4278190080
- m_fontSize: 36
- m_fontSizeBase: 36
- m_fontWeight: 400
- m_enableAutoSizing: 0
- m_fontSizeMin: 18
- m_fontSizeMax: 72
- m_fontStyle: 0
- m_textAlignment: 514
- m_characterSpacing: 0
- m_wordSpacing: 0
- m_lineSpacing: 0
- m_lineSpacingMax: 0
- m_paragraphSpacing: 0
- m_charWidthMaxAdj: 0
- m_enableWordWrapping: 1
- m_wordWrappingRatios: 0.4
- m_overflowMode: 0
- m_firstOverflowCharacterIndex: -1
- m_linkedTextComponent: {fileID: 0}
- m_isLinkedTextComponent: 0
- m_isTextTruncated: 0
- m_enableKerning: 1
- m_enableExtraPadding: 0
- checkPaddingRequired: 0
- m_isRichText: 1
- m_parseCtrlCharacters: 1
- m_isOrthographic: 1
- m_isCullingEnabled: 0
- m_ignoreRectMaskCulling: 0
- m_ignoreCulling: 1
- m_horizontalMapping: 0
- m_verticalMapping: 0
- m_uvLineOffset: 0
- m_geometrySortingOrder: 0
- m_VertexBufferAutoSizeReduction: 1
- m_firstVisibleCharacter: 0
- m_useMaxVisibleDescender: 1
- m_pageToDisplay: 1
- m_margin: {x: 0, y: 0, z: 0, w: 0}
- m_textInfo:
- textComponent: {fileID: 9057784525474689809}
- characterCount: 1
- spriteCount: 0
- spaceCount: 0
- wordCount: 1
- linkCount: 0
- lineCount: 1
- pageCount: 1
- materialCount: 1
- m_isUsingLegacyAnimationComponent: 0
- m_isVolumetricText: 0
- m_spriteAnimator: {fileID: 0}
- m_hasFontAssetChanged: 0
- m_subTextObjects:
- - {fileID: 0}
- - {fileID: 0}
- - {fileID: 0}
- - {fileID: 0}
- - {fileID: 0}
- - {fileID: 0}
- - {fileID: 0}
- - {fileID: 0}
- m_baseMaterial: {fileID: 0}
- m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &1684854595504432256
GameObject:
m_ObjectHideFlags: 0
@@ -189,7 +34,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: -33, y: 2.6}
+ m_AnchoredPosition: {x: 0.000012398, y: -25}
m_SizeDelta: {x: 100, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2819967087338812576
@@ -343,7 +188,6 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 3165017659102780400}
- - {fileID: 8624697515134135149}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -378,7 +222,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: d456617ba2282854d9570dcebcc2b279, type: 3}
+ m_Sprite: {fileID: 21300000, guid: fa8323d8b52054c46b24fc9a0040caa3, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
diff --git a/Assets/Resources/Prefabs/DisplayOnLine.prefab b/Assets/Resources/Prefabs/DisplayOnLine.prefab
index baf612d4..03953fe3 100644
--- a/Assets/Resources/Prefabs/DisplayOnLine.prefab
+++ b/Assets/Resources/Prefabs/DisplayOnLine.prefab
@@ -34,7 +34,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 29, y: -20.2}
+ m_AnchoredPosition: {x: 0, y: -24.999994}
m_SizeDelta: {x: 100, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8802160341508727512
@@ -129,7 +129,7 @@ MonoBehaviour:
m_firstVisibleCharacter: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
- m_margin: {x: 0, y: 0, z: 0, w: 0}
+ m_margin: {x: 0, y: 6.839691, z: 0, w: 0}
m_textInfo:
textComponent: {fileID: 3599574990072972372}
characterCount: 1
@@ -189,8 +189,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: -26.5, y: 22.52}
- m_SizeDelta: {x: 100, y: 50}
+ m_AnchoredPosition: {x: 0, y: 22.369999}
+ m_SizeDelta: {x: 100, y: 44.74}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2081193254273071711
CanvasRenderer:
@@ -263,7 +263,7 @@ MonoBehaviour:
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
- m_firstOverflowCharacterIndex: -1
+ m_firstOverflowCharacterIndex: 0
m_linkedTextComponent: {fileID: 0}
m_isLinkedTextComponent: 0
m_isTextTruncated: 0
@@ -284,7 +284,7 @@ MonoBehaviour:
m_firstVisibleCharacter: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
- m_margin: {x: 0, y: 0, z: 0, w: 0}
+ m_margin: {x: 0, y: 0, z: 0, w: 9.470367}
m_textInfo:
textComponent: {fileID: 8416932638320714506}
characterCount: 1
@@ -378,7 +378,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: 0b5fd1ea5a3b1a74588f605621176b6a, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 3e5d64d50e2c9ca45bff9569a9239b4a, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
diff --git a/Assets/Resources/Prefabs/DisplayPoint.prefab b/Assets/Resources/Prefabs/DisplayPoint.prefab
index 264aa3b2..d8bfb683 100644
--- a/Assets/Resources/Prefabs/DisplayPoint.prefab
+++ b/Assets/Resources/Prefabs/DisplayPoint.prefab
@@ -67,7 +67,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: 61c389e99e8388e4e93070d2f5e6275f, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 9b6210b1c7fa3cf449095c35f42e8dd6, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -112,7 +112,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3}
m_Name:
m_EditorClassIdentifier:
- fact: {fileID: 0}
--- !u!1 &858001164857725565
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Resources/Prefabs/DistanceDisplay.prefab b/Assets/Resources/Prefabs/DistanceDisplay.prefab
index 9062cc08..821baa5d 100644
--- a/Assets/Resources/Prefabs/DistanceDisplay.prefab
+++ b/Assets/Resources/Prefabs/DistanceDisplay.prefab
@@ -68,7 +68,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: 23ef0c9f8111e14439483be733da29eb, type: 3}
+ m_Sprite: {fileID: 21300000, guid: d43e0d48ae1597b4ab15e7e1cf58def6, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
diff --git a/Assets/Resources/Prefabs/ScrollDisplay.prefab b/Assets/Resources/Prefabs/ScrollDisplay.prefab
index dacf6f9f..53e43ab6 100644
--- a/Assets/Resources/Prefabs/ScrollDisplay.prefab
+++ b/Assets/Resources/Prefabs/ScrollDisplay.prefab
@@ -66,7 +66,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 0}
+ m_Sprite: {fileID: 21300000, guid: 95333afd9e1a8a34a880986470a5dcc8, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -93,6 +93,7 @@ MonoBehaviour:
label:
description:
declarations: []
+ DetailScreen: {fileID: 0}
--- !u!114 &114809707957640338
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -224,7 +225,7 @@ MonoBehaviour:
m_outlineColor:
serializedVersion: 2
rgba: 4278190080
- m_fontSize: 44.1
+ m_fontSize: 41.05
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 1
@@ -262,7 +263,7 @@ MonoBehaviour:
m_firstVisibleCharacter: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
- m_margin: {x: 0, y: 0, z: 0, w: 0}
+ m_margin: {x: 3.2196655, y: 3.2196655, z: 3.6221313, w: 3.6221313}
m_textInfo:
textComponent: {fileID: 5867570113647991285}
characterCount: 8
diff --git a/Assets/Scenes.meta b/Assets/Scenes.meta
new file mode 100644
index 00000000..157e8818
--- /dev/null
+++ b/Assets/Scenes.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ac72be71662640f4ab0aaf102090fb95
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
--
GitLab