refactor radial menu, every click work as cancel - problem with invoke in radial button add listener

This commit is contained in:
2023-11-17 12:57:32 +02:00
parent e03633616e
commit c01b969fe0
15 changed files with 170 additions and 187 deletions
+12 -30
View File
@@ -9,7 +9,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 168138392062545360}
- component: {fileID: 168138392062545363}
- component: {fileID: 6341650359450725483}
m_Layer: 0
m_Name: Selected
m_TagString: Untagged
@@ -24,6 +24,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 168138392062545361}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
@@ -31,9 +32,8 @@ Transform:
m_Children:
- {fileID: 199909838302166302}
m_Father: {fileID: 168138393772344589}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &168138392062545363
--- !u!114 &6341650359450725483
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -42,15 +42,12 @@ MonoBehaviour:
m_GameObject: {fileID: 168138392062545361}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c67621cbedb3453428fcc7207806f507, type: 3}
m_Script: {fileID: 11500000, guid: 70ee3205d7b15b4449cdacc7a726e220, type: 3}
m_Name:
m_EditorClassIdentifier:
_selectedObject: {fileID: 5351194727339921736}
visualGameObjectArray:
- {fileID: 199909838302166291}
- {fileID: 199909837917391647}
- {fileID: 199909837306106162}
- {fileID: 199909837468661505}
--- !u!1 &168138393772344594
GameObject:
m_ObjectHideFlags: 0
@@ -76,6 +73,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 168138393772344594}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
m_LocalPosition: {x: -0, y: 0, z: 8.643}
m_LocalScale: {x: 1, y: 1, z: 1}
@@ -85,7 +83,6 @@ Transform:
- {fileID: 6083021128705139609}
- {fileID: 168138392062545360}
m_Father: {fileID: 0}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
--- !u!65 &168138393772344588
BoxCollider:
@@ -121,6 +118,9 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
_interactionPoint: {fileID: 5360312089705388636}
_menuActions:
- {fileID: 11400000, guid: a45b050119410f149b0a257098cdaec5, type: 2}
- {fileID: 11400000, guid: 37a5860278daf904b976c61632085b3d, type: 2}
--- !u!1 &4960435320984939974
GameObject:
m_ObjectHideFlags: 0
@@ -144,13 +144,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4960435320984939974}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.20000544, y: 0, z: 0.8500352}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 168138393772344589}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &3165226905153932186
PrefabInstance:
@@ -261,17 +261,17 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 9189065509065776645, guid: 8af73887c9cd7fa47a2f642969b20378,
type: 3}
propertyPath: m_Materials.Array.data[0]
propertyPath: 'm_Materials.Array.data[0]'
value:
objectReference: {fileID: 2100000, guid: 710613883f6dfb64889bf6134b4b15e3, type: 2}
- target: {fileID: 9189065509477827618, guid: 8af73887c9cd7fa47a2f642969b20378,
type: 3}
propertyPath: m_Materials.Array.data[0]
propertyPath: 'm_Materials.Array.data[0]'
value:
objectReference: {fileID: 2100000, guid: 710613883f6dfb64889bf6134b4b15e3, type: 2}
- target: {fileID: 9189065510491252737, guid: 8af73887c9cd7fa47a2f642969b20378,
type: 3}
propertyPath: m_Materials.Array.data[0]
propertyPath: 'm_Materials.Array.data[0]'
value:
objectReference: {fileID: 2100000, guid: 710613883f6dfb64889bf6134b4b15e3, type: 2}
- target: {fileID: 9189065510491252739, guid: 8af73887c9cd7fa47a2f642969b20378,
@@ -359,24 +359,6 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8af73887c9cd7fa47a2f642969b20378, type: 3}
--- !u!1 &199909837306106162 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 9189065509477827631, guid: 8af73887c9cd7fa47a2f642969b20378,
type: 3}
m_PrefabInstance: {fileID: 9025256075473245469}
m_PrefabAsset: {fileID: 0}
--- !u!1 &199909837468661505 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 9189065509120254492, guid: 8af73887c9cd7fa47a2f642969b20378,
type: 3}
m_PrefabInstance: {fileID: 9025256075473245469}
m_PrefabAsset: {fileID: 0}
--- !u!1 &199909837917391647 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 9189065509065776642, guid: 8af73887c9cd7fa47a2f642969b20378,
type: 3}
m_PrefabInstance: {fileID: 9025256075473245469}
m_PrefabAsset: {fileID: 0}
--- !u!1 &199909838302166291 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 9189065510491252750, guid: 8af73887c9cd7fa47a2f642969b20378,
@@ -11,7 +11,7 @@ GameObject:
- component: {fileID: 6177286257950370620}
- component: {fileID: 5424962769672562944}
m_Layer: 5
m_Name: PopupItemMenu
m_Name: RadialMenu
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -45,8 +45,8 @@ MonoBehaviour:
m_GameObject: {fileID: 6105977268906182483}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0dea2e9a092ecf643963bb697b9963ca, type: 3}
m_Script: {fileID: 11500000, guid: 0652e5472d3afcf4f8d99f61ca2dc62e, type: 3}
m_Name:
m_EditorClassIdentifier:
_popupMenuItemButtonPrefab: {fileID: 8504314472782682815, guid: 07f2894d03b374a4092012178c7bb823,
_radialMenuItemPrefab: {fileID: 8504314472782682815, guid: 07f2894d03b374a4092012178c7bb823,
type: 3}
@@ -13,7 +13,7 @@ GameObject:
- component: {fileID: 6614086836352695636}
- component: {fileID: 8504314472782682815}
m_Layer: 0
m_Name: PopupMenuItemButton
m_Name: RadialMenuItem
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0