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
a1b2c5fc
Commit
a1b2c5fc
authored
Mar 28, 2019
by
Christopher Benes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lemme pull
parent
29e5f60a
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
4407 additions
and
4228 deletions
+4407
-4228
Assets/_Game/Data/Player Data/Movement Data/Movement States.asset
...Game/Data/Player Data/Movement Data/Movement States.asset
+38
-33
Assets/_Game/Graphics/Sprite/StoneTilesNoDetails/Top.png.meta
...ts/_Game/Graphics/Sprite/StoneTilesNoDetails/Top.png.meta
+1
-1
Assets/_Game/Prefabs/Level_Elements/Movable_Thing.prefab
Assets/_Game/Prefabs/Level_Elements/Movable_Thing.prefab
+95
-0
Assets/_Game/Prefabs/Level_Elements/Movable_Thing.prefab.meta
...ts/_Game/Prefabs/Level_Elements/Movable_Thing.prefab.meta
+7
-0
Assets/_Game/Scenes/MainLevel.unity
Assets/_Game/Scenes/MainLevel.unity
+4266
-4194
No files found.
Assets/_Game/Data/Player Data/Movement Data/Movement States.asset
View file @
a1b2c5fc
...
...
@@ -13,42 +13,47 @@ MonoBehaviour:
m_Name
:
Movement States
m_EditorClassIdentifier
:
Assembly-CSharp:_Game.Scripts.Scriptable_Object:MovementStates
airMoveState
:
jumpForce
:
0
smoothing
:
0
airControl
:
0
moveSpeed
:
0
maxJumpCount
:
0
mass
:
0
gravity
:
0
jumpForce
:
5
smoothing
:
0.03
airControl
:
1
canSwim
:
1
moveSpeed
:
30
maxJumpCount
:
5
mass
:
0.1
gravity
:
0.1
earthMoveState
:
jumpForce
:
0
smoothing
:
0
jumpForce
:
2
smoothing
:
0
.03
airControl
:
0
moveSpeed
:
0
maxJumpCount
:
0
mass
:
0
gravity
:
0
canSwim
:
0
moveSpeed
:
15
maxJumpCount
:
1
mass
:
10
gravity
:
1
fireMoveState
:
jumpForce
:
0
smoothing
:
0
airControl
:
0
moveSpeed
:
0
maxJumpCount
:
0
mass
:
0
gravity
:
0
jumpForce
:
10
smoothing
:
0.03
airControl
:
1
canSwim
:
0
moveSpeed
:
20
maxJumpCount
:
1
mass
:
1
gravity
:
1
waterMoveState
:
jumpForce
:
0
smoothing
:
0
airControl
:
0
moveSpeed
:
0
maxJumpCount
:
0
mass
:
0
jumpForce
:
7
smoothing
:
0.03
airControl
:
1
canSwim
:
0
moveSpeed
:
15
maxJumpCount
:
1
mass
:
3
gravity
:
0
defaultMoveState
:
jumpForce
:
0
smoothing
:
0
airControl
:
0
moveSpeed
:
0
maxJumpCount
:
0
mass
:
0
gravity
:
0
jumpForce
:
10
smoothing
:
0.03
airControl
:
1
canSwim
:
0
moveSpeed
:
20
maxJumpCount
:
1
mass
:
1
gravity
:
1
Assets/_Game/Graphics/Sprite/StoneTilesNoDetails/Top.png.meta
View file @
a1b2c5fc
...
...
@@ -46,7 +46,7 @@ TextureImporter:
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 256
spriteBorder: {x:
0
, y: 0, z: 0, w: 0}
spriteBorder: {x:
19
, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
...
...
Assets/_Game/Prefabs/Level_Elements/Movable_Thing.prefab
0 → 100644
View file @
a1b2c5fc
%YAML
1.1
%TAG
!u!
tag:unity3d.com,2011:
---
!u!1
&6240296448730384320
GameObject
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
serializedVersion
:
6
m_Component
:
-
component
:
{
fileID
:
7732554449417407852
}
-
component
:
{
fileID
:
1297297354442121813
}
-
component
:
{
fileID
:
2063039573222851098
}
m_Layer
:
9
m_Name
:
Movable_Thing
m_TagString
:
Untagged
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
m_IsActive
:
1
---
!u!4
&7732554449417407852
Transform
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
6240296448730384320
}
m_LocalRotation
:
{
x
:
-0
,
y
:
-0
,
z
:
-0
,
w
:
1
}
m_LocalPosition
:
{
x
:
133.12
,
y
:
41.63
,
z
:
-0.017713891
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
[]
m_Father
:
{
fileID
:
0
}
m_RootOrder
:
0
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
---
!u!212
&1297297354442121813
SpriteRenderer
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
6240296448730384320
}
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
:
-480944179
m_SortingLayer
:
2
m_SortingOrder
:
0
m_Sprite
:
{
fileID
:
21300000
,
guid
:
5bccf13ce09bd43e39c1c3416d5de92c
,
type
:
3
}
m_Color
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
m_FlipX
:
0
m_FlipY
:
0
m_DrawMode
:
0
m_Size
:
{
x
:
2
,
y
:
2
}
m_AdaptiveModeThreshold
:
0.5
m_SpriteTileMode
:
0
m_WasSpriteAssigned
:
1
m_MaskInteraction
:
0
m_SpriteSortPoint
:
0
---
!u!114
&2063039573222851098
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
6240296448730384320
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
d5c135c3fe901cf4696abeebd2ac1f28
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
force
:
0
Assets/_Game/Prefabs/Level_Elements/Movable_Thing.prefab.meta
0 → 100644
View file @
a1b2c5fc
fileFormatVersion: 2
guid: a0c6081106659114387502f3e4d51362
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/_Game/Scenes/MainLevel.unity
View file @
a1b2c5fc
This diff is collapsed.
Click to expand it.
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