From 4bc3c3724ee40b1ac8026c2b0c1dfb19f4bba47e Mon Sep 17 00:00:00 2001 From: CrispyPin Date: Wed, 25 Jan 2023 21:34:34 +0100 Subject: [PATCH] thing --- Assets/pen/Pen Animator Controller.controller | 54 ++++++++-------- Assets/pen/Pen.unity | 64 +++++++++++++++---- 2 files changed, 80 insertions(+), 38 deletions(-) diff --git a/Assets/pen/Pen Animator Controller.controller b/Assets/pen/Pen Animator Controller.controller index 1714891..9e1a548 100644 --- a/Assets/pen/Pen Animator Controller.controller +++ b/Assets/pen/Pen Animator Controller.controller @@ -9,8 +9,8 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 2 - m_ConditionEvent: held - m_EventTreshold: 0 + m_ConditionEvent: held_local + m_EventTreshold: 0.5 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: -1129998124005004779} m_Solo: 0 @@ -141,8 +141,8 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 4 - m_ConditionEvent: Draw - m_EventTreshold: 0.5 + m_ConditionEvent: draw_state + m_EventTreshold: 1 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 7829240131193807482} m_Solo: 0 @@ -247,8 +247,8 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 3 - m_ConditionEvent: Draw - m_EventTreshold: 0.5 + m_ConditionEvent: draw_state + m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: -4433117024476148192} m_Solo: 0 @@ -272,24 +272,24 @@ AnimatorController: m_Name: Pen Animator Controller serializedVersion: 5 m_AnimatorParameters: - - m_Name: held + - m_Name: held_local m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} - - m_Name: Draw + m_Controller: {fileID: 0} + - m_Name: draw_state m_Type: 1 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} - - m_Name: Clear + m_Controller: {fileID: 0} + - m_Name: is_held m_Type: 1 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: drawing @@ -335,9 +335,9 @@ AnimatorStateTransition: m_PrefabAsset: {fileID: 0} m_Name: m_Conditions: - - m_ConditionMode: 3 - m_ConditionEvent: Clear - m_EventTreshold: 0.5 + - m_ConditionMode: 4 + m_ConditionEvent: draw_state + m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: -4990006184804783653} m_Solo: 0 @@ -360,9 +360,9 @@ AnimatorStateTransition: m_PrefabAsset: {fileID: 0} m_Name: m_Conditions: - - m_ConditionMode: 4 - m_ConditionEvent: Clear - m_EventTreshold: 0.5 + - m_ConditionMode: 3 + m_ConditionEvent: draw_state + m_EventTreshold: -1 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 7829240131193807482} m_Solo: 0 @@ -385,9 +385,9 @@ AnimatorStateTransition: m_PrefabAsset: {fileID: 0} m_Name: m_Conditions: - - m_ConditionMode: 2 - m_ConditionEvent: held - m_EventTreshold: 0 + - m_ConditionMode: 4 + m_ConditionEvent: is_held + m_EventTreshold: 0.5 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: -2166613315141126790} m_Solo: 0 @@ -438,8 +438,8 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 1 - m_ConditionEvent: held - m_EventTreshold: 0 + m_ConditionEvent: held_local + m_EventTreshold: 0.5 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: -1583688577503081385} m_Solo: 0 @@ -462,16 +462,16 @@ AnimatorStateTransition: m_PrefabAsset: {fileID: 0} m_Name: m_Conditions: - - m_ConditionMode: 1 - m_ConditionEvent: held - m_EventTreshold: 0 + - m_ConditionMode: 3 + m_ConditionEvent: is_held + m_EventTreshold: 0.5 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 5579638920960507980} m_Solo: 0 m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.01 + m_TransitionDuration: 0 m_TransitionOffset: 0 m_ExitTime: 0 m_HasExitTime: 0 diff --git a/Assets/pen/Pen.unity b/Assets/pen/Pen.unity index d2887eb..b0d3143 100644 --- a/Assets/pen/Pen.unity +++ b/Assets/pen/Pen.unity @@ -473,7 +473,7 @@ MonoBehaviour: - type: 22 targets: - {fileID: 2083496037} - floatVal: 1 + floatVal: -1 stringVal: Clear stringVal2: stringVal3: @@ -481,7 +481,7 @@ MonoBehaviour: boolVal: 1 boolVal2: 0 gameObjectVal: {fileID: 0} - floatVal2: 1 + floatVal2: 0 floatVal3: 0 floatVal4: 0 varBufferVal: {fileID: 0} @@ -526,7 +526,7 @@ MonoBehaviour: boolVal: 0 boolVal2: 0 gameObjectVal: {fileID: 0} - floatVal2: 1 + floatVal2: 0 floatVal3: 0 floatVal4: 0 varBufferVal: {fileID: 0} @@ -872,18 +872,18 @@ MonoBehaviour: spawnHeight: 0.5 useAdditionalValues: 1 syncValues: - - name: Draw + - name: draw_state startValue: 0 updatedBy: 0 updateMethod: 1 animator: {fileID: 2083496042} - animatorParameterName: Draw - - name: Clear + animatorParameterName: draw_state + - name: is_held startValue: 0 updatedBy: 0 updateMethod: 1 animator: {fileID: 2083496042} - animatorParameterName: Clear + animatorParameterName: is_held propPrivacy: 1 subSyncs: [] spawnableType: 0 @@ -1030,11 +1030,32 @@ MonoBehaviour: guid: - delay: 0 operations: + - type: 22 + targets: + - {fileID: 2083496037} + floatVal: 1 + stringVal: held + stringVal2: + stringVal3: + stringVal4: + boolVal: 1 + boolVal2: 0 + gameObjectVal: {fileID: 0} + floatVal2: 1 + floatVal3: 0 + floatVal4: 0 + varBufferVal: {fileID: 0} + varBufferVal2: {fileID: 0} + varBufferVal3: {fileID: 0} + animationVal: {fileID: 0} + customEvent: + m_PersistentCalls: + m_Calls: [] - type: 4 targets: - {fileID: 2083496037} floatVal: 0 - stringVal: held + stringVal: held_local stringVal2: stringVal3: stringVal4: @@ -1052,7 +1073,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] actionType: 1 - execType: 1 + execType: 2 layerMask: serializedVersion: 2 m_Bits: 0 @@ -1075,7 +1096,7 @@ MonoBehaviour: guid: - delay: 0 operations: - - type: 4 + - type: 22 targets: - {fileID: 2083496037} floatVal: 0 @@ -1086,6 +1107,27 @@ MonoBehaviour: boolVal: 0 boolVal2: 0 gameObjectVal: {fileID: 0} + floatVal2: 1 + floatVal3: 0 + floatVal4: 0 + varBufferVal: {fileID: 0} + varBufferVal2: {fileID: 0} + varBufferVal3: {fileID: 0} + animationVal: {fileID: 0} + customEvent: + m_PersistentCalls: + m_Calls: [] + - type: 4 + targets: + - {fileID: 2083496037} + floatVal: 0 + stringVal: held_local + stringVal2: + stringVal3: + stringVal4: + boolVal: 0 + boolVal2: 0 + gameObjectVal: {fileID: 0} floatVal2: 0 floatVal3: 0 floatVal4: 0 @@ -1097,7 +1139,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] actionType: 2 - execType: 1 + execType: 2 layerMask: serializedVersion: 2 m_Bits: 0