Commit 7230b287 authored by Tobias's avatar Tobias

Merge branch 'master' of...

Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/overbrewed
parents 8a4130eb 9b7bfc97
fileFormatVersion: 2 fileFormatVersion: 2
guid: 74fd32b8a82a08841abd27b278fdf4b0 guid: 2cdc087867a94f948a66639756a8a3e3
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}
......
...@@ -14,9 +14,13 @@ MonoBehaviour: ...@@ -14,9 +14,13 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
prefab: {fileID: 3294543616357163931, guid: 30566b76f8b6e2446a0ff9cc797b2b88, type: 3} prefab: {fileID: 3294543616357163931, guid: 30566b76f8b6e2446a0ff9cc797b2b88, type: 3}
audio: {fileID: 0} audio: {fileID: 0}
allowedIntregients:
- {fileID: 11400000, guid: 49a683ec882e87043b0005cab45e9c44, type: 2}
- {fileID: 11400000, guid: 7eaa53c05a305914e8c533c99ca2093f, type: 2}
- {fileID: 11400000, guid: 25e2eb1e21c808549acbb6642b6048da, type: 2}
closedPrefab: {fileID: 9036522971056616119, guid: f44b94833fafd764fb110433ec798732, closedPrefab: {fileID: 9036522971056616119, guid: f44b94833fafd764fb110433ec798732,
type: 3} type: 3}
emptyPrefab: {fileID: 3907786484169334233, guid: e0c4d1513ad5ed140afa45f3e14f631b, emptyPrefab: {fileID: 3907786484169334233, guid: e0c4d1513ad5ed140afa45f3e14f631b,
type: 3} type: 3}
isOpen: 0 isOpen: 1
isEmpty: 0 isEmpty: 1
...@@ -14,9 +14,13 @@ MonoBehaviour: ...@@ -14,9 +14,13 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
prefab: {fileID: 3294543616357163931, guid: 30566b76f8b6e2446a0ff9cc797b2b88, type: 3} prefab: {fileID: 3294543616357163931, guid: 30566b76f8b6e2446a0ff9cc797b2b88, type: 3}
audio: {fileID: 0} audio: {fileID: 0}
allowedIntregients:
- {fileID: 11400000, guid: 49a683ec882e87043b0005cab45e9c44, type: 2}
- {fileID: 11400000, guid: 7eaa53c05a305914e8c533c99ca2093f, type: 2}
- {fileID: 11400000, guid: 25e2eb1e21c808549acbb6642b6048da, type: 2}
closedPrefab: {fileID: 9036522971056616119, guid: f44b94833fafd764fb110433ec798732, closedPrefab: {fileID: 9036522971056616119, guid: f44b94833fafd764fb110433ec798732,
type: 3} type: 3}
emptyPrefab: {fileID: 3907786484169334233, guid: e0c4d1513ad5ed140afa45f3e14f631b, emptyPrefab: {fileID: 3907786484169334233, guid: e0c4d1513ad5ed140afa45f3e14f631b,
type: 3} type: 3}
isOpen: 0 isOpen: 1
isEmpty: 0 isEmpty: 1
...@@ -13,7 +13,7 @@ MonoBehaviour: ...@@ -13,7 +13,7 @@ MonoBehaviour:
m_Name: HealthInitialVariable m_Name: HealthInitialVariable
m_EditorClassIdentifier: m_EditorClassIdentifier:
DeveloperDescription: DeveloperDescription:
value: 10 value: 2
oldValue: 10 oldValue: 10
Changed: {fileID: 0} Changed: {fileID: 0}
ChangedWithHistory: {fileID: 0} ChangedWithHistory: {fileID: 0}
...@@ -26,14 +26,14 @@ Transform: ...@@ -26,14 +26,14 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6578631021614687659} m_GameObject: {fileID: 6578631021614687659}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 5317287151671554315} - {fileID: 5317287151671554315}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0}
--- !u!114 &7558450272839028383 --- !u!114 &7558450272839028383
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -164,17 +164,17 @@ PrefabInstance: ...@@ -164,17 +164,17 @@ PrefabInstance:
- target: {fileID: 2781946042795559405, guid: 92c0a2ad595e79b49b7602325a2b96d8, - target: {fileID: 2781946042795559405, guid: 92c0a2ad595e79b49b7602325a2b96d8,
type: 3} type: 3}
propertyPath: m_LocalRotation.x propertyPath: m_LocalRotation.x
value: -0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2781946042795559405, guid: 92c0a2ad595e79b49b7602325a2b96d8, - target: {fileID: 2781946042795559405, guid: 92c0a2ad595e79b49b7602325a2b96d8,
type: 3} type: 3}
propertyPath: m_LocalRotation.y propertyPath: m_LocalRotation.y
value: -0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2781946042795559405, guid: 92c0a2ad595e79b49b7602325a2b96d8, - target: {fileID: 2781946042795559405, guid: 92c0a2ad595e79b49b7602325a2b96d8,
type: 3} type: 3}
propertyPath: m_LocalRotation.z propertyPath: m_LocalRotation.z
value: -0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2781946042795559405, guid: 92c0a2ad595e79b49b7602325a2b96d8, - target: {fileID: 2781946042795559405, guid: 92c0a2ad595e79b49b7602325a2b96d8,
type: 3} type: 3}
......
...@@ -117,22 +117,22 @@ PrefabInstance: ...@@ -117,22 +117,22 @@ PrefabInstance:
- target: {fileID: -4216859302048453862, guid: 393608b9dc448b94d95fca4d841fa5d3, - target: {fileID: -4216859302048453862, guid: 393608b9dc448b94d95fca4d841fa5d3,
type: 3} type: 3}
propertyPath: m_LocalRotation.x propertyPath: m_LocalRotation.x
value: -0 value: -0.7071068
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 393608b9dc448b94d95fca4d841fa5d3, - target: {fileID: -4216859302048453862, guid: 393608b9dc448b94d95fca4d841fa5d3,
type: 3} type: 3}
propertyPath: m_LocalRotation.y propertyPath: m_LocalRotation.y
value: -0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 393608b9dc448b94d95fca4d841fa5d3, - target: {fileID: -4216859302048453862, guid: 393608b9dc448b94d95fca4d841fa5d3,
type: 3} type: 3}
propertyPath: m_LocalRotation.z propertyPath: m_LocalRotation.z
value: -0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 393608b9dc448b94d95fca4d841fa5d3, - target: {fileID: -4216859302048453862, guid: 393608b9dc448b94d95fca4d841fa5d3,
type: 3} type: 3}
propertyPath: m_LocalRotation.w propertyPath: m_LocalRotation.w
value: 1 value: 0.7071068
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 393608b9dc448b94d95fca4d841fa5d3, - target: {fileID: -4216859302048453862, guid: 393608b9dc448b94d95fca4d841fa5d3,
type: 3} type: 3}
...@@ -142,7 +142,7 @@ PrefabInstance: ...@@ -142,7 +142,7 @@ PrefabInstance:
- target: {fileID: -4216859302048453862, guid: 393608b9dc448b94d95fca4d841fa5d3, - target: {fileID: -4216859302048453862, guid: 393608b9dc448b94d95fca4d841fa5d3,
type: 3} type: 3}
propertyPath: m_LocalEulerAnglesHint.x propertyPath: m_LocalEulerAnglesHint.x
value: 0 value: -90
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 393608b9dc448b94d95fca4d841fa5d3, - target: {fileID: -4216859302048453862, guid: 393608b9dc448b94d95fca4d841fa5d3,
type: 3} type: 3}
......
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!65 &4288153324729887255
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2729195371746003719}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 29.478506, y: 1.8103123, z: 3.2891085}
m_Center: {x: 3.3690078, y: 0.40515614, z: 1.1445552}
--- !u!1 &7743935121485233299 --- !u!1 &7743935121485233299
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -38,6 +51,36 @@ PrefabInstance: ...@@ -38,6 +51,36 @@ PrefabInstance:
m_Modification: m_Modification:
m_TransformParent: {fileID: 3874318497242293591} m_TransformParent: {fileID: 3874318497242293591}
m_Modifications: m_Modifications:
- target: {fileID: -927199367670048503, guid: a87b959c3a2ca7040bd7c7fdeb553911,
type: 3}
propertyPath: m_Name
value: Bartheke_UR 1
objectReference: {fileID: 0}
- target: {fileID: -927199367670048503, guid: a87b959c3a2ca7040bd7c7fdeb553911,
type: 3}
propertyPath: m_Layer
value: 13
objectReference: {fileID: 0}
- target: {fileID: 1387304262345273839, guid: a87b959c3a2ca7040bd7c7fdeb553911,
type: 3}
propertyPath: m_Layer
value: 13
objectReference: {fileID: 0}
- target: {fileID: -1282689400404095567, guid: a87b959c3a2ca7040bd7c7fdeb553911,
type: 3}
propertyPath: m_Layer
value: 13
objectReference: {fileID: 0}
- target: {fileID: 3543417000117055876, guid: a87b959c3a2ca7040bd7c7fdeb553911,
type: 3}
propertyPath: m_Layer
value: 13
objectReference: {fileID: 0}
- target: {fileID: -1599186369056843476, guid: a87b959c3a2ca7040bd7c7fdeb553911,
type: 3}
propertyPath: m_Layer
value: 13
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: a87b959c3a2ca7040bd7c7fdeb553911, - target: {fileID: -4216859302048453862, guid: a87b959c3a2ca7040bd7c7fdeb553911,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
...@@ -93,63 +136,39 @@ PrefabInstance: ...@@ -93,63 +136,39 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -927199367670048503, guid: a87b959c3a2ca7040bd7c7fdeb553911, - target: {fileID: -2543824071032492177, guid: a87b959c3a2ca7040bd7c7fdeb553911,
type: 3}
propertyPath: m_Name
value: Bartheke_UR 1
objectReference: {fileID: 0}
- target: {fileID: -927199367670048503, guid: a87b959c3a2ca7040bd7c7fdeb553911,
type: 3}
propertyPath: m_Layer
value: 13
objectReference: {fileID: 0}
- target: {fileID: -7967601843708159158, guid: a87b959c3a2ca7040bd7c7fdeb553911,
type: 3} type: 3}
propertyPath: m_Materials.Array.data[0] propertyPath: m_Materials.Array.data[0]
value: value:
objectReference: {fileID: 2100000, guid: d3916b039ec12c043ba5619e7868323e, type: 2} objectReference: {fileID: 2100000, guid: 6fa48c2a126d0d74e8bb671b62e8cb1b, type: 2}
- target: {fileID: -2768172579531324765, guid: a87b959c3a2ca7040bd7c7fdeb553911, - target: {fileID: -2768172579531324765, guid: a87b959c3a2ca7040bd7c7fdeb553911,
type: 3} type: 3}
propertyPath: m_Materials.Array.data[0] propertyPath: m_Materials.Array.data[0]
value: value:
objectReference: {fileID: 2100000, guid: 223cf3dc5f4ab1b47a11da31ae976fb3, type: 2} objectReference: {fileID: 2100000, guid: 223cf3dc5f4ab1b47a11da31ae976fb3, type: 2}
- target: {fileID: -2543824071032492177, guid: a87b959c3a2ca7040bd7c7fdeb553911, - target: {fileID: -7967601843708159158, guid: a87b959c3a2ca7040bd7c7fdeb553911,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 6fa48c2a126d0d74e8bb671b62e8cb1b, type: 2}
- target: {fileID: 2568776623678379799, guid: a87b959c3a2ca7040bd7c7fdeb553911,
type: 3} type: 3}
propertyPath: m_Materials.Array.data[0] propertyPath: m_Materials.Array.data[0]
value: value:
objectReference: {fileID: 2100000, guid: d3916b039ec12c043ba5619e7868323e, type: 2} objectReference: {fileID: 2100000, guid: d3916b039ec12c043ba5619e7868323e, type: 2}
- target: {fileID: -1599186369056843476, guid: a87b959c3a2ca7040bd7c7fdeb553911,
type: 3}
propertyPath: m_Layer
value: 13
objectReference: {fileID: 0}
- target: {fileID: 3543417000117055876, guid: a87b959c3a2ca7040bd7c7fdeb553911,
type: 3}
propertyPath: m_Layer
value: 13
objectReference: {fileID: 0}
- target: {fileID: -1282689400404095567, guid: a87b959c3a2ca7040bd7c7fdeb553911,
type: 3}
propertyPath: m_Layer
value: 13
objectReference: {fileID: 0}
- target: {fileID: 1387304262345273839, guid: a87b959c3a2ca7040bd7c7fdeb553911,
type: 3}
propertyPath: m_Layer
value: 13
objectReference: {fileID: 0}
- target: {fileID: -6947943586855123007, guid: a87b959c3a2ca7040bd7c7fdeb553911, - target: {fileID: -6947943586855123007, guid: a87b959c3a2ca7040bd7c7fdeb553911,
type: 3} type: 3}
propertyPath: m_Layer propertyPath: m_Layer
value: 13 value: 13
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2568776623678379799, guid: a87b959c3a2ca7040bd7c7fdeb553911,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: d3916b039ec12c043ba5619e7868323e, type: 2}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a87b959c3a2ca7040bd7c7fdeb553911, type: 3} m_SourcePrefab: {fileID: 100100000, guid: a87b959c3a2ca7040bd7c7fdeb553911, type: 3}
--- !u!1 &2729195371746003719 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: a87b959c3a2ca7040bd7c7fdeb553911,
type: 3}
m_PrefabInstance: {fileID: 6251525892548383246}
m_PrefabAsset: {fileID: 0}
--- !u!4 &1421823994815412500 stripped --- !u!4 &1421823994815412500 stripped
Transform: Transform:
m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: a87b959c3a2ca7040bd7c7fdeb553911, m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: a87b959c3a2ca7040bd7c7fdeb553911,
......
...@@ -250,22 +250,22 @@ PrefabInstance: ...@@ -250,22 +250,22 @@ PrefabInstance:
- target: {fileID: -4216859302048453862, guid: 515a1296b4924874b8590508d4c50a6d, - target: {fileID: -4216859302048453862, guid: 515a1296b4924874b8590508d4c50a6d,
type: 3} type: 3}
propertyPath: m_LocalRotation.x propertyPath: m_LocalRotation.x
value: -0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 515a1296b4924874b8590508d4c50a6d, - target: {fileID: -4216859302048453862, guid: 515a1296b4924874b8590508d4c50a6d,
type: 3} type: 3}
propertyPath: m_LocalRotation.y propertyPath: m_LocalRotation.y
value: 0.73435843 value: 0.7071068
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 515a1296b4924874b8590508d4c50a6d, - target: {fileID: -4216859302048453862, guid: 515a1296b4924874b8590508d4c50a6d,
type: 3} type: 3}
propertyPath: m_LocalRotation.z propertyPath: m_LocalRotation.z
value: -0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 515a1296b4924874b8590508d4c50a6d, - target: {fileID: -4216859302048453862, guid: 515a1296b4924874b8590508d4c50a6d,
type: 3} type: 3}
propertyPath: m_LocalRotation.w propertyPath: m_LocalRotation.w
value: 0.67876196 value: 0.7071068
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 515a1296b4924874b8590508d4c50a6d, - target: {fileID: -4216859302048453862, guid: 515a1296b4924874b8590508d4c50a6d,
type: 3} type: 3}
...@@ -280,7 +280,7 @@ PrefabInstance: ...@@ -280,7 +280,7 @@ PrefabInstance:
- target: {fileID: -4216859302048453862, guid: 515a1296b4924874b8590508d4c50a6d, - target: {fileID: -4216859302048453862, guid: 515a1296b4924874b8590508d4c50a6d,
type: 3} type: 3}
propertyPath: m_LocalEulerAnglesHint.y propertyPath: m_LocalEulerAnglesHint.y
value: 94.506004 value: 90
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 515a1296b4924874b8590508d4c50a6d, - target: {fileID: -4216859302048453862, guid: 515a1296b4924874b8590508d4c50a6d,
type: 3} type: 3}
......
...@@ -1973,17 +1973,17 @@ RectTransform: ...@@ -1973,17 +1973,17 @@ RectTransform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5638002898429637794} m_GameObject: {fileID: 5638002898429637794}
m_LocalRotation: {x: -0, y: -0, z: -0.16791996, w: 0.9858006} m_LocalRotation: {x: -0, y: -0, z: -0.20987998, w: 0.9777272}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 2943840638048515376} m_Father: {fileID: 2943840638048515376}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -19.334002} m_LocalEulerAnglesHint: {x: 0, y: 0, z: -24.231}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 107, y: 134} m_AnchoredPosition: {x: 92, y: 140}
m_SizeDelta: {x: 701.7, y: 350.9} m_SizeDelta: {x: -253.79999, y: 313.5}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9194969150082210956 --- !u!222 &9194969150082210956
CanvasRenderer: CanvasRenderer:
......
...@@ -1273,7 +1273,7 @@ RectTransform: ...@@ -1273,7 +1273,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -253, y: 135} m_AnchoredPosition: {x: -253, y: 157}
m_SizeDelta: {x: 647.9, y: 415.3} m_SizeDelta: {x: 647.9, y: 415.3}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &904270023 --- !u!114 &904270023
...@@ -1808,8 +1808,8 @@ RectTransform: ...@@ -1808,8 +1808,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -294.4, y: -53} m_AnchoredPosition: {x: -300.3, y: -75.143}
m_SizeDelta: {x: -725.9, y: -214.9} m_SizeDelta: {x: -714.2, y: -170.61}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1255162963 --- !u!1 &1255162963
GameObject: GameObject:
......
...@@ -56,7 +56,8 @@ namespace Scripts.Brewing ...@@ -56,7 +56,8 @@ namespace Scripts.Brewing
return true; return true;
} }
if (_currentCarriable is ContainerType && carriable is IngredientType) if (_currentCarriable is ContainerType && carriable is IngredientType &&
((ContainerType) _currentCarriable).CheckAllowedIngredients((IngredientType) carriable))
{ {
if (_container.AddIngredient((IngredientType) carriable)) if (_container.AddIngredient((IngredientType) carriable))
{ {
...@@ -121,7 +122,8 @@ namespace Scripts.Brewing ...@@ -121,7 +122,8 @@ namespace Scripts.Brewing
if (_currentCarriable is ContainerType) if (_currentCarriable is ContainerType)
{ {
GameObject newObject = Instantiate(((ContainerType) _currentCarriable).GetPrefab(), _itemSpawn.transform.position, GameObject newObject = Instantiate(((ContainerType) _currentCarriable).GetPrefab(),
_itemSpawn.transform.position,
_itemSpawn.transform.rotation); _itemSpawn.transform.rotation);
newObject.transform.parent = _itemSpawn.transform; newObject.transform.parent = _itemSpawn.transform;
} }
...@@ -131,7 +133,6 @@ namespace Scripts.Brewing ...@@ -131,7 +133,6 @@ namespace Scripts.Brewing
_itemSpawn.transform.rotation); _itemSpawn.transform.rotation);
newObject.transform.parent = _itemSpawn.transform; newObject.transform.parent = _itemSpawn.transform;
} }
} }
} }
} }
using UnityEngine; using System.Collections.Generic;
using UnityEngine;
namespace Scripts.Brewing.ItemTypes namespace Scripts.Brewing.ItemTypes
{ {
[CreateAssetMenu(fileName = "New ContainerType", menuName = "OverBrewed/Brewing/ContainerType", order = 6)] [CreateAssetMenu(fileName = "New ContainerType", menuName = "OverBrewed/Brewing/ContainerType", order = 6)]
public class ContainerType : Carriable public class ContainerType : Carriable
{ {
[SerializeField] private List<IngredientType> allowedIntregients;
[SerializeField] private GameObject closedPrefab; [SerializeField] private GameObject closedPrefab;
[SerializeField] private GameObject emptyPrefab; [SerializeField] private GameObject emptyPrefab;
...@@ -17,5 +20,10 @@ namespace Scripts.Brewing.ItemTypes ...@@ -17,5 +20,10 @@ namespace Scripts.Brewing.ItemTypes
{ {
return isOpen ? isEmpty ? emptyPrefab : prefab : closedPrefab; return isOpen ? isEmpty ? emptyPrefab : prefab : closedPrefab;
} }
public bool CheckAllowedIngredients(IngredientType ingredient)
{
return allowedIntregients.Contains(ingredient);
}
} }
} }
...@@ -124,9 +124,9 @@ public class CustomerBehaviour : MonoBehaviour ...@@ -124,9 +124,9 @@ public class CustomerBehaviour : MonoBehaviour
_playerActor.gameObject.transform.LookAt(_playerActor.gameObject.transform.position + _agent.velocity); _playerActor.gameObject.transform.LookAt(_playerActor.gameObject.transform.position + _agent.velocity);
_customerBar.transform.parent.LookAt(_cameraObject.transform); Vector3 trans = _customerBar.transform.position;
_customerBar.transform.parent.LookAt(new Vector3(trans.x, trans.y, -100.0f));
_orderPopUp.transform.LookAt(_cameraObject.transform); _orderPopUp.transform.LookAt(_cameraObject.transform);
} }
private IEnumerator OrderAgain(float orderDuration) private IEnumerator OrderAgain(float orderDuration)
......
fileFormatVersion: 2 fileFormatVersion: 2
guid: 938fe1540aa4aac42981219f8e6e8caf guid: 0e1551d854a4a8247877583fdb2fba9a
folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}
userData: userData:
......