fix button
This commit is contained in:
parent
bd8297594d
commit
9375c177fa
3 changed files with 100 additions and 127 deletions
|
@ -39923,124 +39923,6 @@ Transform:
|
||||||
- {fileID: 976739665}
|
- {fileID: 976739665}
|
||||||
m_Father: {fileID: 1688857688}
|
m_Father: {fileID: 1688857688}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!1 &533787866
|
|
||||||
GameObject:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
serializedVersion: 6
|
|
||||||
m_Component:
|
|
||||||
- component: {fileID: 533787869}
|
|
||||||
- component: {fileID: 533787868}
|
|
||||||
- component: {fileID: 533787870}
|
|
||||||
- component: {fileID: 533787871}
|
|
||||||
m_Layer: 0
|
|
||||||
m_Name: EventSystem
|
|
||||||
m_TagString: Untagged
|
|
||||||
m_Icon: {fileID: 0}
|
|
||||||
m_NavMeshLayer: 0
|
|
||||||
m_StaticEditorFlags: 0
|
|
||||||
m_IsActive: 1
|
|
||||||
--- !u!114 &533787868
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 533787866}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
m_FirstSelected: {fileID: 0}
|
|
||||||
m_sendNavigationEvents: 1
|
|
||||||
m_DragThreshold: 10
|
|
||||||
--- !u!4 &533787869
|
|
||||||
Transform:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 533787866}
|
|
||||||
serializedVersion: 2
|
|
||||||
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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
||||||
--- !u!114 &533787870
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 533787866}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
m_SendPointerHoverToParent: 1
|
|
||||||
m_MoveRepeatDelay: 0.5
|
|
||||||
m_MoveRepeatRate: 0.1
|
|
||||||
m_XRTrackingOrigin: {fileID: 0}
|
|
||||||
m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
|
|
||||||
m_PointAction: {fileID: -1654692200621890270, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
|
|
||||||
m_MoveAction: {fileID: -8784545083839296357, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
|
|
||||||
m_SubmitAction: {fileID: 392368643174621059, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
|
|
||||||
m_CancelAction: {fileID: 7727032971491509709, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
|
|
||||||
m_LeftClickAction: {fileID: 3001919216989983466, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
|
|
||||||
m_MiddleClickAction: {fileID: -2185481485913320682, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
|
|
||||||
m_RightClickAction: {fileID: -4090225696740746782, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
|
|
||||||
m_ScrollWheelAction: {fileID: 6240969308177333660, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
|
|
||||||
m_TrackedDevicePositionAction: {fileID: 6564999863303420839, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
|
|
||||||
m_TrackedDeviceOrientationAction: {fileID: 7970375526676320489, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
|
|
||||||
m_DeselectOnBackgroundClick: 1
|
|
||||||
m_PointerBehavior: 0
|
|
||||||
m_CursorLockBehavior: 0
|
|
||||||
m_ScrollDeltaPerTick: 6
|
|
||||||
--- !u!114 &533787871
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 533787866}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: ab68ce6587aab0146b8dabefbd806791, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
m_SendPointerHoverToParent: 1
|
|
||||||
m_ClickSpeed: 0.3
|
|
||||||
m_MoveDeadzone: 0.6
|
|
||||||
m_RepeatDelay: 0.5
|
|
||||||
m_RepeatRate: 0.1
|
|
||||||
m_TrackedDeviceDragThresholdMultiplier: 2
|
|
||||||
m_TrackedScrollDeltaMultiplier: 5
|
|
||||||
m_ActiveInputMode: 0
|
|
||||||
m_EnableXRInput: 1
|
|
||||||
m_EnableMouseInput: 1
|
|
||||||
m_EnableTouchInput: 1
|
|
||||||
m_PointAction: {fileID: 0}
|
|
||||||
m_LeftClickAction: {fileID: 0}
|
|
||||||
m_MiddleClickAction: {fileID: 0}
|
|
||||||
m_RightClickAction: {fileID: 0}
|
|
||||||
m_ScrollWheelAction: {fileID: 0}
|
|
||||||
m_NavigateAction: {fileID: 0}
|
|
||||||
m_SubmitAction: {fileID: 0}
|
|
||||||
m_CancelAction: {fileID: 0}
|
|
||||||
m_EnableBuiltinActionsAsFallback: 1
|
|
||||||
m_EnableGamepadInput: 1
|
|
||||||
m_EnableJoystickInput: 1
|
|
||||||
m_HorizontalAxis: Horizontal
|
|
||||||
m_VerticalAxis: Vertical
|
|
||||||
m_SubmitButton: Submit
|
|
||||||
m_CancelButton: Cancel
|
|
||||||
--- !u!1 &533820783
|
--- !u!1 &533820783
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -41078,7 +40960,7 @@ MeshCollider:
|
||||||
serializedVersion: 5
|
serializedVersion: 5
|
||||||
m_Convex: 0
|
m_Convex: 0
|
||||||
m_CookingOptions: 30
|
m_CookingOptions: 30
|
||||||
m_Mesh: {fileID: 1300235849}
|
m_Mesh: {fileID: 1274892739}
|
||||||
--- !u!33 &560595107
|
--- !u!33 &560595107
|
||||||
MeshFilter:
|
MeshFilter:
|
||||||
m_ObjectHideFlags: 10
|
m_ObjectHideFlags: 10
|
||||||
|
@ -88499,7 +88381,7 @@ MeshCollider:
|
||||||
serializedVersion: 5
|
serializedVersion: 5
|
||||||
m_Convex: 0
|
m_Convex: 0
|
||||||
m_CookingOptions: 30
|
m_CookingOptions: 30
|
||||||
m_Mesh: {fileID: 1274892739}
|
m_Mesh: {fileID: 789004669}
|
||||||
--- !u!33 &1179906219
|
--- !u!33 &1179906219
|
||||||
MeshFilter:
|
MeshFilter:
|
||||||
m_ObjectHideFlags: 10
|
m_ObjectHideFlags: 10
|
||||||
|
@ -100488,6 +100370,7 @@ MonoBehaviour:
|
||||||
nextSceneName: Town
|
nextSceneName: Town
|
||||||
confirmationPanel: {fileID: 347656170}
|
confirmationPanel: {fileID: 347656170}
|
||||||
warningText: {fileID: 1839460625}
|
warningText: {fileID: 1839460625}
|
||||||
|
warningPanel: {fileID: 1776114648}
|
||||||
--- !u!1001 &1315564629
|
--- !u!1001 &1315564629
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -101069,7 +100952,7 @@ MeshCollider:
|
||||||
serializedVersion: 5
|
serializedVersion: 5
|
||||||
m_Convex: 0
|
m_Convex: 0
|
||||||
m_CookingOptions: 30
|
m_CookingOptions: 30
|
||||||
m_Mesh: {fileID: 1222937665}
|
m_Mesh: {fileID: 1506848929}
|
||||||
--- !u!33 &1332821470
|
--- !u!33 &1332821470
|
||||||
MeshFilter:
|
MeshFilter:
|
||||||
m_ObjectHideFlags: 10
|
m_ObjectHideFlags: 10
|
||||||
|
@ -125340,7 +125223,7 @@ MeshCollider:
|
||||||
serializedVersion: 5
|
serializedVersion: 5
|
||||||
m_Convex: 0
|
m_Convex: 0
|
||||||
m_CookingOptions: 30
|
m_CookingOptions: 30
|
||||||
m_Mesh: {fileID: 1300235849}
|
m_Mesh: {fileID: 903335569}
|
||||||
--- !u!33 &1767780006
|
--- !u!33 &1767780006
|
||||||
MeshFilter:
|
MeshFilter:
|
||||||
m_ObjectHideFlags: 10
|
m_ObjectHideFlags: 10
|
||||||
|
@ -159053,6 +158936,85 @@ Mesh:
|
||||||
offset: 0
|
offset: 0
|
||||||
size: 0
|
size: 0
|
||||||
path:
|
path:
|
||||||
|
--- !u!1 &2143235759
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 2143235762}
|
||||||
|
- component: {fileID: 2143235761}
|
||||||
|
- component: {fileID: 2143235760}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: EventSystem
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!114 &2143235760
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2143235759}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_SendPointerHoverToParent: 1
|
||||||
|
m_MoveRepeatDelay: 0.5
|
||||||
|
m_MoveRepeatRate: 0.1
|
||||||
|
m_XRTrackingOrigin: {fileID: 0}
|
||||||
|
m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
|
||||||
|
m_PointAction: {fileID: -1654692200621890270, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
|
||||||
|
m_MoveAction: {fileID: -8784545083839296357, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
|
||||||
|
m_SubmitAction: {fileID: 392368643174621059, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
|
||||||
|
m_CancelAction: {fileID: 7727032971491509709, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
|
||||||
|
m_LeftClickAction: {fileID: 3001919216989983466, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
|
||||||
|
m_MiddleClickAction: {fileID: -2185481485913320682, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
|
||||||
|
m_RightClickAction: {fileID: -4090225696740746782, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
|
||||||
|
m_ScrollWheelAction: {fileID: 6240969308177333660, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
|
||||||
|
m_TrackedDevicePositionAction: {fileID: 6564999863303420839, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
|
||||||
|
m_TrackedDeviceOrientationAction: {fileID: 7970375526676320489, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
|
||||||
|
m_DeselectOnBackgroundClick: 1
|
||||||
|
m_PointerBehavior: 0
|
||||||
|
m_CursorLockBehavior: 0
|
||||||
|
m_ScrollDeltaPerTick: 6
|
||||||
|
--- !u!114 &2143235761
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2143235759}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_FirstSelected: {fileID: 0}
|
||||||
|
m_sendNavigationEvents: 1
|
||||||
|
m_DragThreshold: 10
|
||||||
|
--- !u!4 &2143235762
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2143235759}
|
||||||
|
serializedVersion: 2
|
||||||
|
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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!1001 &23303258443971575
|
--- !u!1001 &23303258443971575
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -164628,7 +164590,6 @@ SceneRoots:
|
||||||
- {fileID: 108605771}
|
- {fileID: 108605771}
|
||||||
- {fileID: 278618525}
|
- {fileID: 278618525}
|
||||||
- {fileID: 146568762}
|
- {fileID: 146568762}
|
||||||
- {fileID: 533787869}
|
|
||||||
- {fileID: 1898819870}
|
- {fileID: 1898819870}
|
||||||
- {fileID: 649665534}
|
- {fileID: 649665534}
|
||||||
- {fileID: 347656174}
|
- {fileID: 347656174}
|
||||||
|
@ -164641,3 +164602,4 @@ SceneRoots:
|
||||||
- {fileID: 2031915432}
|
- {fileID: 2031915432}
|
||||||
- {fileID: 1312419882}
|
- {fileID: 1312419882}
|
||||||
- {fileID: 1646942369}
|
- {fileID: 1646942369}
|
||||||
|
- {fileID: 2143235762}
|
||||||
|
|
|
@ -18,6 +18,7 @@ public class LeaveHouseTrigger : MonoBehaviour
|
||||||
public string nextSceneName;
|
public string nextSceneName;
|
||||||
public GameObject confirmationPanel;
|
public GameObject confirmationPanel;
|
||||||
public TMP_Text warningText;
|
public TMP_Text warningText;
|
||||||
|
public GameObject warningPanel;
|
||||||
|
|
||||||
// Start is called before the first frame update
|
// Start is called before the first frame update
|
||||||
void Start()
|
void Start()
|
||||||
|
@ -38,6 +39,12 @@ public class LeaveHouseTrigger : MonoBehaviour
|
||||||
{
|
{
|
||||||
confirmationPanel.SetActive(true);
|
confirmationPanel.SetActive(true);
|
||||||
warningText.text = "Am I sure I want to leave the house? I might not have completed everything...";
|
warningText.text = "Am I sure I want to leave the house? I might not have completed everything...";
|
||||||
|
StartCoroutine(HideWarningPanelAfterDelay(10f)); // can change how long you want the text to show for
|
||||||
|
}
|
||||||
|
IEnumerator HideWarningPanelAfterDelay(float delay)
|
||||||
|
{
|
||||||
|
yield return new WaitForSeconds(delay);
|
||||||
|
warningPanel.SetActive(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void ConfirmLeave()
|
public void ConfirmLeave()
|
||||||
|
@ -49,6 +56,7 @@ public class LeaveHouseTrigger : MonoBehaviour
|
||||||
public void CancelLeave()
|
public void CancelLeave()
|
||||||
{
|
{
|
||||||
confirmationPanel.SetActive(false);
|
confirmationPanel.SetActive(false);
|
||||||
|
warningPanel.SetActive(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
|
@ -5,16 +5,16 @@ EditorBuildSettings:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_Scenes:
|
m_Scenes:
|
||||||
- enabled: 1
|
- enabled: 0
|
||||||
path: Assets/Samples/XR Interaction Toolkit/3.0.3/Scenes/SampleScene.unity
|
path: Assets/Samples/XR Interaction Toolkit/3.0.3/Scenes/SampleScene.unity
|
||||||
guid: 55daccc09a3b69647bbab145b54a3ab3
|
guid: 55daccc09a3b69647bbab145b54a3ab3
|
||||||
- enabled: 1
|
- enabled: 0
|
||||||
path: Assets/Scenes/calling scene.unity
|
path: Assets/Scenes/calling scene.unity
|
||||||
guid: 48cde6b0ab9794ada98c7371a0e98e40
|
guid: 48cde6b0ab9794ada98c7371a0e98e40
|
||||||
- enabled: 1
|
- enabled: 0
|
||||||
path: Assets/Scenes/Wai Lam's interaction.unity
|
path: Assets/Scenes/Wai Lam's interaction.unity
|
||||||
guid: 66fe0e94fa29b1f4fb504e90cf59f1a2
|
guid: 66fe0e94fa29b1f4fb504e90cf59f1a2
|
||||||
- enabled: 1
|
- enabled: 0
|
||||||
path: Assets/Scenes/isaac interaction.unity
|
path: Assets/Scenes/isaac interaction.unity
|
||||||
guid: 0918c8f89e6184c5caed264887eabbb4
|
guid: 0918c8f89e6184c5caed264887eabbb4
|
||||||
- enabled: 1
|
- enabled: 1
|
||||||
|
@ -23,6 +23,9 @@ EditorBuildSettings:
|
||||||
- enabled: 1
|
- enabled: 1
|
||||||
path: Assets/Scenes/House.unity
|
path: Assets/Scenes/House.unity
|
||||||
guid: a59e0e295e616ae43a48088e6f52328d
|
guid: a59e0e295e616ae43a48088e6f52328d
|
||||||
|
- enabled: 1
|
||||||
|
path: Assets/Scenes/Town.unity
|
||||||
|
guid: 34ddf74f9d161b149ad0af6f15f9ed1a
|
||||||
m_configObjects:
|
m_configObjects:
|
||||||
Unity.XR.Oculus.Settings: {fileID: 11400000, guid: bfa1182bd221b4ca89619141f66f1260, type: 2}
|
Unity.XR.Oculus.Settings: {fileID: 11400000, guid: bfa1182bd221b4ca89619141f66f1260, type: 2}
|
||||||
Unity.XR.WindowsMR.Settings: {fileID: 11400000, guid: dc5a169419fa04987b057f65238cf3ba, type: 2}
|
Unity.XR.WindowsMR.Settings: {fileID: 11400000, guid: dc5a169419fa04987b057f65238cf3ba, type: 2}
|
||||||
|
|
Loading…
Add table
Reference in a new issue