diff --git a/Assets/Res/Timelines/00_timeline.playable b/Assets/Res/Timelines/00_timeline.playable index b826c9b0..9bf15b3c 100644 --- a/Assets/Res/Timelines/00_timeline.playable +++ b/Assets/Res/Timelines/00_timeline.playable @@ -449,7 +449,7 @@ MonoBehaviour: m_Start: 80.56666666666666 m_ClipIn: 0 m_Asset: {fileID: 4674024635053442591} - m_Duration: 56.63118773506335 + m_Duration: 54.33333333333334 m_TimeScale: 1 m_ParentTrack: {fileID: -4150429269391175459} m_EaseInDuration: 0 diff --git a/Assets/Scripts/HandCatch/CatchManager.cs b/Assets/Scripts/HandCatch/CatchManager.cs index 0b447be5..39d5dece 100644 --- a/Assets/Scripts/HandCatch/CatchManager.cs +++ b/Assets/Scripts/HandCatch/CatchManager.cs @@ -66,5 +66,7 @@ public class CatchManager : MonoBehaviour { Destroy(child.gameObject); } + start = true; + m_collider.enabled = true ; } } diff --git a/Assets/Scripts/HandCatch/GrabItem.cs b/Assets/Scripts/HandCatch/GrabItem.cs index f9025264..02b088fa 100644 --- a/Assets/Scripts/HandCatch/GrabItem.cs +++ b/Assets/Scripts/HandCatch/GrabItem.cs @@ -108,7 +108,7 @@ public class GrabItem : MonoBehaviour { if (other.gameObject.CompareTag("RightHand")) { - //Debug.Log("Ent������:"+other.gameObject.name); + //Debug.Log("Ent������:"+other.gameObject.name);0 SetTriggerParameter("DisTrigger"); SceneMgr.Instance.isTrigger=true; //if (m_catch == null)