Skip to content

Commit 90575a6

Browse files
committed
Keeping only one event called for sfx during talk animations
1 parent bacd1c7 commit 90575a6

File tree

11 files changed

+112
-210
lines changed

11 files changed

+112
-210
lines changed

UOP1_Project/Assets/Art/Characters/BardHare/Animation/BardHare_talk2.fbx.meta

Lines changed: 0 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

UOP1_Project/Assets/Art/Characters/BardHare/Animation/BardHare_talk_nositar.fbx.meta

Lines changed: 0 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

UOP1_Project/Assets/Art/Characters/FryKing/Animation/FryKing_talk.fbx.meta

Lines changed: 0 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

UOP1_Project/Assets/Art/Characters/FryKing/Animation/FryKing_talk2.fbx.meta

Lines changed: 0 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

UOP1_Project/Assets/Art/Characters/PigChef/Animation/PigChef.controller

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -475,6 +475,33 @@ AnimatorStateTransition:
475475
m_InterruptionSource: 0
476476
m_OrderedInterruption: 1
477477
m_CanTransitionToSelf: 1
478+
--- !u!1102 &-3296618600161357701
479+
AnimatorState:
480+
serializedVersion: 6
481+
m_ObjectHideFlags: 1
482+
m_CorrespondingSourceObject: {fileID: 0}
483+
m_PrefabInstance: {fileID: 0}
484+
m_PrefabAsset: {fileID: 0}
485+
m_Name: New State
486+
m_Speed: 1
487+
m_CycleOffset: 0
488+
m_Transitions:
489+
- {fileID: 7504327349704782065}
490+
m_StateMachineBehaviours: []
491+
m_Position: {x: 50, y: 50, z: 0}
492+
m_IKOnFeet: 0
493+
m_WriteDefaultValues: 1
494+
m_Mirror: 0
495+
m_SpeedParameterActive: 0
496+
m_MirrorParameterActive: 0
497+
m_CycleOffsetParameterActive: 0
498+
m_TimeParameterActive: 0
499+
m_Motion: {fileID: 0}
500+
m_Tag:
501+
m_SpeedParameter:
502+
m_MirrorParameter:
503+
m_CycleOffsetParameter:
504+
m_TimeParameter:
478505
--- !u!1101 &-3229695208417307852
479506
AnimatorStateTransition:
480507
m_ObjectHideFlags: 1
@@ -920,6 +947,31 @@ AnimatorStateTransition:
920947
m_InterruptionSource: 0
921948
m_OrderedInterruption: 1
922949
m_CanTransitionToSelf: 1
950+
--- !u!1107 &-84353565874447778
951+
AnimatorStateMachine:
952+
serializedVersion: 6
953+
m_ObjectHideFlags: 1
954+
m_CorrespondingSourceObject: {fileID: 0}
955+
m_PrefabInstance: {fileID: 0}
956+
m_PrefabAsset: {fileID: 0}
957+
m_Name: New Layer
958+
m_ChildStates:
959+
- serializedVersion: 1
960+
m_State: {fileID: -3296618600161357701}
961+
m_Position: {x: 360, y: 80, z: 0}
962+
- serializedVersion: 1
963+
m_State: {fileID: 7305814284695709824}
964+
m_Position: {x: 450, y: -80, z: 0}
965+
m_ChildStateMachines: []
966+
m_AnyStateTransitions: []
967+
m_EntryTransitions: []
968+
m_StateMachineTransitions: {}
969+
m_StateMachineBehaviours: []
970+
m_AnyStatePosition: {x: 50, y: 20, z: 0}
971+
m_EntryPosition: {x: 50, y: 120, z: 0}
972+
m_ExitPosition: {x: 800, y: 120, z: 0}
973+
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
974+
m_DefaultState: {fileID: -3296618600161357701}
923975
--- !u!91 &9100000
924976
AnimatorController:
925977
m_ObjectHideFlags: 0
@@ -1014,6 +1066,18 @@ AnimatorController:
10141066
m_IKPass: 0
10151067
m_SyncedLayerAffectsTiming: 0
10161068
m_Controller: {fileID: 9100000}
1069+
- serializedVersion: 5
1070+
m_Name: New Layer
1071+
m_StateMachine: {fileID: -84353565874447778}
1072+
m_Mask: {fileID: 0}
1073+
m_Motions: []
1074+
m_Behaviours: []
1075+
m_BlendingMode: 0
1076+
m_SyncedLayerIndex: -1
1077+
m_DefaultWeight: 0.91
1078+
m_IKPass: 0
1079+
m_SyncedLayerAffectsTiming: 0
1080+
m_Controller: {fileID: 9100000}
10171081
--- !u!1101 &234358411779192891
10181082
AnimatorStateTransition:
10191083
m_ObjectHideFlags: 1
@@ -1905,6 +1969,54 @@ AnimatorStateTransition:
19051969
m_InterruptionSource: 0
19061970
m_OrderedInterruption: 1
19071971
m_CanTransitionToSelf: 1
1972+
--- !u!1102 &7305814284695709824
1973+
AnimatorState:
1974+
serializedVersion: 6
1975+
m_ObjectHideFlags: 1
1976+
m_CorrespondingSourceObject: {fileID: 0}
1977+
m_PrefabInstance: {fileID: 0}
1978+
m_PrefabAsset: {fileID: 0}
1979+
m_Name: New State 0
1980+
m_Speed: 1
1981+
m_CycleOffset: 0
1982+
m_Transitions: []
1983+
m_StateMachineBehaviours: []
1984+
m_Position: {x: 50, y: 50, z: 0}
1985+
m_IKOnFeet: 0
1986+
m_WriteDefaultValues: 1
1987+
m_Mirror: 0
1988+
m_SpeedParameterActive: 0
1989+
m_MirrorParameterActive: 0
1990+
m_CycleOffsetParameterActive: 0
1991+
m_TimeParameterActive: 0
1992+
m_Motion: {fileID: 0}
1993+
m_Tag:
1994+
m_SpeedParameter:
1995+
m_MirrorParameter:
1996+
m_CycleOffsetParameter:
1997+
m_TimeParameter:
1998+
--- !u!1101 &7504327349704782065
1999+
AnimatorStateTransition:
2000+
m_ObjectHideFlags: 1
2001+
m_CorrespondingSourceObject: {fileID: 0}
2002+
m_PrefabInstance: {fileID: 0}
2003+
m_PrefabAsset: {fileID: 0}
2004+
m_Name:
2005+
m_Conditions: []
2006+
m_DstStateMachine: {fileID: 0}
2007+
m_DstState: {fileID: 7305814284695709824}
2008+
m_Solo: 0
2009+
m_Mute: 0
2010+
m_IsExit: 0
2011+
serializedVersion: 3
2012+
m_TransitionDuration: 0.25
2013+
m_TransitionOffset: 0
2014+
m_ExitTime: 0.75
2015+
m_HasExitTime: 1
2016+
m_HasFixedDuration: 1
2017+
m_InterruptionSource: 0
2018+
m_OrderedInterruption: 1
2019+
m_CanTransitionToSelf: 1
19082020
--- !u!1101 &7870490288971834243
19092021
AnimatorStateTransition:
19102022
m_ObjectHideFlags: 1

UOP1_Project/Assets/Art/Characters/PigChef/Animation/PigChef_Talk.fbx.meta

Lines changed: 0 additions & 35 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

UOP1_Project/Assets/Art/Characters/PigChef/Animation/PigChef_Talk2.fbx.meta

Lines changed: 0 additions & 35 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

UOP1_Project/Assets/Art/Characters/Townsfolk_F/Animation/Townsfolk_F_Talk.fbx.meta

Lines changed: 0 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

UOP1_Project/Assets/Art/Characters/Townsfolk_F/Animation/Townsfolk_F_talk2.fbx.meta

Lines changed: 0 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

UOP1_Project/Assets/Art/Characters/Townsfolk_M/Animation/Townsfolk_Talk.fbx.meta

Lines changed: 0 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)