Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
GameDevWeek
Wintersemester 2018-2019
Unity
Suck It
Commits
ed57dd11
Commit
ed57dd11
authored
Mar 30, 2019
by
Sebastian
Browse files
smaller fixes
parent
201baaaa
Changes
2
Hide whitespace changes
Inline
Side-by-side
Assets/_Game/Scenes/Pick_Up_Test_Scene.unity
View file @
ed57dd11
...
...
@@ -467,11 +467,11 @@ PrefabInstance:
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
4738352637052488
,
guid
:
6cd7f8e10f89642fd88661db0d3f3827
,
type
:
3
}
propertyPath
:
m_LocalPosition.x
value
:
-1
6
value
:
-1
5.93
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
4738352637052488
,
guid
:
6cd7f8e10f89642fd88661db0d3f3827
,
type
:
3
}
propertyPath
:
m_LocalPosition.y
value
:
15
value
:
8.73
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
4738352637052488
,
guid
:
6cd7f8e10f89642fd88661db0d3f3827
,
type
:
3
}
propertyPath
:
m_LocalPosition.z
...
...
@@ -1213,3 +1213,72 @@ PrefabInstance:
objectReference
:
{
fileID
:
0
}
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
a0c6081106659114387502f3e4d51362
,
type
:
3
}
---
!u!1001
&2077499078
PrefabInstance
:
m_ObjectHideFlags
:
0
serializedVersion
:
2
m_Modification
:
m_TransformParent
:
{
fileID
:
0
}
m_Modifications
:
-
target
:
{
fileID
:
100393043881132458
,
guid
:
e9f234b3fda124fe29a2b937c13c099e
,
type
:
3
}
propertyPath
:
m_Name
value
:
Water
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
100393043881132463
,
guid
:
e9f234b3fda124fe29a2b937c13c099e
,
type
:
3
}
propertyPath
:
m_LocalPosition.x
value
:
58.33
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
100393043881132463
,
guid
:
e9f234b3fda124fe29a2b937c13c099e
,
type
:
3
}
propertyPath
:
m_LocalPosition.y
value
:
-4.4
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
100393043881132463
,
guid
:
e9f234b3fda124fe29a2b937c13c099e
,
type
:
3
}
propertyPath
:
m_LocalPosition.z
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
100393043881132463
,
guid
:
e9f234b3fda124fe29a2b937c13c099e
,
type
:
3
}
propertyPath
:
m_LocalRotation.x
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
100393043881132463
,
guid
:
e9f234b3fda124fe29a2b937c13c099e
,
type
:
3
}
propertyPath
:
m_LocalRotation.y
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
100393043881132463
,
guid
:
e9f234b3fda124fe29a2b937c13c099e
,
type
:
3
}
propertyPath
:
m_LocalRotation.z
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
100393043881132463
,
guid
:
e9f234b3fda124fe29a2b937c13c099e
,
type
:
3
}
propertyPath
:
m_LocalRotation.w
value
:
1
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
100393043881132463
,
guid
:
e9f234b3fda124fe29a2b937c13c099e
,
type
:
3
}
propertyPath
:
m_RootOrder
value
:
13
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
100393043881132463
,
guid
:
e9f234b3fda124fe29a2b937c13c099e
,
type
:
3
}
propertyPath
:
m_LocalEulerAnglesHint.x
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
100393043881132463
,
guid
:
e9f234b3fda124fe29a2b937c13c099e
,
type
:
3
}
propertyPath
:
m_LocalEulerAnglesHint.y
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
100393043881132463
,
guid
:
e9f234b3fda124fe29a2b937c13c099e
,
type
:
3
}
propertyPath
:
m_LocalEulerAnglesHint.z
value
:
0
objectReference
:
{
fileID
:
0
}
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
e9f234b3fda124fe29a2b937c13c099e
,
type
:
3
}
Assets/_Game/Scripts/Elements/InteractionObject.cs
View file @
ed57dd11
...
...
@@ -20,7 +20,7 @@ namespace _Game.Scripts.Elements
public
void
InfuseElement
()
{
Debug
.
Log
(
"Infused "
+
this
.
gameObject
.
tag
);
print
(
"Infused "
+
this
.
gameObject
.
tag
);
_isReady
=
false
;
_spriteRenderer
.
color
=
_idleColor
;
Invoke
(
"SetReady"
,
_cooldown
);
...
...
Write
Preview
Supports
Markdown
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