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
f7c3ec68
Commit
f7c3ec68
authored
Mar 27, 2019
by
Sebastian Frey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update der Pickup_Test_Szene
parent
ae69e083
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
176 additions
and
4 deletions
+176
-4
Assets/_Game/Data/Player Data.meta
Assets/_Game/Data/Player Data.meta
+8
-0
Assets/_Game/Data/Player Data/PlayerState.asset
Assets/_Game/Data/Player Data/PlayerState.asset
+14
-1
Assets/_Game/Prefabs/Character.prefab
Assets/_Game/Prefabs/Character.prefab
+17
-2
Assets/_Game/Prefabs/Default.prefab
Assets/_Game/Prefabs/Default.prefab
+71
-0
Assets/_Game/Prefabs/Default.prefab.meta
Assets/_Game/Prefabs/Default.prefab.meta
+7
-0
Assets/_Game/Scenes/Pick_Up_Test_Scene.unity
Assets/_Game/Scenes/Pick_Up_Test_Scene.unity
+59
-1
No files found.
Assets/_Game/Data/Player Data.meta
0 → 100644
View file @
f7c3ec68
fileFormatVersion: 2
guid: 336a38d957ba588489ecf85d686fd9e5
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/_Game/Data/Player Data/PlayerState.asset
View file @
f7c3ec68
...
...
@@ -12,4 +12,17 @@ MonoBehaviour:
m_Script
:
{
fileID
:
11500000
,
guid
:
353b156b7c59b1c45a8767d7500b31fb
,
type
:
3
}
m_Name
:
PlayerState
m_EditorClassIdentifier
:
currentElement
:
0
currentInfusedElement
:
0
currentMoveState
:
{
fileID
:
11400000
,
guid
:
11203796b90159848b6c5f4217eed3ec
,
type
:
2
}
airMoveState
:
{
fileID
:
11400000
,
guid
:
d8ddf6924a883e94583c59a55fd11f8d
,
type
:
2
}
earthMoveState
:
{
fileID
:
11400000
,
guid
:
92286a125406f3643b98aa3f886d53b1
,
type
:
2
}
fireMoveState
:
{
fileID
:
11400000
,
guid
:
805f35d42b113b841b2c8f64adf50f4a
,
type
:
2
}
waterMoveState
:
{
fileID
:
11400000
,
guid
:
b76e74a09da3f224f99559ac3d31fc0c
,
type
:
2
}
defaultMoveState
:
{
fileID
:
11400000
,
guid
:
11203796b90159848b6c5f4217eed3ec
,
type
:
2
}
currentJumpForce
:
0
currentSmoothing
:
0
currentAirControl
:
0
currentMoveSpeed
:
0
currentMaxJumpCount
:
0
currentMass
:
0
currentGravity
:
0
Assets/_Game/Prefabs/Character.prefab
View file @
f7c3ec68
...
...
@@ -14,7 +14,8 @@ GameObject:
-
component
:
{
fileID
:
5143124933316929979
}
-
component
:
{
fileID
:
5143124933316929982
}
-
component
:
{
fileID
:
5143124933316929978
}
m_Layer
:
9
-
component
:
{
fileID
:
4975400068131443305
}
m_Layer
:
10
m_Name
:
Character
m_TagString
:
Character
m_Icon
:
{
fileID
:
0
}
...
...
@@ -132,13 +133,15 @@ MonoBehaviour:
m_Script
:
{
fileID
:
11500000
,
guid
:
e310ba2b65602490894409ff217e2731
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
m_Speed
:
10
m_JumpForce
:
400
m_MovementSmoothing
:
0.05
m_AirControl
:
0
m_WhatIsGround
:
serializedVersion
:
2
m_Bits
:
0
m_GroundCheck
:
{
fileID
:
0
}
m_GroundCheck
:
{
fileID
:
5143124933316929980
}
m_MaxJumpCount
:
1
OnLandEvent
:
m_PersistentCalls
:
m_Calls
:
[]
...
...
@@ -161,3 +164,15 @@ MonoBehaviour:
onEarthInfused
:
{
fileID
:
11400000
,
guid
:
59d96edea2ecb434999c09413da7449a
,
type
:
2
}
onFireInfused
:
{
fileID
:
11400000
,
guid
:
f553df1a50d464e48837fbb6cb99b7e5
,
type
:
2
}
onWaterInfused
:
{
fileID
:
11400000
,
guid
:
ca31b08da78cb134086d7688bbb50628
,
type
:
2
}
---
!u!114
&4975400068131443305
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
5143124933316929969
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
15fda2365f7374bbcbe2fb649e0be47b
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
Assets/_Game/Prefabs/Default.prefab
0 → 100644
View file @
f7c3ec68
%YAML
1.1
%TAG
!u!
tag:unity3d.com,2011:
---
!u!1001
&5863392634997589512
PrefabInstance
:
m_ObjectHideFlags
:
0
serializedVersion
:
2
m_Modification
:
m_TransformParent
:
{
fileID
:
0
}
m_Modifications
:
-
target
:
{
fileID
:
1696247561678524538
,
guid
:
45b8aefc7b4a3af4bb7e9f04aa24d88d
,
type
:
3
}
propertyPath
:
m_Name
value
:
Element
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
5837352869851492550
,
guid
:
45b8aefc7b4a3af4bb7e9f04aa24d88d
,
type
:
3
}
propertyPath
:
m_LocalPosition.x
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
5837352869851492550
,
guid
:
45b8aefc7b4a3af4bb7e9f04aa24d88d
,
type
:
3
}
propertyPath
:
m_LocalPosition.y
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
5837352869851492550
,
guid
:
45b8aefc7b4a3af4bb7e9f04aa24d88d
,
type
:
3
}
propertyPath
:
m_LocalPosition.z
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
5837352869851492550
,
guid
:
45b8aefc7b4a3af4bb7e9f04aa24d88d
,
type
:
3
}
propertyPath
:
m_LocalRotation.x
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
5837352869851492550
,
guid
:
45b8aefc7b4a3af4bb7e9f04aa24d88d
,
type
:
3
}
propertyPath
:
m_LocalRotation.y
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
5837352869851492550
,
guid
:
45b8aefc7b4a3af4bb7e9f04aa24d88d
,
type
:
3
}
propertyPath
:
m_LocalRotation.z
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
5837352869851492550
,
guid
:
45b8aefc7b4a3af4bb7e9f04aa24d88d
,
type
:
3
}
propertyPath
:
m_LocalRotation.w
value
:
1
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
5837352869851492550
,
guid
:
45b8aefc7b4a3af4bb7e9f04aa24d88d
,
type
:
3
}
propertyPath
:
m_RootOrder
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
5837352869851492550
,
guid
:
45b8aefc7b4a3af4bb7e9f04aa24d88d
,
type
:
3
}
propertyPath
:
m_LocalEulerAnglesHint.x
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
5837352869851492550
,
guid
:
45b8aefc7b4a3af4bb7e9f04aa24d88d
,
type
:
3
}
propertyPath
:
m_LocalEulerAnglesHint.y
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
5837352869851492550
,
guid
:
45b8aefc7b4a3af4bb7e9f04aa24d88d
,
type
:
3
}
propertyPath
:
m_LocalEulerAnglesHint.z
value
:
0
objectReference
:
{
fileID
:
0
}
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
45b8aefc7b4a3af4bb7e9f04aa24d88d
,
type
:
3
}
Assets/_Game/Prefabs/Default.prefab.meta
0 → 100644
View file @
f7c3ec68
fileFormatVersion: 2
guid: f142a6c8fda49da48a770270d53e56db
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/_Game/Scenes/Pick_Up_Test_Scene.unity
View file @
f7c3ec68
...
...
@@ -123,7 +123,8 @@ GameObject:
-
component
:
{
fileID
:
5004507
}
-
component
:
{
fileID
:
5004506
}
-
component
:
{
fileID
:
5004505
}
m_Layer
:
0
-
component
:
{
fileID
:
5004508
}
m_Layer
:
9
m_Name
:
Floor
m_TagString
:
Untagged
m_Icon
:
{
fileID
:
0
}
...
...
@@ -213,6 +214,32 @@ Transform:
m_Father
:
{
fileID
:
0
}
m_RootOrder
:
2
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
---
!u!61
&5004508
BoxCollider2D
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
5004504
}
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_SpriteTilingProperty
:
border
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
0
}
pivot
:
{
x
:
0.5
,
y
:
0.5
}
oldSize
:
{
x
:
1
,
y
:
1
}
newSize
:
{
x
:
1
,
y
:
1
}
adaptiveTilingThreshold
:
0.5
drawMode
:
0
adaptiveTiling
:
0
m_AutoTiling
:
0
serializedVersion
:
2
m_Size
:
{
x
:
1
,
y
:
1
}
m_EdgeRadius
:
0
---
!u!1001
&117218958
PrefabInstance
:
m_ObjectHideFlags
:
0
...
...
@@ -514,6 +541,11 @@ PrefabInstance:
propertyPath
:
m_Name
value
:
Character
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
5143124933316929969
,
guid
:
787ca5c3ab8d21d44ad1ba0c254fbd35
,
type
:
3
}
propertyPath
:
m_Layer
value
:
10
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
5143124933316929980
,
guid
:
787ca5c3ab8d21d44ad1ba0c254fbd35
,
type
:
3
}
propertyPath
:
m_LocalPosition.x
...
...
@@ -599,6 +631,26 @@ PrefabInstance:
value
:
objectReference
:
{
fileID
:
11400000
,
guid
:
c5777bcc7b64ce24c9bd65d2c4b7c639
,
type
:
2
}
-
target
:
{
fileID
:
5143124933316929982
,
guid
:
787ca5c3ab8d21d44ad1ba0c254fbd35
,
type
:
3
}
propertyPath
:
m_GroundCheck
value
:
objectReference
:
{
fileID
:
1496802682
}
-
target
:
{
fileID
:
5143124933316929982
,
guid
:
787ca5c3ab8d21d44ad1ba0c254fbd35
,
type
:
3
}
propertyPath
:
m_AirControl
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
5143124933316929982
,
guid
:
787ca5c3ab8d21d44ad1ba0c254fbd35
,
type
:
3
}
propertyPath
:
m_WhatIsGround.m_Bits
value
:
512
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
5143124933316929982
,
guid
:
787ca5c3ab8d21d44ad1ba0c254fbd35
,
type
:
3
}
propertyPath
:
m_Speed
value
:
10
objectReference
:
{
fileID
:
0
}
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
787ca5c3ab8d21d44ad1ba0c254fbd35
,
type
:
3
}
---
!u!1001
&1343459453
...
...
@@ -670,6 +722,12 @@ PrefabInstance:
objectReference
:
{
fileID
:
0
}
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
4512b8eb550115443bbba2ecd59a960c
,
type
:
3
}
---
!u!4
&1496802682
stripped
Transform
:
m_CorrespondingSourceObject
:
{
fileID
:
5143124933316929980
,
guid
:
787ca5c3ab8d21d44ad1ba0c254fbd35
,
type
:
3
}
m_PrefabInstance
:
{
fileID
:
966608049
}
m_PrefabAsset
:
{
fileID
:
0
}
---
!u!1
&1685552533
GameObject
:
m_ObjectHideFlags
:
0
...
...
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