This commit is contained in:
kridoo
2025-11-17 16:24:39 +08:00
parent 6658500acb
commit fec7b90249
16 changed files with 4281 additions and 454 deletions

View File

@@ -4,9 +4,9 @@ using UnityEngine;
public class GrabItem : MonoBehaviour
{
public bool restIsBack = false; //<2F>ſ<EFBFBD><C5BF><EFBFBD><EFBFBD>Ƿ񷵻<C7B7>ԭλ<D4AD><CEBB>
public bool isUseRigidbody = false; //<2F>Ƿ<EFBFBD>ʹ<EFBFBD><CAB9><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
private Vector3 startPosition = Vector3.zero; //<2F><>ʼλ<CABC><CEBB>
public bool restIsBack = false; //<2F>ſ<EFBFBD><C5BF><EFBFBD><EFBFBD>Ƿ񷵻<C7B7>ԭλ<D4AD><CEBB>
public bool isUseRigidbody = false; //<2F>Ƿ<EFBFBD>ʹ<EFBFBD><CAB9><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
private Vector3 startPosition = Vector3.zero; //<2F><>ʼλ<CABC><CEBB>
public bool startIsUseRigid = true;
private Rigidbody m_rig;
public Transform m_originParent;
@@ -19,12 +19,12 @@ public class GrabItem : MonoBehaviour
public EffectHideAndShowCtr effectHideAndShowCtr;
//<2F><>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD>
//<2F><>ʱ<EFBFBD><CAB1><EFBFBD>
bool isRun = false;
float waitTime = 2f;
float runTime = 0;
//<2F><>ʱ<EFBFBD>ȴ<EFBFBD><C8B4><EFBFBD>ʾ<EFBFBD><CABE><EFBFBD>ֵĶ<D6B5><C4B6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ч<EFBFBD><D0A7>
//<2F><>ʱ<EFBFBD>ȴ<EFBFBD><C8B4><EFBFBD>ʾ<EFBFBD><CABE><EFBFBD>ֵĶ<D6B5><C4B6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ч<EFBFBD><D0A7>
bool isRun2 = false;
float waitTime2 = 1f;
float runTime2 = 0;
@@ -47,7 +47,7 @@ public class GrabItem : MonoBehaviour
runTime += Time.deltaTime;
if (runTime >= waitTime)
{
//<2F><>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD>
//<2F><>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD>
isRun = false;
runTime = 0;
HideObj();
@@ -108,12 +108,13 @@ public class GrabItem : MonoBehaviour
{
if (other.gameObject.CompareTag("RightHand"))
{
//Debug.Log("Ent<6E><74><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:"+other.gameObject.name);
//Debug.Log("Ent<6E><74><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:"+other.gameObject.name);
SetTriggerParameter("DisTrigger");
SceneMgr.Instance.isTrigger=true;
//if (m_catch == null)
m_catch = other.GetComponent<CatchManager>();
SetTriggerParameter("DisTrigger");
if (m_catch == null) return;
// Debug.Log("111<31>Ƿ<EFBFBD><EFBFBD><EFBFBD>ʼ:"+ m_catch.Start);
// Debug.Log("111<31>Ƿ<EFBFBD>ʼ:"+ m_catch.Start);
if (m_catch.Start)
{
isRun = false;
@@ -128,17 +129,24 @@ public class GrabItem : MonoBehaviour
}
}
}
private void OnTriggerExit(Collider other)
{
if (other.gameObject.CompareTag("RightHand"))
{
SceneMgr.Instance.isTrigger = false;
}
}
private void OnTriggerStay(Collider other)
{
if (other.gameObject.CompareTag("RightHand"))
{
//Debug.Log("Stay<61><79><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"+ other.gameObject.name);
//if (m_catch == null)
m_catch = other.GetComponent<CatchManager>();
//Debug.Log("Stay<61><79><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"+ other.gameObject.name);
m_catch = other.GetComponent<CatchManager>();
if (m_catch == null) return;
//Debug.Log("222<32>Ƿ<EFBFBD><EFBFBD><EFBFBD>ʼ:" + m_catch.Start);
//Debug.Log("222<32>Ƿ<EFBFBD>ʼ:" + m_catch.Start);
if (m_catch.Start)
{
isRun = false;
@@ -171,18 +179,19 @@ public class GrabItem : MonoBehaviour
{
if (this.GetComponent<UpDownMovement>() != null)
{
Debug.Log("<22><><EFBFBD><EFBFBD><EFBFBD>ƶ<EFBFBD>:"+isMove);
Debug.Log("<22><><EFBFBD><EFBFBD><EFBFBD>ƶ<EFBFBD>:"+isMove);
this.GetComponent<UpDownMovement>().isMove = isMove;
}
}
[Header("<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>")]
[SerializeField] private GameObject childAnimator; // ֱ<><D6B1><EFBFBD>϶<EFBFBD><CFB6><EFBFBD><EFBFBD><EFBFBD>
[Header("<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>")]
[SerializeField] private GameObject childAnimator; // ֱ<><D6B1><EFBFBD>϶<EFBFBD><CFB6><EFBFBD>
public void SetTriggerParameter(string parameterName)
{
if (childAnimator != null)
{
Destroy(childAnimator);
childAnimator = null;
}
}