Skip to content
Snippets Groups Projects
Commit e5185a08 authored by BenniHome's avatar BenniHome
Browse files

Fixed my mistakes, added some fancy item-display-assets

parent c504095b
No related branches found
No related tags found
No related merge requests found
Showing
with 403 additions and 13 deletions
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;
}
}
fileFormatVersion: 2
guid: ab51f8628e4c07449aa2844882114144
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: eec83b50c1e0c604aa91430f72c8dbb0
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
......@@ -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;
}
......
......@@ -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:
......
......@@ -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);
......
......@@ -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:
......
......@@ -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>();
......
......@@ -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: []
fileFormatVersion: 2
guid: 321a0b6a3c8d26e4da8ef600e17d369b
guid: f3a619d9c65f61d4b9c7c86923b1ad95
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
......
fileFormatVersion: 2
guid: 377a2e0baa0da5a4c98c55be11d048aa
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/InventoryStuff/Items/images/Angle.png

129 B

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:
Assets/InventoryStuff/Items/images/Distance.png

129 B

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:
Assets/InventoryStuff/Items/images/pythagoras.png

129 B

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:
%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:
fileFormatVersion: 2
guid: 61db163b97432e6428b3e5b6ad6c8243
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment