1
0
mirror of https://projects.caleb-brown.dev/UDRI-XRT/UDRIGEEKCup2024.git synced 2025-01-22 07:08:51 -05:00

Merge branch 'development' into feature/ball-sucker-trigger

This commit is contained in:
cbrown 2024-04-23 11:46:17 -04:00
commit ab04b76de0
9 changed files with 1657 additions and 321 deletions

View File

@ -210,6 +210,36 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 8622549130173790273}
m_Modifications:
- target: {fileID: 1284771381232090128, guid: a9e7943ab5a624fadb0983e57cb91cce,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.70719147
objectReference: {fileID: 0}
- target: {fileID: 1284771381232090128, guid: a9e7943ab5a624fadb0983e57cb91cce,
type: 3}
propertyPath: m_LocalRotation.x
value: 0.70694464
objectReference: {fileID: 0}
- target: {fileID: 1284771381232090128, guid: a9e7943ab5a624fadb0983e57cb91cce,
type: 3}
propertyPath: m_LocalRotation.y
value: 0.007405954
objectReference: {fileID: 0}
- target: {fileID: 1284771381232090128, guid: a9e7943ab5a624fadb0983e57cb91cce,
type: 3}
propertyPath: m_LocalRotation.z
value: -0.007403369
objectReference: {fileID: 0}
- target: {fileID: 1284771381232090128, guid: a9e7943ab5a624fadb0983e57cb91cce,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 89.98
objectReference: {fileID: 0}
- target: {fileID: 1284771381232090128, guid: a9e7943ab5a624fadb0983e57cb91cce,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 1.2
objectReference: {fileID: 0}
- target: {fileID: 8935256399111493289, guid: a9e7943ab5a624fadb0983e57cb91cce,
type: 3}
propertyPath: m_LocalPosition.x

View File

@ -8,11 +8,13 @@ namespace MAVRIC.GEEKCup
{
[SerializeField] private GameObject ball;
[SerializeField] private IntVariable scoreVariable;
[SerializeField] private GameObject OffScreenSpawnPoint;
private GameObject spawnPoint;
private Transform ballStartTransform;
public void CheckForSpawnPoint()
{
{
ballStartTransform = OffScreenSpawnPoint.transform;
spawnPoint = GameObject.Find("SpawnPoint");
}
public void MoveBallToSpawnPoint()
@ -21,18 +23,24 @@ namespace MAVRIC.GEEKCup
{
CheckForSpawnPoint();
}
StopCoroutine(MoveBall());
StartCoroutine(MoveBall());
StopCoroutine(MoveBall(spawnPoint.transform));
StartCoroutine(MoveBall(spawnPoint.transform));
}
public void MoveBallOffScreen()
{
StopCoroutine(MoveBall(ballStartTransform));
StartCoroutine(MoveBall(ballStartTransform));
}
private IEnumerator MoveBall()
private IEnumerator MoveBall(Transform point)
{
if (ball.TryGetComponent(out Rigidbody rbBall))
{
rbBall.isKinematic = true;
yield return new WaitForFixedUpdate();
rbBall.position = spawnPoint.transform.position;
rbBall.position = point.position;
yield return new WaitForFixedUpdate();
rbBall.isKinematic = false;

View File

@ -1,5 +1,103 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &751957876360049174
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8552071283154088142}
- component: {fileID: 2253104252128500829}
- component: {fileID: 3519403949678876778}
- component: {fileID: 5780048202293232428}
m_Layer: 5
m_Name: BottomPanel
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8552071283154088142
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 751957876360049174}
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: 728928360925399637}
- {fileID: 9011831283548533885}
m_Father: {fileID: 4093525921777245600}
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_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2253104252128500829
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 751957876360049174}
m_CullTransparentMesh: 1
--- !u!114 &3519403949678876778
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 751957876360049174}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0.392}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &5780048202293232428
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 751957876360049174}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreLayout: 0
m_MinWidth: -1
m_MinHeight: -1
m_PreferredWidth: -1
m_PreferredHeight: -1
m_FlexibleWidth: -1
m_FlexibleHeight: -1
m_LayoutPriority: 1
--- !u!1 &955943766339325957
GameObject:
m_ObjectHideFlags: 0
@ -36,8 +134,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 400, y: -0}
m_SizeDelta: {x: 800, y: 111.532196}
m_AnchoredPosition: {x: 400, y: 0}
m_SizeDelta: {x: 800, y: 96.532196}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &7453775476195185560
CanvasRenderer:
@ -129,10 +227,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 4429803177772368616}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 150, y: 150}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5564305803704157731
CanvasRenderer:
@ -289,127 +387,6 @@ MonoBehaviour:
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
m_ReverseArrangement: 0
--- !u!1 &1496509439905108730
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4839095119110903300}
- component: {fileID: 5708213159797606648}
- component: {fileID: 5837909695935068388}
- component: {fileID: 6745067311511981502}
m_Layer: 5
m_Name: Delete Button
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &4839095119110903300
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1496509439905108730}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 3, y: 3, z: 3}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 2106229138023707423}
m_Father: {fileID: 4093525921777245600}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 99.48599}
m_SizeDelta: {x: 30, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5708213159797606648
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1496509439905108730}
m_CullTransparentMesh: 1
--- !u!114 &5837909695935068388
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1496509439905108730}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 7347b6042ec9e40c4a3cbd7077c91e67, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &6745067311511981502
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1496509439905108730}
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: 0, g: 0, b: 0, a: 0.5882353}
m_HighlightedColor: {r: 0, g: 0.5176471, b: 0.9607844, a: 1}
m_PressedColor: {r: 0.427451, g: 0.7372549, b: 1, a: 1}
m_SelectedColor: {r: 0, g: 0.5176471, 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: 5837909695935068388}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!1 &1500832812923498000
GameObject:
m_ObjectHideFlags: 0
@ -488,7 +465,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Cancel
m_Text: Close
--- !u!1 &1519211474055082896
GameObject:
m_ObjectHideFlags: 0
@ -521,7 +498,7 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 3670047245344031719}
m_Father: {fileID: 4093525921777245600}
m_Father: {fileID: 8552071283154088142}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
@ -717,10 +694,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 7667425266489375675}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 150, y: 150}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2321397444268061984
CanvasRenderer:
@ -760,6 +737,103 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &2191467696552855628
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6267940756370835963}
- component: {fileID: 7193880368216472714}
- component: {fileID: 4030428195371516033}
- component: {fileID: 8729367933899122699}
m_Layer: 5
m_Name: TopPanel
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6267940756370835963
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2191467696552855628}
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: 3696478177836164229}
m_Father: {fileID: 4093525921777245600}
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_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7193880368216472714
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2191467696552855628}
m_CullTransparentMesh: 1
--- !u!114 &4030428195371516033
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2191467696552855628}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0.392}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &8729367933899122699
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2191467696552855628}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreLayout: 0
m_MinWidth: -1
m_MinHeight: -1
m_PreferredWidth: -1
m_PreferredHeight: -1
m_FlexibleWidth: -1
m_FlexibleHeight: 2.47
m_LayoutPriority: 1
--- !u!1 &2231026661275616352
GameObject:
m_ObjectHideFlags: 0
@ -873,8 +947,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 400, y: -55.766098}
m_SizeDelta: {x: 780, y: 91.532196}
m_AnchoredPosition: {x: 400, y: -48.266098}
m_SizeDelta: {x: 780, y: 76.532196}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &7655689055911832891
MonoBehaviour:
@ -967,8 +1041,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 543.3333, y: -45.766098}
m_SizeDelta: {x: 236.66666, y: 91.532196}
m_AnchoredPosition: {x: 543.3333, y: -38.266098}
m_SizeDelta: {x: 236.66666, y: 76.532196}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &5705161484206372439
CanvasRenderer:
@ -991,7 +1065,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.509434, g: 0.32546806, b: 0.16100036, a: 1}
m_Color: {r: 0.38431376, g: 0.4784314, b: 0.4901961, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@ -1159,6 +1233,7 @@ GameObject:
m_Component:
- component: {fileID: 4093525921777245600}
- component: {fileID: 7088936279968970421}
- component: {fileID: 8963960584021913408}
m_Layer: 5
m_Name: CourseLayoutUI
m_TagString: Untagged
@ -1178,10 +1253,8 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 728928360925399637}
- {fileID: 3696478177836164229}
- {fileID: 4839095119110903300}
- {fileID: 9011831283548533885}
- {fileID: 6267940756370835963}
- {fileID: 8552071283154088142}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@ -1202,13 +1275,39 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_CreateButton: {fileID: 1345599628266090714}
m_DeleteButton: {fileID: 6745067311511981502}
m_DeleteButton: {fileID: 0}
m_ObjectMenu: {fileID: 3642275361595757492}
m_ObjectMenuAnimator: {fileID: 2324948231275512758}
m_ObjectSpawner: {fileID: 0}
m_CancelButton: {fileID: 8640028883189573870}
m_CloseButton: {fileID: 8640028883189573870}
m_ScreenSpaceController: {fileID: 0}
m_InteractionGroup: {fileID: 0}
--- !u!114 &8963960584021913408
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3524450192704275766}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 0
m_Spacing: 0
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 1
m_ChildControlHeight: 1
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
m_ReverseArrangement: 0
--- !u!1 &3642275361595757492
GameObject:
m_ObjectHideFlags: 0
@ -1326,7 +1425,7 @@ GameObject:
- component: {fileID: 1429856679139924858}
- component: {fileID: 8640028883189573870}
m_Layer: 5
m_Name: Cancel Button (1)
m_Name: Close Button
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -1349,8 +1448,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 400, y: -16.9261}
m_SizeDelta: {x: 0, y: 0}
m_AnchoredPosition: {x: 400, y: -24.4261}
m_SizeDelta: {x: 90, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &46663433469717449
CanvasRenderer:
@ -1522,7 +1621,7 @@ GameObject:
- component: {fileID: 7870986708249083334}
- component: {fileID: 6137636385845886803}
m_Layer: 5
m_Name: Cancel Button Holder
m_Name: Close Button Holder
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -1545,8 +1644,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 400, y: -128.4583}
m_SizeDelta: {x: 800, y: 33.8522}
m_AnchoredPosition: {x: 400, y: -120.9583}
m_SizeDelta: {x: 800, y: 48.8522}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4518410757033437422
CanvasRenderer:
@ -1634,13 +1733,13 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 6020047007495255429}
m_Father: {fileID: 4093525921777245600}
m_Father: {fileID: 6267940756370835963}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 317, y: 527}
m_AnchoredPosition: {x: 328, y: 360}
m_SizeDelta: {x: 30, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
m_Pivot: {x: 0.49999952, y: 0.4999999}
--- !u!222 &4385803179891525133
CanvasRenderer:
m_ObjectHideFlags: 0
@ -1767,10 +1866,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 7197256551416756614}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 150, y: 150}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5556131707851716393
CanvasRenderer:
@ -1885,81 +1984,6 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &7213543429320921598
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2106229138023707423}
- component: {fileID: 7823624817690680729}
- component: {fileID: 9207034319480107908}
m_Layer: 5
m_Name: Icon
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2106229138023707423
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7213543429320921598}
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: 4839095119110903300}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 25, y: 25}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7823624817690680729
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7213543429320921598}
m_CullTransparentMesh: 1
--- !u!114 &9207034319480107908
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7213543429320921598}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 85f8bee1bf27748239fb5488c40a5e4c, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &8287472993966108167
GameObject:
m_ObjectHideFlags: 0
@ -2072,8 +2096,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 271.66666, y: -45.766098}
m_SizeDelta: {x: 236.66666, y: 91.532196}
m_AnchoredPosition: {x: 271.66666, y: -38.266098}
m_SizeDelta: {x: 236.66666, y: 76.532196}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &8180221014875707927
CanvasRenderer:
@ -2096,7 +2120,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.50980395, g: 0.3254902, b: 0.16862746, a: 1}
m_Color: {r: 0.38431376, g: 0.4784314, b: 0.4901961, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@ -2285,12 +2309,12 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 5159347801034191245}
m_Father: {fileID: 4093525921777245600}
m_Father: {fileID: 8552071283154088142}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 198.9716}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0}
--- !u!111 &2990778125173654006
Animation:
@ -2366,8 +2390,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 118.33333, y: -45.766098}
m_SizeDelta: {x: 236.66666, y: 91.532196}
m_AnchoredPosition: {x: 118.33333, y: -38.266098}
m_SizeDelta: {x: 236.66666, y: 76.532196}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5249591418429268564
CanvasRenderer:
@ -2390,7 +2414,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.50980395, g: 0.3254902, b: 0.16862746, a: 1}
m_Color: {r: 0.3910644, g: 0.47834307, b: 0.49056602, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1

View File

@ -33,6 +33,7 @@ Transform:
- {fileID: 5222704817821801315}
- {fileID: 7529011191634243865}
- {fileID: 2969644529280671742}
- {fileID: 3631394724762200096}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &3021524037178137395
@ -49,6 +50,38 @@ MonoBehaviour:
m_EditorClassIdentifier:
ball: {fileID: 8357584060222999024}
scoreVariable: {fileID: 11400000, guid: b17566f4d19813249a993793ac86d94c, type: 2}
OffScreenSpawnPoint: {fileID: 2895288046807806680}
--- !u!1 &2895288046807806680
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3631394724762200096}
m_Layer: 0
m_Name: BallOffScreenPoint
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3631394724762200096
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2895288046807806680}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 1000, y: 1000, z: 1000}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1575695703629199926}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &2420978955236610172
PrefabInstance:
m_ObjectHideFlags: 0
@ -275,6 +308,11 @@ PrefabInstance:
propertyPath: m_Name
value: TestGolfBall
objectReference: {fileID: 0}
- target: {fileID: 3638049900979181177, guid: c9932ec1118ae464983a6a298f97bb6d,
type: 3}
propertyPath: _tags.Array.size
value: 2
objectReference: {fileID: 0}
- target: {fileID: 6730959166714347295, guid: c9932ec1118ae464983a6a298f97bb6d,
type: 3}
propertyPath: m_LocalPosition.x

