Skip to content

Commit 4bf438b

Browse files
committed
working on animations
1 parent 870264a commit 4bf438b

42 files changed

Lines changed: 19002 additions & 408622 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Basis/Assets/TemporaryStorage.meta

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

Basis/Packages/com.basis.sdk/Animator/BasisLocomotion.controller

Lines changed: 25 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ AnimatorStateTransition:
7070
m_TransitionDuration: 0.25
7171
m_TransitionOffset: 0
7272
m_ExitTime: 0.79395604
73-
m_HasExitTime: 1
73+
m_HasExitTime: 0
7474
m_HasFixedDuration: 1
7575
m_InterruptionSource: 0
7676
m_OrderedInterruption: 1
@@ -198,89 +198,41 @@ BlendTree:
198198
m_Name: Locomotion
199199
m_Childs:
200200
- serializedVersion: 2
201-
m_Motion: {fileID: 7400048, guid: df9c30d5fc9fee64cae6f05b9418faa1, type: 3}
201+
m_Motion: {fileID: 7400004, guid: d89ea37480b6d75458aa38843e9688dc, type: 3}
202202
m_Threshold: 0.22222224
203-
m_Position: {x: 0.0009384022, y: 1.5555977}
203+
m_Position: {x: -0.035, y: 1.524}
204204
m_TimeScale: 1
205205
m_CycleOffset: 0
206206
m_DirectBlendParameter: VRIK_Turn
207207
m_Mirror: 0
208208
- serializedVersion: 2
209-
m_Motion: {fileID: 7400052, guid: df9c30d5fc9fee64cae6f05b9418faa1, type: 3}
210-
m_Threshold: 0.31944448
211-
m_Position: {x: 0.8376544, y: 0.8433691}
212-
m_TimeScale: 1
213-
m_CycleOffset: 0
214-
m_DirectBlendParameter:
215-
m_Mirror: 0
216-
- serializedVersion: 2
217-
m_Motion: {fileID: -452484837703153080, guid: 63e21129073260449a38d823cd846c37, type: 3}
218-
m_Threshold: 0.4166667
219-
m_Position: {x: 1.1261303, y: 0.0009387553}
220-
m_TimeScale: 1
221-
m_CycleOffset: 0
222-
m_DirectBlendParameter:
223-
m_Mirror: 0
224-
- serializedVersion: 2
225-
m_Motion: {fileID: 7400062, guid: df9c30d5fc9fee64cae6f05b9418faa1, type: 3}
226-
m_Threshold: 0.51388896
227-
m_Position: {x: 0.7478498, y: -0.7506507}
228-
m_TimeScale: 1
229-
m_CycleOffset: 0
230-
m_DirectBlendParameter:
231-
m_Mirror: 0
232-
- serializedVersion: 2
233-
m_Motion: {fileID: 7400058, guid: df9c30d5fc9fee64cae6f05b9418faa1, type: 3}
234-
m_Threshold: 0.61111116
235-
m_Position: {x: -0.0044947676, y: -1.4266877}
236-
m_TimeScale: 1
237-
m_CycleOffset: 0
238-
m_DirectBlendParameter:
239-
m_Mirror: 0
240-
- serializedVersion: 2
241-
m_Motion: {fileID: 7400060, guid: df9c30d5fc9fee64cae6f05b9418faa1, type: 3}
242-
m_Threshold: 0.7083334
243-
m_Position: {x: -0.7478498, y: -0.7506507}
244-
m_TimeScale: 1
245-
m_CycleOffset: 0
246-
m_DirectBlendParameter:
247-
m_Mirror: 0
248-
- serializedVersion: 2
249-
m_Motion: {fileID: 95702278605347163, guid: 63e21129073260449a38d823cd846c37, type: 3}
250-
m_Threshold: 0.8055556
251-
m_Position: {x: -1.0683707, y: -0.00080259517}
252-
m_TimeScale: 1
253-
m_CycleOffset: 0
254-
m_DirectBlendParameter:
255-
m_Mirror: 0
256-
- serializedVersion: 2
257-
m_Motion: {fileID: 7400050, guid: df9c30d5fc9fee64cae6f05b9418faa1, type: 3}
258-
m_Threshold: 0.9027778
259-
m_Position: {x: -0.8376544, y: 0.8433691}
209+
m_Motion: {fileID: 7400002, guid: d89ea37480b6d75458aa38843e9688dc, type: 3}
210+
m_Threshold: 1.0972222
211+
m_Position: {x: 0, y: 0}
260212
m_TimeScale: 1
261213
m_CycleOffset: 0
262-
m_DirectBlendParameter:
214+
m_DirectBlendParameter: CurrentTurn
263215
m_Mirror: 0
264216
- serializedVersion: 2
265-
m_Motion: {fileID: 7400032, guid: 1b868613f10ae8747a1790c8b79c439a, type: 3}
266-
m_Threshold: 1
267-
m_Position: {x: -0.010452965, y: 5.656913}
217+
m_Motion: {fileID: 7400008, guid: d89ea37480b6d75458aa38843e9688dc, type: 3}
218+
m_Threshold: 1.9722222
219+
m_Position: {x: -1.394433, y: -0.00001099072}
268220
m_TimeScale: 1
269221
m_CycleOffset: 0
270-
m_DirectBlendParameter: VRIK_Turn
222+
m_DirectBlendParameter: VelocityX
271223
m_Mirror: 0
272224
- serializedVersion: 2
273-
m_Motion: {fileID: -3100369314251171874, guid: 241e93a6da187904ea7d6d9cf5a9fb26, type: 3}
274-
m_Threshold: 1.0972222
275-
m_Position: {x: 0, y: 0}
225+
m_Motion: {fileID: 7400006, guid: d89ea37480b6d75458aa38843e9688dc, type: 3}
226+
m_Threshold: 2.8472223
227+
m_Position: {x: 1.3342, y: 0.00001106616}
276228
m_TimeScale: 1
277229
m_CycleOffset: 0
278-
m_DirectBlendParameter: CurrentTurn
230+
m_DirectBlendParameter: VelocityX
279231
m_Mirror: 0
280232
m_BlendParameter: VelocityX
281233
m_BlendParameterY: VelocityZ
282234
m_MinThreshold: 0.22222224
283-
m_MaxThreshold: 1.0972222
235+
m_MaxThreshold: 2.8472223
284236
m_UseAutomaticThresholds: 0
285237
m_NormalizedBlendValues: 0
286238
m_BlendType: 3
@@ -305,7 +257,7 @@ AnimatorState:
305257
m_MirrorParameterActive: 0
306258
m_CycleOffsetParameterActive: 0
307259
m_TimeParameterActive: 0
308-
m_Motion: {fileID: 7400000, guid: 067cc188e25b78b4a940a9fa67cd6ee7, type: 3}
260+
m_Motion: {fileID: 7478122292733868173, guid: 98f277b0c8055e143b2fcf058d3c27dc, type: 3}
309261
m_Tag:
310262
m_SpeedParameter:
311263
m_MirrorParameter:
@@ -318,7 +270,7 @@ AnimatorController:
318270
m_PrefabInstance: {fileID: 0}
319271
m_PrefabAsset: {fileID: 0}
320272
m_Name: BasisLocomotion
321-
serializedVersion: 5
273+
serializedVersion: 6
322274
m_AnimatorParameters:
323275
- m_Name: VelocityX
324276
m_Type: 1
@@ -387,6 +339,7 @@ AnimatorController:
387339
m_IKPass: 0
388340
m_SyncedLayerAffectsTiming: 0
389341
m_Controller: {fileID: 9100000}
342+
m_EvaluateTransitionsOnStart: 0
390343
--- !u!1101 &141944257809237264
391344
AnimatorStateTransition:
392345
m_ObjectHideFlags: 1
@@ -428,7 +381,7 @@ AnimatorTransition:
428381
serializedVersion: 1
429382
--- !u!1107 &1806398901479127876
430383
AnimatorStateMachine:
431-
serializedVersion: 6
384+
serializedVersion: 7
432385
m_ObjectHideFlags: 1
433386
m_CorrespondingSourceObject: {fileID: 0}
434387
m_PrefabInstance: {fileID: 0}
@@ -512,7 +465,7 @@ AnimatorState:
512465
m_MirrorParameterActive: 0
513466
m_CycleOffsetParameterActive: 0
514467
m_TimeParameterActive: 0
515-
m_Motion: {fileID: 7400004, guid: 067cc188e25b78b4a940a9fa67cd6ee7, type: 3}
468+
m_Motion: {fileID: -9098803823909532060, guid: 98f277b0c8055e143b2fcf058d3c27dc, type: 3}
516469
m_Tag:
517470
m_SpeedParameter:
518471
m_MirrorParameter:
@@ -602,7 +555,7 @@ BlendTree:
602555
m_Name: Locomotion
603556
m_Childs:
604557
- serializedVersion: 2
605-
m_Motion: {fileID: 7400048, guid: df9c30d5fc9fee64cae6f05b9418faa1, type: 3}
558+
m_Motion: {fileID: 1657602633327794031, guid: 8269a9f8cf495034c817722ac21f309f, type: 3}
606559
m_Threshold: 0.22222224
607560
m_Position: {x: -0.0012106815, y: 1.8949654}
608561
m_TimeScale: 1
@@ -634,7 +587,7 @@ BlendTree:
634587
m_DirectBlendParameter:
635588
m_Mirror: 0
636589
- serializedVersion: 2
637-
m_Motion: {fileID: 7400058, guid: df9c30d5fc9fee64cae6f05b9418faa1, type: 3}
590+
m_Motion: {fileID: -8704978693243160924, guid: a073c604c44135e438eeeaef77058ac5, type: 3}
638591
m_Threshold: 0.61111116
639592
m_Position: {x: -0.011385167, y: -1.8538179}
640593
m_TimeScale: 1
@@ -666,7 +619,7 @@ BlendTree:
666619
m_DirectBlendParameter:
667620
m_Mirror: 0
668621
- serializedVersion: 2
669-
m_Motion: {fileID: 7400032, guid: 1b868613f10ae8747a1790c8b79c439a, type: 3}
622+
m_Motion: {fileID: 7400000, guid: 1cb8ed3cbba15f0479fbae54e0a963df, type: 3}
670623
m_Threshold: 1
671624
m_Position: {x: 0.03366417, y: 3.6030414}
672625
m_TimeScale: 1
@@ -711,7 +664,7 @@ AnimatorState:
711664
m_MirrorParameterActive: 0
712665
m_CycleOffsetParameterActive: 0
713666
m_TimeParameterActive: 0
714-
m_Motion: {fileID: -4225938145651474181, guid: aea48e2ff51aa6b40939f4137190fe1a, type: 3}
667+
m_Motion: {fileID: 7400004, guid: 0d9d26e2162aa4d11ab075b34c029673, type: 3}
715668
m_Tag:
716669
m_SpeedParameter:
717670
m_MirrorParameter:

0 commit comments

Comments
 (0)