Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
B
BattleMuscle
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
czy
BattleMuscle
Commits
a7312eac
Commit
a7312eac
authored
May 07, 2021
by
czy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
11
parent
737e03ba
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
41 additions
and
21 deletions
+41
-21
Quad Punch.fbx.meta
BattleMuscle/Assets/Animation/Fight/Quad Punch.fbx.meta
+4
-4
Running3.fbx.meta
BattleMuscle/Assets/Animation/Movement/Running3.fbx.meta
+1
-1
Level 1.unity
BattleMuscle/Assets/Levels/Level 1.unity
+11
-6
AnimatorControllerPlayer.controller
...y/AnimationController/AnimatorControllerPlayer.controller
+25
-10
No files found.
BattleMuscle/Assets/Animation/Fight/Quad Punch.fbx.meta
View file @
a7312eac
...
...
@@ -27,9 +27,9 @@ ModelImporter:
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationRotationError: 0
.5
animationPositionError: 0
.5
animationScaleError: 0
.5
animationRotationError: 0
animationPositionError: 0
animationScaleError: 0
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
...
...
@@ -46,7 +46,7 @@ ModelImporter:
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime:
0
loopTime:
1
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
...
...
BattleMuscle/Assets/Animation/Movement/Running3.fbx.meta
View file @
a7312eac
...
...
@@ -17,7 +17,7 @@ ModelImporter:
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
motionNodeName:
motionNodeName:
<Root Transform>
rigImportErrors:
rigImportWarnings:
animationImportErrors:
...
...
BattleMuscle/Assets/Levels/Level 1.unity
View file @
a7312eac
...
...
@@ -220,7 +220,7 @@ Transform:
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
44004332
}
m_LocalRotation
:
{
x
:
0.28
957048
,
y
:
-0.08864184
,
z
:
0.0269435
,
w
:
0.9526624
}
m_LocalRotation
:
{
x
:
0.28
842446
,
y
:
-0.08867417
,
z
:
0.02683686
,
w
:
0.95301
}
m_LocalPosition
:
{
x
:
0
,
y
:
0
,
z
:
-13.099998
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
...
...
@@ -1449,13 +1449,13 @@ MonoBehaviour:
m_HorizontalDamping
:
0.5
m_VerticalDamping
:
0.5
m_ScreenX
:
0.5
m_ScreenY
:
0.5
m_ScreenY
:
0.5
020833
m_DeadZoneWidth
:
0
m_DeadZoneHeight
:
0
m_SoftZoneWidth
:
0.8
m_SoftZoneHeight
:
0.
8
m_SoftZoneWidth
:
0.
3462962
8
m_SoftZoneHeight
:
0.
18645835
m_BiasX
:
0
m_BiasY
:
0
m_BiasY
:
-0.00000031966735
m_CenterOnActivate
:
1
---
!u!114
&730247501
MonoBehaviour
:
...
...
@@ -1958,7 +1958,7 @@ Transform:
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
1001386389
}
m_LocalRotation
:
{
x
:
0.28
957048
,
y
:
-0.08864184
,
z
:
0.0269435
,
w
:
0.9526624
}
m_LocalRotation
:
{
x
:
0.28
842446
,
y
:
-0.08867417
,
z
:
0.02683686
,
w
:
0.95301
}
m_LocalPosition
:
{
x
:
4.5559893
,
y
:
17.040298
,
z
:
-24.270386
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
[]
...
...
@@ -4425,6 +4425,11 @@ PrefabInstance:
propertyPath
:
m_Controller
value
:
objectReference
:
{
fileID
:
9100000
,
guid
:
f709e8dc6e3dec64885141ab1ecdf487
,
type
:
2
}
-
target
:
{
fileID
:
815079108182812359
,
guid
:
ed4e91d9a28ad7e4eb40ceb0e7e9f29b
,
type
:
3
}
propertyPath
:
m_ApplyRootMotion
value
:
1
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
815079108190062857
,
guid
:
ed4e91d9a28ad7e4eb40ceb0e7e9f29b
,
type
:
3
}
propertyPath
:
m_LocalPosition.x
...
...
BattleMuscle/Assets/My/AnimationController/AnimatorControllerPlayer.controller
View file @
a7312eac
...
...
@@ -10,18 +10,19 @@ AnimatorStateMachine:
m_Name
:
Base Layer
m_ChildStates
:
-
serializedVersion
:
1
m_State
:
{
fileID
:
171450083320412537
}
m_Position
:
{
x
:
1
50
,
y
:
1
0
,
z
:
0
}
m_State
:
{
fileID
:
7178080885167727702
}
m_Position
:
{
x
:
1
60
,
y
:
-6
0
,
z
:
0
}
m_ChildStateMachines
:
[]
m_AnyStateTransitions
:
[]
m_EntryTransitions
:
[]
m_EntryTransitions
:
-
{
fileID
:
2231578916844529555
}
m_StateMachineTransitions
:
{}
m_StateMachineBehaviours
:
[]
m_AnyStatePosition
:
{
x
:
110
,
y
:
-320
,
z
:
0
}
m_EntryPosition
:
{
x
:
110
,
y
:
-210
,
z
:
0
}
m_ExitPosition
:
{
x
:
300
,
y
:
240
,
z
:
0
}
m_ParentStateMachinePosition
:
{
x
:
800
,
y
:
20
,
z
:
0
}
m_DefaultState
:
{
fileID
:
171450083320412537
}
m_DefaultState
:
{
fileID
:
7178080885167727702
}
---
!u!91
&9100000
AnimatorController
:
m_ObjectHideFlags
:
0
...
...
@@ -62,15 +63,29 @@ AnimatorController:
m_IKPass
:
0
m_SyncedLayerAffectsTiming
:
0
m_Controller
:
{
fileID
:
9100000
}
---
!u!1102
&171450083320412537
---
!u!1109
&2231578916844529555
AnimatorTransition
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_Name
:
m_Conditions
:
[]
m_DstStateMachine
:
{
fileID
:
0
}
m_DstState
:
{
fileID
:
7178080885167727702
}
m_Solo
:
0
m_Mute
:
0
m_IsExit
:
0
serializedVersion
:
1
---
!u!1102
&7178080885167727702
AnimatorState
:
serializedVersion
:
5
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_Name
:
Running
m_Speed
:
0.8
m_Name
:
mixamo_com
m_Speed
:
1
m_CycleOffset
:
0
m_Transitions
:
[]
m_StateMachineBehaviours
:
[]
...
...
@@ -86,6 +101,6 @@ AnimatorState:
type
:
3
}
m_Tag
:
m_SpeedParameter
:
m_MirrorParameter
:
Grounded
m_CycleOffsetParameter
:
Blend
m_TimeParameter
:
Blend
m_MirrorParameter
:
m_CycleOffsetParameter
:
m_TimeParameter
:
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