diff --git a/Assets/Res/Models/Environments/Scene_01/Anims/JiaGuPian_Translate_1.controller b/Assets/Res/Models/Environments/Scene_01/Anims/JiaGuPian_Translate_1.controller index 0ed1327b..88708106 100644 --- a/Assets/Res/Models/Environments/Scene_01/Anims/JiaGuPian_Translate_1.controller +++ b/Assets/Res/Models/Environments/Scene_01/Anims/JiaGuPian_Translate_1.controller @@ -1,5 +1,27 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-8843240092724397046 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 9023933777772088499} + 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!1107 &-6349990118105418762 AnimatorStateMachine: serializedVersion: 6 @@ -11,20 +33,23 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: -3913999759588322221} - m_Position: {x: 340, y: 0, z: 0} + m_Position: {x: 380, y: 20, z: 0} - serializedVersion: 1 m_State: {fileID: 723240310285595574} - m_Position: {x: 353.91043, y: 104.8288, z: 0} + m_Position: {x: 390, y: 160, z: 0} + - serializedVersion: 1 + m_State: {fileID: 9023933777772088499} + m_Position: {x: 120, y: 160, 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_AnyStatePosition: {x: 60, y: 0, z: 0} + m_EntryPosition: {x: -80, y: 170, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 723240310285595574} + m_DefaultState: {fileID: 9023933777772088499} --- !u!1102 &-3913999759588322221 AnimatorState: serializedVersion: 6 @@ -32,7 +57,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: JiaGuPian_Translate_1 + m_Name: Open m_Speed: 1 m_CycleOffset: 0 m_Transitions: @@ -81,10 +106,11 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: New State + m_Name: Translate m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: -8843240092724397046} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -122,3 +148,29 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1102 &9023933777772088499 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle + 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: 0 + m_Motion: {fileID: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Res/Models/Environments/Scene_01/Anims/JiaGuPian_Translate_2.controller b/Assets/Res/Models/Environments/Scene_01/Anims/JiaGuPian_Translate_2.controller index f23f9ba1..80eaedb7 100644 --- a/Assets/Res/Models/Environments/Scene_01/Anims/JiaGuPian_Translate_2.controller +++ b/Assets/Res/Models/Environments/Scene_01/Anims/JiaGuPian_Translate_2.controller @@ -1,5 +1,27 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-7045044924693576357 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -795987906097413321} + 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!1107 &-6349990118105418762 AnimatorStateMachine: serializedVersion: 6 @@ -11,20 +33,23 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: 723240310285595574} - m_Position: {x: 353.91043, y: 104.8288, z: 0} + m_Position: {x: 340, y: 180, z: 0} - serializedVersion: 1 m_State: {fileID: 4734521213255411440} - m_Position: {x: 388.91043, y: 169.8288, z: 0} + m_Position: {x: 340, y: 30, z: 0} + - serializedVersion: 1 + m_State: {fileID: -795987906097413321} + m_Position: {x: 120, y: 180, 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_EntryPosition: {x: -140, y: 160, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 723240310285595574} + m_DefaultState: {fileID: -795987906097413321} --- !u!1101 &-938555705084673412 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -47,6 +72,32 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1102 &-795987906097413321 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle + 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: 0 + m_Motion: {fileID: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -76,10 +127,11 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: New State + m_Name: Translate m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: -7045044924693576357} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -102,7 +154,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: JiaGuPian_Translate_2 + m_Name: Open m_Speed: 1 m_CycleOffset: 0 m_Transitions: diff --git a/Assets/Res/Models/Environments/Scene_01/Anims/JiaGuPian_Translate_3.controller b/Assets/Res/Models/Environments/Scene_01/Anims/JiaGuPian_Translate_3.controller index 7c7b391d..eb1ce502 100644 --- a/Assets/Res/Models/Environments/Scene_01/Anims/JiaGuPian_Translate_3.controller +++ b/Assets/Res/Models/Environments/Scene_01/Anims/JiaGuPian_Translate_3.controller @@ -1,5 +1,31 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-7587892757583915749 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle + 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: 0 + m_Motion: {fileID: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1107 &-6349990118105418762 AnimatorStateMachine: serializedVersion: 6 @@ -11,20 +37,23 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: 723240310285595574} - m_Position: {x: 353.91043, y: 104.8288, z: 0} + m_Position: {x: 370, y: 200, z: 0} - serializedVersion: 1 m_State: {fileID: -5072963143688027561} - m_Position: {x: 370, y: 190, z: 0} + m_Position: {x: 370, y: 90, z: 0} + - serializedVersion: 1 + m_State: {fileID: -7587892757583915749} + m_Position: {x: 120, y: 190, 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_EntryPosition: {x: -70, y: 190, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 723240310285595574} + m_DefaultState: {fileID: -7587892757583915749} --- !u!1102 &-5072963143688027561 AnimatorState: serializedVersion: 6 @@ -32,7 +61,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: JiaGuPian_Translate_3 + m_Name: Open m_Speed: 1 m_CycleOffset: 0 m_Transitions: @@ -52,6 +81,28 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &-4701158339772835063 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -7587892757583915749} + 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!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -81,10 +132,11 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: New State + m_Name: Translate m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: -4701158339772835063} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 diff --git a/Assets/Res/Models/Environments/Scene_01/Anims/JiaGuPian_Translate_4.controller b/Assets/Res/Models/Environments/Scene_01/Anims/JiaGuPian_Translate_4.controller index 0083c24a..9e15e350 100644 --- a/Assets/Res/Models/Environments/Scene_01/Anims/JiaGuPian_Translate_4.controller +++ b/Assets/Res/Models/Environments/Scene_01/Anims/JiaGuPian_Translate_4.controller @@ -11,20 +11,23 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: 723240310285595574} - m_Position: {x: 353.91043, y: 104.8288, z: 0} + m_Position: {x: 460, y: 170, z: 0} - serializedVersion: 1 m_State: {fileID: 7095875286615351665} - m_Position: {x: 350, y: 170, z: 0} + m_Position: {x: 430, y: 70, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1639248633180085811} + m_Position: {x: 200.08273, y: 185.59738, 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_EntryPosition: {x: -50, y: 160, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 723240310285595574} + m_DefaultState: {fileID: 1639248633180085811} --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -54,7 +57,34 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: New State + m_Name: Translate + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 5496657055015071829} + 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: 0 + m_Motion: {fileID: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &1639248633180085811 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] @@ -95,6 +125,28 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &5496657055015071829 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1639248633180085811} + 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 &7095875286615351665 AnimatorState: serializedVersion: 6 @@ -102,7 +154,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: JiaGuPian_Translate_4 + m_Name: Open m_Speed: 1 m_CycleOffset: 0 m_Transitions: diff --git a/Assets/Res/Models/Environments/Scene_01/Anims/JiaGuPian_Translate_5.controller b/Assets/Res/Models/Environments/Scene_01/Anims/JiaGuPian_Translate_5.controller index 9f2fff76..270c6738 100644 --- a/Assets/Res/Models/Environments/Scene_01/Anims/JiaGuPian_Translate_5.controller +++ b/Assets/Res/Models/Environments/Scene_01/Anims/JiaGuPian_Translate_5.controller @@ -11,20 +11,23 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: 723240310285595574} - m_Position: {x: 353.91043, y: 104.8288, z: 0} + m_Position: {x: 400, y: 200, z: 0} - serializedVersion: 1 m_State: {fileID: 8790947307419477857} - m_Position: {x: 360, y: 230, z: 0} + m_Position: {x: 400, y: 80, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1496178965726991368} + m_Position: {x: 160, y: 200, 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_EntryPosition: {x: -60, y: 200, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 723240310285595574} + m_DefaultState: {fileID: 1496178965726991368} --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -54,10 +57,11 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: New State + m_Name: Translate m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: 2071382569180904914} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -95,6 +99,54 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1102 &1496178965726991368 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle + 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: 0 + m_Motion: {fileID: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &2071382569180904914 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1496178965726991368} + 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 &8790947307419477857 AnimatorState: serializedVersion: 6 @@ -102,7 +154,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: JiaGuPian_Translate_5 + m_Name: Open m_Speed: 1 m_CycleOffset: 0 m_Transitions: diff --git a/Assets/Res/Models/Environments/Scene_01/Anims/JiaGuPian_Translate_6.controller b/Assets/Res/Models/Environments/Scene_01/Anims/JiaGuPian_Translate_6.controller index 63e46a33..80bcf9ae 100644 --- a/Assets/Res/Models/Environments/Scene_01/Anims/JiaGuPian_Translate_6.controller +++ b/Assets/Res/Models/Environments/Scene_01/Anims/JiaGuPian_Translate_6.controller @@ -32,7 +32,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: JiaGuPian_Translate_6 + m_Name: Open m_Speed: 1 m_CycleOffset: 0 m_Transitions: @@ -81,7 +81,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: New State + m_Name: Translate m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] diff --git a/Assets/Res/Models/Environments/Scene_01/Anims/JiaGuPian_Translate_7.controller b/Assets/Res/Models/Environments/Scene_01/Anims/JiaGuPian_Translate_7.controller index 08b23a62..8a5e7245 100644 --- a/Assets/Res/Models/Environments/Scene_01/Anims/JiaGuPian_Translate_7.controller +++ b/Assets/Res/Models/Environments/Scene_01/Anims/JiaGuPian_Translate_7.controller @@ -7,7 +7,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: JiaGuPian_Translate_7 + m_Name: Open m_Speed: 1 m_CycleOffset: 0 m_Transitions: @@ -38,20 +38,45 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: 723240310285595574} - m_Position: {x: 353.91043, y: 104.8288, z: 0} + m_Position: {x: 360, y: 270, z: 0} - serializedVersion: 1 m_State: {fileID: -8769836881423170202} - m_Position: {x: 350, y: 230, z: 0} + m_Position: {x: 350, y: 130, z: 0} + - serializedVersion: 1 + m_State: {fileID: 5212869603890686233} + m_Position: {x: 130, y: 270, 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_EntryPosition: {x: -90, y: 280, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 723240310285595574} + m_DefaultState: {fileID: 5212869603890686233} +--- !u!1101 &-4677526770360604369 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 5212869603890686233} + 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!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -81,7 +106,34 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: New State + m_Name: Translate + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -4677526770360604369} + 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: 0 + m_Motion: {fileID: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &5212869603890686233 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] diff --git a/Assets/Res/Models/Environments/Scene_01/Anims/JiaGuPian_Translate_8.controller b/Assets/Res/Models/Environments/Scene_01/Anims/JiaGuPian_Translate_8.controller index 6b64454e..3bfb8c58 100644 --- a/Assets/Res/Models/Environments/Scene_01/Anims/JiaGuPian_Translate_8.controller +++ b/Assets/Res/Models/Environments/Scene_01/Anims/JiaGuPian_Translate_8.controller @@ -11,20 +11,23 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: 723240310285595574} - m_Position: {x: 353.91043, y: 104.8288, z: 0} + m_Position: {x: 410, y: 170, z: 0} - serializedVersion: 1 m_State: {fileID: -497953667837085437} - m_Position: {x: 360, y: 210, z: 0} + m_Position: {x: 400, y: 60, z: 0} + - serializedVersion: 1 + m_State: {fileID: 4889069091338112646} + m_Position: {x: 190, y: 170, 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_EntryPosition: {x: -10, y: 180, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 723240310285595574} + m_DefaultState: {fileID: 4889069091338112646} --- !u!1101 &-4057014687343416329 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -54,7 +57,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: JiaGuPian_Translate_8 + m_Name: Open m_Speed: 1 m_CycleOffset: 0 m_Transitions: @@ -103,7 +106,34 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: New State + m_Name: Translate + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 5801169001692651195} + 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: 0 + m_Motion: {fileID: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &4889069091338112646 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] @@ -122,3 +152,25 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &5801169001692651195 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 4889069091338112646} + 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 diff --git a/Assets/Res/Models/Environments/Scene_01/Anims/JiaGuPian_Translate_9.controller b/Assets/Res/Models/Environments/Scene_01/Anims/JiaGuPian_Translate_9.controller index 11eaebbc..2ac7c926 100644 --- a/Assets/Res/Models/Environments/Scene_01/Anims/JiaGuPian_Translate_9.controller +++ b/Assets/Res/Models/Environments/Scene_01/Anims/JiaGuPian_Translate_9.controller @@ -11,20 +11,23 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: 723240310285595574} - m_Position: {x: 353.91043, y: 104.8288, z: 0} + m_Position: {x: 340, y: 160, z: 0} - serializedVersion: 1 m_State: {fileID: 4046095503288700214} - m_Position: {x: 350, y: 230, z: 0} + m_Position: {x: 320, y: 60, z: 0} + - serializedVersion: 1 + m_State: {fileID: 6945871152964789436} + m_Position: {x: 110, y: 160, 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_EntryPosition: {x: -80, y: 160, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 723240310285595574} + m_DefaultState: {fileID: 6945871152964789436} --- !u!1101 &-609918010518015836 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -76,10 +79,11 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: New State + m_Name: Translate m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: 7191167644785503843} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -102,7 +106,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: JiaGuPian_Translate_9 + m_Name: Open m_Speed: 1 m_CycleOffset: 0 m_Transitions: @@ -122,3 +126,51 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &6945871152964789436 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idel + 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: 0 + m_Motion: {fileID: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &7191167644785503843 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 6945871152964789436} + 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 diff --git a/Assets/Res/Models/Props/SM_B1_S1_12_A/Anims/SM_B1_S1_12_A.controller b/Assets/Res/Models/Props/SM_B1_S1_12_A/Anims/SM_B1_S1_12_A.controller index 01e736da..fc1f83c1 100644 --- a/Assets/Res/Models/Props/SM_B1_S1_12_A/Anims/SM_B1_S1_12_A.controller +++ b/Assets/Res/Models/Props/SM_B1_S1_12_A/Anims/SM_B1_S1_12_A.controller @@ -91,7 +91,7 @@ AnimatorStateMachine: m_Position: {x: 290, y: 70, z: 0} - serializedVersion: 1 m_State: {fileID: 5418520171378563904} - m_Position: {x: 280, y: 160, z: 0} + m_Position: {x: 280, y: 140, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] diff --git a/Assets/Scenes/Scene_01.unity b/Assets/Scenes/Scene_01.unity index be564de2..be627aed 100644 --- a/Assets/Scenes/Scene_01.unity +++ b/Assets/Scenes/Scene_01.unity @@ -2875,6 +2875,41 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 3285894688704134725} m_PrefabAsset: {fileID: 0} +--- !u!114 &193057870 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1669040848} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9152e17a14030344e9700283f159c637, type: 3} + m_Name: + m_EditorClassIdentifier: + textAnimator: {fileID: 1669040846} + showAnimName: Open + hideAnimName: Translate + touchAudio: {fileID: 0} + effectCtr: {fileID: 1669040847} + resetDelayTime: 2 + dissolveDuration: 1 +--- !u!114 &193057871 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1669040848} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7877962557443e34f8190e3278bd4a5d, type: 3} + m_Name: + m_EditorClassIdentifier: + resetDelayTime: 2 + downAudio: {fileID: 1669040845} + resetSpeed: 5 + stopDistance: 0.01 --- !u!1 &212112956 GameObject: m_ObjectHideFlags: 0 @@ -3706,6 +3741,41 @@ Transform: m_Children: [] m_Father: {fileID: 392358256} m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!114 &322110666 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1669040844} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9152e17a14030344e9700283f159c637, type: 3} + m_Name: + m_EditorClassIdentifier: + textAnimator: {fileID: 1669040842} + showAnimName: Open + hideAnimName: Translate + touchAudio: {fileID: 0} + effectCtr: {fileID: 1669040843} + resetDelayTime: 2 + dissolveDuration: 1 +--- !u!114 &322110667 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1669040844} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7877962557443e34f8190e3278bd4a5d, type: 3} + m_Name: + m_EditorClassIdentifier: + resetDelayTime: 2 + downAudio: {fileID: 0} + resetSpeed: 5 + stopDistance: 0.01 --- !u!1001 &331734529 PrefabInstance: m_ObjectHideFlags: 0 @@ -18778,6 +18848,41 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: sceneTitle: {fileID: 1628613543} +--- !u!114 &1125489853 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1669040864} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9152e17a14030344e9700283f159c637, type: 3} + m_Name: + m_EditorClassIdentifier: + textAnimator: {fileID: 1669040862} + showAnimName: Open + hideAnimName: Translate + touchAudio: {fileID: 0} + effectCtr: {fileID: 1669040863} + resetDelayTime: 2 + dissolveDuration: 1 +--- !u!114 &1125489854 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1669040864} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7877962557443e34f8190e3278bd4a5d, type: 3} + m_Name: + m_EditorClassIdentifier: + resetDelayTime: 2 + downAudio: {fileID: 1669040861} + resetSpeed: 5 + stopDistance: 0.01 --- !u!1001 &1130710413 PrefabInstance: m_ObjectHideFlags: 0 @@ -19198,6 +19303,41 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 +--- !u!114 &1186141057 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1669040860} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9152e17a14030344e9700283f159c637, type: 3} + m_Name: + m_EditorClassIdentifier: + textAnimator: {fileID: 1669040858} + showAnimName: Open + hideAnimName: Translate + touchAudio: {fileID: 0} + effectCtr: {fileID: 1669040859} + resetDelayTime: 2 + dissolveDuration: 1 +--- !u!114 &1186141058 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1669040860} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7877962557443e34f8190e3278bd4a5d, type: 3} + m_Name: + m_EditorClassIdentifier: + resetDelayTime: 2 + downAudio: {fileID: 1669040857} + resetSpeed: 5 + stopDistance: 0.01 --- !u!1 &1196124855 GameObject: m_ObjectHideFlags: 0 @@ -19823,6 +19963,41 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1271602725} m_Mesh: {fileID: 904321418905787556, guid: 7fe88917afa075644b4ad2eccabde845, type: 3} +--- !u!114 &1286764152 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1669040868} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9152e17a14030344e9700283f159c637, type: 3} + m_Name: + m_EditorClassIdentifier: + textAnimator: {fileID: 1669040866} + showAnimName: Open + hideAnimName: Translate + touchAudio: {fileID: 0} + effectCtr: {fileID: 1669040867} + resetDelayTime: 2 + dissolveDuration: 1 +--- !u!114 &1286764153 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1669040868} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7877962557443e34f8190e3278bd4a5d, type: 3} + m_Name: + m_EditorClassIdentifier: + resetDelayTime: 2 + downAudio: {fileID: 1669040865} + resetSpeed: 5 + stopDistance: 0.01 --- !u!1 &1295464252 GameObject: m_ObjectHideFlags: 0 @@ -19928,6 +20103,41 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1295464252} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &1303206826 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1669040856} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9152e17a14030344e9700283f159c637, type: 3} + m_Name: + m_EditorClassIdentifier: + textAnimator: {fileID: 1669040854} + showAnimName: Open + hideAnimName: Translate + touchAudio: {fileID: 0} + effectCtr: {fileID: 1669040855} + resetDelayTime: 2 + dissolveDuration: 1 +--- !u!114 &1303206827 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1669040856} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7877962557443e34f8190e3278bd4a5d, type: 3} + m_Name: + m_EditorClassIdentifier: + resetDelayTime: 2 + downAudio: {fileID: 1669040853} + resetSpeed: 5 + stopDistance: 0.01 --- !u!1 &1323320600 GameObject: m_ObjectHideFlags: 0 @@ -23170,6 +23380,340 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1648849069} m_Mesh: {fileID: 904321418905787556, guid: 7fe88917afa075644b4ad2eccabde845, type: 3} +--- !u!95 &1669040842 stripped +Animator: + m_CorrespondingSourceObject: {fileID: 2971351174309234053, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + m_PrefabInstance: {fileID: 8656849485540867627} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1669040843 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6936937231605848745, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + m_PrefabInstance: {fileID: 8656849485540867627} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8f257539b97873e4f88ffa602a2d139b, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &1669040844 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 356740234646541020, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + m_PrefabInstance: {fileID: 8656849485540867627} + m_PrefabAsset: {fileID: 0} +--- !u!82 &1669040845 stripped +AudioSource: + m_CorrespondingSourceObject: {fileID: 2104867203343529283, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + m_PrefabInstance: {fileID: 8656849485540867627} + m_PrefabAsset: {fileID: 0} +--- !u!95 &1669040846 stripped +Animator: + m_CorrespondingSourceObject: {fileID: 7534501350229222088, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + m_PrefabInstance: {fileID: 8656849485540867627} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1669040847 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1742494849541855883, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + m_PrefabInstance: {fileID: 8656849485540867627} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8f257539b97873e4f88ffa602a2d139b, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &1669040848 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7361149329412765406, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + m_PrefabInstance: {fileID: 8656849485540867627} + m_PrefabAsset: {fileID: 0} +--- !u!82 &1669040849 stripped +AudioSource: + m_CorrespondingSourceObject: {fileID: 7860141823842980913, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + m_PrefabInstance: {fileID: 8656849485540867627} + m_PrefabAsset: {fileID: 0} +--- !u!95 &1669040850 stripped +Animator: + m_CorrespondingSourceObject: {fileID: 1106572657648529990, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + m_PrefabInstance: {fileID: 8656849485540867627} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1669040851 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2112961946259153059, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + m_PrefabInstance: {fileID: 8656849485540867627} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8f257539b97873e4f88ffa602a2d139b, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &1669040852 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4812232402766930262, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + m_PrefabInstance: {fileID: 8656849485540867627} + m_PrefabAsset: {fileID: 0} +--- !u!82 &1669040853 stripped +AudioSource: + m_CorrespondingSourceObject: {fileID: 2697600060344963310, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + m_PrefabInstance: {fileID: 8656849485540867627} + m_PrefabAsset: {fileID: 0} +--- !u!95 &1669040854 stripped +Animator: + m_CorrespondingSourceObject: {fileID: 6991013721852501011, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + m_PrefabInstance: {fileID: 8656849485540867627} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1669040855 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3683282106318796012, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + m_PrefabInstance: {fileID: 8656849485540867627} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8f257539b97873e4f88ffa602a2d139b, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &1669040856 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 485069120653305928, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + m_PrefabInstance: {fileID: 8656849485540867627} + m_PrefabAsset: {fileID: 0} +--- !u!82 &1669040857 stripped +AudioSource: + m_CorrespondingSourceObject: {fileID: 2683112514650455099, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + m_PrefabInstance: {fileID: 8656849485540867627} + m_PrefabAsset: {fileID: 0} +--- !u!95 &1669040858 stripped +Animator: + m_CorrespondingSourceObject: {fileID: 5106511597464440778, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + m_PrefabInstance: {fileID: 8656849485540867627} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1669040859 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3234666364856939540, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + m_PrefabInstance: {fileID: 8656849485540867627} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8f257539b97873e4f88ffa602a2d139b, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &1669040860 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 598757103660655143, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + m_PrefabInstance: {fileID: 8656849485540867627} + m_PrefabAsset: {fileID: 0} +--- !u!82 &1669040861 stripped +AudioSource: + m_CorrespondingSourceObject: {fileID: 2744361134411490433, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + m_PrefabInstance: {fileID: 8656849485540867627} + m_PrefabAsset: {fileID: 0} +--- !u!95 &1669040862 stripped +Animator: + m_CorrespondingSourceObject: {fileID: 1805107673789191590, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + m_PrefabInstance: {fileID: 8656849485540867627} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1669040863 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2174054152331992789, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + m_PrefabInstance: {fileID: 8656849485540867627} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8f257539b97873e4f88ffa602a2d139b, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &1669040864 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3192491347826420235, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + m_PrefabInstance: {fileID: 8656849485540867627} + m_PrefabAsset: {fileID: 0} +--- !u!82 &1669040865 stripped +AudioSource: + m_CorrespondingSourceObject: {fileID: 5770700778555129892, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + m_PrefabInstance: {fileID: 8656849485540867627} + m_PrefabAsset: {fileID: 0} +--- !u!95 &1669040866 stripped +Animator: + m_CorrespondingSourceObject: {fileID: 3481135226893769437, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + m_PrefabInstance: {fileID: 8656849485540867627} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1669040867 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5097985508139703375, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + m_PrefabInstance: {fileID: 8656849485540867627} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8f257539b97873e4f88ffa602a2d139b, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &1669040868 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7543529108288770405, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + m_PrefabInstance: {fileID: 8656849485540867627} + m_PrefabAsset: {fileID: 0} +--- !u!82 &1669040869 stripped +AudioSource: + m_CorrespondingSourceObject: {fileID: 4513382443678210570, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + m_PrefabInstance: {fileID: 8656849485540867627} + m_PrefabAsset: {fileID: 0} +--- !u!95 &1669040870 stripped +Animator: + m_CorrespondingSourceObject: {fileID: 423976066822825611, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + m_PrefabInstance: {fileID: 8656849485540867627} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1669040871 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4076553587257055479, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + m_PrefabInstance: {fileID: 8656849485540867627} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8f257539b97873e4f88ffa602a2d139b, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &1669040872 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4744321446223401129, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + m_PrefabInstance: {fileID: 8656849485540867627} + m_PrefabAsset: {fileID: 0} +--- !u!82 &1669040873 stripped +AudioSource: + m_CorrespondingSourceObject: {fileID: 8296030961957628387, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + m_PrefabInstance: {fileID: 8656849485540867627} + m_PrefabAsset: {fileID: 0} +--- !u!95 &1669040874 stripped +Animator: + m_CorrespondingSourceObject: {fileID: 6496863816185076588, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + m_PrefabInstance: {fileID: 8656849485540867627} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1669040875 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8881093505385115425, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + m_PrefabInstance: {fileID: 8656849485540867627} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8f257539b97873e4f88ffa602a2d139b, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &1669040876 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 540744608131351425, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + m_PrefabInstance: {fileID: 8656849485540867627} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1669040877 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1669040872} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9152e17a14030344e9700283f159c637, type: 3} + m_Name: + m_EditorClassIdentifier: + textAnimator: {fileID: 1669040870} + showAnimName: Open + hideAnimName: Translate + touchAudio: {fileID: 0} + effectCtr: {fileID: 1669040871} + resetDelayTime: 2 + dissolveDuration: 1 +--- !u!114 &1669040878 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1669040872} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7877962557443e34f8190e3278bd4a5d, type: 3} + m_Name: + m_EditorClassIdentifier: + resetDelayTime: 2 + downAudio: {fileID: 1669040869} + resetSpeed: 5 + stopDistance: 0.01 +--- !u!114 &1669040879 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1669040876} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7877962557443e34f8190e3278bd4a5d, type: 3} + m_Name: + m_EditorClassIdentifier: + resetDelayTime: 2 + downAudio: {fileID: 1669040873} + resetSpeed: 5 + stopDistance: 0.01 +--- !u!114 &1669040880 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1669040876} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9152e17a14030344e9700283f159c637, type: 3} + m_Name: + m_EditorClassIdentifier: + textAnimator: {fileID: 1669040874} + showAnimName: Open + hideAnimName: Translate + touchAudio: {fileID: 0} + effectCtr: {fileID: 1669040875} + resetDelayTime: 2 + dissolveDuration: 1 --- !u!1 &1703471208 GameObject: m_ObjectHideFlags: 0 @@ -24232,6 +24776,41 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 +--- !u!114 &1916777213 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1669040852} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9152e17a14030344e9700283f159c637, type: 3} + m_Name: + m_EditorClassIdentifier: + textAnimator: {fileID: 1669040850} + showAnimName: Open + hideAnimName: Translate + touchAudio: {fileID: 0} + effectCtr: {fileID: 1669040851} + resetDelayTime: 2 + dissolveDuration: 1 +--- !u!114 &1916777214 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1669040852} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7877962557443e34f8190e3278bd4a5d, type: 3} + m_Name: + m_EditorClassIdentifier: + resetDelayTime: 2 + downAudio: {fileID: 1669040849} + resetSpeed: 5 + stopDistance: 0.01 --- !u!1 &1917897325 GameObject: m_ObjectHideFlags: 0 @@ -26641,6 +27220,11 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0.053486332 objectReference: {fileID: 0} + - target: {fileID: 1036291357224665655, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1452385352095355107, guid: 154719aa83efcef49b859eb86977282b, type: 3} propertyPath: childAnimator @@ -26686,6 +27270,11 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 1584019124063961870, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1592812620680642537, guid: 154719aa83efcef49b859eb86977282b, type: 3} propertyPath: m_IsActive @@ -26951,6 +27540,21 @@ PrefabInstance: propertyPath: m_Controller value: objectReference: {fileID: 0} + - target: {fileID: 8161102249360962652, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + propertyPath: m_Size.y + value: 0.24 + objectReference: {fileID: 0} + - target: {fileID: 8161102249360962652, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + propertyPath: m_Center.y + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 8881093505385115425, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8950562897089827750, guid: 154719aa83efcef49b859eb86977282b, type: 3} propertyPath: m_IsActive @@ -26996,10 +27600,83 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0.11473056 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 2409218325599829516, guid: 154719aa83efcef49b859eb86977282b, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 540744608131351425, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1669040880} + - targetCorrespondingSourceObject: {fileID: 540744608131351425, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1669040879} + - targetCorrespondingSourceObject: {fileID: 4744321446223401129, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1669040878} + - targetCorrespondingSourceObject: {fileID: 4744321446223401129, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1669040877} + - targetCorrespondingSourceObject: {fileID: 7543529108288770405, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1286764153} + - targetCorrespondingSourceObject: {fileID: 7543529108288770405, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1286764152} + - targetCorrespondingSourceObject: {fileID: 3192491347826420235, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1125489854} + - targetCorrespondingSourceObject: {fileID: 3192491347826420235, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1125489853} + - targetCorrespondingSourceObject: {fileID: 598757103660655143, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1186141058} + - targetCorrespondingSourceObject: {fileID: 598757103660655143, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1186141057} + - targetCorrespondingSourceObject: {fileID: 485069120653305928, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1303206827} + - targetCorrespondingSourceObject: {fileID: 485069120653305928, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1303206826} + - targetCorrespondingSourceObject: {fileID: 4812232402766930262, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1916777214} + - targetCorrespondingSourceObject: {fileID: 4812232402766930262, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1916777213} + - targetCorrespondingSourceObject: {fileID: 7361149329412765406, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + insertIndex: -1 + addedObject: {fileID: 193057871} + - targetCorrespondingSourceObject: {fileID: 7361149329412765406, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + insertIndex: -1 + addedObject: {fileID: 193057870} + - targetCorrespondingSourceObject: {fileID: 356740234646541020, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + insertIndex: -1 + addedObject: {fileID: 322110667} + - targetCorrespondingSourceObject: {fileID: 356740234646541020, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + insertIndex: -1 + addedObject: {fileID: 322110666} m_SourcePrefab: {fileID: 100100000, guid: 154719aa83efcef49b859eb86977282b, type: 3} --- !u!4 &8656849485540867628 stripped Transform: diff --git a/Assets/Scripts/Scene_01/S1_OracleBoneInteract.cs b/Assets/Scripts/Scene_01/S1_OracleBoneInteract.cs new file mode 100644 index 00000000..fa77d012 --- /dev/null +++ b/Assets/Scripts/Scene_01/S1_OracleBoneInteract.cs @@ -0,0 +1,154 @@ +using System.Collections; +using UnityEngine; +using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactables; + +/// +/// S1 天命玄鸟 - 悬浮甲骨交互 +/// +/// 同一 GameObject 需要同时挂 XRGrabInteractable。 +/// +/// 交互逻辑: +/// hover(触摸/靠近,未抓取)→ 播放文字显示动画 +/// selectEntered(抓取) → 隐藏文字,取消归位计时 +/// selectExited(松手) → 延迟后溶解消失 → 瞬间归位 → 溶解出现 +/// +[RequireComponent(typeof(XRGrabInteractable))] +public class S1_OracleBoneInteract : MonoBehaviour +{ + [Header("文字动画")] + [SerializeField] private Animator textAnimator; + [SerializeField] private string showAnimName = "Open"; // 文字出现 + [SerializeField] private string hideAnimName = "Translate"; // 文字消失 + [SerializeField] private AudioSource touchAudio; + + [Header("归位溶解效果")] + [SerializeField] private EffectHideAndShowCtr effectCtr; + [SerializeField] private float resetDelayTime = 2f; // 松手后多久开始归位 + [SerializeField] private float dissolveDuration = 1f; // 溶解动画时长 + + // ── 内部状态 ───────────────────────────────────────────── + private XRGrabInteractable m_grab; + private Rigidbody m_rb; + private Vector3 m_returnPos; + private Quaternion m_returnRot; + private Coroutine m_resetCoroutine; + + // ── 生命周期 ────────────────────────────────────────────── + + private void Awake() + { + m_grab = GetComponent(); + m_rb = GetComponent(); + } + + private void Start() + { + // 记录初始世界位置/旋转作为归位目标 + m_returnPos = transform.position; + m_returnRot = transform.rotation; + } + + private void OnEnable() + { + m_grab.hoverEntered.AddListener(OnHoverEntered); + m_grab.selectEntered.AddListener(OnSelectEntered); + m_grab.selectExited.AddListener(OnSelectExited); + } + + private void OnDisable() + { + m_grab.hoverEntered.RemoveListener(OnHoverEntered); + m_grab.selectEntered.RemoveListener(OnSelectEntered); + m_grab.selectExited.RemoveListener(OnSelectExited); + StopReset(); + } + + // ── XRI 事件 ────────────────────────────────────────────── + + /// 手靠近/触摸(未抓取)→ 显示文字 + private void OnHoverEntered(HoverEnterEventArgs args) + { + if (m_grab.isSelected) return; // 已被抓取中,不重复触发 + ShowText(); + } + + /// 抓取 → 隐藏文字,取消归位计时 + private void OnSelectEntered(SelectEnterEventArgs args) + { + StopReset(); + HideText(); + } + + /// 松手 → 延迟后溶解归位 + private void OnSelectExited(SelectExitEventArgs args) + { + m_resetCoroutine = StartCoroutine(DelayThenReturn()); + } + + // ── 归位协程 ────────────────────────────────────────────── + + private IEnumerator DelayThenReturn() + { + yield return new WaitForSeconds(resetDelayTime); + + // 归位期间禁止被重新抓取 + m_grab.enabled = false; + + // 1. 停止物理运动(避免归位时还在飞) + if (m_rb != null) + { + m_rb.velocity = Vector3.zero; + m_rb.angularVelocity = Vector3.zero; + m_rb.isKinematic = true; + } + + // 2. 溶解消失 + if (effectCtr != null) + effectCtr.Hide(); + + yield return new WaitForSeconds(dissolveDuration); + + // 3. 瞬间归位 + transform.position = m_returnPos; + transform.rotation = m_returnRot; + + // 4. 溶解出现 + if (effectCtr != null) + effectCtr.Show(); + + yield return new WaitForSeconds(dissolveDuration); + + // 5. 恢复交互 + m_grab.enabled = true; + m_resetCoroutine = null; + } + + private void StopReset() + { + if (m_resetCoroutine != null) + { + StopCoroutine(m_resetCoroutine); + m_resetCoroutine = null; + } + // 确保归位中断时交互器恢复可用 + if (m_grab != null) + m_grab.enabled = true; + } + + // ── 文字动画 ────────────────────────────────────────────── + + private void ShowText() + { + if (textAnimator != null) + textAnimator.Play(showAnimName); + if (touchAudio != null) + touchAudio.Play(); + } + + private void HideText() + { + if (textAnimator != null) + textAnimator.Play(hideAnimName); + } +} diff --git a/Assets/Scripts/Scene_01/S1_OracleBoneInteract.cs.meta b/Assets/Scripts/Scene_01/S1_OracleBoneInteract.cs.meta new file mode 100644 index 00000000..0f3fcfb2 --- /dev/null +++ b/Assets/Scripts/Scene_01/S1_OracleBoneInteract.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9152e17a14030344e9700283f159c637 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Yomov/Resources/LBEGlobalCache.asset b/Assets/Yomov/Resources/LBEGlobalCache.asset index c428bdac..ab54249a 100644 --- a/Assets/Yomov/Resources/LBEGlobalCache.asset +++ b/Assets/Yomov/Resources/LBEGlobalCache.asset @@ -720,7 +720,7 @@ MonoBehaviour: isRemovedFromBuildSettings: 0 - sceneGUID: ee715637c0f182e4e999c9738f391545 scenePath: Assets/Scenes/Scene_01.unity - lastFileWriteTime: 134171815164533954 + lastFileWriteTime: 134172423089424073 acts: - id: 4dfe3159-62ab-4bc3-ab9e-cfd44d467f3b name: Scene_01 Act01