Skip to content

Commit

Permalink
Fix Mobile advanced tools panel
Browse files Browse the repository at this point in the history 
Prefab had reverted back a bunch of settings. (probably a bad merge)
  • Loading branch information
@andybak
andybak committed Jan 19, 2024
1 parent 44b2cd6 commit c14d5bf
Showing 1 changed file with 94 additions and 61 deletions.
155 changes: 94 additions & 61 deletions Assets/Prefabs/Panels/AdvancedToolsPanel_Mobile.prefab
View file
Original file line number Diff line number Diff line change
Expand Up @@ -887,12 +887,15 @@ MonoBehaviour:
- m_PopUpPrefab: {fileID: 1758786797962018, guid: e2dd9f64d28858a468b61151cbf090d6,
type: 3}
m_Command: 14
- m_PopUpPrefab: {fileID: 1887799951535888, guid: cea55265052f18b4ca24670a074de41d,
- m_PopUpPrefab: {fileID: 1758786797962018, guid: 04751ea8307825e4bb7657eb20f9bfc5,
type: 3}
m_Command: 67
- m_PopUpPrefab: {fileID: 1386358278955912, guid: be80cc928a63c8c4aa97d1e0d06e965d,
type: 3}
m_Command: 32
- m_PopUpPrefab: {fileID: 1887799951535888, guid: a600c48c5f105874e8e750977bb95d4b,
type: 3}
m_Command: 11500
m_PanelDescription: ADVANCEDTOOLS_PANEL_DESCRIPTION
m_LocalizedPanelDescription:
m_TableReference:
Expand All @@ -905,7 +908,7 @@ MonoBehaviour:
m_LocalVariables: []
m_PanelDescriptionPrefab: {fileID: 160918, guid: 3491f4f01ba6cac47b1633f36d7c6c84,
type: 3}
m_PanelDescriptionOffset: {x: 1.25, y: 1, z: 0}
m_PanelDescriptionOffset: {x: 1.25, y: 0.8, z: 0}
m_PanelDescriptionColor: {r: 1, g: 1, b: 1, a: 1}
m_PanelFlairPrefab: {fileID: 0}
m_PanelFlairOffset: {x: 0, y: 0, z: 0}
Expand All @@ -921,7 +924,7 @@ MonoBehaviour:
m_BorderMeshAdvWidth: 0.01
m_PanelSensitivity: 0.1
m_ClampToBounds: 1
m_ReticleBounds: {x: 1.35, y: 1.9, z: 0}
m_ReticleBounds: {x: 2, y: 1.9, z: 0}
m_BorderSphereHighlightRadius: 2.5
m_PositioningSpheresBounds: {x: 1, y: 1}
m_PositioningSphereRadius: 0.4
Expand All @@ -931,7 +934,7 @@ MonoBehaviour:
m_InitialSpawnPos: {x: 4.61, y: 12, z: 5.34}
m_InitialSpawnRotEulers: {x: 37.18, y: 63.12, z: 0}
m_WandAttachAngle: 240
m_WandAttachYOffset: 1.2
m_WandAttachYOffset: 0.75
m_WandAttachHalfHeight: 1.2
m_BeginFixed: 1
m_CanBeFixedToWand: 1
Expand Down Expand Up @@ -1288,56 +1291,56 @@ MonoBehaviour:
references:
version: 2
RefIds: []
--- !u!1 &1762075770379121108
--- !u!1 &1936695874305319046
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2975505311388951996}
- component: {fileID: 7014779205488695019}
- component: {fileID: 8195250855829399349}
- component: {fileID: 512714663503580483}
- component: {fileID: 3988998951713818744}
- component: {fileID: 6241049838869485412}
- component: {fileID: 2166735873966245073}
- component: {fileID: 1527421687939909522}
- component: {fileID: 2647169894404202813}
- component: {fileID: 7584170256883290574}
m_Layer: 16
m_Name: Button_Repaint
m_Name: Button_Join
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2975505311388951996
--- !u!4 &6241049838869485412
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1762075770379121108}
m_GameObject: {fileID: 1936695874305319046}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.42199993, y: 0.643, z: 0.049999237}
m_LocalPosition: {x: 0.21099995, y: -0.634, z: 0.049999237}
m_LocalScale: {x: 0.35, y: 0.35, z: 0.35}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8559047527123235848}
m_RootOrder: 2
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &7014779205488695019
--- !u!33 &2166735873966245073
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1762075770379121108}
m_GameObject: {fileID: 1936695874305319046}
m_Mesh: {fileID: 4300000, guid: 5501f437160666942ae970f3648fbeb8, type: 3}
--- !u!23 &8195250855829399349
--- !u!23 &1527421687939909522
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1762075770379121108}
m_GameObject: {fileID: 1936695874305319046}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
Expand Down Expand Up @@ -1373,39 +1376,39 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!65 &512714663503580483
--- !u!65 &2647169894404202813
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1762075770379121108}
m_GameObject: {fileID: 1936695874305319046}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 0.01}
m_Center: {x: -0.000000074505806, y: 0.000000022351742, z: -0.05}
--- !u!114 &3988998951713818744
m_Center: {x: 0, y: 0, z: -0.05}
--- !u!114 &7584170256883290574
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1762075770379121108}
m_GameObject: {fileID: 1936695874305319046}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 962894c5495cabc458506a8548e8a1e2, type: 3}
m_Name:
m_EditorClassIdentifier:
m_DescriptionType: 0
m_DescriptionYOffset: 0
m_DescriptionText: ADVANCEDTOOLS_PANEL_BUTTON_REPAINT
m_DescriptionText: ADVANCEDTOOLS_PANEL_BUTTON_JOIN
m_LocalizedDescription:
m_TableReference:
m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86
m_TableEntryReference:
m_KeyId: 5143592097783808
m_KeyId: 68763796961820672
m_Key:
m_FallbackState: 0
m_WaitForCompletion: 0
Expand All @@ -1422,7 +1425,7 @@ MonoBehaviour:
m_LocalVariables: []
m_DescriptionActivateSpeed: 12
m_DescriptionZScale: 1
m_ButtonTexture: {fileID: 2800000, guid: 48c4e2e5ea2c3794fa991bd025329d44, type: 3}
m_ButtonTexture: {fileID: 2800000, guid: cdc7d38d9e0b30443961d1cc27195586, type: 3}
m_AtlasTexture: 1
m_ToggleButton: 1
m_LongPressReleaseButton: 0
Expand All @@ -1432,61 +1435,61 @@ MonoBehaviour:
m_HoverScale: 1.1
m_HoverBoxColliderGrow: 0.2
m_AddOverlay: 0
m_Tool: 18
m_EatGazeInputOnPress: 1
m_Tool: 11001
m_EatGazeInputOnPress: 0
references:
version: 2
RefIds: []
--- !u!1 &1936695874305319046
--- !u!1 &2982966821418160655
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6241049838869485412}
- component: {fileID: 2166735873966245073}
- component: {fileID: 1527421687939909522}
- component: {fileID: 2647169894404202813}
- component: {fileID: 7584170256883290574}
- component: {fileID: 2986380591895733871}
- component: {fileID: 2961652316920826093}
- component: {fileID: 2967914361820424519}
- component: {fileID: 2992326109915266793}
- component: {fileID: 2951056332637183903}
m_Layer: 16
m_Name: Button_Join
m_Name: Button_Repaint
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6241049838869485412
--- !u!4 &2986380591895733871
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1936695874305319046}
m_GameObject: {fileID: 2982966821418160655}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.21099995, y: -0.634, z: 0.049999237}
m_LocalPosition: {x: 0.42199993, y: 0.643, z: 0.049999237}
m_LocalScale: {x: 0.35, y: 0.35, z: 0.35}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8559047527123235848}
m_RootOrder: 10
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &2166735873966245073
--- !u!33 &2961652316920826093
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1936695874305319046}
m_GameObject: {fileID: 2982966821418160655}
m_Mesh: {fileID: 4300000, guid: 5501f437160666942ae970f3648fbeb8, type: 3}
--- !u!23 &1527421687939909522
--- !u!23 &2967914361820424519
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1936695874305319046}
m_GameObject: {fileID: 2982966821418160655}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
Expand Down Expand Up @@ -1522,39 +1525,39 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!65 &2647169894404202813
--- !u!65 &2992326109915266793
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1936695874305319046}
m_GameObject: {fileID: 2982966821418160655}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 0.01}
m_Center: {x: 0, y: 0, z: -0.05}
--- !u!114 &7584170256883290574
m_Center: {x: -0.000000074505806, y: 0.000000022351742, z: -0.05}
--- !u!114 &2951056332637183903
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1936695874305319046}
m_GameObject: {fileID: 2982966821418160655}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 962894c5495cabc458506a8548e8a1e2, type: 3}
m_Script: {fileID: 11500000, guid: 0eca91ea617987a4a8b8d03e685fc648, type: 3}
m_Name:
m_EditorClassIdentifier:
m_DescriptionType: 0
m_DescriptionYOffset: 0
m_DescriptionText: Join
m_DescriptionText: ADVANCEDTOOLS_PANEL_BUTTON_REPAINT
m_LocalizedDescription:
m_TableReference:
m_TableCollectionName:
m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86
m_TableEntryReference:
m_KeyId: 0
m_KeyId: 5143592097783808
m_Key:
m_FallbackState: 0
m_WaitForCompletion: 0
Expand All @@ -1571,7 +1574,7 @@ MonoBehaviour:
m_LocalVariables: []
m_DescriptionActivateSpeed: 12
m_DescriptionZScale: 1
m_ButtonTexture: {fileID: 2800000, guid: cdc7d38d9e0b30443961d1cc27195586, type: 3}
m_ButtonTexture: {fileID: 2800000, guid: e19c558a83b463843bb1f2f37c9c5d52, type: 3}
m_AtlasTexture: 1
m_ToggleButton: 1
m_LongPressReleaseButton: 0
Expand All @@ -1581,8 +1584,38 @@ MonoBehaviour:
m_HoverScale: 1.1
m_HoverBoxColliderGrow: 0.2
m_AddOverlay: 0
m_Tool: 11001
m_EatGazeInputOnPress: 0
m_Command: 11500
m_CommandParam: -1
m_CommandParam2: -1
m_RequiresPopup: 1
m_CenterPopupOnButton: 0
m_PopupOffset: {x: 0, y: 0, z: 0}
m_PopupText:
m_LocalizedPopup:
m_TableReference:
m_TableCollectionName:
m_TableEntryReference:
m_KeyId: 0
m_Key:
m_FallbackState: 0
m_WaitForCompletion: 0
m_LocalVariables: []
m_ToggleOnDescription:
m_LocalizedToggleOnDescription:
m_TableReference:
m_TableCollectionName:
m_TableEntryReference:
m_KeyId: 0
m_Key:
m_FallbackState: 0
m_WaitForCompletion: 0
m_LocalVariables: []
m_ToggleOnTexture: {fileID: 0}
m_AllowUnavailable: 0
m_LinkedUIObject: {fileID: 0}
m_LongPressDuration: 0.3
m_Tool: 18
m_EatGazeInputOnPress: 1
references:
version: 2
RefIds: []
Expand Down Expand Up @@ -1930,12 +1963,12 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_DescriptionType: 0
m_DescriptionYOffset: 0
m_DescriptionText: Cameras
m_DescriptionText: ADVANCEDTOOLS_PANEL_BUTTON_CAMERAS
m_LocalizedDescription:
m_TableReference:
m_TableCollectionName:
m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86
m_TableEntryReference:
m_KeyId: 0
m_KeyId: 5143682283708416
m_Key:
m_FallbackState: 0
m_WaitForCompletion: 0
Expand Down Expand Up @@ -2274,7 +2307,7 @@ Transform:
m_Children:
- {fileID: 4217463243508286}
- {fileID: 4214350192589502}
- {fileID: 2975505311388951996}
- {fileID: 2986380591895733871}
- {fileID: 1749387468369646144}
- {fileID: 4804856552451824}
- {fileID: 4561744009806850}
Expand Down Expand Up @@ -2622,7 +2655,7 @@ PrefabInstance:
- target: {fileID: 6608529110619887157, guid: 3a7c3a09a58b6db43aab80957cc81fc9,
type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6610468352840375919, guid: 3a7c3a09a58b6db43aab80957cc81fc9,
type: 3}
Expand Down

0 comments on commit c14d5bf

Please sign in to comment.