Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
Overbrewed
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
GameDevWeek
S
Sommersemester 2019
Unity
Overbrewed
Commits
91c49cfd
Commit
91c49cfd
authored
Sep 22, 2019
by
Sebastian
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
adjusted level layout and progress bar rotation
parent
f7b86b42
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
531 additions
and
914 deletions
+531
-914
Assets/_Game/Prefabs/Characters/CustomerBase.prefab
Assets/_Game/Prefabs/Characters/CustomerBase.prefab
+5
-5
Assets/_Game/Prefabs/Theken/BarTheke.prefab
Assets/_Game/Prefabs/Theken/BarTheke.prefab
+57
-38
Assets/_Game/Prefabs/Theken/Theke_Herd.prefab
Assets/_Game/Prefabs/Theken/Theke_Herd.prefab
+5
-5
Assets/_Game/Scenes/Level_0_Overbrewed.unity
Assets/_Game/Scenes/Level_0_Overbrewed.unity
+462
-864
Assets/_Game/Scripts/Customer/CustomerBehaviour.cs
Assets/_Game/Scripts/Customer/CustomerBehaviour.cs
+2
-2
No files found.
Assets/_Game/Prefabs/Characters/CustomerBase.prefab
View file @
91c49cfd
...
...
@@ -26,14 +26,14 @@ Transform:
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
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_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
-
{
fileID
:
5317287151671554315
}
m_Father
:
{
fileID
:
0
}
m_RootOrder
:
0
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
-9
0
,
z
:
0
}
---
!u!114
&7558450272839028383
MonoBehaviour
:
m_ObjectHideFlags
:
0
...
...
@@ -164,17 +164,17 @@ PrefabInstance:
-
target
:
{
fileID
:
2781946042795559405
,
guid
:
92c0a2ad595e79b49b7602325a2b96d8
,
type
:
3
}
propertyPath
:
m_LocalRotation.x
value
:
-
0
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
2781946042795559405
,
guid
:
92c0a2ad595e79b49b7602325a2b96d8
,
type
:
3
}
propertyPath
:
m_LocalRotation.y
value
:
-
0
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
2781946042795559405
,
guid
:
92c0a2ad595e79b49b7602325a2b96d8
,
type
:
3
}
propertyPath
:
m_LocalRotation.z
value
:
-
0
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
2781946042795559405
,
guid
:
92c0a2ad595e79b49b7602325a2b96d8
,
type
:
3
}
...
...
Assets/_Game/Prefabs/Theken/BarTheke.prefab
View file @
91c49cfd
%YAML
1.1
%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
GameObject
:
m_ObjectHideFlags
:
0
...
...
@@ -38,6 +51,36 @@ PrefabInstance:
m_Modification
:
m_TransformParent
:
{
fileID
:
3874318497242293591
}
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
,
type
:
3
}
propertyPath
:
m_LocalPosition.x
...
...
@@ -93,63 +136,39 @@ PrefabInstance:
propertyPath
:
m_LocalEulerAnglesHint.z
value
:
0
objectReference
:
{
fileID
:
0
}
-
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
:
-7967601843708159158
,
guid
:
a87b959c3a2ca7040bd7c7fdeb553911
,
-
target
:
{
fileID
:
-2543824071032492177
,
guid
:
a87b959c3a2ca7040bd7c7fdeb553911
,
type
:
3
}
propertyPath
:
m_Materials.Array.data[0]
value
:
objectReference
:
{
fileID
:
2100000
,
guid
:
d3916b039ec12c043ba5619e7868323e
,
type
:
2
}
objectReference
:
{
fileID
:
2100000
,
guid
:
6fa48c2a126d0d74e8bb671b62e8cb1b
,
type
:
2
}
-
target
:
{
fileID
:
-2768172579531324765
,
guid
:
a87b959c3a2ca7040bd7c7fdeb553911
,
type
:
3
}
propertyPath
:
m_Materials.Array.data[0]
value
:
objectReference
:
{
fileID
:
2100000
,
guid
:
223cf3dc5f4ab1b47a11da31ae976fb3
,
type
:
2
}
-
target
:
{
fileID
:
-2543824071032492177
,
guid
:
a87b959c3a2ca7040bd7c7fdeb553911
,
type
:
3
}
propertyPath
:
m_Materials.Array.data[0]
value
:
objectReference
:
{
fileID
:
2100000
,
guid
:
6fa48c2a126d0d74e8bb671b62e8cb1b
,
type
:
2
}
-
target
:
{
fileID
:
2568776623678379799
,
guid
:
a87b959c3a2ca7040bd7c7fdeb553911
,
-
target
:
{
fileID
:
-7967601843708159158
,
guid
:
a87b959c3a2ca7040bd7c7fdeb553911
,
type
:
3
}
propertyPath
:
m_Materials.Array.data[0]
value
:
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
,
type
:
3
}
propertyPath
:
m_Layer
value
:
13
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_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
Transform
:
m_CorrespondingSourceObject
:
{
fileID
:
-4216859302048453862
,
guid
:
a87b959c3a2ca7040bd7c7fdeb553911
,
...
...
Assets/_Game/Prefabs/Theken/Theke_Herd.prefab
View file @
91c49cfd
...
...
@@ -250,22 +250,22 @@ PrefabInstance:
-
target
:
{
fileID
:
-4216859302048453862
,
guid
:
515a1296b4924874b8590508d4c50a6d
,
type
:
3
}
propertyPath
:
m_LocalRotation.x
value
:
-
0
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
-4216859302048453862
,
guid
:
515a1296b4924874b8590508d4c50a6d
,
type
:
3
}
propertyPath
:
m_LocalRotation.y
value
:
0.7
3435843
value
:
0.7
071068
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
-4216859302048453862
,
guid
:
515a1296b4924874b8590508d4c50a6d
,
type
:
3
}
propertyPath
:
m_LocalRotation.z
value
:
-
0
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
-4216859302048453862
,
guid
:
515a1296b4924874b8590508d4c50a6d
,
type
:
3
}
propertyPath
:
m_LocalRotation.w
value
:
0.
67876196
value
:
0.
7071068
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
-4216859302048453862
,
guid
:
515a1296b4924874b8590508d4c50a6d
,
type
:
3
}
...
...
@@ -280,7 +280,7 @@ PrefabInstance:
-
target
:
{
fileID
:
-4216859302048453862
,
guid
:
515a1296b4924874b8590508d4c50a6d
,
type
:
3
}
propertyPath
:
m_LocalEulerAnglesHint.y
value
:
9
4.506004
value
:
9
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
-4216859302048453862
,
guid
:
515a1296b4924874b8590508d4c50a6d
,
type
:
3
}
...
...
Assets/_Game/Scenes/Level_0_Overbrewed.unity
View file @
91c49cfd
This diff is collapsed.
Click to expand it.
Assets/_Game/Scripts/Customer/CustomerBehaviour.cs
View file @
91c49cfd
...
...
@@ -102,9 +102,9 @@ public class CustomerBehaviour : MonoBehaviour
_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
);
}
private
IEnumerator
OrderAndWait
(
float
orderDuration
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment