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
S
Suck It
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
2
Issues
2
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
W
Wintersemester 2018-2019
Unity
Suck It
Commits
2fe63381
Commit
2fe63381
authored
Mar 25, 2019
by
Sebastian Frey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
einfache Interaktion zwischen Spieler und Element hinzugefügt
parent
943cfdef
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
235 additions
and
17 deletions
+235
-17
Assets/_Game/Prefabs/Element.prefab
Assets/_Game/Prefabs/Element.prefab
+1
-1
Assets/_Game/Scenes/Pick_Up_Test_Scene.unity
Assets/_Game/Scenes/Pick_Up_Test_Scene.unity
+213
-0
Assets/_Game/Scripts/MonoBehavior/Interaction/InteractionObject.cs
...ame/Scripts/MonoBehavior/Interaction/InteractionObject.cs
+4
-11
Assets/_Game/Scripts/MonoBehavior/Interaction/PlayerInteract.cs
.../_Game/Scripts/MonoBehavior/Interaction/PlayerInteract.cs
+13
-3
ProjectSettings/EditorSettings.asset
ProjectSettings/EditorSettings.asset
+4
-2
No files found.
Assets/_Game/Prefabs/Element.prefab
View file @
2fe63381
...
...
@@ -70,7 +70,7 @@ SpriteRenderer:
m_SortingLayerID
:
0
m_SortingLayer
:
0
m_SortingOrder
:
0
m_Sprite
:
{
fileID
:
10913
,
guid
:
0000000000000000f000000000000000
,
type
:
0
}
m_Sprite
:
{
fileID
:
21300000
,
guid
:
d0325f4b5843676408fd1f628635d218
,
type
:
3
}
m_Color
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
m_FlipX
:
0
m_FlipY
:
0
...
...
Assets/_Game/Scenes/Pick_Up_Test_Scene.unity
View file @
2fe63381
...
...
@@ -112,6 +112,107 @@ NavMeshSettings:
debug
:
m_Flags
:
0
m_NavMeshData
:
{
fileID
:
0
}
---
!u!1
&5004504
GameObject
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
serializedVersion
:
6
m_Component
:
-
component
:
{
fileID
:
5004507
}
-
component
:
{
fileID
:
5004506
}
-
component
:
{
fileID
:
5004505
}
m_Layer
:
0
m_Name
:
Floor
m_TagString
:
Untagged
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
m_IsActive
:
1
---
!u!50
&5004505
Rigidbody2D
:
serializedVersion
:
4
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
5004504
}
m_BodyType
:
2
m_Simulated
:
1
m_UseFullKinematicContacts
:
0
m_UseAutoMass
:
0
m_Mass
:
1
m_LinearDrag
:
0
m_AngularDrag
:
0.05
m_GravityScale
:
1
m_Material
:
{
fileID
:
0
}
m_Interpolate
:
0
m_SleepingMode
:
1
m_CollisionDetection
:
0
m_Constraints
:
0
---
!u!212
&5004506
SpriteRenderer
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
5004504
}
m_Enabled
:
1
m_CastShadows
:
0
m_ReceiveShadows
:
0
m_DynamicOccludee
:
1
m_MotionVectors
:
1
m_LightProbeUsage
:
1
m_ReflectionProbeUsage
:
1
m_RenderingLayerMask
:
1
m_RendererPriority
:
0
m_Materials
:
-
{
fileID
:
10754
,
guid
:
0000000000000000f000000000000000
,
type
:
0
}
m_StaticBatchInfo
:
firstSubMesh
:
0
subMeshCount
:
0
m_StaticBatchRoot
:
{
fileID
:
0
}
m_ProbeAnchor
:
{
fileID
:
0
}
m_LightProbeVolumeOverride
:
{
fileID
:
0
}
m_ScaleInLightmap
:
1
m_PreserveUVs
:
0
m_IgnoreNormalsForChartDetection
:
0
m_ImportantGI
:
0
m_StitchLightmapSeams
:
0
m_SelectedEditorRenderState
:
0
m_MinimumChartSize
:
4
m_AutoUVMaxDistance
:
0.5
m_AutoUVMaxAngle
:
89
m_LightmapParameters
:
{
fileID
:
0
}
m_SortingLayerID
:
0
m_SortingLayer
:
0
m_SortingOrder
:
0
m_Sprite
:
{
fileID
:
21300000
,
guid
:
d0325f4b5843676408fd1f628635d218
,
type
:
3
}
m_Color
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
m_FlipX
:
0
m_FlipY
:
0
m_DrawMode
:
0
m_Size
:
{
x
:
1
,
y
:
1
}
m_AdaptiveModeThreshold
:
0.5
m_SpriteTileMode
:
0
m_WasSpriteAssigned
:
1
m_MaskInteraction
:
0
m_SpriteSortPoint
:
0
---
!u!4
&5004507
Transform
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
5004504
}
m_LocalRotation
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
1
}
m_LocalPosition
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_LocalScale
:
{
x
:
20
,
y
:
1
,
z
:
1
}
m_Children
:
[]
m_Father
:
{
fileID
:
0
}
m_RootOrder
:
4
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
---
!u!1001
&12744925
PrefabInstance
:
m_ObjectHideFlags
:
0
...
...
@@ -182,6 +283,118 @@ PrefabInstance:
m_RemovedComponents
:
-
{
fileID
:
3093174166953574827
,
guid
:
45b8aefc7b4a3af4bb7e9f04aa24d88d
,
type
:
3
}
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
45b8aefc7b4a3af4bb7e9f04aa24d88d
,
type
:
3
}
---
!u!1
&483305863
GameObject
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
serializedVersion
:
6
m_Component
:
-
component
:
{
fileID
:
483305866
}
-
component
:
{
fileID
:
483305865
}
-
component
:
{
fileID
:
483305864
}
-
component
:
{
fileID
:
483305867
}
m_Layer
:
0
m_Name
:
Character
m_TagString
:
Untagged
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
m_IsActive
:
1
---
!u!114
&483305864
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
483305863
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
e310ba2b65602490894409ff217e2731
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
speed
:
1
GroundDist
:
0.5
layer
:
0
---
!u!212
&483305865
SpriteRenderer
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
483305863
}
m_Enabled
:
1
m_CastShadows
:
0
m_ReceiveShadows
:
0
m_DynamicOccludee
:
1
m_MotionVectors
:
1
m_LightProbeUsage
:
1
m_ReflectionProbeUsage
:
1
m_RenderingLayerMask
:
1
m_RendererPriority
:
0
m_Materials
:
-
{
fileID
:
10754
,
guid
:
0000000000000000f000000000000000
,
type
:
0
}
m_StaticBatchInfo
:
firstSubMesh
:
0
subMeshCount
:
0
m_StaticBatchRoot
:
{
fileID
:
0
}
m_ProbeAnchor
:
{
fileID
:
0
}
m_LightProbeVolumeOverride
:
{
fileID
:
0
}
m_ScaleInLightmap
:
1
m_PreserveUVs
:
0
m_IgnoreNormalsForChartDetection
:
0
m_ImportantGI
:
0
m_StitchLightmapSeams
:
0
m_SelectedEditorRenderState
:
0
m_MinimumChartSize
:
4
m_AutoUVMaxDistance
:
0.5
m_AutoUVMaxAngle
:
89
m_LightmapParameters
:
{
fileID
:
0
}
m_SortingLayerID
:
0
m_SortingLayer
:
0
m_SortingOrder
:
0
m_Sprite
:
{
fileID
:
21300000
,
guid
:
d0cee4e8b659c5646ac1e205b88a3256
,
type
:
3
}
m_Color
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
m_FlipX
:
0
m_FlipY
:
0
m_DrawMode
:
0
m_Size
:
{
x
:
1
,
y
:
1
}
m_AdaptiveModeThreshold
:
0.5
m_SpriteTileMode
:
0
m_WasSpriteAssigned
:
1
m_MaskInteraction
:
0
m_SpriteSortPoint
:
0
---
!u!4
&483305866
Transform
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
483305863
}
m_LocalRotation
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
1
}
m_LocalPosition
:
{
x
:
0
,
y
:
1.5
,
z
:
0
}
m_LocalScale
:
{
x
:
1
,
y
:
2
,
z
:
1
}
m_Children
:
[]
m_Father
:
{
fileID
:
0
}
m_RootOrder
:
3
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
---
!u!70
&483305867
CapsuleCollider2D
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
483305863
}
m_Enabled
:
1
m_Density
:
1
m_Material
:
{
fileID
:
0
}
m_IsTrigger
:
0
m_UsedByEffector
:
0
m_UsedByComposite
:
0
m_Offset
:
{
x
:
0
,
y
:
0
}
m_Size
:
{
x
:
1.2
,
y
:
1.2
}
m_Direction
:
0
---
!u!1
&531909445
GameObject
:
m_ObjectHideFlags
:
0
...
...
Assets/_Game/Scripts/MonoBehavior/Interaction/InteractionObject.cs
View file @
2fe63381
...
...
@@ -4,15 +4,8 @@ using UnityEngine;
public
class
InteractionObject
:
MonoBehaviour
{
// Start is called before the first frame update
void
Start
()
{
}
// Update is called once per frame
void
Update
()
{
}
public
void
DoInteraction
()
{
this
.
GetComponent
<
SpriteRenderer
>().
color
=
Color
.
green
;
}
}
Assets/_Game/Scripts/MonoBehavior/Interaction/PlayerInteract.cs
View file @
2fe63381
using
System.Collections
;
using
System
;
using
System.Collections
;
using
System.Collections.Generic
;
using
UnityEngine
;
public
class
PlayerInteract
:
MonoBehaviour
{
public
GameObject
currentObject
=
null
;
public
GameObject
currentObject
;
private
void
Update
()
{
if
(
Input
.
GetButtonDown
(
"Interact"
)
&&
currentObject
)
{
currentObject
.
SendMessage
(
"DoInteraction"
);
}
}
private
void
OnTriggerEnter2D
(
Collider2D
other
)
{
if
(
!
other
.
CompareTag
(
"Element"
))
if
(
other
.
CompareTag
(
"Element"
))
{
Debug
.
Log
(
"Entered Collider of "
+
other
.
name
);
...
...
ProjectSettings/EditorSettings.asset
View file @
2fe63381
...
...
@@ -8,14 +8,16 @@ EditorSettings:
m_SerializationMode
:
2
m_LineEndingsForNewScripts
:
2
m_DefaultBehaviorMode
:
0
m_PrefabRegularEnvironment
:
{
fileID
:
0
}
m_PrefabUIEnvironment
:
{
fileID
:
0
}
m_SpritePackerMode
:
0
m_SpritePackerPaddingPower
:
1
m_EtcTextureCompressorBehavior
:
1
m_EtcTextureFastCompressor
:
1
m_EtcTextureNormalCompressor
:
2
m_EtcTextureBestCompressor
:
4
m_ProjectGenerationIncludedExtensions
:
txt;xml;fnt;cd
m_ProjectGenerationIncludedExtensions
:
txt;xml;fnt;cd
;asmdef
m_ProjectGenerationRootNamespace
:
m_UserGeneratedProjectSuffix
:
m_CollabEditorSettings
:
inProgressEnabled
:
1
m_EnableTextureStreamingInPlayMode
:
1
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