Skip to content

Commit

Permalink
FIX: #27 蓋の摩擦力とアニメーションを修正する
Browse files Browse the repository at this point in the history
  • Loading branch information
@yigedinglia
yigedinglia committed Dec 18, 2021
1 parent 81b6202 commit 2abd118
Show file tree
Hide file tree
Showing 5 changed files with 438 additions and 26 deletions.
66 changes: 59 additions & 7 deletions Assets/Art/Animations/LeftLid/LeftLidJoint.controller
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,31 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-2502126719889942706
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: LeftLidClosing
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 842424425059486895}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &-2364952926416846021
AnimatorState:
serializedVersion: 6
Expand All @@ -89,6 +114,7 @@ AnimatorState:
m_CycleOffset: 0
m_Transitions:
- {fileID: 8998380489465894676}
- {fileID: -2502126719889942706}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
Expand All @@ -115,7 +141,7 @@ AnimatorStateMachine:
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: -2364952926416846021}
m_Position: {x: 370, y: 390, z: 0}
m_Position: {x: 680, y: 360, z: 0}
- serializedVersion: 1
m_State: {fileID: 842424425059486895}
m_Position: {x: 360, y: 680, z: 0}
Expand All @@ -127,7 +153,7 @@ AnimatorStateMachine:
m_Position: {x: 60, y: 230, z: 0}
- serializedVersion: 1
m_State: {fileID: -8557003195777201200}
m_Position: {x: 360, y: 530, z: 0}
m_Position: {x: 720, y: 520, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
Expand Down Expand Up @@ -165,6 +191,31 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &-113375580569812096
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: LeftLidClosing
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 842424425059486895}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.75409836
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
Expand All @@ -179,31 +230,31 @@ AnimatorController:
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: LeftLidOpenWarning
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: LeftLidOpening
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: LeftLidCloseWarning
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: LeftLidClosing
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
Expand Down Expand Up @@ -281,6 +332,7 @@ AnimatorState:
m_CycleOffset: 0
m_Transitions:
- {fileID: 5427779392860605493}
- {fileID: -113375580569812096}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
Expand Down
66 changes: 59 additions & 7 deletions Assets/Art/Animations/RightLid/RightLidJoint .controller
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,31 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-6668051901912092451
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: RightLidClosing
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -5819322115651636357}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.75409836
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-6624853178964401721
AnimatorStateTransition:
m_ObjectHideFlags: 1
Expand Down Expand Up @@ -155,6 +180,31 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &-5002631028828006435
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: RightLidClosing
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -5819322115651636357}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!206 &-1173166375024911939
BlendTree:
m_ObjectHideFlags: 1
Expand Down Expand Up @@ -184,31 +234,31 @@ AnimatorController:
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: RightLidOpenWarning
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: RightLidOpening
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: RightLidCloseWarning
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: RightLidClosing
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
Expand All @@ -233,7 +283,7 @@ AnimatorStateMachine:
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 3325225093272851784}
m_Position: {x: 370, y: 330, z: 0}
m_Position: {x: 750, y: 300, z: 0}
- serializedVersion: 1
m_State: {fileID: -5819322115651636357}
m_Position: {x: 360, y: 550, z: 0}
Expand All @@ -257,7 +307,7 @@ AnimatorStateMachine:
m_Position: {x: -5572.664, y: -6924.082, z: 0}
- serializedVersion: 1
m_State: {fileID: -5465828492585075643}
m_Position: {x: 370, y: 430, z: 0}
m_Position: {x: 750, y: 430, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
Expand Down Expand Up @@ -331,6 +381,7 @@ AnimatorState:
m_CycleOffset: 0
m_Transitions:
- {fileID: 4331556865552606318}
- {fileID: -5002631028828006435}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
Expand Down Expand Up @@ -383,6 +434,7 @@ AnimatorState:
m_CycleOffset: 0
m_Transitions:
- {fileID: -8245433426053098756}
- {fileID: -6668051901912092451}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
Expand Down
Loading

0 comments on commit 2abd118

Please sign in to comment.