From 6658500acb067f2fc27b89ec2ad8aa2c192dacbb Mon Sep 17 00:00:00 2001 From: kridoo Date: Sat, 15 Nov 2025 14:20:58 +0800 Subject: [PATCH] 1 --- Assets/Scenes/Old/Launcher.unity | 2 +- Assets/Scenes/Scene_00.unity | 28 ++++++++++------------- Assets/Scenes/Scene_01.unity | 33 ++++++++++++++++++++++++++++ Assets/Scripts/HandCatch/GrabItem.cs | 22 +++---------------- 4 files changed, 49 insertions(+), 36 deletions(-) diff --git a/Assets/Scenes/Old/Launcher.unity b/Assets/Scenes/Old/Launcher.unity index ba86d153..ff0f69f8 100644 --- a/Assets/Scenes/Old/Launcher.unity +++ b/Assets/Scenes/Old/Launcher.unity @@ -4479,7 +4479,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _isOffline: 1 - NextSceneId: 10003 + NextSceneId: 10001 --- !u!4 &1249925296 stripped Transform: m_CorrespondingSourceObject: {fileID: 1433784918516034456, guid: ce9599ce44e0e24458ea019ad346716d, diff --git a/Assets/Scenes/Scene_00.unity b/Assets/Scenes/Scene_00.unity index 2efa240b..ae0e1a7a 100644 --- a/Assets/Scenes/Scene_00.unity +++ b/Assets/Scenes/Scene_00.unity @@ -1138,9 +1138,9 @@ Transform: type: 3} m_PrefabInstance: {fileID: 266152219} m_PrefabAsset: {fileID: 0} ---- !u!95 &266152221 stripped -Animator: - m_CorrespondingSourceObject: {fileID: 3180453285060738977, guid: 73ae4c85d47e9ea4eadae5720d5cd39a, +--- !u!1 &266152221 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3686163106370708550, guid: 73ae4c85d47e9ea4eadae5720d5cd39a, type: 3} m_PrefabInstance: {fileID: 266152219} m_PrefabAsset: {fileID: 0} @@ -2074,7 +2074,6 @@ MonoBehaviour: downAudio: {fileID: 1682926738} effectHideAndShowCtr: {fileID: 304835143} childAnimator: {fileID: 1225883578} - Vfx: {fileID: 0} --- !u!54 &424983973 Rigidbody: m_ObjectHideFlags: 0 @@ -4206,9 +4205,9 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1225883576} m_PrefabAsset: {fileID: 0} ---- !u!95 &1225883578 stripped -Animator: - m_CorrespondingSourceObject: {fileID: 5832523621397547280, guid: 2f1fd09bbd1521d42a40511ac5f4aabc, +--- !u!1 &1225883578 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 485971515020599277, guid: 2f1fd09bbd1521d42a40511ac5f4aabc, type: 3} m_PrefabInstance: {fileID: 1225883576} m_PrefabAsset: {fileID: 0} @@ -5687,7 +5686,6 @@ MonoBehaviour: downAudio: {fileID: 1765466125} effectHideAndShowCtr: {fileID: 953777886} childAnimator: {fileID: 266152221} - Vfx: {fileID: 0} --- !u!54 &1885496125 Rigidbody: m_ObjectHideFlags: 0 @@ -6248,7 +6246,6 @@ MonoBehaviour: downAudio: {fileID: 2486525908698656047} effectHideAndShowCtr: {fileID: 5819981134880835058} childAnimator: {fileID: 5653565530626206467} - Vfx: {fileID: 0} --- !u!114 &352400051239525199 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6269,7 +6266,6 @@ MonoBehaviour: downAudio: {fileID: 844986080689518516} effectHideAndShowCtr: {fileID: 8368998440913379781} childAnimator: {fileID: 2334322423654924834} - Vfx: {fileID: 0} --- !u!4 &384174474300625376 Transform: m_ObjectHideFlags: 0 @@ -7834,9 +7830,9 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2334322423654924832} m_PrefabAsset: {fileID: 0} ---- !u!95 &2334322423654924834 stripped -Animator: - m_CorrespondingSourceObject: {fileID: 3180453285060738977, guid: 73ae4c85d47e9ea4eadae5720d5cd39a, +--- !u!1 &2334322423654924834 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3686163106370708550, guid: 73ae4c85d47e9ea4eadae5720d5cd39a, type: 3} m_PrefabInstance: {fileID: 2334322423654924832} m_PrefabAsset: {fileID: 0} @@ -10096,9 +10092,9 @@ Transform: type: 3} m_PrefabInstance: {fileID: 5653565530626206465} m_PrefabAsset: {fileID: 0} ---- !u!95 &5653565530626206467 stripped -Animator: - m_CorrespondingSourceObject: {fileID: 5832523621397547280, guid: 2f1fd09bbd1521d42a40511ac5f4aabc, +--- !u!1 &5653565530626206467 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 485971515020599277, guid: 2f1fd09bbd1521d42a40511ac5f4aabc, type: 3} m_PrefabInstance: {fileID: 5653565530626206465} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Scenes/Scene_01.unity b/Assets/Scenes/Scene_01.unity index fb66d453..695c78f9 100644 --- a/Assets/Scenes/Scene_01.unity +++ b/Assets/Scenes/Scene_01.unity @@ -713,6 +713,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 8656849485540867627} m_PrefabAsset: {fileID: 0} +--- !u!1 &116081856 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3101147304272225910, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + m_PrefabInstance: {fileID: 8656849485540867627} + m_PrefabAsset: {fileID: 0} --- !u!1 &124334115 GameObject: m_ObjectHideFlags: 0 @@ -24274,6 +24280,12 @@ MonoBehaviour: m_FirstSelected: {fileID: 0} m_sendNavigationEvents: 1 m_DragThreshold: 10 +--- !u!1 &1929784093 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8710921039696807225, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + m_PrefabInstance: {fileID: 8656849485540867627} + m_PrefabAsset: {fileID: 0} --- !u!1 &1931227709 GameObject: m_ObjectHideFlags: 0 @@ -24462,6 +24474,12 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1937647117} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1942423265 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3524266666914695879, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + m_PrefabInstance: {fileID: 8656849485540867627} + m_PrefabAsset: {fileID: 0} --- !u!1 &1956451857 GameObject: m_ObjectHideFlags: 0 @@ -26591,6 +26609,16 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0.035767082 objectReference: {fileID: 0} + - target: {fileID: 6752486292721757352, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + propertyPath: childAnimator + value: + objectReference: {fileID: 116081856} + - target: {fileID: 7303050080752662717, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + propertyPath: childAnimator + value: + objectReference: {fileID: 1929784093} - target: {fileID: 7955468460808116785, guid: 154719aa83efcef49b859eb86977282b, type: 3} propertyPath: m_LocalPosition.x @@ -26636,6 +26664,11 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 8959811391412185859, guid: 154719aa83efcef49b859eb86977282b, + type: 3} + propertyPath: childAnimator + value: + objectReference: {fileID: 1942423265} - target: {fileID: 8984475541639148132, guid: 154719aa83efcef49b859eb86977282b, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/Scripts/HandCatch/GrabItem.cs b/Assets/Scripts/HandCatch/GrabItem.cs index ad21945a..7c25ddbb 100644 --- a/Assets/Scripts/HandCatch/GrabItem.cs +++ b/Assets/Scripts/HandCatch/GrabItem.cs @@ -176,30 +176,14 @@ public class GrabItem : MonoBehaviour } } [Header("动画控制")] - [SerializeField] private Animator childAnimator; // 直接拖动绑定 + [SerializeField] private GameObject childAnimator; // 直接拖动绑定 public void SetTriggerParameter(string parameterName) { if (childAnimator != null) { - childAnimator.SetTrigger(parameterName); - } - } - - public void SetIntegerParameter(string parameterName, int value) - { - if (childAnimator != null) - { - childAnimator.SetInteger(parameterName, value); - } - } - - // 示例方法：播放特定动画状态 - public void PlayAnimationState(string stateName) - { - if (childAnimator != null) - { - childAnimator.Play(stateName); + Destroy(childAnimator); } } + }