Compare commits

..

No commits in common. "f202aace09be53551fd3bcaea83db8135862dac9" and "21f344277e64b4f59eaf4e8ba450d9cd81d16366" have entirely different histories.

17 changed files with 23 additions and 1698 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

View File

@ -1,127 +0,0 @@
fileFormatVersion: 2
guid: 16b2f7c43fa69494995c29e59d235330
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 1
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
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
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: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 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
ignorePlatformSupport: 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
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,83 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: foodDeveloperNeed
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
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: 2800000, guid: 16b2f7c43fa69494995c29e59d235330, type: 3}
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_Ints: []
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _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: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 2e9f21225c4c0564384d586dfff59786
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,125 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &2350437210533342175
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4436768814499293496}
- component: {fileID: 143819135981374605}
- component: {fileID: 2964655485596874049}
- component: {fileID: 1943093715876155399}
- component: {fileID: 120758001594329482}
m_Layer: 0
m_Name: FoodDeveloperNeeds
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4436768814499293496
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2350437210533342175}
serializedVersion: 2
m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.6, y: 0.05, z: 0.6}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
--- !u!33 &143819135981374605
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2350437210533342175}
m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &2964655485596874049
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2350437210533342175}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 2e9f21225c4c0564384d586dfff59786, 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
m_AdditionalVertexStreams: {fileID: 0}
--- !u!136 &1943093715876155399
CapsuleCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2350437210533342175}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 2
m_Radius: 0.5000001
m_Height: 2
m_Direction: 1
m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940697}
--- !u!114 &120758001594329482
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2350437210533342175}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4b7e9647fcf4a0b439acce6afe885ee3, type: 3}
m_Name:
m_EditorClassIdentifier:
spinningSpeed: 100
hoverSpeed: 1.5
hoverHeight: 0.1

View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 2122156ae265fcc4da01213f31a64901
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: a34b2d22562c7214f9daf0d3dea8d85c
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -251,58 +251,6 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0} m_Pivot: {x: 0, y: 0}
--- !u!1 &37507747
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 37507749}
- component: {fileID: 37507748}
m_Layer: 0
m_Name: Zeitschaltuhr
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &37507748
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 37507747}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1627adb53b4429346a7b0a984867d9d2, type: 3}
m_Name:
m_EditorClassIdentifier:
IsOn: 0
_turnOnTime:
_hour: 0
_minutes: 0
_turnOffTime:
_hour: 0
_minutes: 0
--- !u!4 &37507749
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 37507747}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 27.598955, y: 1.3647667, z: -5.786058}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 266099154}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &179279865 --- !u!1 &179279865
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -445,53 +393,6 @@ Transform:
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &266099153
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 266099154}
- component: {fileID: 266099155}
m_Layer: 0
m_Name: ZombieSpawner
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &266099154
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 266099153}
serializedVersion: 2
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 37507749}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &266099155
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 266099153}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a61873b0f5608a44982d48387f34f682, type: 3}
m_Name:
m_EditorClassIdentifier:
ZombiePrefab: {fileID: 0}
_spawnRate: 1
_spawnTimer: 0
--- !u!1001 &514859708 --- !u!1001 &514859708
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -2097,7 +1998,7 @@ MonoBehaviour:
- {fileID: 2907046783514947559, guid: 92b71cfc6a2687d44b165ead746233f0, type: 3} - {fileID: 2907046783514947559, guid: 92b71cfc6a2687d44b165ead746233f0, type: 3}
- {fileID: 3355435593704932208, guid: b31fb59d198e53b459943bf898293618, type: 3} - {fileID: 3355435593704932208, guid: b31fb59d198e53b459943bf898293618, type: 3}
- {fileID: 7697340910557049827, guid: 5d809e3a343d45f4185615db92384dc7, type: 3} - {fileID: 7697340910557049827, guid: 5d809e3a343d45f4185615db92384dc7, type: 3}
- {fileID: 2350437210533342175, guid: 2122156ae265fcc4da01213f31a64901, type: 3} - {fileID: 2405502523364773131, guid: b396df2098c22e1488c2c2769c6ddcd6, type: 3}
--- !u!114 &1814492794 --- !u!114 &1814492794
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -2352,4 +2253,3 @@ SceneRoots:
- {fileID: 983523620} - {fileID: 983523620}
- {fileID: 1814492790} - {fileID: 1814492790}
- {fileID: 514859708} - {fileID: 514859708}
- {fileID: 37507749}

View File

