diff --git a/Assets/DistanceDisplayScript.cs b/Assets/DistanceDisplayScript.cs new file mode 100644 index 0000000000000000000000000000000000000000..baa408f341cbd18a17aead053cf543fd28f3abd7 --- /dev/null +++ b/Assets/DistanceDisplayScript.cs @@ -0,0 +1,29 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; +using TMPro; + +public class DistanceDisplayScript : MonoBehaviour +{ + + public LengthObject fact; + public TextMeshProUGUI PointOne; + public TextMeshProUGUI PointTwo; + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + PointOne.text = fact.PointA; + PointTwo.text = fact.PointB; + } + + void setfact(LengthObject f){ + this.fact = f; + } +} diff --git a/Assets/DistanceDisplayScript.cs.meta b/Assets/DistanceDisplayScript.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..da5d14ac4fe6fb95b0baeadb9deee8a0401188ca --- /dev/null +++ b/Assets/DistanceDisplayScript.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ab51f8628e4c07449aa2844882114144 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Graphics.meta b/Assets/Graphics.meta new file mode 100644 index 0000000000000000000000000000000000000000..2f27852dee817f89c3c9f3c670d67c4e8a201894 --- /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 90bd9d1aee7f2b26492626dab210ff3d8174e727..0b481482923c3ef2aeb622946cc205e1a74d274d 100644 --- a/Assets/InventoryStuff/DisplayFacts.cs +++ b/Assets/InventoryStuff/DisplayFacts.cs @@ -5,7 +5,7 @@ public class DisplayFacts : MonoBehaviour { - public InventoryObject inventory; + public Inventory inventory; public GameObject prefab; @@ -27,12 +27,13 @@ void Update() } public void UpdateDisplay() - { + { for( int i = 0; i< inventory.Facts.Count; i++){ if(! inventory.Facts[i].isDisplayed){ var obj = Instantiate(prefab, Vector3.zero, Quaternion.identity, transform); obj.GetComponent<RectTransform>().localPosition = GetPosition(i); - obj.GetComponentInChildren<Text>().text = inventory.Facts[i].item.Description; + //obj.transform.FindChild("PointOne").text = "X"; + //obj.transform.FindChild("PointTwo").text = "Y"; inventory.Facts[i].isDisplayed = true; } diff --git a/Assets/InventoryStuff/DisplayFacts.cs.meta b/Assets/InventoryStuff/DisplayFacts.cs.meta index 8b0b779237625778b8be9890906cc313e7f26bc5..7c4a9f977325f90f53916da62f70725a7492969e 100644 --- a/Assets/InventoryStuff/DisplayFacts.cs.meta +++ b/Assets/InventoryStuff/DisplayFacts.cs.meta @@ -3,7 +3,10 @@ guid: d982f30612e9c5c4eb26c1ad0bb859e1 MonoImporter: externalObjects: {} serializedVersion: 2 - defaultReferences: [] + defaultReferences: + - inventory: {fileID: 11400000, guid: f3a619d9c65f61d4b9c7c86923b1ad95, type: 2} + - prefab: {fileID: 3623208097461608675, guid: f8cb4e8bb9c09724c925b25c660fb2cd, + type: 3} executionOrder: 0 icon: {instanceID: 0} userData: diff --git a/Assets/InventoryStuff/DisplayScrolls.cs b/Assets/InventoryStuff/DisplayScrolls.cs index 25c0ba79c22501360c67a41684761c23b2633779..d37e61bc761520ca26c72cfd2e10791a9808e80d 100644 --- a/Assets/InventoryStuff/DisplayScrolls.cs +++ b/Assets/InventoryStuff/DisplayScrolls.cs @@ -5,7 +5,7 @@ public class DisplayScrolls : MonoBehaviour { - public InventoryObject inventory; + public Inventory inventory; public GameObject prefab; @@ -28,9 +28,6 @@ void Update() public void UpdateDisplay() { - Debug.Log("1 "+ inventory); - Debug.Log("2 "+ inventory.Scrolls ); - Debug.Log("3 "+ inventory.Scrolls.Count); for( int i = 0; i< inventory.Scrolls.Count; i++){ if(! inventory.Scrolls[i].isDisplayed){ var obj = Instantiate(prefab, Vector3.zero, Quaternion.identity, transform); diff --git a/Assets/InventoryStuff/DisplayScrolls.cs.meta b/Assets/InventoryStuff/DisplayScrolls.cs.meta index 69f55781ef11d755ab08244fb1dbb82c83b3643c..cd8047fc0fc19ac1ef01fd1bef95644acc8ebd03 100644 --- a/Assets/InventoryStuff/DisplayScrolls.cs.meta +++ b/Assets/InventoryStuff/DisplayScrolls.cs.meta @@ -3,7 +3,10 @@ guid: 66df8f5d2fa2cc140aa2d3eca570e8dd MonoImporter: externalObjects: {} serializedVersion: 2 - defaultReferences: [] + defaultReferences: + - inventory: {fileID: 11400000, guid: f3a619d9c65f61d4b9c7c86923b1ad95, type: 2} + - prefab: {fileID: 3173330253721512196, guid: a6a9a3ebdb022e546a21d9f9ff148261, + type: 3} executionOrder: 0 icon: {instanceID: 0} userData: diff --git a/Assets/InventoryStuff/Inventory/Scripts/InventoryObject.cs b/Assets/InventoryStuff/Inventory/Scripts/Inventory.cs similarity index 81% rename from Assets/InventoryStuff/Inventory/Scripts/InventoryObject.cs rename to Assets/InventoryStuff/Inventory/Scripts/Inventory.cs index 0984151132d8a8978d648f9a37fafef737921d99..36acff9dfbbbb96c168122568840d055f43d0493 100644 --- a/Assets/InventoryStuff/Inventory/Scripts/InventoryObject.cs +++ b/Assets/InventoryStuff/Inventory/Scripts/Inventory.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using UnityEngine; - [CreateAssetMenu(fileName = "New Inventory", menuName= "Inventory System/Inventory" )] -public class InventoryObject : ScriptableObject +[CreateAssetMenu(fileName = "New Inventory", menuName= "Inventory System/Inventory" )] +public class Inventory : ScriptableObject { public List<InventorySlot> Facts = new List<InventorySlot>(); public List<InventorySlot> Scrolls = new List<InventorySlot>(); diff --git a/Assets/InventoryStuff/Inventory/Scripts/InventoryObject.cs.meta b/Assets/InventoryStuff/Inventory/Scripts/Inventory.cs.meta similarity index 100% rename from Assets/InventoryStuff/Inventory/Scripts/InventoryObject.cs.meta rename to Assets/InventoryStuff/Inventory/Scripts/Inventory.cs.meta diff --git a/Assets/InventoryStuff/Inventory/THE Inventory.asset b/Assets/InventoryStuff/Inventory/THE_INVENTORY.asset similarity index 94% rename from Assets/InventoryStuff/Inventory/THE Inventory.asset rename to Assets/InventoryStuff/Inventory/THE_INVENTORY.asset index 56d3805c796d6c3324a11678a970e7788c768b40..04eec5c7d00d74b0fbdbd1c169a2f3a0406e59aa 100644 --- a/Assets/InventoryStuff/Inventory/THE Inventory.asset +++ b/Assets/InventoryStuff/Inventory/THE_INVENTORY.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 14aa6bfc325535540999d9ee4927d556, type: 3} - m_Name: THE Inventory + m_Name: THE_INVENTORY m_EditorClassIdentifier: Facts: [] Scrolls: [] diff --git a/Assets/InventoryStuff/Inventory/THE Inventory.asset.meta b/Assets/InventoryStuff/Inventory/THE_INVENTORY.asset.meta similarity index 79% rename from Assets/InventoryStuff/Inventory/THE Inventory.asset.meta rename to Assets/InventoryStuff/Inventory/THE_INVENTORY.asset.meta index 7b2f6e3e75902f39339745f9dea4e84c98327ce0..bb20d2c55bfdf23e60a801e1e5c47f8ce62a5731 100644 --- a/Assets/InventoryStuff/Inventory/THE Inventory.asset.meta +++ b/Assets/InventoryStuff/Inventory/THE_INVENTORY.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 321a0b6a3c8d26e4da8ef600e17d369b +guid: f3a619d9c65f61d4b9c7c86923b1ad95 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/InventoryStuff/Items/images.meta b/Assets/InventoryStuff/Items/images.meta new file mode 100644 index 0000000000000000000000000000000000000000..8771d5b0f4ce3eb38171fbde50a06f860a663932 --- /dev/null +++ b/Assets/InventoryStuff/Items/images.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 377a2e0baa0da5a4c98c55be11d048aa +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/InventoryStuff/Items/images/Angle.png b/Assets/InventoryStuff/Items/images/Angle.png new file mode 100644 index 0000000000000000000000000000000000000000..23da3590b6409bf0fb675f0003a4e7d1fb094654 --- /dev/null +++ b/Assets/InventoryStuff/Items/images/Angle.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2ebfa448b086441374c083298e400d8dc3ef7fb646ea483cbee39bbe29cba350 +size 3118 diff --git a/Assets/InventoryStuff/Items/images/Angle.png.meta b/Assets/InventoryStuff/Items/images/Angle.png.meta new file mode 100644 index 0000000000000000000000000000000000000000..4a8592a69ae9b8318e1da67f38962ec359bd3183 --- /dev/null +++ b/Assets/InventoryStuff/Items/images/Angle.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 644edf8b3fa05da418500a0e9dd10820 +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: 4052110779d2c57468e5a62b993c6106 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/InventoryStuff/Items/images/Distance.png b/Assets/InventoryStuff/Items/images/Distance.png new file mode 100644 index 0000000000000000000000000000000000000000..b568143cbc66c6c35a31b41cde86e6de07ebe0ce --- /dev/null +++ b/Assets/InventoryStuff/Items/images/Distance.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8482ea63c86c43eb1d72baa8685ccf01933700d522a8af76d9dccf9442aad7da +size 2746 diff --git a/Assets/InventoryStuff/Items/images/Distance.png.meta b/Assets/InventoryStuff/Items/images/Distance.png.meta new file mode 100644 index 0000000000000000000000000000000000000000..317e6f7fbf6f37b9ccd80fdfeb852074071adcd9 --- /dev/null +++ b/Assets/InventoryStuff/Items/images/Distance.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 23ef0c9f8111e14439483be733da29eb +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: 36b29e6a5a2ecf84db2dc1ac8b5a5066 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/InventoryStuff/Items/images/pythagoras.png b/Assets/InventoryStuff/Items/images/pythagoras.png new file mode 100644 index 0000000000000000000000000000000000000000..d23b544d448396cb8538908570bdb3c085468286 --- /dev/null +++ b/Assets/InventoryStuff/Items/images/pythagoras.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:90f55f63627f551da8916791975f707f6271d21cfb7282396ffa14a0f38f2474 +size 3996 diff --git a/Assets/InventoryStuff/Items/images/pythagoras.png.meta b/Assets/InventoryStuff/Items/images/pythagoras.png.meta new file mode 100644 index 0000000000000000000000000000000000000000..45abd274513d5376f85f11c86b4eaa1216740cdc --- /dev/null +++ b/Assets/InventoryStuff/Items/images/pythagoras.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: e706f1d2fb068e342b1c80c357d84b40 +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: 78997c56a4f74e44e83fe7fe7b244038 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/InventoryStuff/Items/new DefaultScroll.asset b/Assets/InventoryStuff/Items/new DefaultScroll.asset new file mode 100644 index 0000000000000000000000000000000000000000..4de3b527e80d7bd4478121c09ee4d9239b59ffea --- /dev/null +++ b/Assets/InventoryStuff/Items/new DefaultScroll.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: 4863e36a3d5b58b47a13400c96dce2fd, type: 3} + m_Name: new DefaultScroll + m_EditorClassIdentifier: + type: 2 + Description: diff --git a/Assets/InventoryStuff/Items/new DefaultScroll.asset.meta b/Assets/InventoryStuff/Items/new DefaultScroll.asset.meta new file mode 100644 index 0000000000000000000000000000000000000000..fa7040f8a097ddd3804f67d6f0f4acb262e23428 --- /dev/null +++ b/Assets/InventoryStuff/Items/new DefaultScroll.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 61db163b97432e6428b3e5b6ad6c8243 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/PlayerScript.cs b/Assets/PlayerScript.cs index 9323ac1a3cddfcfe41a62d1c65514a799cba009c..2fc7c7b81a71cd3a2e2190496bb00eb73639804d 100644 --- a/Assets/PlayerScript.cs +++ b/Assets/PlayerScript.cs @@ -4,7 +4,7 @@ public class PlayerScript : MonoBehaviour { - public InventoryObject inventory; + public Inventory inventory; // Start is called before the first frame update void Start() { diff --git a/Assets/PlayerScript.cs.meta b/Assets/PlayerScript.cs.meta index a865520d1e1a5db6e6a2a284fb537567de0e1c02..4338a7767892f76fab840ba1d71e2c47a5d3c8e8 100644 --- a/Assets/PlayerScript.cs.meta +++ b/Assets/PlayerScript.cs.meta @@ -3,7 +3,8 @@ guid: 8deb287bc63461e4b9bfa68c45404328 MonoImporter: externalObjects: {} serializedVersion: 2 - defaultReferences: [] + defaultReferences: + - inventory: {fileID: 11400000, guid: f3a619d9c65f61d4b9c7c86923b1ad95, type: 2} executionOrder: 0 icon: {instanceID: 0} userData: diff --git a/Assets/Prefabs/DistanceDisplay.prefab b/Assets/Prefabs/DistanceDisplay.prefab new file mode 100644 index 0000000000000000000000000000000000000000..3847165a3a6bb144f5b483fa015633bed6ee5c97 --- /dev/null +++ b/Assets/Prefabs/DistanceDisplay.prefab @@ -0,0 +1,386 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4221381813544557775 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7299404996771626324} + - component: {fileID: 2318968178306689515} + - component: {fileID: 1241458608524046696} + m_Layer: 5 + m_Name: DistanceDisplay + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7299404996771626324 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4221381813544557775} + 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: + - {fileID: 46295265100678663} + - {fileID: 1552400999978466847} + m_Father: {fileID: 0} + m_RootOrder: 0 + 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: -10.1, y: 94.9} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2318968178306689515 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4221381813544557775} + m_CullTransparentMesh: 0 +--- !u!114 &1241458608524046696 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4221381813544557775} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, 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_Sprite: {fileID: 21300000, guid: 23ef0c9f8111e14439483be733da29eb, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!1 &6379254425133528592 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 46295265100678663} + - component: {fileID: 4227042351945717100} + - component: {fileID: 3246237648589042601} + m_Layer: 5 + m_Name: PointOne + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &46295265100678663 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6379254425133528592} + 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: 7299404996771626324} + m_RootOrder: 0 + 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: -25, y: 25} + m_SizeDelta: {x: 50, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4227042351945717100 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6379254425133528592} + m_CullTransparentMesh: 0 +--- !u!114 &3246237648589042601 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6379254425133528592} + 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: 4278782217 + m_fontColor: {r: 0.03773582, g: 0.03773582, b: 0.03773582, a: 1} + m_enableVertexGradient: 1 + 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: 44.75 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 1 + 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: 3246237648589042601} + 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 &6753951534025985804 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1552400999978466847} + - component: {fileID: 235831928864293416} + - component: {fileID: 469060305737786517} + m_Layer: 5 + m_Name: PointTwo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1552400999978466847 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6753951534025985804} + 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: 7299404996771626324} + 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: 25, y: 25} + m_SizeDelta: {x: 50, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &235831928864293416 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6753951534025985804} + m_CullTransparentMesh: 0 +--- !u!114 &469060305737786517 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6753951534025985804} + 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: 4278782217 + m_fontColor: {r: 0.03773582, g: 0.03773582, b: 0.03773582, a: 1} + m_enableVertexGradient: 1 + 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: 44.75 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 1 + 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: 469060305737786517} + 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} diff --git a/Assets/Prefabs/DistanceDisplay.prefab.meta b/Assets/Prefabs/DistanceDisplay.prefab.meta new file mode 100644 index 0000000000000000000000000000000000000000..ae837ae3f090d82965a00c3d37cdaf1e79d866cb --- /dev/null +++ b/Assets/Prefabs/DistanceDisplay.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8106c748f1aeb084d87fdc71dd009b67 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes.meta b/Assets/Scenes.meta new file mode 100644 index 0000000000000000000000000000000000000000..157e8818897d6ed29501f87f879801a120255f46 --- /dev/null +++ b/Assets/Scenes.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ac72be71662640f4ab0aaf102090fb95 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/inventoryStuff.unity b/Assets/inventoryStuff.unity index 804b8129e840f57a644dc0c8d52f7010fe437ad8..3168e5538f324cb3a82f1d53268f468da22a1e73 100644 --- a/Assets/inventoryStuff.unity +++ b/Assets/inventoryStuff.unity @@ -124,7 +124,6 @@ GameObject: - component: {fileID: 249048814} - component: {fileID: 249048813} - component: {fileID: 249048812} - - component: {fileID: 249048816} m_Layer: 5 m_Name: Canvas m_TagString: Untagged @@ -188,7 +187,7 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 0 + m_AdditionalShaderChannelsFlag: 25 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -213,25 +212,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} ---- !u!114 &249048816 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 249048811} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 66df8f5d2fa2cc140aa2d3eca570e8dd, type: 3} - m_Name: - m_EditorClassIdentifier: - inventory: {fileID: 0} - prefab: {fileID: 0} - x_Start: 0 - y_Start: 0 - X_Pacece_Between_Items: 0 - y_Pacece_Between_Items: 0 - number_of_Column: 0 --- !u!1 &274389188 GameObject: m_ObjectHideFlags: 0 @@ -283,7 +263,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 66df8f5d2fa2cc140aa2d3eca570e8dd, type: 3} m_Name: m_EditorClassIdentifier: - inventory: {fileID: 11400000, guid: 321a0b6a3c8d26e4da8ef600e17d369b, type: 2} + inventory: {fileID: 11400000, guid: f3a619d9c65f61d4b9c7c86923b1ad95, type: 2} prefab: {fileID: 3173330253721512196, guid: a6a9a3ebdb022e546a21d9f9ff148261, type: 3} x_Start: -125 y_Start: 225 @@ -454,7 +434,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8deb287bc63461e4b9bfa68c45404328, type: 3} m_Name: m_EditorClassIdentifier: - inventory: {fileID: 0} + inventory: {fileID: 11400000, guid: f3a619d9c65f61d4b9c7c86923b1ad95, type: 2} --- !u!114 &774642202 MonoBehaviour: m_ObjectHideFlags: 0 @@ -750,8 +730,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d982f30612e9c5c4eb26c1ad0bb859e1, type: 3} m_Name: m_EditorClassIdentifier: - inventory: {fileID: 11400000, guid: 321a0b6a3c8d26e4da8ef600e17d369b, type: 2} - prefab: {fileID: 3623208097461608675, guid: f8cb4e8bb9c09724c925b25c660fb2cd, type: 3} + inventory: {fileID: 11400000, guid: f3a619d9c65f61d4b9c7c86923b1ad95, type: 2} + prefab: {fileID: 4221381813544557775, guid: 8106c748f1aeb084d87fdc71dd009b67, type: 3} x_Start: -125 y_Start: 525 X_Pacece_Between_Items: 105 @@ -919,7 +899,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8deb287bc63461e4b9bfa68c45404328, type: 3} m_Name: m_EditorClassIdentifier: - inventory: {fileID: 11400000, guid: 321a0b6a3c8d26e4da8ef600e17d369b, type: 2} + inventory: {fileID: 11400000, guid: f3a619d9c65f61d4b9c7c86923b1ad95, type: 2} --- !u!4 &1332007316 Transform: m_ObjectHideFlags: 0 @@ -987,7 +967,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8deb287bc63461e4b9bfa68c45404328, type: 3} m_Name: m_EditorClassIdentifier: - inventory: {fileID: 0} + inventory: {fileID: 11400000, guid: f3a619d9c65f61d4b9c7c86923b1ad95, type: 2} --- !u!114 &1494109234 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index 0621bef18733701b4e7e560aaa4a000d9e2c4236..b82e822f91679ec5fb84f9a71ab3ca612845ba5e 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -29,9 +29,16 @@ QualitySettings: vSyncCount: 0 lodBias: 0.3 maximumLODLevel: 0 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 particleRaycastBudget: 4 asyncUploadTimeSlice: 2 asyncUploadBufferSize: 16 + asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 excludedTargetPlatforms: [] - serializedVersion: 2 @@ -57,9 +64,16 @@ QualitySettings: vSyncCount: 0 lodBias: 0.4 maximumLODLevel: 0 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 particleRaycastBudget: 16 asyncUploadTimeSlice: 2 asyncUploadBufferSize: 16 + asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 excludedTargetPlatforms: [] - serializedVersion: 2 @@ -85,9 +99,16 @@ QualitySettings: vSyncCount: 1 lodBias: 0.7 maximumLODLevel: 0 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 particleRaycastBudget: 64 asyncUploadTimeSlice: 2 asyncUploadBufferSize: 16 + asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 excludedTargetPlatforms: [] - serializedVersion: 2 @@ -113,9 +134,16 @@ QualitySettings: vSyncCount: 1 lodBias: 1 maximumLODLevel: 0 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 particleRaycastBudget: 256 asyncUploadTimeSlice: 2 asyncUploadBufferSize: 16 + asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 excludedTargetPlatforms: [] - serializedVersion: 2 @@ -141,9 +169,16 @@ QualitySettings: vSyncCount: 1 lodBias: 1.5 maximumLODLevel: 0 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 particleRaycastBudget: 1024 asyncUploadTimeSlice: 2 asyncUploadBufferSize: 16 + asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 excludedTargetPlatforms: [] - serializedVersion: 2 @@ -169,22 +204,16 @@ QualitySettings: vSyncCount: 1 lodBias: 2 maximumLODLevel: 0 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 particleRaycastBudget: 4096 asyncUploadTimeSlice: 2 asyncUploadBufferSize: 16 + asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 excludedTargetPlatforms: [] - m_PerPlatformDefaultQuality: - Android: 2 - Nintendo 3DS: 5 - Nintendo Switch: 5 - PS4: 5 - PSP2: 2 - Standalone: 5 - Tizen: 2 - WebGL: 3 - WiiU: 5 - Windows Store Apps: 5 - XboxOne: 5 - iPhone: 2 - tvOS: 2 + m_PerPlatformDefaultQuality: {} diff --git a/ProjectSettings/UnityConnectSettings.asset b/ProjectSettings/UnityConnectSettings.asset index fa0b146579fb787323d29e1d7b7768a0541031af..c3ae9a02084b09750d9815ee31e75039337a6ee5 100644 --- a/ProjectSettings/UnityConnectSettings.asset +++ b/ProjectSettings/UnityConnectSettings.asset @@ -4,7 +4,7 @@ UnityConnectSettings: m_ObjectHideFlags: 0 serializedVersion: 1 - m_Enabled: 0 + m_Enabled: 1 m_TestMode: 0 m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events m_EventUrl: https://cdp.cloud.unity3d.com/v1/events