Commit 7529ed06 authored by yzy's avatar yzy

更新

parent 13067aed
......@@ -689,7 +689,7 @@
{
"name": "",
"id": "4929aac1-a2ac-4a7a-9280-9d5603223f34",
"path": "<XRController>{LeftHand}/menu",
"path": "<XRController>{LeftHand}/secondaryButton",
"interactions": "",
"processors": "",
"groups": "",
......@@ -1505,7 +1505,7 @@
{
"name": "",
"id": "0d9a4288-0d70-463e-a6a0-7781ea1b82cb",
"path": "<XRController>{RightHand}/menu",
"path": "<XRController>{RightHand}/secondaryButton",
"interactions": "",
"processors": "",
"groups": "",
......
......@@ -519,5 +519,5 @@ MonoBehaviour:
- {fileID: -2771305187168360531}
- {fileID: 4049027495373602799}
- {fileID: -3565808094716580916}
m_renderMode: 1
m_renderMode: 0
m_depthSubmissionMode: 0
Subproject commit 24bf63921fcde0c26a8b5b50e1748dd5e12e6898
Subproject commit 8c774b1c0ada1fb854a499eb1afe3f32730f0c28
This diff is collapsed.
fileFormatVersion: 2
guid: 8947791c2876d054586ec865e43c0751
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
using UnityEngine;
public class ResetTransform : MonoBehaviour
{
private Vector3 initialPosition;
private Quaternion initialRotation;
void Start()
{
// 记录物体初始位置和旋转
initialPosition = transform.position;
initialRotation = transform.rotation;
}
public void ResetPosition()
{
// 恢复物体初始位置和旋转
transform.position = initialPosition;
transform.rotation = initialRotation;
}
}
fileFormatVersion: 2
guid: 36244f44183594d4289d68c1bf7bf258
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
......@@ -7,7 +7,7 @@ using TMPro;
using UnityEngine.InputSystem;
using UnityEngine.XR.Interaction.Toolkit;
public class GameSystem : SingletonBase<GameSystem>
public class GameSystem : MonoBehaviour
{
[SerializeField] private float totalTime = 60f; // 倒计时总时间
[Tooltip("时间文本")]
......@@ -47,9 +47,10 @@ public class GameSystem : SingletonBase<GameSystem>
}
currentTime = totalTime;
StartGame();
StartCoroutine(SwitchBackgroundMusicSpeed());
//StartCoroutine(SwitchBackgroundMusicSpeed());
}
private void Update()
{
UpdateTimeText();
......@@ -100,7 +101,10 @@ public class GameSystem : SingletonBase<GameSystem>
Time.timeScale = 0f;
currentTime = 0;
isPauseGame = false;
onGameEndUI.SetActive(true);
if (onGameEndUI != null)
{
onGameEndUI.SetActive(true);
}
onGameEnd.Invoke();
}
}
......@@ -148,7 +152,10 @@ public class GameSystem : SingletonBase<GameSystem>
private IEnumerator PauseGameCoroutine()
{
PausePostProcessing.SetActive(true);
if (PausePostProcessing != null)
{
PausePostProcessing.SetActive(true);
}
yield return new WaitForSeconds(1f);
Time.timeScale = 0f;
isPauseGame = true;
......@@ -160,7 +167,10 @@ public class GameSystem : SingletonBase<GameSystem>
/// </summary>
public void ResumeGame()
{
PausePostProcessing.SetActive(false);
if(PausePostProcessing != null)
{
PausePostProcessing.SetActive(false);
}
Time.timeScale = 1f;
isPauseGame = false;
PauseUI.SetActive(false);
......
......@@ -26,6 +26,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 480546}
- {fileID: 465060}
......@@ -60,6 +61,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 483478}
m_RootOrder: 1
......@@ -83,10 +85,12 @@ MeshRenderer:
m_CastShadows: 0
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
......@@ -111,6 +115,7 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &196688
GameObject:
m_ObjectHideFlags: 0
......@@ -122,7 +127,6 @@ GameObject:
- component: {fileID: 480546}
- component: {fileID: 3346416}
- component: {fileID: 2304266}
- component: {fileID: 6540286}
m_Layer: 0
m_Name: Tile_1_A
m_TagString: Untagged
......@@ -140,6 +144,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 483478}
m_RootOrder: 0
......@@ -163,10 +168,12 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
......@@ -191,16 +198,4 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!65 &6540286
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 196688}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 2, y: 6.061752, z: 2}
m_Center: {x: 0, y: -2.969124, z: 0}
m_AdditionalVertexStreams: {fileID: 0}
......@@ -28,6 +28,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071067}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 483478}
m_RootOrder: 0
......@@ -51,10 +52,12 @@ MeshRenderer:
m_CastShadows: 0
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
......@@ -79,6 +82,7 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &148192
GameObject:
m_ObjectHideFlags: 0
......@@ -105,6 +109,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 447224}
- {fileID: 498748}
......@@ -122,7 +127,6 @@ GameObject:
- component: {fileID: 498748}
- component: {fileID: 3387482}
- component: {fileID: 2324296}
- component: {fileID: 6558072}
m_Layer: 0
m_Name: Tile_1_B
m_TagString: Untagged
......@@ -140,6 +144,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 483478}
m_RootOrder: 1
......@@ -163,10 +168,12 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
......@@ -191,16 +198,4 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!65 &6558072
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 155054}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 2, y: 6.061752, z: 2}
m_Center: {x: 0, y: -2.969124, z: 0}
m_AdditionalVertexStreams: {fileID: 0}
......@@ -11,7 +11,6 @@ GameObject:
- component: {fileID: 465830}
- component: {fileID: 3374966}
- component: {fileID: 2300098}
- component: {fileID: 6513864}
m_Layer: 0
m_Name: Tile_1_F
m_TagString: Untagged
......@@ -29,6 +28,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 483478}
m_RootOrder: 1
......@@ -52,10 +52,12 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
......@@ -80,19 +82,7 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!65 &6513864
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 129730}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 2, y: 6.061752, z: 2}
m_Center: {x: 0, y: -2.969124, z: 0}
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &148192
GameObject:
m_ObjectHideFlags: 0
......@@ -119,6 +109,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 465060}
- {fileID: 465830}
......@@ -153,6 +144,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 483478}
m_RootOrder: 0
......@@ -176,10 +168,12 @@ MeshRenderer:
m_CastShadows: 0
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
......@@ -204,3 +198,4 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
......@@ -519,7 +519,6 @@ GameObject:
- component: {fileID: 7615587965573288919}
- component: {fileID: 7956530603519099570}
- component: {fileID: 2001574910576863901}
- component: {fileID: 2001574910576863900}
- component: {fileID: 2001574910576863903}
m_Layer: 5
m_Name: "\u6846"
......@@ -591,50 +590,6 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 3
--- !u!114 &2001574910576863900
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7640910220961603629}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 2001574910576863901}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &2001574910576863903
MonoBehaviour:
m_ObjectHideFlags: 0
......
......@@ -218,7 +218,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &6173290820738791253
RectTransform:
m_ObjectHideFlags: 0
......@@ -235,9 +235,9 @@ RectTransform:
m_Father: {fileID: 1529007549234141994}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 700, y: -75}
m_SizeDelta: {x: 580, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6173290820738791254
......
This diff is collapsed.
......@@ -11,7 +11,6 @@ GameObject:
- component: {fileID: 496116}
- component: {fileID: 3335630}
- component: {fileID: 2372022}
- component: {fileID: 6507860}
m_Layer: 0
m_Name: Tile_1_H
m_TagString: Untagged
......@@ -29,6 +28,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
......@@ -52,10 +52,12 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
......@@ -80,16 +82,4 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!65 &6507860
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 148860}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 2, y: 6.061752, z: 2}
m_Center: {x: 0, y: -2.969124, z: 0}
m_AdditionalVertexStreams: {fileID: 0}
......@@ -11,7 +11,6 @@ GameObject:
- component: {fileID: 473322}
- component: {fileID: 3395348}
- component: {fileID: 2349616}
- component: {fileID: 6598906}
m_Layer: 0
m_Name: Tile_1_brick_B
m_TagString: Untagged
......@@ -29,6 +28,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -3, y: 0, z: 2}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
......@@ -52,10 +52,12 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
......@@ -80,16 +82,4 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!65 &6598906
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 148576}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 2, y: 6.061752, z: 2}
m_Center: {x: 0, y: -2.969124, z: 0}
m_AdditionalVertexStreams: {fileID: 0}
......@@ -11,7 +11,6 @@ GameObject:
- component: {fileID: 476810}
- component: {fileID: 3383106}
- component: {fileID: 2331098}
- component: {fileID: 6511892}
m_Layer: 0
m_Name: Tile_1_brick_D
m_TagString: Untagged
......@@ -29,6 +28,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -3, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
......@@ -52,10 +52,12 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
......@@ -80,16 +82,4 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!65 &6511892
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 109362}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 2, y: 6.061752, z: 2}
m_Center: {x: 0, y: -2.969124, z: 0}
m_AdditionalVertexStreams: {fileID: 0}
This diff is collapsed.
......@@ -14,9 +14,12 @@ EditorBuildSettings:
- enabled: 0
path: "Assets/_Scenes/0_\u521D\u59CB\u754C\u97621.unity"
guid: 3b4379fc0534a85409b95222a2ce99f0
- enabled: 1
- enabled: 0
path: "Assets/_Scenes/0_\u521D\u59CB\u754C\u97622.unity"
guid: a7affb7b109f6e04da6637f87f531d83
- enabled: 1
path: Assets/_Scenes/0_Maze0.unity
guid: 8947791c2876d054586ec865e43c0751
- enabled: 1
path: Assets/_Scenes/1_Maze1.unity
guid: 9fc0d4010bbf28b4594072e72b8655ab
......
......@@ -157,8 +157,6 @@ PlayerSettings:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 7405867191050963036, guid: e60ad326389e9b14e9f7ae2c33703862, type: 2}
- {fileID: 6859214065320108093, guid: fba6072275013e6448e381f83d131b7f, type: 2}
metroInputSource: 0
wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment