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
bb37a1d2
Commit
bb37a1d2
authored
Jan 30, 2019
by
Mitchie Maluschnig
Browse files
player walk animation works
parent
60c2e759
Changes
4
Hide whitespace changes
Inline
Side-by-side
RingMaster/RingMaster/Assets/Animations/PlayerController.controller
View file @
bb37a1d2
...
...
@@ -13,7 +13,7 @@ AnimatorController:
m_DefaultFloat
:
0
m_DefaultInt
:
0
m_DefaultBool
:
0
m_Controller
:
{
fileID
:
0
}
m_Controller
:
{
fileID
:
910000
0
}
m_AnimatorLayers
:
-
serializedVersion
:
5
m_Name
:
Base Layer
...
...
@@ -43,7 +43,7 @@ AnimatorStateTransition:
m_Mute
:
0
m_IsExit
:
0
serializedVersion
:
3
m_TransitionDuration
:
0
.25
m_TransitionDuration
:
0
m_TransitionOffset
:
0
m_ExitTime
:
0.75
m_HasExitTime
:
0
...
...
@@ -67,7 +67,7 @@ AnimatorStateTransition:
m_Mute
:
0
m_IsExit
:
0
serializedVersion
:
3
m_TransitionDuration
:
0
.25
m_TransitionDuration
:
0
m_TransitionOffset
:
0
m_ExitTime
:
0.75
m_HasExitTime
:
0
...
...
RingMaster/RingMaster/Assets/Scenes/Daytime.unity
View file @
bb37a1d2
...
...
@@ -7805,6 +7805,11 @@ Prefab:
propertyPath
:
m_RootOrder
value
:
3
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
70805503887653740
,
guid
:
1601fd9c4dae6aa49a28743fde0bd9a3
,
type
:
2
}
propertyPath
:
m_Offset.x
value
:
0
objectReference
:
{
fileID
:
0
}
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
1601fd9c4dae6aa49a28743fde0bd9a3
,
type
:
2
}
m_IsPrefabAsset
:
0
...
...
RingMaster/RingMaster/Assets/Textures/clownDraft-1.png.meta
View file @
bb37a1d2
...
...
@@ -46,7 +46,7 @@ TextureImporter:
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w:
0
}
spriteBorder: {x: 0, y: 0, z: 0, w:
16
}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
...
...
RingMaster/RingMaster/Assets/Textures/walking player.png.meta
View file @
bb37a1d2
...
...
@@ -89,8 +89,8 @@ TextureImporter:
name: walking player_0
rect:
serializedVersion: 2
x:
88
y:
256
x:
10
y:
0
width: 108
height: 240
alignment: 0
...
...
@@ -100,7 +100,7 @@ TextureImporter:
physicsShape: []
tessellationDetail: 0
bones: []
spriteID:
3120470dcdb990e458e4dbedbdf4559d
spriteID:
15223c13e4252534788b6da1443d38e1
vertices: []
indices:
edges: []
...
...
@@ -109,8 +109,8 @@ TextureImporter:
name: walking player_1
rect:
serializedVersion: 2
x:
8
4
y:
4
x:
12
4
y:
0
width: 113
height: 232
alignment: 0
...
...
@@ -120,7 +120,7 @@ TextureImporter:
physicsShape: []
tessellationDetail: 0
bones: []
spriteID:
8dea2914da505bc4295aca6f1491f6d8
spriteID:
79d839205e8f22b4dba42fe81d476557
vertices: []
indices:
edges: []
...
...
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