1
This commit is contained in:
Binary file not shown.
@@ -29,7 +29,7 @@ Material:
|
|||||||
m_LightmapFlags: 4
|
m_LightmapFlags: 4
|
||||||
m_EnableInstancingVariants: 0
|
m_EnableInstancingVariants: 0
|
||||||
m_DoubleSidedGI: 0
|
m_DoubleSidedGI: 0
|
||||||
m_CustomRenderQueue: 3002
|
m_CustomRenderQueue: 2002
|
||||||
stringTagMap: {}
|
stringTagMap: {}
|
||||||
disabledShaderPasses: []
|
disabledShaderPasses: []
|
||||||
m_LockedProperties:
|
m_LockedProperties:
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ Material:
|
|||||||
m_LightmapFlags: 4
|
m_LightmapFlags: 4
|
||||||
m_EnableInstancingVariants: 0
|
m_EnableInstancingVariants: 0
|
||||||
m_DoubleSidedGI: 0
|
m_DoubleSidedGI: 0
|
||||||
m_CustomRenderQueue: 3005
|
m_CustomRenderQueue: 2005
|
||||||
stringTagMap: {}
|
stringTagMap: {}
|
||||||
disabledShaderPasses: []
|
disabledShaderPasses: []
|
||||||
m_LockedProperties: _AlphaTex
|
m_LockedProperties: _AlphaTex
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ Material:
|
|||||||
m_LightmapFlags: 4
|
m_LightmapFlags: 4
|
||||||
m_EnableInstancingVariants: 0
|
m_EnableInstancingVariants: 0
|
||||||
m_DoubleSidedGI: 0
|
m_DoubleSidedGI: 0
|
||||||
m_CustomRenderQueue: 3005
|
m_CustomRenderQueue: 2005
|
||||||
stringTagMap: {}
|
stringTagMap: {}
|
||||||
disabledShaderPasses: []
|
disabledShaderPasses: []
|
||||||
m_LockedProperties: _AlphaTex
|
m_LockedProperties: _AlphaTex
|
||||||
|
|||||||
@@ -3103,6 +3103,12 @@ CanvasRenderer:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 820055824}
|
m_GameObject: {fileID: 820055824}
|
||||||
m_CullTransparentMesh: 1
|
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
|
--- !u!1001 &939980832
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -4484,7 +4490,7 @@ MonoBehaviour:
|
|||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
_isOffline: 1
|
_isOffline: 1
|
||||||
NextSceneId: 10000
|
NextSceneId: 10002
|
||||||
--- !u!4 &1249925296 stripped
|
--- !u!4 &1249925296 stripped
|
||||||
Transform:
|
Transform:
|
||||||
m_CorrespondingSourceObject: {fileID: 1433784918516034456, guid: ce9599ce44e0e24458ea019ad346716d,
|
m_CorrespondingSourceObject: {fileID: 1433784918516034456, guid: ce9599ce44e0e24458ea019ad346716d,
|
||||||
@@ -6696,6 +6702,18 @@ MonoBehaviour:
|
|||||||
cub: {fileID: 1060132188}
|
cub: {fileID: 1060132188}
|
||||||
plam: {fileID: 964771995}
|
plam: {fileID: 964771995}
|
||||||
lookatPosition: {fileID: 1052907142}
|
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
|
--- !u!1001 &1952505398
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -7082,6 +7100,121 @@ PrefabInstance:
|
|||||||
serializedVersion: 3
|
serializedVersion: 3
|
||||||
m_TransformParent: {fileID: 0}
|
m_TransformParent: {fileID: 0}
|
||||||
m_Modifications:
|
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,
|
- target: {fileID: 4834088618036615507, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_Name
|
propertyPath: m_Name
|
||||||
@@ -7137,6 +7270,161 @@ PrefabInstance:
|
|||||||
propertyPath: m_LocalEulerAnglesHint.z
|
propertyPath: m_LocalEulerAnglesHint.z
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 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,
|
- target: {fileID: 7879158823761601897, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_target
|
propertyPath: m_target
|
||||||
|
|||||||
@@ -8037,7 +8037,7 @@ PrefabInstance:
|
|||||||
- target: {fileID: 41330033827983655, guid: 2de3bf9ac390ec74fb7966c1afa122f5,
|
- target: {fileID: 41330033827983655, guid: 2de3bf9ac390ec74fb7966c1afa122f5,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_LocalScale.x
|
propertyPath: m_LocalScale.x
|
||||||
value: 0.62
|
value: 0.8
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 41330033827983655, guid: 2de3bf9ac390ec74fb7966c1afa122f5,
|
- target: {fileID: 41330033827983655, guid: 2de3bf9ac390ec74fb7966c1afa122f5,
|
||||||
type: 3}
|
type: 3}
|
||||||
@@ -8049,6 +8049,11 @@ PrefabInstance:
|
|||||||
propertyPath: m_LocalPosition.x
|
propertyPath: m_LocalPosition.x
|
||||||
value: 1
|
value: 1
|
||||||
objectReference: {fileID: 0}
|
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,
|
- target: {fileID: 344456212405456365, guid: 2de3bf9ac390ec74fb7966c1afa122f5,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_IsActive
|
propertyPath: m_IsActive
|
||||||
|
|||||||
@@ -67,11 +67,15 @@ public class HandCatchFontCtr : MonoBehaviour
|
|||||||
if (rightRunTime >= rightWaitTime)
|
if (rightRunTime >= rightWaitTime)
|
||||||
{
|
{
|
||||||
isRightStartStay = false;
|
isRightStartStay = false;
|
||||||
GlobalEventMgr.Dispatch(GameEvent.EventRayStart, 2);//2:<3A><><EFBFBD><EFBFBD>
|
GlobalEventMgr.Dispatch(GameEvent.EventRayStart,2);//2:<3A><><EFBFBD><EFBFBD>
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
public void RightHandPosCatchReset()
|
||||||
|
{
|
||||||
|
isRightStartStay = false;
|
||||||
|
rightRunTime = 0;
|
||||||
|
}
|
||||||
public void RightHandPosCatchEnd(bool isShow)
|
public void RightHandPosCatchEnd(bool isShow)
|
||||||
{
|
{
|
||||||
isRightStartStay = false;
|
isRightStartStay = false;
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ public class NengNiangQiuCtr : MonoBehaviour
|
|||||||
// Start is called before the first frame update
|
// Start is called before the first frame update
|
||||||
void Start()
|
void Start()
|
||||||
{
|
{
|
||||||
|
|
||||||
GlobalEventMgr.Listen<bool, int, int>(GameEvent.EventRayQuadOk, GameDataManage_EventRayQuadOk);
|
GlobalEventMgr.Listen<bool, int, int>(GameEvent.EventRayQuadOk, GameDataManage_EventRayQuadOk);
|
||||||
GlobalEventMgr.Listen<int>(GameEvent.EventHandRelease, GameDataManage_EventHandRelease);
|
GlobalEventMgr.Listen<int>(GameEvent.EventHandRelease, GameDataManage_EventHandRelease);
|
||||||
GlobalEventMgr.Listen(GameEvent.EventHideCatchFont, GameDataManage_EventHideCatchFont);
|
GlobalEventMgr.Listen(GameEvent.EventHideCatchFont, GameDataManage_EventHideCatchFont);
|
||||||
|
|||||||
@@ -30,12 +30,16 @@ public class CatchManager : MonoBehaviour
|
|||||||
m_collider = GetComponent<Collider>();
|
m_collider = GetComponent<Collider>();
|
||||||
GlobalEventMgr.Listen(GameEvent.EventChangeScence, GameDataManage_EventChangeScence);
|
GlobalEventMgr.Listen(GameEvent.EventChangeScence, GameDataManage_EventChangeScence);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void SetStart(bool value)
|
public void SetStart(bool value)
|
||||||
{
|
{
|
||||||
//Debug.Log("ʶ<><CAB6><EFBFBD><EFBFBD>ץȡ<D7A5><C8A1><EFBFBD><EFBFBD>:"+value);
|
|
||||||
|
Start = value;
|
||||||
|
}
|
||||||
|
public void SetEnd(bool value)
|
||||||
|
{
|
||||||
Start = value;
|
Start = value;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void SetCurrentItem(GrabItem item)
|
public void SetCurrentItem(GrabItem item)
|
||||||
{
|
{
|
||||||
if(item == null)
|
if(item == null)
|
||||||
|
|||||||
@@ -2,6 +2,8 @@ using System.Collections;
|
|||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using BigSpace.Logic;
|
using BigSpace.Logic;
|
||||||
using BigSpace.XRCore.Event;
|
using BigSpace.XRCore.Event;
|
||||||
|
using RenderHeads.Media.AVProVideo;
|
||||||
|
using Unity.XR.PXR;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
|
||||||
public class SelfCharacterControllCtr : MonoBehaviour
|
public class SelfCharacterControllCtr : MonoBehaviour
|
||||||
@@ -9,18 +11,13 @@ public class SelfCharacterControllCtr : MonoBehaviour
|
|||||||
public GameObject bodyBox;
|
public GameObject bodyBox;
|
||||||
CharacterController characterCtr;
|
CharacterController characterCtr;
|
||||||
// Start is called before the first frame update
|
// Start is called before the first frame update
|
||||||
|
|
||||||
void Start()
|
void Start()
|
||||||
{
|
{
|
||||||
GlobalEventMgr.Listen<bool>(GameEvent.EventSetReadyCatchAnimal, GameDataManage_EventSetReadyCatchAnimal);
|
GlobalEventMgr.Listen<bool>(GameEvent.EventSetReadyCatchAnimal, GameDataManage_EventSetReadyCatchAnimal);
|
||||||
characterCtr = GetComponent<CharacterController>();
|
characterCtr = GetComponent<CharacterController>();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Update is called once per frame
|
|
||||||
void Update()
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
void GameDataManage_EventSetReadyCatchAnimal(bool isShow)
|
void GameDataManage_EventSetReadyCatchAnimal(bool isShow)
|
||||||
{
|
{
|
||||||
if (isShow)
|
if (isShow)
|
||||||
@@ -36,3 +33,6 @@ public class SelfCharacterControllCtr : MonoBehaviour
|
|||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -29,14 +29,8 @@ public class LeavePlayPrefabControll : MonoBehaviour
|
|||||||
//GameObject staticObj = gameScene.transform.Find("Static").gameObject;
|
//GameObject staticObj = gameScene.transform.Find("Static").gameObject;
|
||||||
//gameScene.transform.Find("Static").gameObject.SetActive(false);
|
//gameScene.transform.Find("Static").gameObject.SetActive(false);
|
||||||
//Renderer[] renderers = staticObj.GetComponentsInChildren<Renderer>();
|
//Renderer[] renderers = staticObj.GetComponentsInChildren<Renderer>();
|
||||||
//for (int i = 0; i < renderers.Length-1; i++)
|
|
||||||
//{
|
|
||||||
// renderers[i].enabled = false;
|
|
||||||
//}
|
|
||||||
//gameScene.transform.Find("Dynamic").gameObject.SetActive(false);
|
|
||||||
|
|
||||||
SetObjsRender(false);
|
SetObjsRender(false);
|
||||||
|
|
||||||
GameObject gameEnvi = GameObject.Find("GameScene/Environment/SkyBox_360Player");
|
GameObject gameEnvi = GameObject.Find("GameScene/Environment/SkyBox_360Player");
|
||||||
SetGameObjectLayer(gameEnvi, false);
|
SetGameObjectLayer(gameEnvi, false);
|
||||||
leavePrefab.transform.position = new Vector3(v3.x, 0, v3.z);
|
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);
|
boxCollider.transform.localScale = new Vector3(1, 1, 1.5f);
|
||||||
//block.SetActive(true);
|
//block.SetActive(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void SetObjsRender(bool isActive)
|
public void SetObjsRender(bool isActive)
|
||||||
{
|
{
|
||||||
GameObject gameScene = GameObject.Find("GameScene");
|
GameObject gameScene = GameObject.Find("GameScene");
|
||||||
GameObject staticObj = gameScene.transform.Find("Static").gameObject;
|
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);
|
||||||
|
}
|
||||||
|
|
||||||
// 使用递归方法获取所有子物体的Renderer组件
|
// 使用递归方法获取所有子物体的Renderer组件
|
||||||
List<Renderer> staticRenderers = GetAllRenderersRecursive(staticObj);
|
List<Renderer> staticRenderers = GetAllRenderersRecursive(staticObj);
|
||||||
for (int i = 0; i < staticRenderers.Count; i++)
|
for (int i = 0; i < staticRenderers.Count; i++)
|
||||||
{
|
{
|
||||||
staticRenderers[i].enabled = isActive;
|
staticRenderers[i].enabled = isActive;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
GameObject dynamicObj = gameScene.transform.Find("Dynamic").gameObject;
|
GameObject dynamicObj = gameScene.transform.Find("Dynamic").gameObject;
|
||||||
@@ -153,25 +153,15 @@ public class LeavePlayPrefabControll : MonoBehaviour
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 检查是否有碰撞器或触发器,如果有则跳过该节点,保持原状
|
|
||||||
Collider collider = parent.GetComponent<Collider>();
|
|
||||||
if (collider != null)
|
|
||||||
{
|
|
||||||
// 如果节点上有碰撞器或触发器,跳过该节点的Renderer,继续遍历子物体
|
|
||||||
foreach (Transform child in parent)
|
|
||||||
{
|
|
||||||
GetAllRenderersRecursive(child, renderers, includeInactive);
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// 获取当前物体的Renderer组件
|
// 获取当前物体的Renderer组件
|
||||||
Renderer renderer = parent.GetComponent<Renderer>();
|
Renderer renderer = parent.GetComponent<Renderer>();
|
||||||
|
|
||||||
if (renderer != null)
|
if (renderer != null)
|
||||||
{
|
{
|
||||||
renderers.Add(renderer);
|
renderers.Add(renderer);
|
||||||
}
|
}
|
||||||
|
|
||||||
// 递归遍历所有子物体
|
// 递归遍历所有子物体
|
||||||
foreach (Transform child in parent)
|
foreach (Transform child in parent)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -22,16 +22,16 @@ public class AnimalCatchCtr : MonoBehaviour
|
|||||||
//<2F><><EFBFBD>ֻ<EFBFBD><D6BB><EFBFBD>ץ<EFBFBD>ŵ<EFBFBD><C5B5><EFBFBD><EFBFBD><EFBFBD>
|
//<2F><><EFBFBD>ֻ<EFBFBD><D6BB><EFBFBD>ץ<EFBFBD>ŵ<EFBFBD><C5B5><EFBFBD><EFBFBD><EFBFBD>
|
||||||
public void LeftHandPosCatch(bool isShow)
|
public void LeftHandPosCatch(bool isShow)
|
||||||
{
|
{
|
||||||
if (isShow)
|
//if (isShow)
|
||||||
{
|
//{
|
||||||
GlobalEventMgr.Dispatch(GameEvent.EventRayStart,1);//1:<3A><><EFBFBD><EFBFBD>
|
// 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>");
|
// //Debug.Log("ץȡ<D7A5><C8A1><EFBFBD><EFBFBD>ʶ<EFBFBD><CAB6><EFBFBD>ɹ<EFBFBD><C9B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
|
||||||
}
|
//}
|
||||||
else
|
//else
|
||||||
{
|
//{
|
||||||
//Debug.Log("<22>ɿ<EFBFBD><C9BF><EFBFBD><EFBFBD><EFBFBD>ʶ<EFBFBD><CAB6><EFBFBD>ɹ<EFBFBD><C9B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
|
// //Debug.Log("<22>ɿ<EFBFBD><C9BF><EFBFBD><EFBFBD><EFBFBD>ʶ<EFBFBD><CAB6><EFBFBD>ɹ<EFBFBD><C9B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
|
||||||
//GlobalEventMgr.Dispatch(GameEvent.EventRayQuadOk, false,1);
|
// //GlobalEventMgr.Dispatch(GameEvent.EventRayQuadOk, false,1);
|
||||||
}
|
//}
|
||||||
}
|
}
|
||||||
|
|
||||||
//<2F><><EFBFBD>ֻ<EFBFBD><D6BB><EFBFBD>ץ<EFBFBD>ŵ<EFBFBD><C5B5><EFBFBD><EFBFBD><EFBFBD>
|
//<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>
|
//<2F><><EFBFBD><EFBFBD>ץȡ<D7A5><C8A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
public void LeftHandCatchPalmUp(bool isShowFont)
|
public void LeftHandCatchPalmUp(bool isShowFont)
|
||||||
{
|
{
|
||||||
if (isShowFont)
|
//if (isShowFont)
|
||||||
{
|
//{
|
||||||
Debug.Log("<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϻ<EFBFBD>ȡ<EFBFBD><C8A1>:"+ AnimalCatchMgr.Instance.leftHandIsCatchObj);
|
// Debug.Log("<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϻ<EFBFBD>ȡ<EFBFBD><C8A1>:"+ AnimalCatchMgr.Instance.leftHandIsCatchObj);
|
||||||
//if(AnimalCatchMgr.Instance.handIsCatchObj)
|
// //if(AnimalCatchMgr.Instance.handIsCatchObj)
|
||||||
GlobalEventMgr.Dispatch(GameEvent.EventHandShowFont,1, AnimalCatchMgr.Instance.leftAnimalType);
|
// GlobalEventMgr.Dispatch(GameEvent.EventHandShowFont,1, AnimalCatchMgr.Instance.leftAnimalType);
|
||||||
}
|
//}
|
||||||
}
|
}
|
||||||
|
|
||||||
//<2F><><EFBFBD><EFBFBD>ץȡ<D7A5><C8A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
//<2F><><EFBFBD><EFBFBD>ץȡ<D7A5><C8A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
|
|||||||
@@ -29,6 +29,8 @@ public class RayCtr : MonoBehaviour
|
|||||||
void Start()
|
void Start()
|
||||||
{
|
{
|
||||||
GlobalEventMgr.Listen<int>(GameEvent.EventRayStart, GameDataManage_EventRayStart);
|
GlobalEventMgr.Listen<int>(GameEvent.EventRayStart, GameDataManage_EventRayStart);
|
||||||
|
GlobalEventMgr.Listen<int>(GameEvent.EventHandRelease, GameDataManage_EventHandRelease);
|
||||||
|
|
||||||
//// <20><><EFBFBD><EFBFBD>LineRenderer<65><72><EFBFBD><EFBFBD>
|
//// <20><><EFBFBD><EFBFBD>LineRenderer<65><72><EFBFBD><EFBFBD>
|
||||||
//lineRenderer = gameObject.AddComponent<LineRenderer>();
|
//lineRenderer = gameObject.AddComponent<LineRenderer>();
|
||||||
|
|
||||||
@@ -62,7 +64,7 @@ public class RayCtr : MonoBehaviour
|
|||||||
// lineRenderer.endColor = rayColor;
|
// lineRenderer.endColor = rayColor;
|
||||||
// }
|
// }
|
||||||
//}
|
//}
|
||||||
|
|
||||||
// Update is called once per frame
|
// Update is called once per frame
|
||||||
void Update()
|
void Update()
|
||||||
{
|
{
|
||||||
@@ -74,20 +76,16 @@ public class RayCtr : MonoBehaviour
|
|||||||
{
|
{
|
||||||
Debug.DrawRay(transform.position, transform.forward * rayLength, Color.red);
|
Debug.DrawRay(transform.position, transform.forward * rayLength, Color.red);
|
||||||
Ray ray;
|
Ray ray;
|
||||||
if (SceneMgr.Instance.nowSceneId == 2)
|
|
||||||
{
|
ray = new Ray(transform.position, transform.forward);
|
||||||
ray = new Ray(transform.position, transform.forward);
|
Ray ray2;
|
||||||
}
|
var Cam = Camera.main;
|
||||||
else
|
ray2 = new Ray(Cam.transform.position, Cam.transform.forward);
|
||||||
{
|
|
||||||
var Cam = Camera.main;
|
|
||||||
ray = 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>
|
// <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>Ϣ
|
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>");
|
//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>
|
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))
|
if ("Quad" == hitObject.name.Substring(0, 4))
|
||||||
{
|
{
|
||||||
fontIndex = int.Parse(hitObject.name.Substring(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;
|
starRay = false;
|
||||||
isRun = false;
|
isRun = false;
|
||||||
runTime = 0;
|
runTime = 0;
|
||||||
@@ -128,5 +126,15 @@ public class RayCtr : MonoBehaviour
|
|||||||
runTime = 0;
|
runTime = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
void GameDataManage_EventHandRelease(int type)
|
||||||
|
{
|
||||||
|
//Debug.Log("<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:"+type);
|
||||||
|
if (myhandType == type)
|
||||||
|
{
|
||||||
|
starRay = false;
|
||||||
|
isRun = false;
|
||||||
|
runTime = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ using BigSpace.XRCore.Scene;
|
|||||||
using System;
|
using System;
|
||||||
using BigSpace.XRCore.Event;
|
using BigSpace.XRCore.Event;
|
||||||
using BigSpace.Logic;
|
using BigSpace.Logic;
|
||||||
|
using Unity.XR.PXR;
|
||||||
public class SceneMgr : MonoSingleton<SceneMgr>
|
public class SceneMgr : MonoSingleton<SceneMgr>
|
||||||
{
|
{
|
||||||
private Coroutine _currentCoroutine; // <20><>ǰ<EFBFBD><C7B0><EFBFBD>ڽ<EFBFBD><DABD>еij<D0B5><C4B3><EFBFBD><EFBFBD>л<EFBFBD>Э<EFBFBD><D0AD>
|
private Coroutine _currentCoroutine; // <20><>ǰ<EFBFBD><C7B0><EFBFBD>ڽ<EFBFBD><DABD>еij<D0B5><C4B3><EFBFBD><EFBFBD>л<EFBFBD>Э<EFBFBD><D0AD>
|
||||||
@@ -15,6 +15,7 @@ public class SceneMgr : MonoSingleton<SceneMgr>
|
|||||||
public int nowSceneId = 0; //<2F><>ǰ<EFBFBD><C7B0>ʽ<EFBFBD>ij<EFBFBD><C4B3><EFBFBD>(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>м<EFBFBD><D0BC><EFBFBD><EFBFBD>ȳ<EFBFBD><C8B3><EFBFBD>)
|
public int nowSceneId = 0; //<2F><>ǰ<EFBFBD><C7B0>ʽ<EFBFBD>ij<EFBFBD><C4B3><EFBFBD>(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>м<EFBFBD><D0BC><EFBFBD><EFBFBD>ȳ<EFBFBD><C8B3><EFBFBD>)
|
||||||
public bool isCanMove = true;//<2F>Ƿ<EFBFBD><C7B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֱ<EFBFBD><D6B1>߶<EFBFBD>
|
public bool isCanMove = true;//<2F>Ƿ<EFBFBD><C7B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֱ<EFBFBD><D6B1>߶<EFBFBD>
|
||||||
public bool isTrigger = false;
|
public bool isTrigger = false;
|
||||||
|
public bool handisactive = false;
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// <20><>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
/// <20><>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -29,7 +30,7 @@ public class SceneMgr : MonoSingleton<SceneMgr>
|
|||||||
{
|
{
|
||||||
SceneManager.sceneLoaded += OnSceneLoaded;
|
SceneManager.sceneLoaded += OnSceneLoaded;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private void OnSceneLoaded(Scene arg0, LoadSceneMode arg1)
|
private void OnSceneLoaded(Scene arg0, LoadSceneMode arg1)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -14,25 +14,25 @@ EditorBuildSettings:
|
|||||||
- enabled: 1
|
- enabled: 1
|
||||||
path: Assets/Scenes/Old/Loading.unity
|
path: Assets/Scenes/Old/Loading.unity
|
||||||
guid: 3cfa99d38790d7d41b7c96b45739c19d
|
guid: 3cfa99d38790d7d41b7c96b45739c19d
|
||||||
- enabled: 1
|
- enabled: 0
|
||||||
path: Assets/Scenes/Scene_00.unity
|
path: Assets/Scenes/Scene_00.unity
|
||||||
guid: 19c6213d43d0a514380c61578667dc1b
|
guid: 19c6213d43d0a514380c61578667dc1b
|
||||||
- enabled: 1
|
- enabled: 0
|
||||||
path: Assets/Scenes/Scene_01.unity
|
path: Assets/Scenes/Scene_01.unity
|
||||||
guid: ee715637c0f182e4e999c9738f391545
|
guid: ee715637c0f182e4e999c9738f391545
|
||||||
- enabled: 1
|
- enabled: 1
|
||||||
path: Assets/Scenes/Scene_02.unity
|
path: Assets/Scenes/Scene_02.unity
|
||||||
guid: 8eaab09c0bef06b44ab38fbc9851bc95
|
guid: 8eaab09c0bef06b44ab38fbc9851bc95
|
||||||
- enabled: 1
|
- enabled: 0
|
||||||
path: Assets/Scenes/Scene_03.unity
|
path: Assets/Scenes/Scene_03.unity
|
||||||
guid: 9420365d551014747bb1aef28ff7b718
|
guid: 9420365d551014747bb1aef28ff7b718
|
||||||
- enabled: 1
|
- enabled: 0
|
||||||
path: Assets/Scenes/Scene_04.unity
|
path: Assets/Scenes/Scene_04.unity
|
||||||
guid: ad379b1b85275984793e924b36290ea2
|
guid: ad379b1b85275984793e924b36290ea2
|
||||||
- enabled: 1
|
- enabled: 0
|
||||||
path: Assets/Scenes/Scene_05.unity
|
path: Assets/Scenes/Scene_05.unity
|
||||||
guid: cbbc9f554f205bc48b38a1049fdc0cbf
|
guid: cbbc9f554f205bc48b38a1049fdc0cbf
|
||||||
- enabled: 1
|
- enabled: 0
|
||||||
path: Assets/Scenes/Scene_06.unity
|
path: Assets/Scenes/Scene_06.unity
|
||||||
guid: 15dffa1af456bc64d89b160385f36b7a
|
guid: 15dffa1af456bc64d89b160385f36b7a
|
||||||
m_configObjects:
|
m_configObjects:
|
||||||
|
|||||||
@@ -141,6 +141,8 @@ PlayerSettings:
|
|||||||
bundleVersion: 1.0
|
bundleVersion: 1.0
|
||||||
preloadedAssets:
|
preloadedAssets:
|
||||||
- {fileID: 11400000, guid: 9e7be553448fa2546aea5752021cbcf7, type: 2}
|
- {fileID: 11400000, guid: 9e7be553448fa2546aea5752021cbcf7, type: 2}
|
||||||
|
- {fileID: -1506098009177567215, guid: f2f89e34580da664ea7627784c93a3d6, type: 2}
|
||||||
|
- {fileID: 11400000, guid: 846a6119e15216d4fbad905eb21e4169, type: 2}
|
||||||
metroInputSource: 0
|
metroInputSource: 0
|
||||||
wsaTransparentSwapchain: 0
|
wsaTransparentSwapchain: 0
|
||||||
m_HolographicPauseOnTrackingLoss: 1
|
m_HolographicPauseOnTrackingLoss: 1
|
||||||
|
|||||||
Reference in New Issue
Block a user