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

Browse Source 
# 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
Download Patch File Download Diff File Expand all files Collapse all files

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}