@ -123,8 +123,6 @@ public class Developer : MonoBehaviour
[SerializeField, ShowOnly] [SerializeField, ShowOnly]
private float _talkTimer; private float _talkTimer;
private List<GameObject> _needList = new List<GameObject>();
void Start() void Start()
{ {
_developerNeeds = gameObject.GetComponent<DeveloperNeeds>(); _developerNeeds = gameObject.GetComponent<DeveloperNeeds>();
@ -181,8 +179,6 @@ public class Developer : MonoBehaviour
if (_caffeineNeed != null && _caffeineLevel > GameManager.Instance.NeedNotificationThreshold) if (_caffeineNeed != null && _caffeineLevel > GameManager.Instance.NeedNotificationThreshold)
{ {
UpdateNeedPositions(_caffeineNeed);
_needList.Remove(_caffeineNeed);
NeedFullfilled(_caffeineNeed); NeedFullfilled(_caffeineNeed);
_caffeineNeed = null; _caffeineNeed = null;
} }
@ -213,8 +209,6 @@ public class Developer : MonoBehaviour
if (_hungerNeed != null && _hungerLevel > GameManager.Instance.NeedNotificationThreshold) if (_hungerNeed != null && _hungerLevel > GameManager.Instance.NeedNotificationThreshold)
{ {
UpdateNeedPositions(_hungerNeed);
_needList.Remove(_hungerNeed);
NeedFullfilled(_hungerNeed); NeedFullfilled(_hungerNeed);
_hungerNeed = null; _hungerNeed = null;
} }
@ -245,8 +239,6 @@ public class Developer : MonoBehaviour
if (_toiletNeed != null && _urgeToUrinateLevel > GameManager.Instance.NeedNotificationThreshold) if (_toiletNeed != null && _urgeToUrinateLevel > GameManager.Instance.NeedNotificationThreshold)
{ {
UpdateNeedPositions(_toiletNeed);
_needList.Remove(_toiletNeed);
NeedFullfilled(_toiletNeed); NeedFullfilled(_toiletNeed);
_toiletNeed = null; _toiletNeed = null;
} }
@ -279,23 +271,20 @@ public class Developer : MonoBehaviour
if (Random.Range(0.0f, 1.0f) > 0.5f) if (Random.Range(0.0f, 1.0f) > 0.5f)
{ {
_caffeineNeed = _developerNeeds.SpawnMateNeed(_needList.Count); _caffeineNeed = _developerNeeds.SpawnMateNeed();
_wantedDrink = WantedConsumable.Mate; _wantedDrink = WantedConsumable.Mate;
_needList.Add(_caffeineNeed);
} }
else else
{ {
_caffeineNeed = _developerNeeds.SpawnCoffeeNeed(_needList.Count); _caffeineNeed = _developerNeeds.SpawnCoffeeNeed();
_wantedDrink = WantedConsumable.Coffee; _wantedDrink = WantedConsumable.Coffee;
_needList.Add(_caffeineNeed);
} }
} }
if (_hungerLevel < GameManager.Instance.NeedNotificationThreshold && _hungerNeed == null) if (_hungerLevel < GameManager.Instance.NeedNotificationThreshold && _hungerNeed == null)
{ {
_hungerNeed = _developerNeeds.SpawnHungerNeed(_needList.Count); _hungerNeed = _developerNeeds.SpawnHungerNeed();
_wantedFood = WantedConsumable.Pizza; _wantedFood = WantedConsumable.Pizza;
_needList.Add(_hungerNeed);
} }
if (_urgeToUrinateLevel < GameManager.Instance.NeedNotificationThreshold && _toiletNeed == null) if (_urgeToUrinateLevel < GameManager.Instance.NeedNotificationThreshold && _toiletNeed == null)
@ -304,8 +293,7 @@ public class Developer : MonoBehaviour
Debug.Log("Ich muss aufs Klo!"); Debug.Log("Ich muss aufs Klo!");
_toiletNeed = _developerNeeds.SpawnToiletNeed(_needList.Count); _toiletNeed = _developerNeeds.SpawnToiletNeed();
_needList.Add(_toiletNeed);
} }
if (_hungerLevel <= 0.0) if (_hungerLevel <= 0.0)
@ -314,23 +302,6 @@ public class Developer : MonoBehaviour
} }
} }
private void UpdateNeedPositions(GameObject reference)
{
int referenceIndex = _needList.IndexOf(reference);
if (referenceIndex == -1)
{
Debug.LogError("Reference GameObject not in List.");
return;
}
for (int i = referenceIndex + 1; i < _needList.Count; i++)
{
GameObject currentItem = _needList[i];
currentItem.GetComponent<SpinningSpinner>().originalY -= 0.5f;
}
}
private void NeedFullfilled(GameObject needObject) private void NeedFullfilled(GameObject needObject)
{ {
Instantiate(GameManager.Instance.NeedFullfilledParticleEffect, needObject.transform.position, needObject.transform.rotation); Instantiate(GameManager.Instance.NeedFullfilledParticleEffect, needObject.transform.position, needObject.transform.rotation);

View File

@ -25,13 +25,13 @@ public class DeveloperNeeds : MonoBehaviour
// TODO: Enums statt strings verwenden // TODO: Enums statt strings verwenden
// TODO: Multiple Needs möglich übereinander anzeigen? // TODO: Multiple Needs möglich übereinander anzeigen?
public GameObject SpawnCoffeeNeed(int numNeeds) => spawnNeed("coffee", numNeeds); public GameObject SpawnCoffeeNeed() => spawnNeed("coffee");
public GameObject SpawnMateNeed(int numNeeds) => spawnNeed("mate", numNeeds); public GameObject SpawnMateNeed() => spawnNeed("mate");
public GameObject SpawnToiletNeed(int numNeeds) => spawnNeed("toilet", numNeeds); public GameObject SpawnToiletNeed() => spawnNeed("toilet");
public GameObject SpawnHungerNeed(int numNeeds) => spawnNeed("hunger", numNeeds); public GameObject SpawnHungerNeed() => spawnNeed("hunger");
public GameObject SpawnMoneyNeed(int numNeeds) => spawnNeed("money", numNeeds); public GameObject SpawnMoneyNeed() => spawnNeed("money");
public GameObject spawnNeed(string needName, float numNeeds) public GameObject spawnNeed(string needName)
{ {
GameObject spawnedNeed = null; GameObject spawnedNeed = null;
@ -40,20 +40,20 @@ public class DeveloperNeeds : MonoBehaviour
switch (needName) switch (needName)
{ {
case "coffee": case "coffee":
spawnedNeed = Instantiate(Needs[0], new Vector3(0.0f, 2f + (numNeeds * 0.5f), 0.0f), Needs[0].transform.rotation); spawnedNeed = Instantiate(Needs[0], new Vector3(0.0f, 2f, 0.0f), Needs[0].transform.rotation);
context = "The Developer wants coffee"; context = "The NPC wants coffee";
break; break;
case "mate": case "mate":
spawnedNeed = Instantiate(Needs[1], new Vector3(0.0f, 2f + (numNeeds * 0.5f), 0.0f), Needs[0].transform.rotation); spawnedNeed = Instantiate(Needs[1], new Vector3(0.0f, 2f, 0.0f), Needs[0].transform.rotation);
context = "The Developer wants a Blub Mate (Yes, its a drink called Blub Mate)"; context = "The NPC wants a Blub Mate (Yes, its a drink called Blub Mate)";
break; break;
case "toilet": case "toilet":
spawnedNeed = Instantiate(Needs[2], new Vector3(0.0f, 2f + (numNeeds * 0.5f), 0.0f), Needs[0].transform.rotation); spawnedNeed = Instantiate(Needs[2], new Vector3(0.0f, 2f, 0.0f), Needs[0].transform.rotation);
context = "The Developer wants to go to the toilet, toilet is clogged and dirty"; context = "The NPC wants to go to the toilet, toilet is clogged and dirty";
break; break;
case "hunger": case "money":
spawnedNeed = Instantiate(Needs[3], new Vector3(0.0f, 2f + (numNeeds * 0.5f), 0.0f), Needs[0].transform.rotation); spawnedNeed = Instantiate(Needs[3], new Vector3(0.0f, 2f, 0.0f), Needs[0].transform.rotation);
context = "The Developer wants a pizza"; context = "The NPC wants a raise, The NPC needs more money";
break; break;
default: default:
Debug.LogError($"Unbekannter need \"{needName}\""); Debug.LogError($"Unbekannter need \"{needName}\"");

View File

@ -126,7 +126,7 @@ public class NPC_Behavior : MonoBehaviour
need = needName; need = needName;
} }
_currentNeed = _developerNeeds.spawnNeed(need, 0); _currentNeed = _developerNeeds.spawnNeed(need);
HasNeed = true; HasNeed = true;
_lastTenNeeds.Add(need); _lastTenNeeds.Add(need);
if (_lastTenNeeds.Count > 10) if (_lastTenNeeds.Count > 10)

View File

@ -8,7 +8,7 @@ public class SpinningSpinner : MonoBehaviour
public float hoverSpeed = 1.5f; public float hoverSpeed = 1.5f;
public float hoverHeight = 0.1f; public float hoverHeight = 0.1f;
public float originalY; private float originalY;
void Start() void Start()

View File

@ -1,18 +0,0 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class Zombie : MonoBehaviour
{
// Start is called before the first frame update
void Start()
{
}
// Update is called once per frame
void Update()
{
}
}

View File

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: a455fc831fa3efb449326d693b740682
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,32 +0,0 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using Utility;
public class ZombieSpawner : MonoBehaviour
{
[SerializeField]
GameObject ZombiePrefab;
[SerializeField]
private float _spawnRate = 1.0f;
[SerializeField, ShowOnly]
private float _spawnTimer;
// Start wird aufgerufen, bevor das erste Frame gezeichnet wird
void Start()
{
_spawnTimer = 60 / _spawnRate;
}
// Update wird einmal pro Frame aufgerufen
void Update()
{
_spawnTimer -= Time.deltaTime;
if (_spawnTimer <= 0)
{
Instantiate(ZombiePrefab, transform.position, Quaternion.identity);
_spawnTimer = 60 / _spawnRate;
}
}
}

View File

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: a61873b0f5608a44982d48387f34f682
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant: