Station_Obscurum/StationObscurum
8
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updatesx

Browse Source
This commit is contained in:
sebastianhampel1 2023-04-03 19:39:16 -04:00
parent 260ca88656
commit 9f71b56c94
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/Materials/PBR/rusted-steel-unity/rusted-steel.mat
View File

@ -195,7 +195,7 @@ Material:
- _AlphaToMaskInspectorValue: 0
- _Anisotropy: 0
- _BASE_COLOR_WEIGHT: 1
- _BUMP_MAP_STRENGTH: 4.67
- _BUMP_MAP_STRENGTH: 1.08
- _BlendMode: 0
- _COAT_IOR: 1.4
- _COAT_ROUGHNESS: 0
@ -255,7 +255,7 @@ Material:
- _PPDMinSamples: 5
- _PPDPrimitiveLength: 1
- _PPDPrimitiveWidth: 1
- _REFLECTIONS_IOR: 1.52
- _REFLECTIONS_IOR: 1
- _REFLECTIONS_ROUGHNESS: 0.601
- _REFLECTIONS_WEIGHT: 1
- _RayTracing: 0

11
Assets/Scripts/Player/PlayerInteractionHandler.cs
View File

@ -214,10 +214,11 @@ public void DisableFlashlight()
this.flashlightEnabled = false;
}
private void OnTriggerEnter(Collider other)
{
if(other.gameObject.GetComponent<InteractableItem>() != null)
/* if(other.gameObject.GetComponent<InteractableItem>() != null)
{
InteractableItem item = other.gameObject.GetComponent<InteractableItem>();
if(item is InteractableItem && item is not HeavyInteractableItem)
@ -230,11 +231,11 @@ private void OnTriggerEnter(Collider other)
heavyItemsInRange.Add((HeavyInteractableItem)item);
}
}
}*/
}
private void OnTriggerExit(Collider other)
{
if (other.gameObject.GetComponent<InteractableItem>() != null)
/*if (other.gameObject.GetComponent<InteractableItem>() != null)
{
InteractableItem item = other.gameObject.GetComponent<InteractableItem>();
if (item is InteractableItem && item is not HeavyInteractableItem)
@ -249,6 +250,6 @@ private void OnTriggerExit(Collider other)
//itemsInRange.Remove((HeavyInteractableItem)(item));
heavyItemsInRange.Remove((HeavyInteractableItem)item);
}
}
}*/
}
}