Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
GDW-SS-18
to-the-surface
Commits
653e5305
Commit
653e5305
authored
Sep 27, 2018
by
Markus Schlösser
Browse files
Added sliding animation
parent
cc43bed7
Changes
20
Hide whitespace changes
Inline
Side-by-side
Assets/_Game/Animations/Player/Player.controller
View file @
653e5305
...
...
@@ -26,6 +26,12 @@ AnimatorController:
m_DefaultInt
:
0
m_DefaultBool
:
0
m_Controller
:
{
fileID
:
0
}
-
m_Name
:
shouldSlide
m_Type
:
9
m_DefaultFloat
:
0
m_DefaultInt
:
0
m_DefaultBool
:
0
m_Controller
:
{
fileID
:
0
}
m_AnimatorLayers
:
-
serializedVersion
:
5
m_Name
:
Base Layer
...
...
@@ -63,6 +69,27 @@ AnimatorStateTransition:
m_InterruptionSource
:
0
m_OrderedInterruption
:
1
m_CanTransitionToSelf
:
1
---
!u!1101
&1101177660377309608
AnimatorStateTransition
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
0
}
m_Name
:
m_Conditions
:
[]
m_DstStateMachine
:
{
fileID
:
0
}
m_DstState
:
{
fileID
:
1102744145824733098
}
m_Solo
:
0
m_Mute
:
0
m_IsExit
:
0
serializedVersion
:
3
m_TransitionDuration
:
0
m_TransitionOffset
:
0
m_ExitTime
:
0
m_HasExitTime
:
1
m_HasFixedDuration
:
1
m_InterruptionSource
:
0
m_OrderedInterruption
:
1
m_CanTransitionToSelf
:
1
---
!u!1101
&1101232610796361344
AnimatorStateTransition
:
m_ObjectHideFlags
:
1
...
...
@@ -135,6 +162,30 @@ AnimatorStateTransition:
m_InterruptionSource
:
0
m_OrderedInterruption
:
1
m_CanTransitionToSelf
:
1
---
!u!1101
&1101297456517076938
AnimatorStateTransition
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
0
}
m_Name
:
m_Conditions
:
-
m_ConditionMode
:
1
m_ConditionEvent
:
shouldSlide
m_EventTreshold
:
0
m_DstStateMachine
:
{
fileID
:
0
}
m_DstState
:
{
fileID
:
1102178736221671684
}
m_Solo
:
0
m_Mute
:
0
m_IsExit
:
0
serializedVersion
:
3
m_TransitionDuration
:
0
m_TransitionOffset
:
0
m_ExitTime
:
0
m_HasExitTime
:
0
m_HasFixedDuration
:
1
m_InterruptionSource
:
0
m_OrderedInterruption
:
1
m_CanTransitionToSelf
:
1
---
!u!1101
&1101367507659398734
AnimatorStateTransition
:
m_ObjectHideFlags
:
1
...
...
@@ -156,6 +207,30 @@ AnimatorStateTransition:
m_InterruptionSource
:
0
m_OrderedInterruption
:
1
m_CanTransitionToSelf
:
1
---
!u!1101
&1101403076772652070
AnimatorStateTransition
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
0
}
m_Name
:
m_Conditions
:
-
m_ConditionMode
:
1
m_ConditionEvent
:
shouldSlide
m_EventTreshold
:
0
m_DstStateMachine
:
{
fileID
:
0
}
m_DstState
:
{
fileID
:
1102178736221671684
}
m_Solo
:
0
m_Mute
:
0
m_IsExit
:
0
serializedVersion
:
3
m_TransitionDuration
:
0
m_TransitionOffset
:
0
m_ExitTime
:
0
m_HasExitTime
:
0
m_HasFixedDuration
:
1
m_InterruptionSource
:
0
m_OrderedInterruption
:
1
m_CanTransitionToSelf
:
1
---
!u!1101
&1101522950236437224
AnimatorStateTransition
:
m_ObjectHideFlags
:
1
...
...
@@ -312,6 +387,7 @@ AnimatorState:
m_CycleOffset
:
0
m_Transitions
:
-
{
fileID
:
1101522950236437224
}
-
{
fileID
:
1101297456517076938
}
m_StateMachineBehaviours
:
[]
m_Position
:
{
x
:
50
,
y
:
50
,
z
:
0
}
m_IKOnFeet
:
0
...
...
@@ -327,6 +403,32 @@ AnimatorState:
m_MirrorParameter
:
m_CycleOffsetParameter
:
m_TimeParameter
:
---
!u!1102
&1102178736221671684
AnimatorState
:
serializedVersion
:
5
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
0
}
m_Name
:
Sliding
m_Speed
:
2
m_CycleOffset
:
0
m_Transitions
:
-
{
fileID
:
1101177660377309608
}
m_StateMachineBehaviours
:
[]
m_Position
:
{
x
:
50
,
y
:
50
,
z
:
0
}
m_IKOnFeet
:
0
m_WriteDefaultValues
:
1
m_Mirror
:
0
m_SpeedParameterActive
:
0
m_MirrorParameterActive
:
0
m_CycleOffsetParameterActive
:
0
m_TimeParameterActive
:
0
m_Motion
:
{
fileID
:
7400000
,
guid
:
78e12223e9a6d5f4fa67bc02498e6f29
,
type
:
2
}
m_Tag
:
m_SpeedParameter
:
m_MirrorParameter
:
m_CycleOffsetParameter
:
m_TimeParameter
:
---
!u!1102
&1102263954022118424
AnimatorState
:
serializedVersion
:
5
...
...
@@ -391,6 +493,7 @@ AnimatorState:
m_CycleOffset
:
0
m_Transitions
:
-
{
fileID
:
1101673364750266568
}
-
{
fileID
:
1101403076772652070
}
m_StateMachineBehaviours
:
[]
m_Position
:
{
x
:
50
,
y
:
50
,
z
:
0
}
m_IKOnFeet
:
0
...
...
@@ -449,16 +552,19 @@ AnimatorStateMachine:
m_Position
:
{
x
:
408
,
y
:
132
,
z
:
0
}
-
serializedVersion
:
1
m_State
:
{
fileID
:
1102502364957185512
}
m_Position
:
{
x
:
3
96
,
y
:
276
,
z
:
0
}
m_Position
:
{
x
:
3
48
,
y
:
312
,
z
:
0
}
-
serializedVersion
:
1
m_State
:
{
fileID
:
1102161486332623666
}
m_Position
:
{
x
:
564
,
y
:
2
04
,
z
:
0
}
m_Position
:
{
x
:
636
,
y
:
2
16
,
z
:
0
}
-
serializedVersion
:
1
m_State
:
{
fileID
:
1102114199382222114
}
m_Position
:
{
x
:
276
,
y
:
48
,
z
:
0
}
-
serializedVersion
:
1
m_State
:
{
fileID
:
1102263954022118424
}
m_Position
:
{
x
:
552
,
y
:
36
,
z
:
0
}
-
serializedVersion
:
1
m_State
:
{
fileID
:
1102178736221671684
}
m_Position
:
{
x
:
360
,
y
:
216
,
z
:
0
}
m_ChildStateMachines
:
[]
m_AnyStateTransitions
:
[]
m_EntryTransitions
:
[]
...
...
Assets/_Game/Animations/Player/Sliding.anim
0 → 100644
View file @
653e5305
%YAML
1.1
%TAG
!u!
tag:unity3d.com,2011:
---
!u!74
&7400000
AnimationClip
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
0
}
m_Name
:
Sliding
serializedVersion
:
6
m_Legacy
:
0
m_Compressed
:
0
m_UseHighQualityCurve
:
1
m_RotationCurves
:
[]
m_CompressedRotationCurves
:
[]
m_EulerCurves
:
[]
m_PositionCurves
:
[]
m_ScaleCurves
:
[]
m_FloatCurves
:
[]
m_PPtrCurves
:
-
curve
:
-
time
:
0
value
:
{
fileID
:
21300000
,
guid
:
0af299962eccfbf4285f65cf0c466cdf
,
type
:
3
}
-
time
:
0.14285715
value
:
{
fileID
:
21300000
,
guid
:
c833219d2cc5a834cb783a880d0220b0
,
type
:
3
}
-
time
:
0.2857143
value
:
{
fileID
:
21300000
,
guid
:
0d8b872e0709a3848809604a9cefca64
,
type
:
3
}
-
time
:
0.42857143
value
:
{
fileID
:
21300000
,
guid
:
708c0466cb3ec6245867f0989e8bbcb3
,
type
:
3
}
-
time
:
0.5714286
value
:
{
fileID
:
21300000
,
guid
:
bbefa3f78e5674c41ad9f5ba9631f7ff
,
type
:
3
}
-
time
:
0.71428573
value
:
{
fileID
:
21300000
,
guid
:
3df7191fc83e6674da1eba4882fe8144
,
type
:
3
}
-
time
:
0.85714287
value
:
{
fileID
:
21300000
,
guid
:
a76968c5855b4364d973c051a52a709a
,
type
:
3
}
attribute
:
m_Sprite
path
:
classID
:
212
script
:
{
fileID
:
0
}
m_SampleRate
:
7
m_WrapMode
:
0
m_Bounds
:
m_Center
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_Extent
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_ClipBindingConstant
:
genericBindings
:
-
serializedVersion
:
2
path
:
0
attribute
:
0
script
:
{
fileID
:
0
}
typeID
:
212
customType
:
23
isPPtrCurve
:
1
pptrCurveMapping
:
-
{
fileID
:
21300000
,
guid
:
0af299962eccfbf4285f65cf0c466cdf
,
type
:
3
}
-
{
fileID
:
21300000
,
guid
:
c833219d2cc5a834cb783a880d0220b0
,
type
:
3
}
-
{
fileID
:
21300000
,
guid
:
0d8b872e0709a3848809604a9cefca64
,
type
:
3
}
-
{
fileID
:
21300000
,
guid
:
708c0466cb3ec6245867f0989e8bbcb3
,
type
:
3
}
-
{
fileID
:
21300000
,
guid
:
bbefa3f78e5674c41ad9f5ba9631f7ff
,
type
:
3
}
-
{
fileID
:
21300000
,
guid
:
3df7191fc83e6674da1eba4882fe8144
,
type
:
3
}
-
{
fileID
:
21300000
,
guid
:
a76968c5855b4364d973c051a52a709a
,
type
:
3
}
m_AnimationClipSettings
:
serializedVersion
:
2
m_AdditiveReferencePoseClip
:
{
fileID
:
0
}
m_AdditiveReferencePoseTime
:
0
m_StartTime
:
0
m_StopTime
:
1
m_OrientationOffsetY
:
0
m_Level
:
0
m_CycleOffset
:
0
m_HasAdditiveReferencePose
:
0
m_LoopTime
:
0
m_LoopBlend
:
0
m_LoopBlendOrientation
:
0
m_LoopBlendPositionY
:
0
m_LoopBlendPositionXZ
:
0
m_KeepOriginalOrientation
:
0
m_KeepOriginalPositionY
:
1
m_KeepOriginalPositionXZ
:
0
m_HeightFromFeet
:
0
m_Mirror
:
0
m_EditorCurves
:
[]
m_EulerEditorCurves
:
[]
m_HasGenericRootTransform
:
0
m_HasMotionFloatCurves
:
0
m_GenerateMotionCurves
:
0
m_Events
:
[]
Assets/_Game/Animations/Player/Sliding.anim.meta
0 → 100644
View file @
653e5305
fileFormatVersion: 2
guid: 78e12223e9a6d5f4fa67bc02498e6f29
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
Assets/_Game/Scripts/PlayerActor.cs
View file @
653e5305
...
...
@@ -271,11 +271,13 @@ public class PlayerActor : MonoBehaviour {
case
OnLandAction
.
MoveConcaveLeft
:
transform
.
position
=
tilemap
.
GetCellCenterWorld
(
celllPos
);
animator
.
SetTrigger
(
"shouldSlide"
);
yield
return
Move
(
MovementDirection
.
Left
);
break
;
case
OnLandAction
.
MoveConcaveRight
:
transform
.
position
=
tilemap
.
GetCellCenterWorld
(
celllPos
);
animator
.
SetTrigger
(
"shouldSlide"
);
yield
return
Move
(
MovementDirection
.
Right
);
break
;
...
...
@@ -283,6 +285,7 @@ public class PlayerActor : MonoBehaviour {
transform
.
position
=
tilemap
.
GetCellCenterWorld
(
celllPos
-
direction
);
facing
=
MovementDirection
.
Left
;
UpdateOrientation
();
animator
.
SetTrigger
(
"shouldSlide"
);
yield
return
Rotate
(
orientation
.
GetLeft
(),
orientation
.
GetDown
(),
orientation
.
GetLeft
(),
1.0f
,
0.2f
);
yield
return
Move
(
MovementDirection
.
Left
);
break
;
...
...
@@ -291,6 +294,7 @@ public class PlayerActor : MonoBehaviour {
transform
.
position
=
tilemap
.
GetCellCenterWorld
(
celllPos
-
direction
);
facing
=
MovementDirection
.
Right
;
UpdateOrientation
();
animator
.
SetTrigger
(
"shouldSlide"
);
yield
return
Rotate
(
orientation
.
GetRight
(),
orientation
.
GetDown
(),
orientation
.
GetRight
(),
1.0f
,
0.1f
);
yield
return
Move
(
MovementDirection
.
Right
);
break
;
...
...
Assets/_Game/Sprites/Character/Sliding.meta
0 → 100644
View file @
653e5305
fileFormatVersion: 2
guid: bd10ba911080b764588c6123246ce568
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/_Game/Sprites/Character/Sliding/GDW_Bergarbeiter_seitlich_fallend_AE00.png
0 → 100644
LFS
View file @
653e5305
131 Bytes
Assets/_Game/Sprites/Character/Sliding/GDW_Bergarbeiter_seitlich_fallend_AE00.png.meta
0 → 100644
View file @
653e5305
fileFormatVersion: 2
guid: 0af299962eccfbf4285f65cf0c466cdf
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 7
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: -1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 512
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/_Game/Sprites/Character/Sliding/GDW_Bergarbeiter_seitlich_fallend_AE01.png
0 → 100644
LFS
View file @
653e5305
130 Bytes
Assets/_Game/Sprites/Character/Sliding/GDW_Bergarbeiter_seitlich_fallend_AE01.png.meta
0 → 100644
View file @
653e5305
fileFormatVersion: 2
guid: c833219d2cc5a834cb783a880d0220b0
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 7
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: -1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 512
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/_Game/Sprites/Character/Sliding/GDW_Bergarbeiter_seitlich_fallend_AE02.png
0 → 100644
LFS
View file @
653e5305
130 Bytes
Assets/_Game/Sprites/Character/Sliding/GDW_Bergarbeiter_seitlich_fallend_AE02.png.meta
0 → 100644
View file @
653e5305
fileFormatVersion: 2
guid: 0d8b872e0709a3848809604a9cefca64
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 7
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: -1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 512
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []