diff --git a/Assets/D5VR/TestResource/TechVideo.mp4 b/Assets/D5VR/TestResource/TechVideo.mp4 index 95013ca7..5f78ecf3 100644 Binary files a/Assets/D5VR/TestResource/TechVideo.mp4 and b/Assets/D5VR/TestResource/TechVideo.mp4 differ diff --git a/Assets/Res/Models/Environments/Intro/Materials/OutLine_Blue.mat b/Assets/Res/Models/Environments/Intro/Materials/OutLine_Blue.mat index 4879de1c..0d24742f 100644 --- a/Assets/Res/Models/Environments/Intro/Materials/OutLine_Blue.mat +++ b/Assets/Res/Models/Environments/Intro/Materials/OutLine_Blue.mat @@ -29,7 +29,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3002 + m_CustomRenderQueue: 2002 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: diff --git a/Assets/Res/Models/Environments/Intro/Materials/RedFrame_Intro.mat b/Assets/Res/Models/Environments/Intro/Materials/RedFrame_Intro.mat index 91cbff06..76936e4a 100644 --- a/Assets/Res/Models/Environments/Intro/Materials/RedFrame_Intro.mat +++ b/Assets/Res/Models/Environments/Intro/Materials/RedFrame_Intro.mat @@ -16,7 +16,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3005 + m_CustomRenderQueue: 2005 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: _AlphaTex diff --git a/Assets/Res/Models/Environments/Intro/Materials/WhiteFrame_Intro.mat b/Assets/Res/Models/Environments/Intro/Materials/WhiteFrame_Intro.mat index fa8e4966..093210c7 100644 --- a/Assets/Res/Models/Environments/Intro/Materials/WhiteFrame_Intro.mat +++ b/Assets/Res/Models/Environments/Intro/Materials/WhiteFrame_Intro.mat @@ -16,7 +16,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3005 + m_CustomRenderQueue: 2005 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: _AlphaTex diff --git a/Assets/Scenes/Old/Launcher.unity b/Assets/Scenes/Old/Launcher.unity index cad16b6d..cf6e27f4 100644 --- a/Assets/Scenes/Old/Launcher.unity +++ b/Assets/Scenes/Old/Launcher.unity @@ -3103,6 +3103,12 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 820055824} m_CullTransparentMesh: 1 +--- !u!1 &827424209 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2023683129556986397, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, + type: 3} + m_PrefabInstance: {fileID: 2016766474} + m_PrefabAsset: {fileID: 0} --- !u!1001 &939980832 PrefabInstance: m_ObjectHideFlags: 0 @@ -4484,7 +4490,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _isOffline: 1 - NextSceneId: 10000 + NextSceneId: 10002 --- !u!4 &1249925296 stripped Transform: m_CorrespondingSourceObject: {fileID: 1433784918516034456, guid: ce9599ce44e0e24458ea019ad346716d, @@ -6696,6 +6702,18 @@ MonoBehaviour: cub: {fileID: 1060132188} plam: {fileID: 964771995} lookatPosition: {fileID: 1052907142} +--- !u!114 &1929272373 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3502075511356859790, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, + type: 3} + m_PrefabInstance: {fileID: 2016766474} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c0efe83764dc8314697bedfa22710258, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &1952505398 PrefabInstance: m_ObjectHideFlags: 0 @@ -7082,6 +7100,121 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 2104909604202173943, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, + type: 3} + propertyPath: m_Handedness + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2976268035275492179, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, + type: 3} + propertyPath: testCube + value: + objectReference: {fileID: 0} + - target: {fileID: 3502075511356859790, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, + type: 3} + propertyPath: v1 + value: + objectReference: {fileID: 0} + - target: {fileID: 3502075511356859790, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, + type: 3} + propertyPath: v2 + value: + objectReference: {fileID: 0} + - target: {fileID: 3502075511356859790, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, + type: 3} + propertyPath: v3 + value: + objectReference: {fileID: 0} + - target: {fileID: 3502075511356859790, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, + type: 3} + propertyPath: test1 + value: + objectReference: {fileID: 0} + - target: {fileID: 3502075511356859790, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, + type: 3} + propertyPath: test2 + value: + objectReference: {fileID: 0} + - target: {fileID: 3502075511356859790, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, + type: 3} + propertyPath: test3 + value: + objectReference: {fileID: 0} + - target: {fileID: 3527815017421743119, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, + type: 3} + propertyPath: handPoseEnd.m_PersistentCalls.m_Calls.Array.size + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3527815017421743119, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, + type: 3} + propertyPath: handPoseUpdate.m_PersistentCalls.m_Calls.Array.size + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3527815017421743119, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, + type: 3} + propertyPath: handPoseEnd.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 3527815017421743119, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, + type: 3} + propertyPath: handPoseEnd.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1929272373} + - target: {fileID: 3527815017421743119, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, + type: 3} + propertyPath: handPoseEnd.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3527815017421743119, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, + type: 3} + propertyPath: handPoseEnd.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: SetEnd + objectReference: {fileID: 0} + - target: {fileID: 3527815017421743119, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, + type: 3} + propertyPath: handPoseStart.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: SetStart + objectReference: {fileID: 0} + - target: {fileID: 3527815017421743119, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, + type: 3} + propertyPath: handPoseUpdate.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3527815017421743119, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, + type: 3} + propertyPath: handPoseEnd.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: CatchManager, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 3527815017421743119, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, + type: 3} + propertyPath: handPoseEnd.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_BoolArgument + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3527815017421743119, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, + type: 3} + propertyPath: handPoseEnd.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 3654236315388489143, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, + type: 3} + propertyPath: handobj + value: + objectReference: {fileID: 827424209} + - target: {fileID: 3654236315388489143, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, + type: 3} + propertyPath: testCube + value: + objectReference: {fileID: 0} + - target: {fileID: 3774916886869996527, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4134069240938312508, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, + type: 3} + propertyPath: m_Handedness + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4834088618036615507, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, type: 3} propertyPath: m_Name @@ -7137,6 +7270,161 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6421715568953444632, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, + type: 3} + propertyPath: handPoseEnd.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6421715568953444632, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, + type: 3} + propertyPath: handPoseStart.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6421715568953444632, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, + type: 3} + propertyPath: handPoseUpdate.m_PersistentCalls.m_Calls.Array.size + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6421715568953444632, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, + type: 3} + propertyPath: handPoseEnd.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 6421715568953444632, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, + type: 3} + propertyPath: handPoseEnd.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1929272373} + - target: {fileID: 6421715568953444632, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, + type: 3} + propertyPath: handPoseStart.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 6421715568953444632, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, + type: 3} + propertyPath: handPoseStart.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 6421715568953444632, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, + type: 3} + propertyPath: handPoseUpdate.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 6421715568953444632, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, + type: 3} + propertyPath: handPoseStart.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1929272373} + - target: {fileID: 6421715568953444632, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, + type: 3} + propertyPath: handPoseStart.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 1929272373} + - target: {fileID: 6421715568953444632, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, + type: 3} + propertyPath: handPoseEnd.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6421715568953444632, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, + type: 3} + propertyPath: handPoseUpdate.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1929272373} + - target: {fileID: 6421715568953444632, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, + type: 3} + propertyPath: handPoseEnd.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: SetEnd + objectReference: {fileID: 0} + - target: {fileID: 6421715568953444632, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, + type: 3} + propertyPath: handPoseStart.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6421715568953444632, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, + type: 3} + propertyPath: handPoseStart.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6421715568953444632, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, + type: 3} + propertyPath: handPoseStart.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: SetStart + objectReference: {fileID: 0} + - target: {fileID: 6421715568953444632, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, + type: 3} + propertyPath: handPoseStart.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: SetStart + objectReference: {fileID: 0} + - target: {fileID: 6421715568953444632, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, + type: 3} + propertyPath: handPoseUpdate.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6421715568953444632, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, + type: 3} + propertyPath: handPoseUpdate.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: SetStart + objectReference: {fileID: 0} + - target: {fileID: 6421715568953444632, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, + type: 3} + propertyPath: handPoseEnd.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: CatchManager, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 6421715568953444632, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, + type: 3} + propertyPath: handPoseEnd.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_BoolArgument + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6421715568953444632, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, + type: 3} + propertyPath: handPoseStart.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: CatchManager, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 6421715568953444632, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, + type: 3} + propertyPath: handPoseStart.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: CatchManager, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 6421715568953444632, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, + type: 3} + propertyPath: handPoseUpdate.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: CatchManager, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 6421715568953444632, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, + type: 3} + propertyPath: handPoseStart.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_BoolArgument + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6421715568953444632, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, + type: 3} + propertyPath: handPoseStart.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_BoolArgument + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6421715568953444632, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, + type: 3} + propertyPath: handPoseUpdate.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_BoolArgument + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6421715568953444632, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, + type: 3} + propertyPath: handPoseEnd.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 6421715568953444632, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, + type: 3} + propertyPath: handPoseStart.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 6421715568953444632, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, + type: 3} + propertyPath: handPoseStart.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 6421715568953444632, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, + type: 3} + propertyPath: handPoseUpdate.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 7879158823761601897, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, type: 3} propertyPath: m_target diff --git a/Assets/Scenes/Scene_05.unity b/Assets/Scenes/Scene_05.unity index d7b73d44..4ab95f24 100644 --- a/Assets/Scenes/Scene_05.unity +++ b/Assets/Scenes/Scene_05.unity @@ -8037,7 +8037,7 @@ PrefabInstance: - target: {fileID: 41330033827983655, guid: 2de3bf9ac390ec74fb7966c1afa122f5, type: 3} propertyPath: m_LocalScale.x - value: 0.62 + value: 0.8 objectReference: {fileID: 0} - target: {fileID: 41330033827983655, guid: 2de3bf9ac390ec74fb7966c1afa122f5, type: 3} @@ -8049,6 +8049,11 @@ PrefabInstance: propertyPath: m_LocalPosition.x value: 1 objectReference: {fileID: 0} + - target: {fileID: 41330033827983655, guid: 2de3bf9ac390ec74fb7966c1afa122f5, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.68 + objectReference: {fileID: 0} - target: {fileID: 344456212405456365, guid: 2de3bf9ac390ec74fb7966c1afa122f5, type: 3} propertyPath: m_IsActive diff --git a/Assets/Scripts/Hand/HandCatchFontCtr.cs b/Assets/Scripts/Hand/HandCatchFontCtr.cs index 152abb42..848cdbba 100644 --- a/Assets/Scripts/Hand/HandCatchFontCtr.cs +++ b/Assets/Scripts/Hand/HandCatchFontCtr.cs @@ -67,11 +67,15 @@ public class HandCatchFontCtr : MonoBehaviour if (rightRunTime >= rightWaitTime) { isRightStartStay = false; - GlobalEventMgr.Dispatch(GameEvent.EventRayStart, 2);//2:右手 + GlobalEventMgr.Dispatch(GameEvent.EventRayStart,2);//2:右手 } } } - + public void RightHandPosCatchReset() + { + isRightStartStay = false; + rightRunTime = 0; + } public void RightHandPosCatchEnd(bool isShow) { isRightStartStay = false; diff --git a/Assets/Scripts/Hand/NengNiangQiuCtr.cs b/Assets/Scripts/Hand/NengNiangQiuCtr.cs index 49b517ef..5c63da2b 100644 --- a/Assets/Scripts/Hand/NengNiangQiuCtr.cs +++ b/Assets/Scripts/Hand/NengNiangQiuCtr.cs @@ -14,6 +14,7 @@ public class NengNiangQiuCtr : MonoBehaviour // Start is called before the first frame update void Start() { + GlobalEventMgr.Listen(GameEvent.EventRayQuadOk, GameDataManage_EventRayQuadOk); GlobalEventMgr.Listen(GameEvent.EventHandRelease, GameDataManage_EventHandRelease); GlobalEventMgr.Listen(GameEvent.EventHideCatchFont, GameDataManage_EventHideCatchFont); diff --git a/Assets/Scripts/HandCatch/CatchManager.cs b/Assets/Scripts/HandCatch/CatchManager.cs index 39d5dece..6e73e0b1 100644 --- a/Assets/Scripts/HandCatch/CatchManager.cs +++ b/Assets/Scripts/HandCatch/CatchManager.cs @@ -30,12 +30,16 @@ public class CatchManager : MonoBehaviour m_collider = GetComponent(); GlobalEventMgr.Listen(GameEvent.EventChangeScence, GameDataManage_EventChangeScence); } + public void SetStart(bool value) { - //Debug.Log("识别了抓取手势:"+value); + + Start = value; + } + public void SetEnd(bool value) + { Start = value; } - public void SetCurrentItem(GrabItem item) { if(item == null) diff --git a/Assets/Scripts/Help/SelfCharacterControllCtr.cs b/Assets/Scripts/Help/SelfCharacterControllCtr.cs index f24a3521..0014e7c6 100644 --- a/Assets/Scripts/Help/SelfCharacterControllCtr.cs +++ b/Assets/Scripts/Help/SelfCharacterControllCtr.cs @@ -2,6 +2,8 @@ using System.Collections; using System.Collections.Generic; using BigSpace.Logic; using BigSpace.XRCore.Event; +using RenderHeads.Media.AVProVideo; +using Unity.XR.PXR; using UnityEngine; public class SelfCharacterControllCtr : MonoBehaviour @@ -9,18 +11,13 @@ public class SelfCharacterControllCtr : MonoBehaviour public GameObject bodyBox; CharacterController characterCtr; // Start is called before the first frame update + void Start() { GlobalEventMgr.Listen(GameEvent.EventSetReadyCatchAnimal, GameDataManage_EventSetReadyCatchAnimal); characterCtr = GetComponent(); } - - // Update is called once per frame - void Update() - { - - } - + void GameDataManage_EventSetReadyCatchAnimal(bool isShow) { if (isShow) @@ -36,3 +33,6 @@ public class SelfCharacterControllCtr : MonoBehaviour } } + + + \ No newline at end of file diff --git a/Assets/Scripts/Leave/LeavePlayPrefabControll.cs b/Assets/Scripts/Leave/LeavePlayPrefabControll.cs index c20e9373..79e4e3e7 100644 --- a/Assets/Scripts/Leave/LeavePlayPrefabControll.cs +++ b/Assets/Scripts/Leave/LeavePlayPrefabControll.cs @@ -29,14 +29,8 @@ public class LeavePlayPrefabControll : MonoBehaviour //GameObject staticObj = gameScene.transform.Find("Static").gameObject; //gameScene.transform.Find("Static").gameObject.SetActive(false); //Renderer[] renderers = staticObj.GetComponentsInChildren(); - //for (int i = 0; i < renderers.Length-1; i++) - //{ - // renderers[i].enabled = false; - //} - //gameScene.transform.Find("Dynamic").gameObject.SetActive(false); SetObjsRender(false); - GameObject gameEnvi = GameObject.Find("GameScene/Environment/SkyBox_360Player"); SetGameObjectLayer(gameEnvi, false); leavePrefab.transform.position = new Vector3(v3.x, 0, v3.z); @@ -64,16 +58,22 @@ public class LeavePlayPrefabControll : MonoBehaviour boxCollider.transform.localScale = new Vector3(1, 1, 1.5f); //block.SetActive(true); } - public void SetObjsRender(bool isActive) { GameObject gameScene = GameObject.Find("GameScene"); GameObject staticObj = gameScene.transform.Find("Static").gameObject; + GameObject Dog_Root = GameObject.Find("GameScene/Dynamic/Character/Dog_Root"); + if (Dog_Root!=null) + { + Dog_Root.gameObject.SetActive(isActive); + } + // 浣跨敤閫掑綊鏂规硶鑾峰彇鎵鏈夊瓙鐗╀綋鐨凴enderer缁勪欢 List staticRenderers = GetAllRenderersRecursive(staticObj); for (int i = 0; i < staticRenderers.Count; i++) { staticRenderers[i].enabled = isActive; + } GameObject dynamicObj = gameScene.transform.Find("Dynamic").gameObject; @@ -153,25 +153,15 @@ public class LeavePlayPrefabControll : MonoBehaviour return; } - // 妫鏌ユ槸鍚︽湁纰版挒鍣ㄦ垨瑙﹀彂鍣紝濡傛灉鏈夊垯璺宠繃璇ヨ妭鐐癸紝淇濇寔鍘熺姸 - Collider collider = parent.GetComponent(); - if (collider != null) - { - // 濡傛灉鑺傜偣涓婃湁纰版挒鍣ㄦ垨瑙﹀彂鍣紝璺宠繃璇ヨ妭鐐圭殑Renderer锛岀户缁亶鍘嗗瓙鐗╀綋 - foreach (Transform child in parent) - { - GetAllRenderersRecursive(child, renderers, includeInactive); - } - return; - } // 鑾峰彇褰撳墠鐗╀綋鐨凴enderer缁勪欢 Renderer renderer = parent.GetComponent(); + if (renderer != null) { renderers.Add(renderer); } - + // 閫掑綊閬嶅巻鎵鏈夊瓙鐗╀綋 foreach (Transform child in parent) { diff --git a/Assets/Scripts/Scene_02/AnimalCatchCtr.cs b/Assets/Scripts/Scene_02/AnimalCatchCtr.cs index 2fe0aaf6..bcf5c0e0 100644 --- a/Assets/Scripts/Scene_02/AnimalCatchCtr.cs +++ b/Assets/Scripts/Scene_02/AnimalCatchCtr.cs @@ -22,16 +22,16 @@ public class AnimalCatchCtr : MonoBehaviour //左手获得抓放的手势 public void LeftHandPosCatch(bool isShow) { - if (isShow) - { - GlobalEventMgr.Dispatch(GameEvent.EventRayStart,1);//1:左手 - //Debug.Log("抓取手势识别成功进来了"); - } - else - { - //Debug.Log("松开手势识别成功进来了"); - //GlobalEventMgr.Dispatch(GameEvent.EventRayQuadOk, false,1); - } + //if (isShow) + //{ + // GlobalEventMgr.Dispatch(GameEvent.EventRayStart,1);//1:左手 + // //Debug.Log("抓取手势识别成功进来了"); + //} + //else + //{ + // //Debug.Log("松开手势识别成功进来了"); + // //GlobalEventMgr.Dispatch(GameEvent.EventRayQuadOk, false,1); + //} } //右手获得抓放的手势 @@ -52,12 +52,12 @@ public class AnimalCatchCtr : MonoBehaviour //左手抓取手势手掌向上 public void LeftHandCatchPalmUp(bool isShowFont) { - if (isShowFont) - { - Debug.Log("手势向上获取到:"+ AnimalCatchMgr.Instance.leftHandIsCatchObj); - //if(AnimalCatchMgr.Instance.handIsCatchObj) - GlobalEventMgr.Dispatch(GameEvent.EventHandShowFont,1, AnimalCatchMgr.Instance.leftAnimalType); - } + //if (isShowFont) + //{ + // Debug.Log("手势向上获取到:"+ AnimalCatchMgr.Instance.leftHandIsCatchObj); + // //if(AnimalCatchMgr.Instance.handIsCatchObj) + // GlobalEventMgr.Dispatch(GameEvent.EventHandShowFont,1, AnimalCatchMgr.Instance.leftAnimalType); + //} } //右手抓取手势手掌向上 diff --git a/Assets/Scripts/Scene_02/RayCtr.cs b/Assets/Scripts/Scene_02/RayCtr.cs index 0d5bb0b4..a58554a5 100644 --- a/Assets/Scripts/Scene_02/RayCtr.cs +++ b/Assets/Scripts/Scene_02/RayCtr.cs @@ -29,6 +29,8 @@ public class RayCtr : MonoBehaviour void Start() { GlobalEventMgr.Listen(GameEvent.EventRayStart, GameDataManage_EventRayStart); + GlobalEventMgr.Listen(GameEvent.EventHandRelease, GameDataManage_EventHandRelease); + //// 创建LineRenderer组件 //lineRenderer = gameObject.AddComponent(); @@ -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); - } // 从物体位置向前方发射射线 RaycastHit hit; // 存储射线碰撞信息 //Debug.Log("调用了射线......第1步"); - 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; // 获取碰撞到的物体 @@ -95,7 +93,7 @@ public class RayCtr : MonoBehaviour if ("Quad" == hitObject.name.Substring(0, 4)) { fontIndex = int.Parse(hitObject.name.Substring(4)); - Debug.Log("对了第几个文字......" + fontIndex); + //Debug.Log("对了第几个文字......" + fontIndex); starRay = false; isRun = false; runTime = 0; @@ -128,5 +126,15 @@ public class RayCtr : MonoBehaviour runTime = 0; } } - + void GameDataManage_EventHandRelease(int type) + { + //Debug.Log("调用了:"+type); + if (myhandType == type) + { + starRay = false; + isRun = false; + runTime = 0; + } + } + } diff --git a/Assets/Scripts/XRCore/Scene/SceneMgr.cs b/Assets/Scripts/XRCore/Scene/SceneMgr.cs index f557aad1..bc0dbda7 100644 --- a/Assets/Scripts/XRCore/Scene/SceneMgr.cs +++ b/Assets/Scripts/XRCore/Scene/SceneMgr.cs @@ -6,7 +6,7 @@ using BigSpace.XRCore.Scene; using System; using BigSpace.XRCore.Event; using BigSpace.Logic; - +using Unity.XR.PXR; public class SceneMgr : MonoSingleton { private Coroutine _currentCoroutine; // 当前正在进行的场景切换协程 @@ -15,6 +15,7 @@ public class SceneMgr : MonoSingleton public int nowSceneId = 0; //当前正式的场景(不包括中间过度场景) public bool isCanMove = true;//是否可以用手柄走动 public bool isTrigger = false; + public bool handisactive = false; /// /// 初始化场景管理器 /// @@ -29,7 +30,7 @@ public class SceneMgr : MonoSingleton { SceneManager.sceneLoaded += OnSceneLoaded; } - + private void OnSceneLoaded(Scene arg0, LoadSceneMode arg1) { diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 2e750cc7..22709ee6 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -14,25 +14,25 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/Old/Loading.unity guid: 3cfa99d38790d7d41b7c96b45739c19d - - enabled: 1 + - enabled: 0 path: Assets/Scenes/Scene_00.unity guid: 19c6213d43d0a514380c61578667dc1b - - enabled: 1 + - enabled: 0 path: Assets/Scenes/Scene_01.unity guid: ee715637c0f182e4e999c9738f391545 - enabled: 1 path: Assets/Scenes/Scene_02.unity guid: 8eaab09c0bef06b44ab38fbc9851bc95 - - enabled: 1 + - enabled: 0 path: Assets/Scenes/Scene_03.unity guid: 9420365d551014747bb1aef28ff7b718 - - enabled: 1 + - enabled: 0 path: Assets/Scenes/Scene_04.unity guid: ad379b1b85275984793e924b36290ea2 - - enabled: 1 + - enabled: 0 path: Assets/Scenes/Scene_05.unity guid: cbbc9f554f205bc48b38a1049fdc0cbf - - enabled: 1 + - enabled: 0 path: Assets/Scenes/Scene_06.unity guid: 15dffa1af456bc64d89b160385f36b7a m_configObjects: diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index f7fc734e..c7e99167 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -141,6 +141,8 @@ PlayerSettings: bundleVersion: 1.0 preloadedAssets: - {fileID: 11400000, guid: 9e7be553448fa2546aea5752021cbcf7, type: 2} + - {fileID: -1506098009177567215, guid: f2f89e34580da664ea7627784c93a3d6, type: 2} + - {fileID: 11400000, guid: 846a6119e15216d4fbad905eb21e4169, type: 2} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1