MeigoFried
/
GameVsJam
1
0
Fork 0
Code Issues 14 Pull Requests Packages Projects 1 Releases Wiki Activity

Merge branch 'main' of https://gitfrieds.nackenbox.xyz/MeigoFried/GameVsJam 

# Conflicts:
#	3d Prototyp/Assets/Scenes/NPC_Test.unity
This commit is contained in:
Meiko Remiorz 2024-04-04 12:18:22 +02:00
parent 160678c9a9 bd4fc70ca5
commit 5a86b8b4f5
8 changed files with 229 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
3d Prototyp/Assets/Mini Toon Office/Scenes/Toon Office sample Scene.unity
View File

@ -7947,6 +7947,63 @@ BoxCollider:
serializedVersion: 3
m_Size: {x: 1.0274248, y: 1, z: 1.0274248}
m_Center: {x: -0.0000009536743, y: 0.5, z: 0}
--- !u!1001 &1670218665
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2703668081068178613, guid: e1e33f0b2075b5c40817665dd8a86f31, type: 3}
propertyPath: m_Name
value: GameManager
objectReference: {fileID: 0}
- target: {fileID: 2715764554523923620, guid: e1e33f0b2075b5c40817665dd8a86f31, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2715764554523923620, guid: e1e33f0b2075b5c40817665dd8a86f31, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2715764554523923620, guid: e1e33f0b2075b5c40817665dd8a86f31, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2715764554523923620, guid: e1e33f0b2075b5c40817665dd8a86f31, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2715764554523923620, guid: e1e33f0b2075b5c40817665dd8a86f31, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2715764554523923620, guid: e1e33f0b2075b5c40817665dd8a86f31, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2715764554523923620, guid: e1e33f0b2075b5c40817665dd8a86f31, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2715764554523923620, guid: e1e33f0b2075b5c40817665dd8a86f31, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2715764554523923620, guid: e1e33f0b2075b5c40817665dd8a86f31, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2715764554523923620, guid: e1e33f0b2075b5c40817665dd8a86f31, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e1e33f0b2075b5c40817665dd8a86f31, type: 3}
--- !u!1001 &1689990508
PrefabInstance:
m_ObjectHideFlags: 0
@ -12201,3 +12258,4 @@ SceneRoots:
- {fileID: 2012357350}
- {fileID: 552825313}
- {fileID: 1891423499}
- {fileID: 1670218665}

8
3d Prototyp/Assets/Prefabs.meta 100644
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: ab173088132c6bf43a47494b3c826977
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

46
3d Prototyp/Assets/Prefabs/GameManager.prefab 100644
View File

@ -0,0 +1,46 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &2703668081068178613
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2715764554523923620}
- component: {fileID: 3650884189301972455}
m_Layer: 0
m_Name: GameManager
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2715764554523923620
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2703668081068178613}
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: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &3650884189301972455
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2703668081068178613}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4c31bfd8f0f10f540b73de81aac6d46c, type: 3}
m_Name:
m_EditorClassIdentifier:

7
3d Prototyp/Assets/Prefabs/GameManager.prefab.meta 100644
View File

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

70
3d Prototyp/Assets/Scenes/NPC_Test.unity
View File

