diff --git a/Assets/minecraft-character/animcontrollers/character-android-fx.controller b/Assets/minecraft-character/animcontrollers/character-android-fx.controller index 4783df3..74caa2b 100644 --- a/Assets/minecraft-character/animcontrollers/character-android-fx.controller +++ b/Assets/minecraft-character/animcontrollers/character-android-fx.controller @@ -33,7 +33,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: index_L - m_Speed: 1 + m_Speed: -1 m_CycleOffset: 0 m_Transitions: [] m_StateMachineBehaviours: [] @@ -157,7 +157,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: index_R - m_Speed: 1 + m_Speed: -1 m_CycleOffset: 0 m_Transitions: [] m_StateMachineBehaviours: [] @@ -201,33 +201,6 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1102 &-1963891171897827963 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: thumb_L - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: [] - m_StateMachineBehaviours: [] - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 0 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 0 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 1 - m_Motion: {fileID: 3955850465990302734, guid: 05a0a108d584596449bd7c7caa557d29, - type: 3} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: thumbLevel_L --- !u!1102 &-1633881187748505557 AnimatorState: serializedVersion: 6 @@ -255,33 +228,6 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1102 &-262414112464421131 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: thumb_R - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: [] - m_StateMachineBehaviours: [] - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 0 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 0 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 1 - m_Motion: {fileID: -7212677886900430560, guid: 05a0a108d584596449bd7c7caa557d29, - type: 3} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: thumbLevel_R --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -460,18 +406,6 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} - - serializedVersion: 5 - m_Name: Left Thumb Level - m_StateMachine: {fileID: 6692282207262878905} - m_Mask: {fileID: 0} - m_Motions: [] - m_Behaviours: [] - m_BlendingMode: 1 - m_SyncedLayerIndex: -1 - m_DefaultWeight: 1 - m_IKPass: 0 - m_SyncedLayerAffectsTiming: 0 - m_Controller: {fileID: 9100000} - serializedVersion: 5 m_Name: Left Index Level m_StateMachine: {fileID: 7204500332436311203} @@ -496,18 +430,6 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} - - serializedVersion: 5 - m_Name: Right Thumb Level - m_StateMachine: {fileID: 5605192913091592005} - m_Mask: {fileID: 0} - m_Motions: [] - m_Behaviours: [] - m_BlendingMode: 1 - m_SyncedLayerIndex: -1 - m_DefaultWeight: 1 - m_IKPass: 0 - m_SyncedLayerAffectsTiming: 0 - m_Controller: {fileID: 9100000} - serializedVersion: 5 m_Name: Right Index Level m_StateMachine: {fileID: 3771146128470450677} @@ -692,7 +614,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: middle_R - m_Speed: 1 + m_Speed: -1 m_CycleOffset: 0 m_Transitions: [] m_StateMachineBehaviours: [] @@ -760,28 +682,6 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1107 &5605192913091592005 -AnimatorStateMachine: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Right Thumb Level - m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: -262414112464421131} - m_Position: {x: 300, y: 100, z: 0} - m_ChildStateMachines: [] - m_AnyStateTransitions: [] - m_EntryTransitions: [] - m_StateMachineTransitions: {} - m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: -262414112464421131} --- !u!1102 &6300141686907686336 AnimatorState: serializedVersion: 6 @@ -809,28 +709,6 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: armBend_L ---- !u!1107 &6692282207262878905 -AnimatorStateMachine: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Left Thumb Level - m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: -1963891171897827963} - m_Position: {x: 300, y: 100, z: 0} - m_ChildStateMachines: [] - m_AnyStateTransitions: [] - m_EntryTransitions: [] - m_StateMachineTransitions: {} - m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: -1963891171897827963} --- !u!1107 &7204500332436311203 AnimatorStateMachine: serializedVersion: 6 @@ -842,7 +720,7 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: -6735657027176716442} - m_Position: {x: 300, y: 100, z: 0} + m_Position: {x: 30, y: 210, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -861,7 +739,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: middle_L - m_Speed: 1 + m_Speed: -1 m_CycleOffset: 0 m_Transitions: [] m_StateMachineBehaviours: [] diff --git a/Assets/minecraft-character/animcontrollers/character-base-fx.controller b/Assets/minecraft-character/animcontrollers/character-base-fx.controller index 9625b9a..b1d083e 100644 --- a/Assets/minecraft-character/animcontrollers/character-base-fx.controller +++ b/Assets/minecraft-character/animcontrollers/character-base-fx.controller @@ -8,7 +8,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: ring_R - m_Speed: 1 + m_Speed: -1 m_CycleOffset: 0 m_Transitions: [] m_StateMachineBehaviours: [] @@ -60,7 +60,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: pinky_R - m_Speed: 1 + m_Speed: -1 m_CycleOffset: 0 m_Transitions: [] m_StateMachineBehaviours: [] @@ -87,7 +87,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: index_L - m_Speed: 1 + m_Speed: -1 m_CycleOffset: 0 m_Transitions: [] m_StateMachineBehaviours: [] @@ -329,7 +329,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: index_R - m_Speed: 1 + m_Speed: -1 m_CycleOffset: 0 m_Transitions: [] m_StateMachineBehaviours: [] @@ -381,7 +381,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: thumb_L - m_Speed: 1 + m_Speed: -1 m_CycleOffset: 0 m_Transitions: [] m_StateMachineBehaviours: [] @@ -457,7 +457,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: thumb_R - m_Speed: 1 + m_Speed: -1 m_CycleOffset: 0 m_Transitions: [] m_StateMachineBehaviours: [] @@ -958,7 +958,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: middle_R - m_Speed: 1 + m_Speed: -1 m_CycleOffset: 0 m_Transitions: [] m_StateMachineBehaviours: [] @@ -1078,7 +1078,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: pinky_L - m_Speed: 1 + m_Speed: -1 m_CycleOffset: 0 m_Transitions: [] m_StateMachineBehaviours: [] @@ -1154,7 +1154,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: ring_L - m_Speed: 1 + m_Speed: -1 m_CycleOffset: 0 m_Transitions: [] m_StateMachineBehaviours: [] @@ -1206,7 +1206,7 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: -6735657027176716442} - m_Position: {x: 300, y: 100, z: 0} + m_Position: {x: 30, y: 210, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -1225,7 +1225,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: middle_L - m_Speed: 1 + m_Speed: -1 m_CycleOffset: 0 m_Transitions: [] m_StateMachineBehaviours: [] diff --git a/Assets/minecraft-character/prefabs/burgerking-base.prefab b/Assets/minecraft-character/prefabs/burgerking-base.prefab index 6376f50..68596a4 100644 --- a/Assets/minecraft-character/prefabs/burgerking-base.prefab +++ b/Assets/minecraft-character/prefabs/burgerking-base.prefab @@ -1189,46 +1189,11 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0.7071067 objectReference: {fileID: 0} - - target: {fileID: 432054121345122748, guid: 394f61922d5f34d46ae905cdc1f2ce17, - type: 3} - propertyPath: m_BlendShapeWeights.Array.data[1] - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 432054121345122748, guid: 394f61922d5f34d46ae905cdc1f2ce17, - type: 3} - propertyPath: m_BlendShapeWeights.Array.data[2] - value: 0 - objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 394f61922d5f34d46ae905cdc1f2ce17, type: 3} propertyPath: m_Name value: burgerking-base objectReference: {fileID: 0} - - target: {fileID: 1153436820070416889, guid: 394f61922d5f34d46ae905cdc1f2ce17, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.000000053385076 - objectReference: {fileID: 0} - - target: {fileID: 1153436820070416889, guid: 394f61922d5f34d46ae905cdc1f2ce17, - type: 3} - propertyPath: m_LocalRotation.x - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 1153436820070416889, guid: 394f61922d5f34d46ae905cdc1f2ce17, - type: 3} - propertyPath: m_LocalRotation.y - value: -0.00000005338508 - objectReference: {fileID: 0} - - target: {fileID: 1153436820070416889, guid: 394f61922d5f34d46ae905cdc1f2ce17, - type: 3} - propertyPath: m_LocalRotation.z - value: -0.7071067 - objectReference: {fileID: 0} - - target: {fileID: 1630794972795428178, guid: 394f61922d5f34d46ae905cdc1f2ce17, - type: 3} - propertyPath: m_DirtyAABB - value: 0 - objectReference: {fileID: 0} - target: {fileID: 3411977542463065733, guid: 394f61922d5f34d46ae905cdc1f2ce17, type: 3} propertyPath: m_LocalRotation.w @@ -1289,26 +1254,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0.70710665 objectReference: {fileID: 0} - - target: {fileID: 5471225420639062426, guid: 394f61922d5f34d46ae905cdc1f2ce17, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.00000006828625 - objectReference: {fileID: 0} - - target: {fileID: 5471225420639062426, guid: 394f61922d5f34d46ae905cdc1f2ce17, - type: 3} - propertyPath: m_LocalRotation.x - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 5471225420639062426, guid: 394f61922d5f34d46ae905cdc1f2ce17, - type: 3} - propertyPath: m_LocalRotation.y - value: -0.00000003848392 - objectReference: {fileID: 0} - - target: {fileID: 5471225420639062426, guid: 394f61922d5f34d46ae905cdc1f2ce17, - type: 3} - propertyPath: m_LocalRotation.z - value: -0.7071068 - objectReference: {fileID: 0} - target: {fileID: 5741559470092966127, guid: 394f61922d5f34d46ae905cdc1f2ce17, type: 3} propertyPath: m_LocalPosition.x @@ -2107,9 +2052,9 @@ MonoBehaviour: m_EditorClassIdentifier: rootTransform: {fileID: 0} shapeType: 0 - radius: 0.1 + radius: 0.110679716 height: 2 - position: {x: -0.105, y: 0, z: 0} + position: {x: 0, y: 0, z: -0.035} rotation: {x: 0, y: 0, z: 0, w: 1} localOnly: 0 contentTypes: -1 @@ -2140,9 +2085,9 @@ MonoBehaviour: m_EditorClassIdentifier: rootTransform: {fileID: 0} shapeType: 0 - radius: 0.1 + radius: 0.110679716 height: 2 - position: {x: -0.105, y: 0, z: 0} + position: {x: 0, y: 0, z: -0.035} rotation: {x: 0, y: 0, z: 0, w: 1} localOnly: 0 contentTypes: -1 @@ -2179,9 +2124,9 @@ MonoBehaviour: m_EditorClassIdentifier: rootTransform: {fileID: 0} shapeType: 0 - radius: 0.1 + radius: 0.110679716 height: 2 - position: {x: -0.105, y: 0, z: 0} + position: {x: 0, y: 0, z: -0.035} rotation: {x: 0, y: 0, z: 0, w: 1} localOnly: 0 contentTypes: -1 @@ -3172,9 +3117,9 @@ MonoBehaviour: m_EditorClassIdentifier: rootTransform: {fileID: 0} shapeType: 0 - radius: 0.1 + radius: 0.110679716 height: 2 - position: {x: -0.105, y: 0, z: 0} + position: {x: 0, y: 0, z: -0.035} rotation: {x: 0, y: 0, z: 0, w: 1} localOnly: 0 contentTypes: -1 @@ -3744,9 +3689,9 @@ MonoBehaviour: m_EditorClassIdentifier: rootTransform: {fileID: 0} shapeType: 0 - radius: 0.05 + radius: 0.1106797 height: 2 - position: {x: -0.105, y: 0, z: 0} + position: {x: 0, y: 0, z: -0.035} rotation: {x: 0, y: 0, z: 0, w: 1} localOnly: 0 contentTypes: -1 @@ -3777,9 +3722,9 @@ MonoBehaviour: m_EditorClassIdentifier: rootTransform: {fileID: 0} shapeType: 0 - radius: 0.1 + radius: 0.110679716 height: 2 - position: {x: -0.105, y: 0, z: 0} + position: {x: 0, y: 0, z: -0.035} rotation: {x: 0, y: 0, z: 0, w: 1} localOnly: 0 contentTypes: -1 @@ -3816,9 +3761,9 @@ MonoBehaviour: m_EditorClassIdentifier: rootTransform: {fileID: 0} shapeType: 0 - radius: 0.05 + radius: 0.1106797 height: 2 - position: {x: -0.105, y: 0, z: 0} + position: {x: 0, y: 0, z: -0.035} rotation: {x: 0, y: 0, z: 0, w: 1} localOnly: 0 contentTypes: -1 @@ -3883,9 +3828,9 @@ MonoBehaviour: m_EditorClassIdentifier: rootTransform: {fileID: 0} shapeType: 0 - radius: 0.1 + radius: 0.110679716 height: 2 - position: {x: -0.105, y: 0, z: 0} + position: {x: 0, y: 0, z: -0.035} rotation: {x: 0, y: 0, z: 0, w: 1} localOnly: 0 contentTypes: -1 @@ -4097,9 +4042,9 @@ MonoBehaviour: m_EditorClassIdentifier: rootTransform: {fileID: 0} shapeType: 0 - radius: 0.1 + radius: 0.110679716 height: 2 - position: {x: -0.105, y: 0, z: 0} + position: {x: 0, y: 0, z: -0.035} rotation: {x: 0, y: 0, z: 0, w: 1} localOnly: 0 contentTypes: -1 @@ -4517,9 +4462,9 @@ MonoBehaviour: m_EditorClassIdentifier: rootTransform: {fileID: 0} shapeType: 0 - radius: 0.1 + radius: 0.110679716 height: 2 - position: {x: -0.105, y: 0, z: 0} + position: {x: 0, y: 0, z: -0.035} rotation: {x: 0, y: 0, z: 0, w: 1} localOnly: 0 contentTypes: -1