Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix selection tray collider #504

Merged
merged 1 commit into from
Aug 23, 2023
Merged

fix selection tray collider #504

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
158 changes: 121 additions & 37 deletions Assets/Prefabs/UIComponents/SelectionTray.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,23 @@ MonoBehaviour:
m_DescriptionText:
m_LocalizedDescription:
m_TableReference:
m_TableCollectionName:
m_TableCollectionName:
m_TableEntryReference:
m_KeyId: 0
m_Key:
m_Key:
m_FallbackState: 0
m_WaitForCompletion: 0
m_LocalVariables: []
m_DescriptionTextExtra:
m_LocalizedDescriptionExtra:
m_TableReference:
m_TableCollectionName:
m_TableEntryReference:
m_KeyId: 0
m_Key:
m_FallbackState: 0
m_WaitForCompletion: 0
m_LocalVariables: []
m_DescriptionTextExtra:
m_DescriptionActivateSpeed: 12
m_DescriptionZScale: 1
m_Mesh: {fileID: 1596481825594902}
Expand Down Expand Up @@ -106,7 +115,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1596481825594902}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: -0.000000014901161, y: 0, z: 0}
m_LocalScale: {x: 0.75, y: 0.75, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
Expand Down Expand Up @@ -145,10 +154,10 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1895032314352020}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: -0.177, z: 0}
m_LocalScale: {x: 0.4, y: 1.68, z: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Children: []
m_Father: {fileID: 4144920620344815534}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Expand All @@ -163,8 +172,8 @@ BoxCollider:
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 0.2}
m_Center: {x: 0, y: 0, z: 0}
m_Size: {x: 0.4, y: 1.7, z: 0.2}
m_Center: {x: 0, y: -0.18, z: 0}
--- !u!1 &527762663584930946
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -449,11 +458,20 @@ MonoBehaviour:
m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86
m_TableEntryReference:
m_KeyId: 5145130421690368
m_Key:
m_Key:
m_FallbackState: 0
m_WaitForCompletion: 0
m_LocalVariables: []
m_DescriptionTextExtra:
m_LocalizedDescriptionExtra:
m_TableReference:
m_TableCollectionName:
m_TableEntryReference:
m_KeyId: 0
m_Key:
m_FallbackState: 0
m_WaitForCompletion: 0
m_LocalVariables: []
m_DescriptionActivateSpeed: 12
m_DescriptionZScale: 1
m_ButtonTexture: {fileID: 2800000, guid: 6fac6fbfc7872e445ad562d8585098ff, type: 3}
Expand All @@ -475,20 +493,20 @@ MonoBehaviour:
m_PopupText:
m_LocalizedPopup:
m_TableReference:
m_TableCollectionName:
m_TableCollectionName:
m_TableEntryReference:
m_KeyId: 0
m_Key:
m_Key:
m_FallbackState: 0
m_WaitForCompletion: 0
m_LocalVariables: []
m_ToggleOnDescription:
m_ToggleOnDescription:
m_LocalizedToggleOnDescription:
m_TableReference:
m_TableCollectionName:
m_TableCollectionName:
m_TableEntryReference:
m_KeyId: 0
m_Key:
m_Key:
m_FallbackState: 0
m_WaitForCompletion: 0
m_LocalVariables: []
Expand Down Expand Up @@ -616,11 +634,20 @@ MonoBehaviour:
m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86
m_TableEntryReference:
m_KeyId: 5144771179552768
m_Key:
m_Key:
m_FallbackState: 0
m_WaitForCompletion: 0
m_LocalVariables: []
m_DescriptionTextExtra:
m_LocalizedDescriptionExtra:
m_TableReference:
m_TableCollectionName:
m_TableEntryReference:
m_KeyId: 0
m_Key:
m_FallbackState: 0
m_WaitForCompletion: 0
m_LocalVariables: []
m_DescriptionActivateSpeed: 12
m_DescriptionZScale: 1
m_ButtonTexture: {fileID: 2800000, guid: 342cbde45e0e65b418f9323d0dfdf3b3, type: 3}
Expand All @@ -642,10 +669,10 @@ MonoBehaviour:
m_PopupText:
m_LocalizedPopup:
m_TableReference:
m_TableCollectionName:
m_TableCollectionName:
m_TableEntryReference:
m_KeyId: 0
m_Key:
m_Key:
m_FallbackState: 0
m_WaitForCompletion: 0
m_LocalVariables: []
Expand All @@ -655,7 +682,7 @@ MonoBehaviour:
m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86
m_TableEntryReference:
m_KeyId: 5145968804339712
m_Key:
m_Key:
m_FallbackState: 0
m_WaitForCompletion: 0
m_LocalVariables: []
Expand Down Expand Up @@ -783,11 +810,20 @@ MonoBehaviour:
m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86
m_TableEntryReference:
m_KeyId: 5145342544420864
m_Key:
m_Key:
m_FallbackState: 0
m_WaitForCompletion: 0
m_LocalVariables: []
m_DescriptionTextExtra:
m_LocalizedDescriptionExtra:
m_TableReference:
m_TableCollectionName:
m_TableEntryReference:
m_KeyId: 0
m_Key:
m_FallbackState: 0
m_WaitForCompletion: 0
m_LocalVariables: []
m_DescriptionActivateSpeed: 12
m_DescriptionZScale: 1
m_ButtonTexture: {fileID: 2800000, guid: 82c4045b61e406342beabf4cd6b325a3, type: 3}
Expand All @@ -809,20 +845,20 @@ MonoBehaviour:
m_PopupText:
m_LocalizedPopup:
m_TableReference:
m_TableCollectionName:
m_TableCollectionName:
m_TableEntryReference:
m_KeyId: 0
m_Key:
m_Key:
m_FallbackState: 0
m_WaitForCompletion: 0
m_LocalVariables: []
m_ToggleOnDescription:
m_ToggleOnDescription:
m_LocalizedToggleOnDescription:
m_TableReference:
m_TableCollectionName:
m_TableCollectionName:
m_TableEntryReference:
m_KeyId: 0
m_Key:
m_Key:
m_FallbackState: 0
m_WaitForCompletion: 0
m_LocalVariables: []
Expand Down Expand Up @@ -950,11 +986,20 @@ MonoBehaviour:
m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86
m_TableEntryReference:
m_KeyId: 5145273980133376
m_Key:
m_Key:
m_FallbackState: 0
m_WaitForCompletion: 0
m_LocalVariables: []
m_DescriptionTextExtra:
m_LocalizedDescriptionExtra:
m_TableReference:
m_TableCollectionName:
m_TableEntryReference:
m_KeyId: 0
m_Key:
m_FallbackState: 0
m_WaitForCompletion: 0
m_LocalVariables: []
m_DescriptionActivateSpeed: 12
m_DescriptionZScale: 1
m_ButtonTexture: {fileID: 2800000, guid: ca71eaeea4cfdfa4ba16e0f859494f3f, type: 3}
Expand All @@ -976,20 +1021,20 @@ MonoBehaviour:
m_PopupText:
m_LocalizedPopup:
m_TableReference:
m_TableCollectionName:
m_TableCollectionName:
m_TableEntryReference:
m_KeyId: 0
m_Key:
m_Key:
m_FallbackState: 0
m_WaitForCompletion: 0
m_LocalVariables: []
m_ToggleOnDescription:
m_ToggleOnDescription:
m_LocalizedToggleOnDescription:
m_TableReference:
m_TableCollectionName:
m_TableCollectionName:
m_TableEntryReference:
m_KeyId: 0
m_Key:
m_Key:
m_FallbackState: 0
m_WaitForCompletion: 0
m_LocalVariables: []
Expand Down Expand Up @@ -1107,12 +1152,30 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d1eea6a2cc004b83af9aebb729e1df80, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Name:
m_EditorClassIdentifier:
m_DescriptionType: 0
m_DescriptionYOffset: 0
m_DescriptionText: Repaint Selected
m_DescriptionTextExtra:
m_LocalizedDescription:
m_TableReference:
m_TableCollectionName:
m_TableEntryReference:
m_KeyId: 0
m_Key:
m_FallbackState: 0
m_WaitForCompletion: 0
m_LocalVariables: []
m_DescriptionTextExtra:
m_LocalizedDescriptionExtra:
m_TableReference:
m_TableCollectionName:
m_TableEntryReference:
m_KeyId: 0
m_Key:
m_FallbackState: 0
m_WaitForCompletion: 0
m_LocalVariables: []
m_DescriptionActivateSpeed: 12
m_DescriptionZScale: 1
m_ButtonTexture: {fileID: 2800000, guid: e19c558a83b463843bb1f2f37c9c5d52, type: 3}
Expand All @@ -1131,8 +1194,26 @@ MonoBehaviour:
m_RequiresPopup: 1
m_CenterPopupOnButton: 0
m_PopupOffset: {x: 0, y: 0, z: 0}
m_PopupText:
m_ToggleOnDescription:
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}
Expand All @@ -1149,9 +1230,12 @@ MonoBehaviour:
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
references:
version: 2
RefIds: []
--- !u!1 &4746940080256643886
GameObject:
m_ObjectHideFlags: 0
Expand Down
Loading