@ -9484,11 +9484,11 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: ef5183dac70a54b4cbed3e05d617524f, type: 3}
m_Name:
m_EditorClassIdentifier:
context: office, gamedevelopement, coffee, spillage, questioning life
context: office, game crashing, bugs, errors
gender: FEMALE
speakingSpeed: 1.1
playSound: 0
generate: 0
generate: 1
--- !u!82 &1891423493
AudioSource:
m_ObjectHideFlags: 0
@ -9724,10 +9724,18 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 707d39e7a8ed7a44a8341ead8ee2a9ad, type: 3}
m_Name:
m_EditorClassIdentifier:
<<<<<<< HEAD
_caffeine_level: 0
_hunger_level: 0
_happiness_level: 100
_developement_power: 100
=======
_caffeineLevel: 0
_hungerLevel: 0
_happinessLevel: 100
_developementPower: 100
eventRate: 1
>>>>>>> bd4fc70ca5dee9f3506037e77bd9556f108b202d
--- !u!1001 &1901183706
PrefabInstance:
m_ObjectHideFlags: 0
@ -11888,6 +11896,63 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f13b72967b20549d5aff589765bc47c2, type: 3}
--- !u!1001 &6633369173471466424
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2703668081068178613, guid: e1e33f0b2075b5c40817665dd8a86f31, type: 3}
propertyPath: m_Name
value: GameManager
objectReference: {fileID: 0}
- target: {fileID: 2715764554523923620, guid: e1e33f0b2075b5c40817665dd8a86f31, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2715764554523923620, guid: e1e33f0b2075b5c40817665dd8a86f31, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2715764554523923620, guid: e1e33f0b2075b5c40817665dd8a86f31, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2715764554523923620, guid: e1e33f0b2075b5c40817665dd8a86f31, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2715764554523923620, guid: e1e33f0b2075b5c40817665dd8a86f31, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2715764554523923620, guid: e1e33f0b2075b5c40817665dd8a86f31, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2715764554523923620, guid: e1e33f0b2075b5c40817665dd8a86f31, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2715764554523923620, guid: e1e33f0b2075b5c40817665dd8a86f31, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2715764554523923620, guid: e1e33f0b2075b5c40817665dd8a86f31, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2715764554523923620, guid: e1e33f0b2075b5c40817665dd8a86f31, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e1e33f0b2075b5c40817665dd8a86f31, type: 3}
--- !u!1001 &6749397640789047005
PrefabInstance:
m_ObjectHideFlags: 0
@ -12229,3 +12294,4 @@ SceneRoots:
- {fileID: 2012357350}
- {fileID: 552825313}
- {fileID: 1891423499}
- {fileID: 6633369173471466424}

18
3d Prototyp/Assets/Scripts/GameManager.cs 100644
View File

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

11
3d Prototyp/Assets/Scripts/GameManager.cs.meta 100644
View File

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

25
3d Prototyp/Assets/Scripts/NPC_Behavior.cs
View File

@ -4,10 +4,11 @@ using UnityEngine;
public class NPC_Behavior : MonoBehaviour
{
[SerializeField] private double _caffeine_level = 0.0; // max 100
[SerializeField] private double _hunger_level = 0.0; // max 100
[SerializeField] private double _happiness_level = 100.0; // max 100
[SerializeField] private double _developement_power = 100.0; // max unlimited
[SerializeField] private double _caffeineLevel = 0.0; // max 100, min 0
[SerializeField] private double _hungerLevel = 0.0; // max 100, min 0
[SerializeField] private double _happinessLevel = 100.0; // max 100, min 0
[SerializeField] private double _developementPower = 100.0; // max unlimited, min 0
[SerializeField] double eventRate = 1.0; // max 60, min 0 -> how many events are requested per minute
// Start is called before the first frame update
void Start()
@ -25,10 +26,10 @@ public class NPC_Behavior : MonoBehaviour
{
return new Dictionary<string, double>
{
{ "Caffine", _caffeine_level },
{ "Hunger", _hunger_level },
{ "Happiness", _happiness_level },
{ "Developement Power", _developement_power }
{ "Caffine", _caffeineLevel },
{ "Hunger", _hungerLevel },
{ "Happiness", _happinessLevel },
{ "Developement Power", _developementPower }
};
}
@ -39,16 +40,16 @@ public class NPC_Behavior : MonoBehaviour
switch (key)
{
case "Caffine":
_caffeine_level = stats[key];
_caffeineLevel = stats[key];
break;
case "Hunger":
_hunger_level = stats[key];
_hungerLevel = stats[key];
break;
case "Happiness":
_happiness_level = stats[key];
_happinessLevel = stats[key];
break;
case "Developement Power":
_developement_power = stats[key];
_developementPower = stats[key];
break;
default:
Debug.LogError("Unknown Stat/Key");