View File

@ -13,7 +13,7 @@ GameObject:
- component: {fileID: 6111169043551568500}
- component: {fileID: 2209335416918571775}
m_Layer: 5
m_Name: AnchorButton
m_Name: ResetGame
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -34,10 +34,10 @@ RectTransform:
- {fileID: 808835754764798433}
m_Father: {fileID: 5017249908300832766}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 43.21384, y: -65.36927}
m_SizeDelta: {x: 76.42768, y: 33.579514}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &422863097939129889
CanvasRenderer:
@ -121,14 +121,13 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 11400000, guid: 13acac687a571c343ab02079296549cd, type: 2}
m_TargetAssemblyTypeName: UnityAtoms.AtomEvent`1[[UnityEngine.GameObject,
UnityEngine
- m_Target: {fileID: 11400000, guid: e40e40bd17724c643a36711277734822, type: 2}
m_TargetAssemblyTypeName: UnityAtoms.BaseAtoms.VoidEvent, UnityAtoms.UnityAtomsBaseAtoms.Runtime
m_MethodName: Raise
m_Mode: 2
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.GameObject, UnityEngine
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
@ -169,10 +168,10 @@ RectTransform:
- {fileID: 8628996390368018201}
m_Father: {fileID: 5315978857558658518}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 400, y: -357.08197}
m_SizeDelta: {x: 800, y: 452.6869}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &6504601204719725150
MonoBehaviour:
@ -285,7 +284,9 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: Anchor
m_text: 'Reset
Game'
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@ -437,10 +438,10 @@ RectTransform:
- {fileID: 732848191053134804}
m_Father: {fileID: 5611332135643766733}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 70.54674, y: -226.34344}
m_SizeDelta: {x: 141.09348, y: 452.6869}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &9046168101239157074
MonoBehaviour:
@ -571,10 +572,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 6822881964581568414}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 356.78616, y: -65.36927}
m_SizeDelta: {x: 713.5723, y: 130.73854}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7702088531766176
CanvasRenderer:
@ -817,10 +818,10 @@ RectTransform:
- {fileID: 7084470639867465817}
m_Father: {fileID: 5017249908300832766}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 43.21384, y: -108.948784}
m_SizeDelta: {x: 76.42768, y: 33.579514}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8226246673512063451
CanvasRenderer:
@ -981,7 +982,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: Reset Course
m_text: "Reset \nCourse"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@ -1081,10 +1082,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 5611332135643766733}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 729.45325, y: -226.34344}
m_SizeDelta: {x: 141.09348, y: 452.6869}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &9188377459368314601
MonoBehaviour:
@ -1193,10 +1194,10 @@ RectTransform:
- {fileID: 5017249908300832766}
m_Father: {fileID: 5315978857558658518}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 400, y: -65.36927}
m_SizeDelta: {x: 800, y: 130.73854}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2754584408991230942
MonoBehaviour:
@ -1276,10 +1277,10 @@ RectTransform:
- {fileID: 8593196206423128769}
m_Father: {fileID: 5611332135643766733}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 400, y: -226.34344}
m_SizeDelta: {x: 517.81305, y: 452.6869}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &3266494810773044015
MonoBehaviour:
@ -1335,10 +1336,10 @@ RectTransform:
- {fileID: 5633813164990307547}
m_Father: {fileID: 5017249908300832766}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 43.21384, y: -21.789757}
m_SizeDelta: {x: 76.42768, y: 33.579514}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &157331330861266544
CanvasRenderer:
@ -1462,7 +1463,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &5315978857558658518
RectTransform:
m_ObjectHideFlags: 0
@ -1545,10 +1546,10 @@ RectTransform:
- {fileID: 4567674121355300256}
m_Father: {fileID: 6822881964581568414}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 756.7862, y: -65.36927}
m_SizeDelta: {x: 86.42768, y: 130.73854}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &809754802217479832
MonoBehaviour:

View File

@ -133,16 +133,146 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 7478519019532169470}
m_Modifications:
- target: {fileID: 401978161523643605, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
value: 2
objectReference: {fileID: 0}
- target: {fileID: 401978161523643605, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Mode
value: 1
objectReference: {fileID: 0}
- target: {fileID: 401978161523643605, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 4024034192225890645}
- target: {fileID: 401978161523643605, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 401978161523643605, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName
value: MAVRIC.GEEKCup.UIControler, Assembly-CSharp
objectReference: {fileID: 0}
- target: {fileID: 2249838454556904288, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2249838454556904288, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2249838454556904288, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_SizeDelta.x
value: 800
objectReference: {fileID: 0}
- target: {fileID: 2249838454556904288, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_SizeDelta.y
value: 96.532196
objectReference: {fileID: 0}
- target: {fileID: 2249838454556904288, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 400
objectReference: {fileID: 0}
- target: {fileID: 3108965939737468407, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3108965939737468407, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3108965939737468407, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_SizeDelta.x
value: 800
objectReference: {fileID: 0}
- target: {fileID: 3108965939737468407, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_SizeDelta.y
value: 48.8522
objectReference: {fileID: 0}
- target: {fileID: 3108965939737468407, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 400
objectReference: {fileID: 0}
- target: {fileID: 3108965939737468407, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -120.9583
objectReference: {fileID: 0}
- target: {fileID: 3514286752865316932, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3514286752865316932, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3514286752865316932, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 400
objectReference: {fileID: 0}
- target: {fileID: 3514286752865316932, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -24.4261
objectReference: {fileID: 0}
- target: {fileID: 3524450192704275766, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_Name
value: CourseLayoutUI
objectReference: {fileID: 0}
- target: {fileID: 3642275361595757492, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3943492902580190157, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3943492902580190157, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3943492902580190157, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_SizeDelta.x
value: 780
objectReference: {fileID: 0}
- target: {fileID: 3943492902580190157, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_SizeDelta.y
value: 76.532196
objectReference: {fileID: 0}
- target: {fileID: 3943492902580190157, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 400
objectReference: {fileID: 0}
- target: {fileID: 3943492902580190157, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -48.266098
objectReference: {fileID: 0}
- target: {fileID: 4093525921777245600, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_Pivot.x
@ -243,6 +373,156 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4429803177772368616, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4429803177772368616, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4429803177772368616, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_SizeDelta.x
value: 236.66666
objectReference: {fileID: 0}
- target: {fileID: 4429803177772368616, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_SizeDelta.y
value: 76.532196
objectReference: {fileID: 0}
- target: {fileID: 4429803177772368616, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 118.33333
objectReference: {fileID: 0}
- target: {fileID: 4429803177772368616, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -38.266098
objectReference: {fileID: 0}
- target: {fileID: 6267940756370835963, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6267940756370835963, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6267940756370835963, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6267940756370835963, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6267940756370835963, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6267940756370835963, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7197256551416756614, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7197256551416756614, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7197256551416756614, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_SizeDelta.x
value: 236.66666
objectReference: {fileID: 0}
- target: {fileID: 7197256551416756614, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_SizeDelta.y
value: 76.532196
objectReference: {fileID: 0}
- target: {fileID: 7197256551416756614, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 543.3333
objectReference: {fileID: 0}
- target: {fileID: 7197256551416756614, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -38.266098
objectReference: {fileID: 0}
- target: {fileID: 7667425266489375675, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7667425266489375675, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7667425266489375675, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_SizeDelta.x
value: 236.66666
objectReference: {fileID: 0}
- target: {fileID: 7667425266489375675, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_SizeDelta.y
value: 76.532196
objectReference: {fileID: 0}
- target: {fileID: 7667425266489375675, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 271.66666
objectReference: {fileID: 0}
- target: {fileID: 7667425266489375675, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -38.266098
objectReference: {fileID: 0}
- target: {fileID: 8552071283154088142, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8552071283154088142, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8552071283154088142, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8552071283154088142, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8552071283154088142, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8552071283154088142, guid: 5df815d3649b58b4484d2ae582fbf0c3,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
@ -268,6 +548,156 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 7478519019532169470}
m_Modifications:
- target: {fileID: 1109112800518834720, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1109112800518834720, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1109112800518834720, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_SizeDelta.x
value: 141.09348
objectReference: {fileID: 0}
- target: {fileID: 1109112800518834720, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_SizeDelta.y
value: 467.604
objectReference: {fileID: 0}
- target: {fileID: 1109112800518834720, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 70.54674
objectReference: {fileID: 0}
- target: {fileID: 1109112800518834720, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -233.802
objectReference: {fileID: 0}
- target: {fileID: 1222094003175734207, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1222094003175734207, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1222094003175734207, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_SizeDelta.x
value: 517.81305
objectReference: {fileID: 0}
- target: {fileID: 1222094003175734207, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_SizeDelta.y
value: 467.604
objectReference: {fileID: 0}
- target: {fileID: 1222094003175734207, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 400
objectReference: {fileID: 0}
- target: {fileID: 1222094003175734207, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -233.802
objectReference: {fileID: 0}
- target: {fileID: 3683352126321482462, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3683352126321482462, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3683352126321482462, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_SizeDelta.x
value: 713.5723
objectReference: {fileID: 0}
- target: {fileID: 3683352126321482462, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_SizeDelta.y
value: 132.396
objectReference: {fileID: 0}
- target: {fileID: 3683352126321482462, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 356.78616
objectReference: {fileID: 0}
- target: {fileID: 3683352126321482462, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -66.198
objectReference: {fileID: 0}
- target: {fileID: 4567674121355300256, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4567674121355300256, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4567674121355300256, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_SizeDelta.x
value: 76.42768
objectReference: {fileID: 0}
- target: {fileID: 4567674121355300256, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_SizeDelta.y
value: 34.131996
objectReference: {fileID: 0}
- target: {fileID: 4567674121355300256, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 43.21384
objectReference: {fileID: 0}
- target: {fileID: 4567674121355300256, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -110.32999
objectReference: {fileID: 0}
- target: {fileID: 5017249908300832766, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5017249908300832766, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5017249908300832766, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_SizeDelta.x
value: 86.42768
objectReference: {fileID: 0}
- target: {fileID: 5017249908300832766, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_SizeDelta.y
value: 132.396
objectReference: {fileID: 0}
- target: {fileID: 5017249908300832766, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 756.7862
objectReference: {fileID: 0}
- target: {fileID: 5017249908300832766, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -66.198
objectReference: {fileID: 0}
- target: {fileID: 5315978857558658518, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_Pivot.x
@ -368,6 +798,96 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5611332135643766733, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5611332135643766733, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5611332135643766733, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_SizeDelta.x
value: 800
objectReference: {fileID: 0}
- target: {fileID: 5611332135643766733, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_SizeDelta.y
value: 467.604
objectReference: {fileID: 0}
- target: {fileID: 5611332135643766733, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 400
objectReference: {fileID: 0}
- target: {fileID: 5611332135643766733, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -366.198
objectReference: {fileID: 0}
- target: {fileID: 6405355493915766111, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6405355493915766111, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6405355493915766111, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_SizeDelta.x
value: 76.42768
objectReference: {fileID: 0}
- target: {fileID: 6405355493915766111, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_SizeDelta.y
value: 34.131996
objectReference: {fileID: 0}
- target: {fileID: 6405355493915766111, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 43.21384
objectReference: {fileID: 0}
- target: {fileID: 6405355493915766111, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -22.065998
objectReference: {fileID: 0}
- target: {fileID: 6822881964581568414, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6822881964581568414, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6822881964581568414, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_SizeDelta.x
value: 800
objectReference: {fileID: 0}
- target: {fileID: 6822881964581568414, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_SizeDelta.y
value: 132.396
objectReference: {fileID: 0}
- target: {fileID: 6822881964581568414, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 400
objectReference: {fileID: 0}
- target: {fileID: 6822881964581568414, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -66.198
objectReference: {fileID: 0}
- target: {fileID: 6845093383438384349, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
@ -378,6 +898,71 @@ PrefabInstance:
propertyPath: m_Name
value: GameUI
objectReference: {fileID: 0}
- target: {fileID: 7216457840435028077, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8628996390368018201, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8628996390368018201, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8628996390368018201, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_SizeDelta.x
value: 141.09348
objectReference: {fileID: 0}
- target: {fileID: 8628996390368018201, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_SizeDelta.y
value: 467.604
objectReference: {fileID: 0}
- target: {fileID: 8628996390368018201, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 729.45325
objectReference: {fileID: 0}
- target: {fileID: 8628996390368018201, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -233.802
objectReference: {fileID: 0}
- target: {fileID: 9118863009621341683, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 9118863009621341683, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 9118863009621341683, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_SizeDelta.x
value: 76.42768
objectReference: {fileID: 0}
- target: {fileID: 9118863009621341683, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_SizeDelta.y
value: 34.131996
objectReference: {fileID: 0}
- target: {fileID: 9118863009621341683, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 43.21384
objectReference: {fileID: 0}
- target: {fileID: 9118863009621341683, guid: 686b51ff9e7b323448470fac3420b8a3,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -66.198
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []

View File

@ -1,5 +1,6 @@
using UnityEngine.EventSystems;
using UnityEngine.InputSystem;
using UnityEngine.Serialization;
using UnityEngine.UI;
using UnityEngine.XR.Interaction.Toolkit.Samples.StarterAssets;
@ -77,17 +78,18 @@ namespace UnityEngine.XR.Interaction.Toolkit.Samples.ARStarterAssets
set => m_ObjectSpawner = value;
}
[FormerlySerializedAs("m_CancelButton")]
[SerializeField]
[Tooltip("Button that closes the object creation menu.")]
Button m_CancelButton;
Button m_CloseButton;
/// <summary>
/// Button that closes the object creation menu.
/// </summary>
public Button cancelButton
{
get => m_CancelButton;
set => m_CancelButton = value;
get => m_CloseButton;
set => m_CloseButton = value;
}
[SerializeField]
@ -124,7 +126,7 @@ namespace UnityEngine.XR.Interaction.Toolkit.Samples.ARStarterAssets
m_ScreenSpaceController.dragCurrentPositionAction.action.started += HideTapOutsideUI;
m_ScreenSpaceController.tapStartPositionAction.action.started += HideTapOutsideUI;
m_CreateButton.onClick.AddListener(ShowMenu);
m_CancelButton.onClick.AddListener(HideMenu);
m_CloseButton.onClick.AddListener(CloseMenu);
m_DeleteButton.onClick.AddListener(DeleteFocusedObject);
}
@ -134,7 +136,7 @@ namespace UnityEngine.XR.Interaction.Toolkit.Samples.ARStarterAssets
m_ScreenSpaceController.dragCurrentPositionAction.action.started -= HideTapOutsideUI;
m_ScreenSpaceController.tapStartPositionAction.action.started -= HideTapOutsideUI;
m_CreateButton.onClick.RemoveListener(ShowMenu);
m_CancelButton.onClick.RemoveListener(HideMenu);
m_CloseButton.onClick.RemoveListener(CloseMenu);
m_DeleteButton.onClick.RemoveListener(DeleteFocusedObject);
}
@ -192,10 +194,10 @@ namespace UnityEngine.XR.Interaction.Toolkit.Samples.ARStarterAssets
{
m_ShowObjectMenu = true;
m_ObjectMenu.SetActive(true);
if (!m_ObjectMenuAnimator.GetBool("Show"))
{
m_ObjectMenuAnimator.SetBool("Show", true);
}
// if (!m_ObjectMenuAnimator.GetBool("Show"))
// {
// m_ObjectMenuAnimator.SetBool("Show", true);
// }
}
/// <summary>
@ -203,8 +205,14 @@ namespace UnityEngine.XR.Interaction.Toolkit.Samples.ARStarterAssets
/// </summary>
public void HideMenu()
{
m_ObjectMenuAnimator.SetBool("Show", false);
// m_ObjectMenuAnimator.SetBool("Show", false);
m_ShowObjectMenu = false;
//m_ObjectMenu.SetActive(false);
}
private void CloseMenu()
{
m_ObjectMenu.SetActive(false);
}
void HideTapOutsideUI(InputAction.CallbackContext context)

View File

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1}
m_IndirectSpecularColor: {r: 0.18028326, g: 0.22571333, b: 0.30692202, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@ -146,11 +146,6 @@ PrefabInstance:
propertyPath: m_Name
value: XR Origin (AR Rig)
objectReference: {fileID: 0}
- target: {fileID: 2512387470528047737, guid: 48cb3fb68c91eb94999fd99957eb0cae,
type: 3}
propertyPath: m_DetectionMode
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2512387470528047738, guid: 48cb3fb68c91eb94999fd99957eb0cae,
type: 3}
propertyPath: m_RootOrder
@ -665,31 +660,561 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 339076641259314068, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 339076641259314068, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 339076641259314068, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 339076641259314068, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 339076641259314068, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 339076641259314068, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 864705718441091586, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_Name
value: UI
objectReference: {fileID: 0}
- target: {fileID: 952743104557620447, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 952743104557620447, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 952743104557620447, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 952743104557620447, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 952743104557620447, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1006637533637529982, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1006637533637529982, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1006637533637529982, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1006637533637529982, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1006637533637529982, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1006637533637529982, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1699484247299457898, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target
value:
objectReference: {fileID: 2022381351}
- target: {fileID: 1699484247299457898, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName
value: MoveBallToSpawnPoint
objectReference: {fileID: 0}
- target: {fileID: 1699484247299457898, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName
value: MAVRIC.GEEKCup.GameLogic, Assembly-CSharp
objectReference: {fileID: 0}
- target: {fileID: 1699484247299457898, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 2471429432974865443, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 2022381351}
- target: {fileID: 2505298574407444475, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2505298574407444475, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2505298574407444475, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2505298574407444475, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2512011460402152248, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2512011460402152248, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2512011460402152248, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2512011460402152248, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2512011460402152248, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2512011460402152248, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2636768522075935225, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2636768522075935225, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2636768522075935225, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2636768522075935225, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2636768522075935225, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2636768522075935225, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2646923679365868658, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2646923679365868658, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2646923679365868658, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2646923679365868658, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2646923679365868658, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2646923679365868658, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2650009755706299066, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
value: 3
objectReference: {fileID: 0}
- target: {fileID: 2650009755706299066, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Mode
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2650009755706299066, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Target
value:
objectReference: {fileID: 2022381351}
- target: {fileID: 2650009755706299066, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 2650009755706299066, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_MethodName
value: MoveBallOffScreen
objectReference: {fileID: 0}
- target: {fileID: 2650009755706299066, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_TargetAssemblyTypeName
value: MAVRIC.GEEKCup.GameLogic, Assembly-CSharp
objectReference: {fileID: 0}
- target: {fileID: 2650009755706299066, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 3420493177419208023, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3420493177419208023, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3420493177419208023, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3420493177419208023, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3420493177419208023, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3420493177419208023, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4024034192225890645, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: gameLogic
value:
objectReference: {fileID: 2022381351}
- target: {fileID: 4024034192225890645, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: arPlanePrefab
value:
objectReference: {fileID: 0}
- target: {fileID: 4024034192225890645, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: arPlaneManager
value:
objectReference: {fileID: 1037826357}
- target: {fileID: 4028299612833903018, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4028299612833903018, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4028299612833903018, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4028299612833903018, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4028299612833903018, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4028299612833903018, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4117590669473335880, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4117590669473335880, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4117590669473335880, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4117590669473335880, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4117590669473335880, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4117590669473335880, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4582636692777267609, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4582636692777267609, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4582636692777267609, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4582636692777267609, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4582636692777267609, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4582636692777267609, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4971384656962362948, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4971384656962362948, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4971384656962362948, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4971384656962362948, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4971384656962362948, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4971384656962362948, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4997784572690801607, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4997784572690801607, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4997784572690801607, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4997784572690801607, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4997784572690801607, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4997784572690801607, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5270888049379341497, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5270888049379341497, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5270888049379341497, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5270888049379341497, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5270888049379341497, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5270888049379341497, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7246629506756629656, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
value: 2
objectReference: {fileID: 0}
- target: {fileID: 7246629506756629656, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Mode
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7246629506756629656, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target
value:
objectReference: {fileID: 2022381351}
- target: {fileID: 7246629506756629656, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 7246629506756629656, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName
value: MoveBallToSpawnPoint
objectReference: {fileID: 0}
- target: {fileID: 7246629506756629656, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName
value: MAVRIC.GEEKCup.GameLogic, Assembly-CSharp
objectReference: {fileID: 0}
- target: {fileID: 7246629506756629656, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgument
value:
objectReference: {fileID: 331264287}
- target: {fileID: 7246629506756629656, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 7254970711025592177, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7254970711025592177, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7254970711025592177, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7254970711025592177, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7254970711025592177, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7254970711025592177, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7478519019532169470, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_Pivot.x
@ -790,6 +1315,36 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7696038210310608344, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7696038210310608344, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7696038210310608344, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7696038210310608344, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7696038210310608344, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7696038210310608344, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8097805375892431114, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_ObjectSpawner
@ -805,6 +1360,96 @@ PrefabInstance:
propertyPath: m_ScreenSpaceController
value:
objectReference: {fileID: 2001374503}
- target: {fileID: 8205576501147512377, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8205576501147512377, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8205576501147512377, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8205576501147512377, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8205576501147512377, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8205576501147512377, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8456719723576075335, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8456719723576075335, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8456719723576075335, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8456719723576075335, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8456719723576075335, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8456719723576075335, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8676730378364972036, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8676730378364972036, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8676730378364972036, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8676730378364972036, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8676730378364972036, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8676730378364972036, guid: 3ccc2f7c888da2b4c9997752a4d80cc2,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []

View File

@ -12,7 +12,12 @@ namespace MAVRIC.GEEKCup
[SerializeField] private GameObject arPlanePrefab;
[SerializeField] private IntVariable scoreVariable;
[SerializeField] private GameLogic gameLogic;
[SerializeField] private GameObject trackables;
private void Start()
{
trackables = GameObject.Find("Trackables");
}
public void ShowCourseLayout()
{
foreach (var obj in CourseLayoutObjects)
@ -25,7 +30,7 @@ namespace MAVRIC.GEEKCup
{
obj.SetActive(false);
}
setPlaneManagerPrefab(true);
setTrackablePlanes(true);
}
public void ShowGamePlay()
@ -39,22 +44,14 @@ namespace MAVRIC.GEEKCup
{
obj.SetActive(true);
}
setPlaneManagerPrefab(false);
arPlaneManager.planePrefab = null;
setTrackablePlanes(false);
scoreVariable.Value = 0;
gameLogic.CheckForSpawnPoint();
}
private void setPlaneManagerPrefab(bool value)
private void setTrackablePlanes(bool value)
{
if (value)
{
arPlaneManager.planePrefab = arPlanePrefab;
}
else
{
arPlaneManager.planePrefab = null;
}
trackables.SetActive(value);
}
}
}