Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
gstuitje
RingMaster
Commits
80010280
Commit
80010280
authored
Jan 30, 2019
by
Mitchie Maluschnig
Browse files
fixed weird drop after animation
parent
8203058e
Changes
3
Hide whitespace changes
Inline
Side-by-side
RingMaster/RingMaster/Assets/Prefabs/Character Prefabs/PlayerPrefab.prefab
View file @
80010280
...
...
@@ -181,7 +181,7 @@ SpriteRenderer:
m_FlipX
:
0
m_FlipY
:
0
m_DrawMode
:
0
m_Size
:
{
x
:
2.56
,
y
:
2.
56
}
m_Size
:
{
x
:
1.08
,
y
:
2.
4
}
m_AdaptiveModeThreshold
:
0.5
m_SpriteTileMode
:
0
m_WasSpriteAssigned
:
1
...
...
RingMaster/RingMaster/Assets/Scripts/DaytimeScripts/PlayerMovement.cs
View file @
80010280
...
...
@@ -82,12 +82,10 @@ public class PlayerMovement : MonoBehaviour {
if
(
Input
.
GetKey
(
KeyCode
.
LeftShift
))
{
speed
=
sprintSpeed
;
anim
.
speed
=
sprintSpeed
/
3f
;
}
else
{
speed
=
walkSpeed
;
anim
.
speed
=
walkSpeed
/
3f
;
}
}
}
...
...
@@ -123,5 +121,6 @@ public class PlayerMovement : MonoBehaviour {
}
else
{
anim
.
SetBool
(
"Walking"
,
false
);
}
anim
.
speed
=
speed
/
3f
;
}
}
RingMaster/RingMaster/Assets/Textures/clownDraft-1.png.meta
View file @
80010280
fileFormatVersion: 2
guid: 3fa214d604776462cb99a2d4f78a8f79
TextureImporter:
fileIDToRecycleName: {}
fileIDToRecycleName:
21300000: clownDraft-1_0
externalObjects: {}
serializedVersion: 7
mipmaps:
...
...
@@ -40,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode:
1
spriteMode:
2
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
...
...
@@ -50,7 +51,7 @@ TextureImporter:
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail:
-1
spriteTessellationDetail:
0
textureType: 8
textureShape: 1
singleChannelComponent: 0
...
...
@@ -69,10 +70,45 @@ TextureImporter:
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: []
sprites:
- serializedVersion: 2
name: clownDraft-1_0
rect:
serializedVersion: 2
x: 10
y: 0
width: 108
height: 240
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 2a6b39723f788d447bdc3c3c239538b1
vertices: []
indices:
edges: []
weights: []
outline:
- - {x: -60, y: -128}
- {x: -60, y: 108}
- {x: 59, y: 114}
- {x: 60, y: -128}
physicsShape: []
bones: []
spriteID: d48af0cc706104e3691587b11a81476a
...
...
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