Commit 2cba0cc0 authored by LasseKau's avatar LasseKau
Browse files

note wip

,
parent 2bab2365
fileFormatVersion: 2
guid: f787b62fa682461428ef17181c360e04
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 10
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: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Note
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.63
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 0.7576337, b: 0.6084906, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
fileFormatVersion: 2
guid: 0c7e9ec730498bb48a15828b0529d32b
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &8366914009312278138
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8593782348303222289}
- component: {fileID: 1071215817375129947}
- component: {fileID: 3331874215500118122}
- component: {fileID: 777884451298955008}
- component: {fileID: 6328056017147941167}
- component: {fileID: 357971863}
m_Layer: 0
m_Name: Note
m_TagString: Note
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8593782348303222289
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8366914009312278138}
m_LocalRotation: {x: 0.6423917, y: -0.29552147, z: 0.29552147, w: 0.6423917}
m_LocalPosition: {x: 620.33, y: 75.1, z: 658.83}
m_LocalScale: {x: 0.57, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 90, y: -49.407, z: 0.001}
--- !u!33 &1071215817375129947
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8366914009312278138}
m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &3331874215500118122
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8366914009312278138}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 0c7e9ec730498bb48a15828b0529d32b, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!114 &777884451298955008
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8366914009312278138}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: aba571034f62195419d62e2ecb581796, type: 3}
m_Name:
m_EditorClassIdentifier:
Ammo: 0
Health: 0
readNote: 0
--- !u!65 &6328056017147941167
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8366914009312278138}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 2.97, y: 2.17, z: 3.08}
m_Center: {x: 0, y: 0, z: 0}
--- !u!54 &357971863
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8366914009312278138}
serializedVersion: 2
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 0
m_IsKinematic: 1
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
fileFormatVersion: 2
guid: 975976900a4c7c74daa7f3277be71c8f
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
......@@ -7001,6 +7001,7 @@ MonoBehaviour:
MasterSlider: {fileID: 1138244184}
SfxSlider: {fileID: 1181114520}
AudioSlider: {fileID: 2071989960}
MusicSlider: {fileID: 0}
audioMixer: {fileID: 24100000, guid: 426eb5f59adf289498f67a632a111c37, type: 2}
--- !u!1 &1056694454
GameObject:
......
This diff is collapsed.
......@@ -66,7 +66,7 @@ public class SensorTriggeredBehaviorManager : MonoBehaviour
if (this.sensors.Any(x => x.IsTriggered))
{
this.BeginTriggeredState();
//Debug.Log("trigger");
//Debug.Log("trigger")
return;
}
/*
......
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class NoteReader : MonoBehaviour
{
[SerializeField] GameObject Note;
// Start is called before the first frame update
void Start()
{
Note.gameObject.SetActive(false);
}
// Update is called once per frame
void Update()
{
PickupItem pickupItem = GetComponent<PickupItem>();
if(pickupItem.readNote == true)
{
Note.gameObject.SetActive(true);
}
}
public void CloseNote()
{
PickupItem pickupItem = GetComponent<PickupItem>();
pickupItem.readNote = false;
Note.gameObject.SetActive(false);
}
}
fileFormatVersion: 2
guid: f412f43dce4e0114086c9a191a297d5e
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
......@@ -7,6 +7,8 @@ public class PickupItem : MonoBehaviour
public int Ammo = 0;
public int Health = 0;
public bool readNote = false;
private void Start()
{
if (gameObject.tag.Contains("Ammo"))
......@@ -44,6 +46,10 @@ public class PickupItem : MonoBehaviour
{
PickupObstacles();
}
if (gameObject.tag == "Note")
{
PickupNote();
}
}
}
......@@ -130,6 +136,13 @@ public class PickupItem : MonoBehaviour
}
}
//spagetti
void PickupNote()
{
readNote = true;
}
/*public void BuyStuff(string buyWhat)
{
GameObject toBuy = Instantiate(gameObject);
......
......@@ -19,6 +19,10 @@ public class PlaceableManager : MonoBehaviour
public Transform playerPos;
Transform playerSpot;
//note, things have gone to spagetti
public GameObject Note;
public GameObject crosshair;
//public GameObject distillerMenu;
//public GameObject inGameCanvas;
......@@ -124,6 +128,25 @@ public class PlaceableManager : MonoBehaviour
Debug.Log("You already have yeast");
}
}
if (Physics.Raycast(fpsCam.transform.position, fpsCam.transform.forward, out hit, range) && hit.transform.gameObject.tag == "Note")
{
if (Input.GetKeyDown(KeyCode.E))
{
PickupItem pickupItem = GetComponent<PickupItem>();
if (pickupItem.readNote == true)
{
Note.gameObject.SetActive(true);
}
}
/*
else
{
PickupItem pickupItem = GetComponent<PickupItem>();
pickupItem.readNote = false;
Note.gameObject.SetActive(false);
}
*/
}
if (Physics.Raycast(fpsCam.transform.position, fpsCam.transform.forward, out hit, range) && hit.transform.gameObject.tag == "Distiller")
{
......@@ -268,6 +291,12 @@ public class PlaceableManager : MonoBehaviour
StationaryWeaponInactive();
}
}
public void CloseNote()
{
PickupItem pickupItem = GetComponent<PickupItem>();
pickupItem.readNote = false;
Note.gameObject.SetActive(false);
}
void StationaryWeaponActivate()
{
......
......@@ -18,7 +18,7 @@ MonoBehaviour:
transitionBehaviors: []
timeMoving:
from: 6.14
to: 8.22
to: 25
timeStill:
from: 0
to: 0
......@@ -88,6 +88,11 @@ PrefabInstance:
propertyPath: allowedTargets.m_Bits
value: 4294967295
objectReference: {fileID: 0}
- target: {fileID: 8898221211294516641, guid: fba7e0ae056d6394ab3a89dd5dc8efd8,
type: 3}
propertyPath: damage
value: 14
objectReference: {fileID: 0}
- target: {fileID: 8898221211294516642, guid: fba7e0ae056d6394ab3a89dd5dc8efd8,
type: 3}
propertyPath: runSpeed
......
......@@ -9,8 +9,6 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 3813106991676375201}
- component: {fileID: 544717458}
- component: {fileID: 544717457}
m_Layer: 0
m_Name: spawnPoint
m_TagString: Untagged
......@@ -32,32 +30,3 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!54 &544717458
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6179396238244707013}
serializedVersion: 2
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!65 &544717457
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6179396238244707013}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
......@@ -33,6 +33,7 @@ TagManager:
- Sugar
- Water
- Yeast
- Note
layers:
- Default
- TransparentFX
......@@ -46,7 +47,7 @@ TagManager:
- PostProcess
- Weapon
- Perceptor
-
- Note
-
-
-
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment