Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
gstuitje
RingMaster
Commits
006cc674
Commit
006cc674
authored
Feb 04, 2019
by
Mitchie Maluschnig
Browse files
added animations to characters and created John Smith as an interactable character
parent
4c7bfad3
Changes
53
Hide whitespace changes
Inline
Side-by-side
RingMaster/RingMaster/Assets/Animations/Ahava.meta
0 → 100644
View file @
006cc674
fileFormatVersion: 2
guid: 610047997e9f3cd4ea4560cde5181812
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
RingMaster/RingMaster/Assets/Animations/Ahava/AhavaController.controller
0 → 100644
View file @
006cc674
%YAML
1.1
%TAG
!u!
tag:unity3d.com,2011:
---
!u!91
&9100000
AnimatorController
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
0
}
m_Name
:
AhavaController
serializedVersion
:
5
m_AnimatorParameters
:
-
m_Name
:
Talking
m_Type
:
4
m_DefaultFloat
:
0
m_DefaultInt
:
0
m_DefaultBool
:
0
m_Controller
:
{
fileID
:
0
}
m_AnimatorLayers
:
-
serializedVersion
:
5
m_Name
:
Base Layer
m_StateMachine
:
{
fileID
:
1107835117735254098
}
m_Mask
:
{
fileID
:
0
}
m_Motions
:
[]
m_Behaviours
:
[]
m_BlendingMode
:
0
m_SyncedLayerIndex
:
-1
m_DefaultWeight
:
0
m_IKPass
:
0
m_SyncedLayerAffectsTiming
:
0
m_Controller
:
{
fileID
:
9100000
}
---
!u!1101
&1101199626167863564
AnimatorStateTransition
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
0
}
m_Name
:
m_Conditions
:
-
m_ConditionMode
:
2
m_ConditionEvent
:
Talking
m_EventTreshold
:
0
m_DstStateMachine
:
{
fileID
:
0
}
m_DstState
:
{
fileID
:
1102551410733133638
}
m_Solo
:
0
m_Mute
:
0
m_IsExit
:
0
serializedVersion
:
3
m_TransitionDuration
:
0.5
m_TransitionOffset
:
0
m_ExitTime
:
0.75
m_HasExitTime
:
0
m_HasFixedDuration
:
1
m_InterruptionSource
:
0
m_OrderedInterruption
:
1
m_CanTransitionToSelf
:
1
---
!u!1101
&1101972036303902284
AnimatorStateTransition
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
0
}
m_Name
:
m_Conditions
:
-
m_ConditionMode
:
1
m_ConditionEvent
:
Talking
m_EventTreshold
:
0
m_DstStateMachine
:
{
fileID
:
0
}
m_DstState
:
{
fileID
:
1102067602587182296
}
m_Solo
:
0
m_Mute
:
0
m_IsExit
:
0
serializedVersion
:
3
m_TransitionDuration
:
0
m_TransitionOffset
:
0
m_ExitTime
:
0.75
m_HasExitTime
:
0
m_HasFixedDuration
:
1
m_InterruptionSource
:
0
m_OrderedInterruption
:
1
m_CanTransitionToSelf
:
1
---
!u!1102
&1102067602587182296
AnimatorState
:
serializedVersion
:
5
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
0
}
m_Name
:
Talking
m_Speed
:
1
m_CycleOffset
:
0
m_Transitions
:
-
{
fileID
:
1101199626167863564
}
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
:
a6734b4c465ad294da610b469d507dea
,
type
:
2
}
m_Tag
:
m_SpeedParameter
:
m_MirrorParameter
:
m_CycleOffsetParameter
:
m_TimeParameter
:
---
!u!1102
&1102551410733133638
AnimatorState
:
serializedVersion
:
5
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
0
}
m_Name
:
Idle
m_Speed
:
1
m_CycleOffset
:
0
m_Transitions
:
-
{
fileID
:
1101972036303902284
}
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
:
861bc4daefaed30449759f5fa3b5c88c
,
type
:
2
}
m_Tag
:
m_SpeedParameter
:
m_MirrorParameter
:
m_CycleOffsetParameter
:
m_TimeParameter
:
---
!u!1107
&1107835117735254098
AnimatorStateMachine
:
serializedVersion
:
5
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
0
}
m_Name
:
Base Layer
m_ChildStates
:
-
serializedVersion
:
1
m_State
:
{
fileID
:
1102551410733133638
}
m_Position
:
{
x
:
336
,
y
:
0
,
z
:
0
}
-
serializedVersion
:
1
m_State
:
{
fileID
:
1102067602587182296
}
m_Position
:
{
x
:
324
,
y
:
108
,
z
:
0
}
m_ChildStateMachines
:
[]
m_AnyStateTransitions
:
[]
m_EntryTransitions
:
[]
m_StateMachineTransitions
:
{}
m_StateMachineBehaviours
:
[]
m_AnyStatePosition
:
{
x
:
50
,
y
:
20
,
z
:
0
}
m_EntryPosition
:
{
x
:
50
,
y
:
120
,
z
:
0
}
m_ExitPosition
:
{
x
:
800
,
y
:
120
,
z
:
0
}
m_ParentStateMachinePosition
:
{
x
:
800
,
y
:
20
,
z
:
0
}
m_DefaultState
:
{
fileID
:
1102551410733133638
}
RingMaster/RingMaster/Assets/Animations/Ahava/AhavaController.controller.meta
0 → 100644
View file @
006cc674
fileFormatVersion: 2
guid: 212326486c7833b43a3d9258c078f01b
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:
RingMaster/RingMaster/Assets/Animations/Ahava/Ahava_Idle.anim
0 → 100644
View file @
006cc674
%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
:
Ahava_Idle
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
:
5a8fe7e96cf91e6418c80199f75c78af
,
type
:
3
}
-
time
:
0.5
value
:
{
fileID
:
21300002
,
guid
:
5a8fe7e96cf91e6418c80199f75c78af
,
type
:
3
}
attribute
:
m_Sprite
path
:
classID
:
212
script
:
{
fileID
:
0
}
m_SampleRate
:
2
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
:
5a8fe7e96cf91e6418c80199f75c78af
,
type
:
3
}
-
{
fileID
:
21300002
,
guid
:
5a8fe7e96cf91e6418c80199f75c78af
,
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
:
1
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
:
[]
RingMaster/RingMaster/Assets/Animations/Ahava/Ahava_Idle.anim.meta
0 → 100644
View file @
006cc674
fileFormatVersion: 2
guid: 861bc4daefaed30449759f5fa3b5c88c
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
RingMaster/RingMaster/Assets/Animations/
Player_Idle
.anim
→
RingMaster/RingMaster/Assets/Animations/
Ahava/Ahava_Talk
.anim
View file @
006cc674
...
...
@@ -5,7 +5,7 @@ AnimationClip:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
0
}
m_Name
:
Player_Idle
m_Name
:
Ahava_Talk
serializedVersion
:
6
m_Legacy
:
0
m_Compressed
:
0
...
...
@@ -35,7 +35,7 @@ AnimationClip:
m_Level
:
0
m_CycleOffset
:
0
m_HasAdditiveReferencePose
:
0
m_LoopTime
:
0
m_LoopTime
:
1
m_LoopBlend
:
0
m_LoopBlendOrientation
:
0
m_LoopBlendPositionY
:
0
...
...
RingMaster/RingMaster/Assets/Animations/Ahava/Ahava_Talk.anim.meta
0 → 100644
View file @
006cc674
fileFormatVersion: 2
guid: a6734b4c465ad294da610b469d507dea
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
RingMaster/RingMaster/Assets/Animations/JohnSmith.meta
0 → 100644
View file @
006cc674
fileFormatVersion: 2
guid: ee79db0b9e8110045b58c56b7610b9e9
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
RingMaster/RingMaster/Assets/Animations/JohnSmith/JohnSmithController.controller
0 → 100644
View file @
006cc674
%YAML
1.1
%TAG
!u!
tag:unity3d.com,2011:
---
!u!91
&9100000
AnimatorController
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
0
}
m_Name
:
JohnSmithController
serializedVersion
:
5
m_AnimatorParameters
:
-
m_Name
:
Talking
m_Type
:
4
m_DefaultFloat
:
0
m_DefaultInt
:
0
m_DefaultBool
:
0
m_Controller
:
{
fileID
:
9100000
}
m_AnimatorLayers
:
-
serializedVersion
:
5
m_Name
:
Base Layer
m_StateMachine
:
{
fileID
:
1107835117735254098
}
m_Mask
:
{
fileID
:
0
}
m_Motions
:
[]
m_Behaviours
:
[]
m_BlendingMode
:
0
m_SyncedLayerIndex
:
-1
m_DefaultWeight
:
0
m_IKPass
:
0
m_SyncedLayerAffectsTiming
:
0
m_Controller
:
{
fileID
:
9100000
}
---
!u!1101
&1101199626167863564
AnimatorStateTransition
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
0
}
m_Name
:
m_Conditions
:
-
m_ConditionMode
:
2
m_ConditionEvent
:
Talking
m_EventTreshold
:
0
m_DstStateMachine
:
{
fileID
:
0
}
m_DstState
:
{
fileID
:
1102551410733133638
}
m_Solo
:
0
m_Mute
:
0
m_IsExit
:
0
serializedVersion
:
3
m_TransitionDuration
:
0.5
m_TransitionOffset
:
0
m_ExitTime
:
0.75
m_HasExitTime
:
0
m_HasFixedDuration
:
1
m_InterruptionSource
:
0
m_OrderedInterruption
:
1
m_CanTransitionToSelf
:
1
---
!u!1101
&1101972036303902284
AnimatorStateTransition
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
0
}
m_Name
:
m_Conditions
:
-
m_ConditionMode
:
1
m_ConditionEvent
:
Talking
m_EventTreshold
:
0
m_DstStateMachine
:
{
fileID
:
0
}
m_DstState
:
{
fileID
:
1102067602587182296
}
m_Solo
:
0
m_Mute
:
0
m_IsExit
:
0
serializedVersion
:
3
m_TransitionDuration
:
0
m_TransitionOffset
:
0
m_ExitTime
:
0.75
m_HasExitTime
:
0
m_HasFixedDuration
:
1
m_InterruptionSource
:
0
m_OrderedInterruption
:
1
m_CanTransitionToSelf
:
1
---
!u!1102
&1102067602587182296
AnimatorState
:
serializedVersion
:
5
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
0
}
m_Name
:
Talking
m_Speed
:
1
m_CycleOffset
:
0
m_Transitions
:
-
{
fileID
:
1101199626167863564
}
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
:
8a54e989e0aac734f8fe604ecd69e8f6
,
type
:
2
}
m_Tag
:
m_SpeedParameter
:
m_MirrorParameter
:
m_CycleOffsetParameter
:
m_TimeParameter
:
---
!u!1102
&1102551410733133638
AnimatorState
:
serializedVersion
:
5
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
0
}
m_Name
:
Idle
m_Speed
:
1
m_CycleOffset
:
0
m_Transitions
:
-
{
fileID
:
1101972036303902284
}
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
:
6c9401ec9e8e1424da17b2b1ef362250
,
type
:
2
}
m_Tag
:
m_SpeedParameter
:
m_MirrorParameter
:
m_CycleOffsetParameter
:
m_TimeParameter
:
---
!u!1107
&1107835117735254098
AnimatorStateMachine
:
serializedVersion
:
5
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
0
}
m_Name
:
Base Layer
m_ChildStates
:
-
serializedVersion
:
1
m_State
:
{
fileID
:
1102551410733133638
}
m_Position
:
{
x
:
336
,
y
:
0
,
z
:
0
}
-
serializedVersion
:
1
m_State
:
{
fileID
:
1102067602587182296
}
m_Position
:
{
x
:
324
,
y
:
108
,
z
:
0
}
m_ChildStateMachines
:
[]
m_AnyStateTransitions
:
[]
m_EntryTransitions
:
[]
m_StateMachineTransitions
:
{}
m_StateMachineBehaviours
:
[]
m_AnyStatePosition
:
{
x
:
50
,
y
:
20
,
z
:
0
}
m_EntryPosition
:
{
x
:
50
,
y
:
120
,
z
:
0
}
m_ExitPosition
:
{
x
:
800
,
y
:
120
,
z
:
0
}
m_ParentStateMachinePosition
:
{
x
:
800
,
y
:
20
,
z
:
0
}
m_DefaultState
:
{
fileID
:
1102551410733133638
}
RingMaster/RingMaster/Assets/Animations/JohnSmith/JohnSmithController.controller.meta
0 → 100644
View file @
006cc674
fileFormatVersion: 2
guid: f95c8f456d5ed014b85eaa628e99fdcb
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:
RingMaster/RingMaster/Assets/Animations/JohnSmith/JohnSmith_Talk.anim
0 → 100644
View file @
006cc674
%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
:
JohnSmith_Talk
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
:
[]
m_SampleRate
:
60
m_WrapMode
:
0
m_Bounds
:
m_Center
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_Extent
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_ClipBindingConstant
:
genericBindings
:
[]
pptrCurveMapping
:
[]
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
:
1
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
:
[]
RingMaster/RingMaster/Assets/Animations/JohnSmith/JohnSmith_Talk.anim.meta
0 → 100644
View file @
006cc674
fileFormatVersion: 2
guid: 8a54e989e0aac734f8fe604ecd69e8f6
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
RingMaster/RingMaster/Assets/Animations/JohnSmith/JohnSmith_idle.anim
0 → 100644
View file @
006cc674
%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
:
JohnSmith_idle
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
:
6eafc9dbd6489444a91c8c8f0f88a445
,
type
:
3
}
-
time
:
0.5
value
:
{
fileID
:
21300002
,
guid
:
6eafc9dbd6489444a91c8c8f0f88a445
,
type
:
3
}
attribute
:
m_Sprite
path
:
classID
:
212
script
:
{
fileID
:
0
}
m_SampleRate
:
2
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
:
6eafc9dbd6489444a91c8c8f0f88a445
,
type
:
3
}
-
{
fileID
:
21300002
,
guid
:
6eafc9dbd6489444a91c8c8f0f88a445
,
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
:
1
m_LoopBlend
:
0
m_LoopBlendOrientation
:
0
m_LoopBlendPositionY
:
0