Skip to content

Commit 4f5a162

Browse files
committed
Leftover files
1 parent bff67ba commit 4f5a162

File tree

2 files changed

+71
-4
lines changed

2 files changed

+71
-4
lines changed

UOP1_Project/Assets/Art/Characters/Townsfolk_F/Animation/Townsfolk_F.overrideController

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,11 @@ AnimatorOverrideController:
2121
type: 3}
2222
m_OverrideClip: {fileID: -3419257869308726280, guid: 04b624c9c23f14df3b9d8316a8e8da2c,
2323
type: 3}
24+
- m_OriginalClip: {fileID: -395696784264195149, guid: e24cee4b4d7d4c643b7c1af93545399c,
25+
type: 3}
26+
m_OverrideClip: {fileID: -395696784264195149, guid: 530ae980197cf5e48a91006005c85a8b,
27+
type: 3}
28+
- m_OriginalClip: {fileID: 665853745831072719, guid: 87226ae1782bd024fac34c7fa010fcf8,
29+
type: 3}
30+
m_OverrideClip: {fileID: 665853745831072719, guid: cc3ad960a2946814686d39a7df3e8fc4,
31+
type: 3}

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

Lines changed: 63 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ AnimatorStateTransition:
8080
m_CanTransitionToSelf: 1
8181
--- !u!1102 &-7058627895698951798
8282
AnimatorState:
83-
serializedVersion: 5
83+
serializedVersion: 6
8484
m_ObjectHideFlags: 1
8585
m_CorrespondingSourceObject: {fileID: 0}
8686
m_PrefabInstance: {fileID: 0}
@@ -108,7 +108,7 @@ AnimatorState:
108108
m_TimeParameter:
109109
--- !u!1102 &-6787925190261692325
110110
AnimatorState:
111-
serializedVersion: 5
111+
serializedVersion: 6
112112
m_ObjectHideFlags: 1
113113
m_CorrespondingSourceObject: {fileID: 0}
114114
m_PrefabInstance: {fileID: 0}
@@ -135,9 +135,35 @@ AnimatorState:
135135
m_MirrorParameter:
136136
m_CycleOffsetParameter:
137137
m_TimeParameter:
138+
--- !u!1102 &-5249082931292424735
139+
AnimatorState:
140+
serializedVersion: 6
141+
m_ObjectHideFlags: 1
142+
m_CorrespondingSourceObject: {fileID: 0}
143+
m_PrefabInstance: {fileID: 0}
144+
m_PrefabAsset: {fileID: 0}
145+
m_Name: idle2
146+
m_Speed: 1
147+
m_CycleOffset: 0
148+
m_Transitions: []
149+
m_StateMachineBehaviours: []
150+
m_Position: {x: 50, y: 50, z: 0}
151+
m_IKOnFeet: 0
152+
m_WriteDefaultValues: 1
153+
m_Mirror: 0
154+
m_SpeedParameterActive: 0
155+
m_MirrorParameterActive: 0
156+
m_CycleOffsetParameterActive: 0
157+
m_TimeParameterActive: 0
158+
m_Motion: {fileID: 665853745831072719, guid: 87226ae1782bd024fac34c7fa010fcf8, type: 3}
159+
m_Tag:
160+
m_SpeedParameter:
161+
m_MirrorParameter:
162+
m_CycleOffsetParameter:
163+
m_TimeParameter:
138164
--- !u!1102 &-4311044846455179410
139165
AnimatorState:
140-
serializedVersion: 5
166+
serializedVersion: 6
141167
m_ObjectHideFlags: 1
142168
m_CorrespondingSourceObject: {fileID: 0}
143169
m_PrefabInstance: {fileID: 0}
@@ -253,7 +279,7 @@ AnimatorStateTransition:
253279
m_CanTransitionToSelf: 1
254280
--- !u!1107 &6255328692093510715
255281
AnimatorStateMachine:
256-
serializedVersion: 5
282+
serializedVersion: 6
257283
m_ObjectHideFlags: 1
258284
m_CorrespondingSourceObject: {fileID: 0}
259285
m_PrefabInstance: {fileID: 0}
@@ -269,6 +295,12 @@ AnimatorStateMachine:
269295
- serializedVersion: 1
270296
m_State: {fileID: -7058627895698951798}
271297
m_Position: {x: 320, y: 150, z: 0}
298+
- serializedVersion: 1
299+
m_State: {fileID: 8708967178038148988}
300+
m_Position: {x: 410, y: 420, z: 0}
301+
- serializedVersion: 1
302+
m_State: {fileID: -5249082931292424735}
303+
m_Position: {x: 200, y: 420, z: 0}
272304
m_ChildStateMachines: []
273305
m_AnyStateTransitions: []
274306
m_EntryTransitions: []
@@ -279,3 +311,30 @@ AnimatorStateMachine:
279311
m_ExitPosition: {x: 800, y: 120, z: 0}
280312
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
281313
m_DefaultState: {fileID: -6787925190261692325}
314+
--- !u!1102 &8708967178038148988
315+
AnimatorState:
316+
serializedVersion: 6
317+
m_ObjectHideFlags: 1
318+
m_CorrespondingSourceObject: {fileID: 0}
319+
m_PrefabInstance: {fileID: 0}
320+
m_PrefabAsset: {fileID: 0}
321+
m_Name: talk2
322+
m_Speed: 1
323+
m_CycleOffset: 0
324+
m_Transitions: []
325+
m_StateMachineBehaviours: []
326+
m_Position: {x: 50, y: 50, z: 0}
327+
m_IKOnFeet: 0
328+
m_WriteDefaultValues: 1
329+
m_Mirror: 0
330+
m_SpeedParameterActive: 0
331+
m_MirrorParameterActive: 0
332+
m_CycleOffsetParameterActive: 0
333+
m_TimeParameterActive: 0
334+
m_Motion: {fileID: -395696784264195149, guid: e24cee4b4d7d4c643b7c1af93545399c,
335+
type: 3}
336+
m_Tag:
337+
m_SpeedParameter:
338+
m_MirrorParameter:
339+
m_CycleOffsetParameter:
340+
m_TimeParameter:

0 commit comments

Comments
 (0)