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
08067480
Commit
08067480
authored
Sep 29, 2018
by
Jan Meissner
Browse files
Fixed fire animation loop
parent
ba4aa6f5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Assets/_Game/Animations/Cannon/CannonAnimator.controller
View file @
08067480
...
...
@@ -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
...
...
@@ -27,6 +27,30 @@ AnimatorController:
m_IKPass
:
0
m_SyncedLayerAffectsTiming
:
0
m_Controller
:
{
fileID
:
9100000
}
---
!u!1101
&1101038863132271820
AnimatorStateTransition
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
0
}
m_Name
:
m_Conditions
:
-
m_ConditionMode
:
1
m_ConditionEvent
:
Fire
m_EventTreshold
:
0
m_DstStateMachine
:
{
fileID
:
0
}
m_DstState
:
{
fileID
:
1102222599320385362
}
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
&1101399011918543454
AnimatorStateTransition
:
m_ObjectHideFlags
:
1
...
...
@@ -109,6 +133,7 @@ AnimatorState:
m_CycleOffset
:
0
m_Transitions
:
-
{
fileID
:
1101399011918543454
}
-
{
fileID
:
1101038863132271820
}
m_StateMachineBehaviours
:
[]
m_Position
:
{
x
:
50
,
y
:
50
,
z
:
0
}
m_IKOnFeet
:
0
...
...
Assets/_Game/Scenes/Levels/Level15.unity
View file @
08067480
...
...
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.373119
26
, g: 0.3807
400
8, b: 0.358727
07
, a: 1}
m_IndirectSpecularColor: {r: 0.373119
18
, g: 0.3807
39
8, b: 0.358727
16
, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
...
...
@@ -34601,6 +34601,10 @@ Prefab:
propertyPath: speed
value: 7
objectReference: {fileID: 0}
- target: {fileID: 4468318558309648, guid: 9a0e64aef26033945a369820bc065ae1, type: 2}
propertyPath: m_LocalPosition.x
value: 1.52
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 9a0e64aef26033945a369820bc065ae1, type: 2}
m_IsPrefabAsset: 0
...
...
@@ -34643,53 +34647,10 @@ Prefab:
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4060432582790156, guid: 9a0e64aef26033945a369820bc065ae1, type: 2}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4060432582790156, guid: 9a0e64aef26033945a369820bc065ae1, type: 2}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4060432582790156, guid: 9a0e64aef26033945a369820bc065ae1, type: 2}
propertyPath: m_LocalRotation.z
value: -0.7071068
objectReference: {fileID: 0}
- target: {fileID: 4060432582790156, guid: 9a0e64aef26033945a369820bc065ae1, type: 2}
propertyPath: m_LocalRotation.w
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 4060432582790156, guid: 9a0e64aef26033945a369820bc065ae1, type: 2}
propertyPath: m_LocalEulerAnglesHint.z
value: -90
objectReference: {fileID: 0}
- target: {fileID: 4060432582790156, guid: 9a0e64aef26033945a369820bc065ae1, type: 2}
propertyPath: m_LocalPosition.y
value: -1.47
objectReference: {fileID: 0}
- target: {fileID: 114146924872583258, guid: 9a0e64aef26033945a369820bc065ae1,
type: 2}
propertyPath: shotsPerSeconds
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4060432582790156, guid: 9a0e64aef26033945a369820bc065ae1, type: 2}
propertyPath: m_LocalPosition.x
value: 0.03
objectReference: {fileID: 0}
- target: {fileID: 1320188170728490, guid: 9a0e64aef26033945a369820bc065ae1, type: 2}
propertyPath: m_Name
value: Cannon (1)
objectReference: {fileID: 0}
- target: {fileID: 114146924872583258, guid: 9a0e64aef26033945a369820bc065ae1,
type: 2}
propertyPath: startAfterTime
value: 0
objectReference: {fileID: 0}
- target: {fileID: 114146924872583258, guid: 9a0e64aef26033945a369820bc065ae1,
type: 2}
propertyPath: speed
value: 7
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 9a0e64aef26033945a369820bc065ae1, type: 2}
m_IsPrefabAsset: 0
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