This commit is contained in:
kridoo
2025-11-19 23:51:17 +08:00
parent 0ba6ef05dd
commit 6019406bc8
16 changed files with 375 additions and 72 deletions

View File

@@ -22,16 +22,16 @@ public class AnimalCatchCtr : MonoBehaviour
//<2F><><EFBFBD>ֻ<EFBFBD><D6BB><EFBFBD>ץ<EFBFBD>ŵ<EFBFBD><C5B5><EFBFBD><EFBFBD><EFBFBD>
public void LeftHandPosCatch(bool isShow)
{
if (isShow)
{
GlobalEventMgr.Dispatch(GameEvent.EventRayStart,1);//1:<3A><><EFBFBD><EFBFBD>
//Debug.Log("ץȡ<D7A5><C8A1><EFBFBD><EFBFBD>ʶ<EFBFBD><CAB6><EFBFBD>ɹ<EFBFBD><C9B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
}
else
{
//Debug.Log("<22>ɿ<EFBFBD><C9BF><EFBFBD><EFBFBD><EFBFBD>ʶ<EFBFBD><CAB6><EFBFBD>ɹ<EFBFBD><C9B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
//GlobalEventMgr.Dispatch(GameEvent.EventRayQuadOk, false,1);
}
//if (isShow)
//{
// GlobalEventMgr.Dispatch(GameEvent.EventRayStart,1);//1:<3A><><EFBFBD><EFBFBD>
// //Debug.Log("ץȡ<D7A5><C8A1><EFBFBD><EFBFBD>ʶ<EFBFBD><CAB6><EFBFBD>ɹ<EFBFBD><C9B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
//}
//else
//{
// //Debug.Log("<22>ɿ<EFBFBD><C9BF><EFBFBD><EFBFBD><EFBFBD>ʶ<EFBFBD><CAB6><EFBFBD>ɹ<EFBFBD><C9B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
// //GlobalEventMgr.Dispatch(GameEvent.EventRayQuadOk, false,1);
//}
}
//<2F><><EFBFBD>ֻ<EFBFBD><D6BB><EFBFBD>ץ<EFBFBD>ŵ<EFBFBD><C5B5><EFBFBD><EFBFBD><EFBFBD>
@@ -52,12 +52,12 @@ public class AnimalCatchCtr : MonoBehaviour
//<2F><><EFBFBD><EFBFBD>ץȡ<D7A5><C8A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
public void LeftHandCatchPalmUp(bool isShowFont)
{
if (isShowFont)
{
Debug.Log("<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϻ<EFBFBD>ȡ<EFBFBD><C8A1>:"+ AnimalCatchMgr.Instance.leftHandIsCatchObj);
//if(AnimalCatchMgr.Instance.handIsCatchObj)
GlobalEventMgr.Dispatch(GameEvent.EventHandShowFont,1, AnimalCatchMgr.Instance.leftAnimalType);
}
//if (isShowFont)
//{
// Debug.Log("<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϻ<EFBFBD>ȡ<EFBFBD><C8A1>:"+ AnimalCatchMgr.Instance.leftHandIsCatchObj);
// //if(AnimalCatchMgr.Instance.handIsCatchObj)
// GlobalEventMgr.Dispatch(GameEvent.EventHandShowFont,1, AnimalCatchMgr.Instance.leftAnimalType);
//}
}
//<2F><><EFBFBD><EFBFBD>ץȡ<D7A5><C8A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>

View File

@@ -29,6 +29,8 @@ public class RayCtr : MonoBehaviour
void Start()
{
GlobalEventMgr.Listen<int>(GameEvent.EventRayStart, GameDataManage_EventRayStart);
GlobalEventMgr.Listen<int>(GameEvent.EventHandRelease, GameDataManage_EventHandRelease);
//// <20><><EFBFBD><EFBFBD>LineRenderer<65><72><EFBFBD><EFBFBD>
//lineRenderer = gameObject.AddComponent<LineRenderer>();
@@ -62,7 +64,7 @@ public class RayCtr : MonoBehaviour
// lineRenderer.endColor = rayColor;
// }
//}
// Update is called once per frame
void Update()
{
@@ -74,20 +76,16 @@ public class RayCtr : MonoBehaviour
{
Debug.DrawRay(transform.position, transform.forward * rayLength, Color.red);
Ray ray;
if (SceneMgr.Instance.nowSceneId == 2)
{
ray = new Ray(transform.position, transform.forward);
}
else
{
var Cam = Camera.main;
ray = new Ray(Cam.transform.position, Cam.transform.forward);
ray = new Ray(transform.position, transform.forward);
Ray ray2;
var Cam = Camera.main;
ray2 = new Ray(Cam.transform.position, Cam.transform.forward);
}
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>λ<EFBFBD><CEBB><EFBFBD><EFBFBD>ǰ<EFBFBD><C7B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
RaycastHit hit; // <20><EFBFBD><E6B4A2><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ײ<EFBFBD><D7B2>Ϣ
//Debug.Log("<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>......<2E><>1<EFBFBD><31>");
if (Physics.Raycast(ray, out hit, rayLength, detectionLayer))
if (Physics.Raycast(ray, out hit, rayLength, detectionLayer)&& Physics.Raycast(ray2, out hit, rayLength, detectionLayer))
{
GameObject hitObject = hit.collider.gameObject; // <20><>ȡ<EFBFBD><C8A1>ײ<EFBFBD><D7B2><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
@@ -95,7 +93,7 @@ public class RayCtr : MonoBehaviour
if ("Quad" == hitObject.name.Substring(0, 4))
{
fontIndex = int.Parse(hitObject.name.Substring(4));
Debug.Log("<22><><EFBFBD>˵ڼ<CBB5><DABC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>......" + fontIndex);
//Debug.Log("<22><><EFBFBD>˵ڼ<CBB5><DABC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>......" + fontIndex);
starRay = false;
isRun = false;
runTime = 0;
@@ -128,5 +126,15 @@ public class RayCtr : MonoBehaviour
runTime = 0;
}
}
void GameDataManage_EventHandRelease(int type)
{
//Debug.Log("<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:"+type);
if (myhandType == type)
{
starRay = false;
isRun = false;
runTime = 0;
}
}
}