对战与AR骑行相关逻辑修改

This commit is contained in:
lishuo committed 2022-08-24 18:43:43 +08:00
1 parent 3bcb3ee83e
commit 89b5275efd
64 files changed
+50131 -29495

No files matched your search

File diff suppressed because it is too large. Load diff
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 3d067189c6bd042468a0866710be5f9e
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:
+41 -140
View File
@@ -161,7 +161,7 @@ AnimatorStateTransition:
m_CanTransitionToSelf: 1
--- !u!1102 &-6280473346169069233
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@@ -172,7 +172,6 @@ AnimatorState:
m_Transitions:
- {fileID: 4962937267187318886}
- {fileID: 628895593721634343}
- {fileID: 8335684326445612345}
- {fileID: 8004998155799987221}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
@@ -192,7 +191,7 @@ AnimatorState:
m_TimeParameter:
--- !u!1102 &-6197807439964194722
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@@ -323,7 +322,7 @@ AnimatorStateTransition:
m_CanTransitionToSelf: 1
--- !u!1102 &-5028631798582772322
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@@ -373,7 +372,7 @@ AnimatorStateTransition:
m_CanTransitionToSelf: 1
--- !u!1102 &-4448948008395002896
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@@ -399,31 +398,6 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &-4041146987074567963
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 3
m_ConditionEvent: bearing
m_EventTreshold: 1
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -1921903986252914710}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.24999988
m_TransitionOffset: 0.00000015549041
m_ExitTime: 0.99523795
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-3823386753831176018
AnimatorStateTransition:
m_ObjectHideFlags: 1
@@ -448,7 +422,7 @@ AnimatorStateTransition:
m_CanTransitionToSelf: 1
--- !u!1102 &-3789228838010061756
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@@ -475,7 +449,7 @@ AnimatorState:
m_TimeParameter:
--- !u!1102 &-3680733670995154060
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@@ -525,7 +499,7 @@ AnimatorStateTransition:
m_CanTransitionToSelf: 1
--- !u!1102 &-3206231950487047934
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@@ -597,7 +571,7 @@ AnimatorStateTransition:
m_CanTransitionToSelf: 1
--- !u!1102 &-2690597925175035265
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@@ -626,7 +600,7 @@ AnimatorState:
m_TimeParameter:
--- !u!1102 &-2561558923055515796
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@@ -662,7 +636,7 @@ AnimatorState:
m_TimeParameter:
--- !u!1102 &-2474074929572245477
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@@ -688,31 +662,6 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &-2448630386238416150
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 4
m_ConditionEvent: bearing
m_EventTreshold: -1
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -1921903986252914710}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.24999976
m_TransitionOffset: 0
m_ExitTime: 0.9978974
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 2
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1109 &-2159963661882776293
AnimatorTransition:
m_ObjectHideFlags: 1
@@ -729,7 +678,7 @@ AnimatorTransition:
serializedVersion: 1
--- !u!1102 &-1921903986252914710
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@@ -757,7 +706,7 @@ AnimatorState:
m_TimeParameter:
--- !u!1102 &-1867621270447226975
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@@ -865,7 +814,7 @@ AnimatorStateTransition:
m_CanTransitionToSelf: 1
--- !u!1102 &-1696406813102555496
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@@ -893,7 +842,7 @@ AnimatorState:
m_TimeParameter:
--- !u!1102 &-1674479558448565141
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@@ -902,10 +851,8 @@ AnimatorState:
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -2448630386238416150}
- {fileID: -1348034233613075618}
- {fileID: 6643453857259642113}
- {fileID: -4041146987074567963}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@@ -924,7 +871,7 @@ AnimatorState:
m_TimeParameter:
--- !u!1107 &-1637695127637103515
AnimatorStateMachine:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@@ -1031,12 +978,6 @@ AnimatorStateTransition:
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 3
m_ConditionEvent: bearing
m_EventTreshold: -1
- m_ConditionMode: 4
m_ConditionEvent: bearing
m_EventTreshold: 1
- m_ConditionMode: 3
m_ConditionEvent: grade
m_EventTreshold: 5
@@ -1065,12 +1006,6 @@ AnimatorStateTransition:
- m_ConditionMode: 3
m_ConditionEvent: grade
m_EventTreshold: 5
- m_ConditionMode: 3
m_ConditionEvent: bearing
m_EventTreshold: -1
- m_ConditionMode: 4
m_ConditionEvent: bearing
m_EventTreshold: 1
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 8037845210809518626}
m_Solo: 0
@@ -1109,7 +1044,7 @@ AnimatorStateTransition:
m_CanTransitionToSelf: 1
--- !u!1102 &-149237661038222874
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@@ -1149,73 +1084,73 @@ AnimatorController:
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: speed
m_Type: 1
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: power
m_Type: 1
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: cadance
m_Type: 1
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: preSpeed
m_Type: 1
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: grade
m_Type: 1
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: touchHead
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: headBack
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: cadanceConnected
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: cadance 0
m_Type: 3
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: drinking
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: canturn
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
@@ -1231,7 +1166,7 @@ AnimatorController:
m_Controller: {fileID: 9100000}
--- !u!1102 &57360962280543080
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@@ -1259,7 +1194,7 @@ AnimatorState:
m_TimeParameter:
--- !u!1102 &152988074441697560
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@@ -1315,7 +1250,7 @@ AnimatorStateTransition:
m_CanTransitionToSelf: 1
--- !u!1102 &646349641302932126
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@@ -1343,7 +1278,7 @@ AnimatorState:
m_TimeParameter:
--- !u!1102 &1018308057553964354
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@@ -1424,12 +1359,6 @@ AnimatorStateTransition:
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 3
m_ConditionEvent: bearing
m_EventTreshold: -1
- m_ConditionMode: 4
m_ConditionEvent: bearing
m_EventTreshold: 1
- m_ConditionMode: 3
m_ConditionEvent: speed
m_EventTreshold: 35
@@ -1496,7 +1425,7 @@ AnimatorStateTransition:
m_CanTransitionToSelf: 1
--- !u!1102 &3705284127588475039
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@@ -1524,7 +1453,7 @@ AnimatorState:
m_TimeParameter:
--- !u!1102 &3857089115179635187
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@@ -1597,7 +1526,7 @@ AnimatorStateTransition:
m_CanTransitionToSelf: 1
--- !u!1102 &4213284675513532716
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@@ -1703,7 +1632,7 @@ AnimatorStateTransition:
m_CanTransitionToSelf: 1
--- !u!1102 &5931569063321047081
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@@ -1731,7 +1660,7 @@ AnimatorState:
m_TimeParameter:
--- !u!1102 &5932869819320440490
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@@ -1834,7 +1763,7 @@ AnimatorTransition:
serializedVersion: 1
--- !u!1102 &7167068954877030447
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@@ -1978,7 +1907,7 @@ AnimatorStateTransition:
m_CanTransitionToSelf: 1
--- !u!1102 &8037845210809518626
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@@ -2051,34 +1980,6 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &8335684326445612345
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 3
m_ConditionEvent: bearing
m_EventTreshold: 1
- m_ConditionMode: 4
m_ConditionEvent: bearing
m_EventTreshold: -1
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -3680733670995154060}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.99939305
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &8459541290117965463
AnimatorStateTransition:
m_ObjectHideFlags: 1
@@ -2103,7 +2004,7 @@ AnimatorStateTransition:
m_CanTransitionToSelf: 1
--- !u!1102 &8758911657893801591
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@@ -2131,7 +2032,7 @@ AnimatorState:
m_TimeParameter:
--- !u!1102 &9029427672491609446
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}