Skip to content

Commit f5f8478

Browse files
committed
Public Release 2.5.0-2
1 parent 1f481bb commit f5f8478

33 files changed

+78012
-4237
lines changed

.vs/Mate-Engine/v17/DocumentLayout.backup.json

Lines changed: 141 additions & 279 deletions
Large diffs are not rendered by default.

.vs/Mate-Engine/v17/DocumentLayout.json

Lines changed: 101 additions & 195 deletions
Large diffs are not rendered by default.

.vs/Mate-Engine/v17/fileList.bin

-96 Bytes
Binary file not shown.
Binary file not shown.

Assets/AddressableAssetsData/link.xml

Lines changed: 0 additions & 24 deletions
This file was deleted.

Assets/MATE ENGINE - Animations/AvatarAnimatorControllerV2.controller

Lines changed: 181 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,33 @@ AnimatorStateTransition:
143143
m_InterruptionSource: 0
144144
m_OrderedInterruption: 1
145145
m_CanTransitionToSelf: 1
146+
--- !u!1102 &-8228880465931972869
147+
AnimatorState:
148+
serializedVersion: 6
149+
m_ObjectHideFlags: 1
150+
m_CorrespondingSourceObject: {fileID: 0}
151+
m_PrefabInstance: {fileID: 0}
152+
m_PrefabAsset: {fileID: 0}
153+
m_Name: Wait For Dance
154+
m_Speed: 1
155+
m_CycleOffset: 0
156+
m_Transitions:
157+
- {fileID: -2142437194473828184}
158+
m_StateMachineBehaviours: []
159+
m_Position: {x: 50, y: 50, z: 0}
160+
m_IKOnFeet: 0
161+
m_WriteDefaultValues: 1
162+
m_Mirror: 0
163+
m_SpeedParameterActive: 0
164+
m_MirrorParameterActive: 0
165+
m_CycleOffsetParameterActive: 0
166+
m_TimeParameterActive: 0
167+
m_Motion: {fileID: 7400000, guid: e7edd592215e49142b17a9c16e7f6c50, type: 2}
168+
m_Tag:
169+
m_SpeedParameter:
170+
m_MirrorParameter:
171+
m_CycleOffsetParameter:
172+
m_TimeParameter:
146173
--- !u!1101 &-8145397512203767221
147174
AnimatorStateTransition:
148175
m_ObjectHideFlags: 1
@@ -165,6 +192,32 @@ AnimatorStateTransition:
165192
m_InterruptionSource: 0
166193
m_OrderedInterruption: 1
167194
m_CanTransitionToSelf: 1
195+
--- !u!1102 &-8074657740746833434
196+
AnimatorState:
197+
serializedVersion: 6
198+
m_ObjectHideFlags: 1
199+
m_CorrespondingSourceObject: {fileID: 0}
200+
m_PrefabInstance: {fileID: 0}
201+
m_PrefabAsset: {fileID: 0}
202+
m_Name: Next Custom Dance
203+
m_Speed: 1
204+
m_CycleOffset: 0
205+
m_Transitions: []
206+
m_StateMachineBehaviours: []
207+
m_Position: {x: 50, y: 50, z: 0}
208+
m_IKOnFeet: 0
209+
m_WriteDefaultValues: 1
210+
m_Mirror: 0
211+
m_SpeedParameterActive: 0
212+
m_MirrorParameterActive: 0
213+
m_CycleOffsetParameterActive: 0
214+
m_TimeParameterActive: 0
215+
m_Motion: {fileID: 0}
216+
m_Tag:
217+
m_SpeedParameter:
218+
m_MirrorParameter:
219+
m_CycleOffsetParameter:
220+
m_TimeParameter:
168221
--- !u!1101 &-7997284906753765995
169222
AnimatorStateTransition:
170223
m_ObjectHideFlags: 1
@@ -202,6 +255,7 @@ AnimatorState:
202255
m_CycleOffset: 0
203256
m_Transitions:
204257
- {fileID: 8571646670687882345}
258+
- {fileID: -6505394006315663022}
205259
m_StateMachineBehaviours: []
206260
m_Position: {x: 50, y: 50, z: 0}
207261
m_IKOnFeet: 0
@@ -211,7 +265,7 @@ AnimatorState:
211265
m_MirrorParameterActive: 0
212266
m_CycleOffsetParameterActive: 0
213267
m_TimeParameterActive: 0
214-
m_Motion: {fileID: 7400000, guid: a3e66e3f72df13843984fc046167b715, type: 2}
268+
m_Motion: {fileID: 7400000, guid: 9f7e5abeb6be55e41b8f458398622398, type: 2}
215269
m_Tag:
216270
m_SpeedParameter:
217271
m_MirrorParameter:
@@ -433,6 +487,31 @@ AnimatorStateTransition:
433487
m_InterruptionSource: 0
434488
m_OrderedInterruption: 1
435489
m_CanTransitionToSelf: 1
490+
--- !u!1101 &-6505394006315663022
491+
AnimatorStateTransition:
492+
m_ObjectHideFlags: 1
493+
m_CorrespondingSourceObject: {fileID: 0}
494+
m_PrefabInstance: {fileID: 0}
495+
m_PrefabAsset: {fileID: 0}
496+
m_Name:
497+
m_Conditions:
498+
- m_ConditionMode: 1
499+
m_ConditionEvent: isWaitingForDancing
500+
m_EventTreshold: 0
501+
m_DstStateMachine: {fileID: 0}
502+
m_DstState: {fileID: -8228880465931972869}
503+
m_Solo: 0
504+
m_Mute: 0
505+
m_IsExit: 0
506+
serializedVersion: 3
507+
m_TransitionDuration: 1
508+
m_TransitionOffset: 0
509+
m_ExitTime: 0
510+
m_HasExitTime: 0
511+
m_HasFixedDuration: 1
512+
m_InterruptionSource: 0
513+
m_OrderedInterruption: 1
514+
m_CanTransitionToSelf: 1
436515
--- !u!1102 &-6264180180712135662
437516
AnimatorState:
438517
serializedVersion: 6
@@ -630,7 +709,7 @@ AnimatorStateTransition:
630709
m_Mute: 0
631710
m_IsExit: 0
632711
serializedVersion: 3
633-
m_TransitionDuration: 0.25
712+
m_TransitionDuration: 1
634713
m_TransitionOffset: 0
635714
m_ExitTime: 0.966096
636715
m_HasExitTime: 0
@@ -1123,6 +1202,32 @@ AnimatorStateTransition:
11231202
m_InterruptionSource: 0
11241203
m_OrderedInterruption: 1
11251204
m_CanTransitionToSelf: 1
1205+
--- !u!1102 &-3447058897258345218
1206+
AnimatorState:
1207+
serializedVersion: 6
1208+
m_ObjectHideFlags: 1
1209+
m_CorrespondingSourceObject: {fileID: 0}
1210+
m_PrefabInstance: {fileID: 0}
1211+
m_PrefabAsset: {fileID: 0}
1212+
m_Name: Hide
1213+
m_Speed: 1
1214+
m_CycleOffset: 0
1215+
m_Transitions: []
1216+
m_StateMachineBehaviours: []
1217+
m_Position: {x: 50, y: 50, z: 0}
1218+
m_IKOnFeet: 0
1219+
m_WriteDefaultValues: 1
1220+
m_Mirror: 0
1221+
m_SpeedParameterActive: 0
1222+
m_MirrorParameterActive: 0
1223+
m_CycleOffsetParameterActive: 0
1224+
m_TimeParameterActive: 0
1225+
m_Motion: {fileID: 0}
1226+
m_Tag:
1227+
m_SpeedParameter:
1228+
m_MirrorParameter:
1229+
m_CycleOffsetParameter:
1230+
m_TimeParameter:
11261231
--- !u!206 &-3399682301291021540
11271232
BlendTree:
11281233
m_ObjectHideFlags: 1
@@ -1351,6 +1456,31 @@ AnimatorStateTransition:
13511456
m_InterruptionSource: 3
13521457
m_OrderedInterruption: 1
13531458
m_CanTransitionToSelf: 1
1459+
--- !u!1101 &-2142437194473828184
1460+
AnimatorStateTransition:
1461+
m_ObjectHideFlags: 1
1462+
m_CorrespondingSourceObject: {fileID: 0}
1463+
m_PrefabInstance: {fileID: 0}
1464+
m_PrefabAsset: {fileID: 0}
1465+
m_Name:
1466+
m_Conditions:
1467+
- m_ConditionMode: 2
1468+
m_ConditionEvent: isWaitingForDancing
1469+
m_EventTreshold: 0
1470+
m_DstStateMachine: {fileID: 0}
1471+
m_DstState: {fileID: -7911162531502596171}
1472+
m_Solo: 0
1473+
m_Mute: 0
1474+
m_IsExit: 0
1475+
serializedVersion: 3
1476+
m_TransitionDuration: 2
1477+
m_TransitionOffset: 0
1478+
m_ExitTime: 0.8979597
1479+
m_HasExitTime: 0
1480+
m_HasFixedDuration: 1
1481+
m_InterruptionSource: 0
1482+
m_OrderedInterruption: 1
1483+
m_CanTransitionToSelf: 1
13541484
--- !u!1101 &-2094853775240703695
13551485
AnimatorStateTransition:
13561486
m_ObjectHideFlags: 1
@@ -1764,6 +1894,12 @@ AnimatorController:
17641894
m_DefaultInt: 0
17651895
m_DefaultBool: 0
17661896
m_Controller: {fileID: 9100000}
1897+
- m_Name: isWaitingForDancing
1898+
m_Type: 4
1899+
m_DefaultFloat: 0
1900+
m_DefaultInt: 0
1901+
m_DefaultBool: 0
1902+
m_Controller: {fileID: 9100000}
17671903
- m_Name: Headpat
17681904
m_Type: 4
17691905
m_DefaultFloat: 0
@@ -1919,16 +2055,28 @@ AnimatorStateMachine:
19192055
m_Position: {x: -500, y: 610, z: 0}
19202056
- serializedVersion: 1
19212057
m_State: {fileID: -3917236710240354943}
1922-
m_Position: {x: -800, y: 60, z: 0}
2058+
m_Position: {x: -800, y: -40, z: 0}
19232059
- serializedVersion: 1
19242060
m_State: {fileID: 7100023902385883240}
19252061
m_Position: {x: 0, y: 490, z: 0}
19262062
- serializedVersion: 1
19272063
m_State: {fileID: -7911162531502596171}
1928-
m_Position: {x: -250, y: 490, z: 0}
2064+
m_Position: {x: 0, y: 890, z: 0}
19292065
- serializedVersion: 1
19302066
m_State: {fileID: -4958842989425780176}
19312067
m_Position: {x: -250, y: 760, z: 0}
2068+
- serializedVersion: 1
2069+
m_State: {fileID: -8074657740746833434}
2070+
m_Position: {x: 250, y: 960, z: 0}
2071+
- serializedVersion: 1
2072+
m_State: {fileID: 4935193477922544847}
2073+
m_Position: {x: -250, y: 960, z: 0}
2074+
- serializedVersion: 1
2075+
m_State: {fileID: -3447058897258345218}
2076+
m_Position: {x: 500, y: -40, z: 0}
2077+
- serializedVersion: 1
2078+
m_State: {fileID: -8228880465931972869}
2079+
m_Position: {x: 0, y: 1060, z: 0}
19322080
m_ChildStateMachines: []
19332081
m_AnyStateTransitions: []
19342082
m_EntryTransitions: []
@@ -2563,6 +2711,32 @@ AnimatorState:
25632711
m_MirrorParameter:
25642712
m_CycleOffsetParameter:
25652713
m_TimeParameter:
2714+
--- !u!1102 &4935193477922544847
2715+
AnimatorState:
2716+
serializedVersion: 6
2717+
m_ObjectHideFlags: 1
2718+
m_CorrespondingSourceObject: {fileID: 0}
2719+
m_PrefabInstance: {fileID: 0}
2720+
m_PrefabAsset: {fileID: 0}
2721+
m_Name: Previous Custom Dance
2722+
m_Speed: 1
2723+
m_CycleOffset: 0
2724+
m_Transitions: []
2725+
m_StateMachineBehaviours: []
2726+
m_Position: {x: 50, y: 50, z: 0}
2727+
m_IKOnFeet: 0
2728+
m_WriteDefaultValues: 1
2729+
m_Mirror: 0
2730+
m_SpeedParameterActive: 0
2731+
m_MirrorParameterActive: 0
2732+
m_CycleOffsetParameterActive: 0
2733+
m_TimeParameterActive: 0
2734+
m_Motion: {fileID: 0}
2735+
m_Tag:
2736+
m_SpeedParameter:
2737+
m_MirrorParameter:
2738+
m_CycleOffsetParameter:
2739+
m_TimeParameter:
25662740
--- !u!1101 &5037538730161381123
25672741
AnimatorStateTransition:
25682742
m_ObjectHideFlags: 1
@@ -3152,6 +3326,9 @@ AnimatorStateTransition:
31523326
- m_ConditionMode: 2
31533327
m_ConditionEvent: isCustomDancing
31543328
m_EventTreshold: 0
3329+
- m_ConditionMode: 2
3330+
m_ConditionEvent: isWaitingForDancing
3331+
m_EventTreshold: 0
31553332
m_DstStateMachine: {fileID: 0}
31563333
m_DstState: {fileID: -7706594677403160786}
31573334
m_Solo: 0

0 commit comments

Comments
 (0)