diff --git a/Assets/GameMain/Scripts/Presentation/Menu/SelectRole/RoleItem.cs b/Assets/GameMain/Scripts/Presentation/Menu/SelectRole/RoleItem.cs index 8e9043c..d7721d7 100644 --- a/Assets/GameMain/Scripts/Presentation/Menu/SelectRole/RoleItem.cs +++ b/Assets/GameMain/Scripts/Presentation/Menu/SelectRole/RoleItem.cs @@ -27,10 +27,14 @@ namespace SepCore.UI _context = null; } - public void UpdateShowRole() + public void OnHoverEnter() { - int roleId = _context?.RoleId ?? -1; - GameEntry.Event.Fire(this, SelectRoleHoverEventArgs.Create(roleId)); + if (_context == null) + { + return; + } + + GameEntry.Event.Fire(this, SelectRoleHoverEventArgs.Create(_context.RoleId)); } public void OnConfirmRoleClick() diff --git a/Assets/GameMain/Scripts/Presentation/Menu/SelectRole/SelectRoleForm.cs b/Assets/GameMain/Scripts/Presentation/Menu/SelectRole/SelectRoleForm.cs index ad7ec2c..3779f3f 100644 --- a/Assets/GameMain/Scripts/Presentation/Menu/SelectRole/SelectRoleForm.cs +++ b/Assets/GameMain/Scripts/Presentation/Menu/SelectRole/SelectRoleForm.cs @@ -1,4 +1,3 @@ -using System; using SepCore.Event; using UnityEngine; using UnityGameFramework.Runtime; @@ -21,24 +20,22 @@ namespace SepCore.UI { _context = context; - int itemIndex = 1, roleIndex = 0; - while (itemIndex < _roleItems.Length) + RoleItemContext[] roleContexts = _context.RoleItemContexts; + for (int i = 0; i < _roleItems.Length; i++) { - if (roleIndex < _context.RoleItemContexts.Length) + RoleItem item = _roleItems[i]; + if (i < roleContexts.Length) { - _roleItems[itemIndex].OnInit(_context.RoleItemContexts[roleIndex]).Forget(); - _roleItems[itemIndex].gameObject.SetActive(true); + item.OnInit(roleContexts[i]).Forget(); + item.gameObject.SetActive(true); } else { - _roleItems[itemIndex].gameObject.SetActive(false); - _roleItems[itemIndex].OnReset(); + item.OnReset(); + item.gameObject.SetActive(false); } - - itemIndex++; - roleIndex++; } - + UpdateShowRole(_context.ShowRoleProperty, _context.RolePropertyAreaContext); } @@ -96,5 +93,10 @@ namespace SepCore.UI { GameEntry.Event.Fire(this, SelectRoleReturnEventArgs.Create()); } + + public void OnRandomConfirmClick() + { + GameEntry.Event.Fire(this, SelectRoleConfirmEventArgs.Create()); + } } } diff --git a/Assets/GameMain/UI/UIForms/SelectRoleForm.prefab b/Assets/GameMain/UI/UIForms/SelectRoleForm.prefab index 21b6d5f..aeaae08 100644 --- a/Assets/GameMain/UI/UIForms/SelectRoleForm.prefab +++ b/Assets/GameMain/UI/UIForms/SelectRoleForm.prefab @@ -75,6 +75,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &449822899622303460 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9190859613643939616} + - component: {fileID: 8477214061003518627} + - component: {fileID: 4252967114067606290} + m_Layer: 5 + m_Name: Fill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9190859613643939616 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 449822899622303460} + 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: 397114337025658313} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8477214061003518627 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 449822899622303460} + m_CullTransparentMesh: 1 +--- !u!114 &4252967114067606290 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 449822899622303460} + 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: 0.27450982, g: 0.27450982, b: 0.27450982, 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: 9f847ec5e66e03e4ead1d3c5f7b510e8, 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 &719579150060282525 GameObject: m_ObjectHideFlags: 0 @@ -661,6 +736,143 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &2535800833685598380 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 397114337025658313} + - component: {fileID: 402127537566038992} + - component: {fileID: 7266142669901275671} + m_Layer: 5 + m_Name: RoleItem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &397114337025658313 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2535800833685598380} + 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: 9190859613643939616} + - {fileID: 6727303210515399728} + m_Father: {fileID: 6124030385652187818} + 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 &402127537566038992 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2535800833685598380} + m_CullTransparentMesh: 1 +--- !u!114 &7266142669901275671 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2535800833685598380} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a5079836f95c2a44b96fa331487ebb70, 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: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, 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: 0} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + _background: {fileID: 4252967114067606290} + _onPointerEnterAction: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 7510942500789349387} + m_TargetAssemblyTypeName: UI.UGuiForm, Assembly-CSharp + m_MethodName: PlayUISound + m_Mode: 3 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 10000 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + _onClickAction: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 7510942500789349387} + m_TargetAssemblyTypeName: UI.UGuiForm, Assembly-CSharp + m_MethodName: PlayUISound + m_Mode: 3 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 10001 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 7510942500789349387} + m_TargetAssemblyTypeName: SepCore.UI.SelectRoleForm, SepCore.Presentation + m_MethodName: OnRandomConfirmClick + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 10001 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + _onPointerExitAction: + m_PersistentCalls: + m_Calls: [] --- !u!1 &2994269299361818432 GameObject: m_ObjectHideFlags: 0 @@ -1258,6 +1470,81 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &5275647082244221686 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6727303210515399728} + - component: {fileID: 6941950566611373671} + - component: {fileID: 1102960082913041348} + m_Layer: 5 + m_Name: Icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6727303210515399728 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5275647082244221686} + 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: 397114337025658313} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6941950566611373671 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5275647082244221686} + m_CullTransparentMesh: 1 +--- !u!114 &1102960082913041348 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5275647082244221686} + 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: 1eb120084e9602c4da979658e08c63e4, 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 &5343305521914829864 GameObject: m_ObjectHideFlags: 0 @@ -2220,7 +2507,7 @@ PrefabInstance: - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName - value: UpdateShowRole + value: OnHoverEnter objectReference: {fileID: 0} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} @@ -2235,7 +2522,7 @@ PrefabInstance: - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName - value: UI.RoleItem, Assembly-CSharp + value: SepCore.UI.RoleItem, SepCore.Presentation objectReference: {fileID: 0} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} @@ -2355,7 +2642,7 @@ PrefabInstance: - target: {fileID: 8290519928564306843, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: m_Name - value: RoleItem (7) + value: RoleItem 6 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -2442,7 +2729,7 @@ PrefabInstance: type: 3} propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Target value: - objectReference: {fileID: 4965267041341936459} + objectReference: {fileID: 5201218836764882073} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_CallState @@ -2451,7 +2738,7 @@ PrefabInstance: - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName - value: UpdateShowRole + value: OnHoverEnter objectReference: {fileID: 0} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} @@ -2466,7 +2753,7 @@ PrefabInstance: - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName - value: UI.RoleItem, Assembly-CSharp + value: SepCore.UI.RoleItem, SepCore.Presentation objectReference: {fileID: 0} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} @@ -2586,7 +2873,7 @@ PrefabInstance: - target: {fileID: 8290519928564306843, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: m_Name - value: RoleItem (11) + value: RoleItem 10 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -2678,7 +2965,7 @@ PrefabInstance: type: 3} propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Target value: - objectReference: {fileID: 8836415805828564547} + objectReference: {fileID: 5201218836764882073} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_CallState @@ -2687,7 +2974,7 @@ PrefabInstance: - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName - value: UpdateShowRole + value: OnHoverEnter objectReference: {fileID: 0} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} @@ -2702,7 +2989,7 @@ PrefabInstance: - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName - value: UI.RoleItem, Assembly-CSharp + value: SepCore.UI.RoleItem, SepCore.Presentation objectReference: {fileID: 0} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} @@ -2822,7 +3109,7 @@ PrefabInstance: - target: {fileID: 8290519928564306843, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: m_Name - value: RoleItem (3) + value: RoleItem 2 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -2914,7 +3201,7 @@ PrefabInstance: type: 3} propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Target value: - objectReference: {fileID: 7249589387663696490} + objectReference: {fileID: 5201218836764882073} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_CallState @@ -2923,7 +3210,7 @@ PrefabInstance: - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName - value: UpdateShowRole + value: OnHoverEnter objectReference: {fileID: 0} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} @@ -2938,7 +3225,7 @@ PrefabInstance: - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName - value: UI.RoleItem, Assembly-CSharp + value: SepCore.UI.RoleItem, SepCore.Presentation objectReference: {fileID: 0} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} @@ -3058,7 +3345,7 @@ PrefabInstance: - target: {fileID: 8290519928564306843, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: m_Name - value: RoleItem (4) + value: RoleItem 3 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -3145,7 +3432,7 @@ PrefabInstance: type: 3} propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Target value: - objectReference: {fileID: 7108998779798040682} + objectReference: {fileID: 5201218836764882073} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_CallState @@ -3154,7 +3441,7 @@ PrefabInstance: - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName - value: UpdateShowRole + value: OnHoverEnter objectReference: {fileID: 0} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} @@ -3169,7 +3456,7 @@ PrefabInstance: - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName - value: UI.RoleItem, Assembly-CSharp + value: SepCore.UI.RoleItem, SepCore.Presentation objectReference: {fileID: 0} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} @@ -3289,7 +3576,7 @@ PrefabInstance: - target: {fileID: 8290519928564306843, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: m_Name - value: RoleItem (6) + value: RoleItem 5 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -3415,12 +3702,12 @@ PrefabInstance: - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: UI.UGuiForm, Assembly-CSharp + value: SepCore.UI.UGuiForm, SepCore.Runtime objectReference: {fileID: 0} - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName - value: UI.SelectRoleForm, Assembly-CSharp + value: SepCore.UI.SelectRoleForm, SepCore.Presentation objectReference: {fileID: 0} - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} @@ -3440,7 +3727,7 @@ PrefabInstance: - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: UI.UGuiForm, Assembly-CSharp + value: SepCore.UI.UGuiForm, SepCore.Runtime objectReference: {fileID: 0} - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} @@ -3645,7 +3932,7 @@ PrefabInstance: type: 3} propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Target value: - objectReference: {fileID: 1254353399428518429} + objectReference: {fileID: 5201218836764882073} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_CallState @@ -3654,7 +3941,7 @@ PrefabInstance: - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName - value: UpdateShowRole + value: OnHoverEnter objectReference: {fileID: 0} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} @@ -3669,7 +3956,7 @@ PrefabInstance: - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName - value: UI.RoleItem, Assembly-CSharp + value: SepCore.UI.RoleItem, SepCore.Presentation objectReference: {fileID: 0} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} @@ -3789,7 +4076,7 @@ PrefabInstance: - target: {fileID: 8290519928564306843, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: m_Name - value: RoleItem (2) + value: RoleItem 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -3876,7 +4163,7 @@ PrefabInstance: type: 3} propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Target value: - objectReference: {fileID: 1271290373848557919} + objectReference: {fileID: 5201218836764882073} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_CallState @@ -3885,7 +4172,7 @@ PrefabInstance: - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName - value: UpdateShowRole + value: OnHoverEnter objectReference: {fileID: 0} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} @@ -3900,7 +4187,7 @@ PrefabInstance: - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName - value: UI.RoleItem, Assembly-CSharp + value: SepCore.UI.RoleItem, SepCore.Presentation objectReference: {fileID: 0} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} @@ -4020,7 +4307,7 @@ PrefabInstance: - target: {fileID: 8290519928564306843, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: m_Name - value: RoleItem (10) + value: RoleItem 9 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -4045,242 +4332,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 5675034716082216336} m_PrefabAsset: {fileID: 0} ---- !u!1001 &5781828759089275703 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 6124030385652187818} - m_Modifications: - - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_Transition - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.size - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.size - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 7510942500789349387} - - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Target - value: - objectReference: {fileID: 1105756041237075960} - - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName - value: OnConfirmRoleClick - objectReference: {fileID: 0} - - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 7510942500789349387} - - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Target - value: - objectReference: {fileID: 1105756041237075960} - - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName - value: UpdateShowRole - objectReference: {fileID: 0} - - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName - value: UI.RoleItem, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_IntArgument - value: 10001 - objectReference: {fileID: 0} - - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName - value: UI.RoleItem, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_IntArgument - value: 10000 - objectReference: {fileID: 0} - - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8290519928564306843, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_Name - value: RoleItem - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} ---- !u!224 &397114337025658313 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - m_PrefabInstance: {fileID: 5781828759089275703} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1105756041237075960 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 6873972826773845199, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - m_PrefabInstance: {fileID: 5781828759089275703} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 35de2974f065de547952f8d5cbb9f6fe, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &6560079103928125111 PrefabInstance: m_ObjectHideFlags: 0 @@ -4343,7 +4394,7 @@ PrefabInstance: type: 3} propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Target value: - objectReference: {fileID: 319567477725180536} + objectReference: {fileID: 5201218836764882073} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_CallState @@ -4352,7 +4403,7 @@ PrefabInstance: - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName - value: UpdateShowRole + value: OnHoverEnter objectReference: {fileID: 0} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} @@ -4367,7 +4418,7 @@ PrefabInstance: - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName - value: UI.RoleItem, Assembly-CSharp + value: SepCore.UI.RoleItem, SepCore.Presentation objectReference: {fileID: 0} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} @@ -4487,7 +4538,7 @@ PrefabInstance: - target: {fileID: 8290519928564306843, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: m_Name - value: RoleItem (8) + value: RoleItem 7 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -4574,7 +4625,7 @@ PrefabInstance: type: 3} propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Target value: - objectReference: {fileID: 4146823842836454614} + objectReference: {fileID: 5201218836764882073} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_CallState @@ -4583,7 +4634,7 @@ PrefabInstance: - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName - value: UpdateShowRole + value: OnHoverEnter objectReference: {fileID: 0} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} @@ -4598,7 +4649,7 @@ PrefabInstance: - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName - value: UI.RoleItem, Assembly-CSharp + value: SepCore.UI.RoleItem, SepCore.Presentation objectReference: {fileID: 0} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} @@ -4718,7 +4769,7 @@ PrefabInstance: - target: {fileID: 8290519928564306843, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: m_Name - value: RoleItem (9) + value: RoleItem 8 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -4805,7 +4856,7 @@ PrefabInstance: type: 3} propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Target value: - objectReference: {fileID: 3893566779691405690} + objectReference: {fileID: 5201218836764882073} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_CallState @@ -4814,7 +4865,7 @@ PrefabInstance: - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName - value: UpdateShowRole + value: OnHoverEnter objectReference: {fileID: 0} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} @@ -4829,7 +4880,7 @@ PrefabInstance: - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName - value: UI.RoleItem, Assembly-CSharp + value: SepCore.UI.RoleItem, SepCore.Presentation objectReference: {fileID: 0} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} @@ -4949,7 +5000,7 @@ PrefabInstance: - target: {fileID: 8290519928564306843, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: m_Name - value: RoleItem (5) + value: RoleItem 4 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -5045,7 +5096,7 @@ PrefabInstance: - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName - value: UpdateShowRole + value: OnHoverEnter objectReference: {fileID: 0} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} @@ -5060,7 +5111,7 @@ PrefabInstance: - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName - value: UI.RoleItem, Assembly-CSharp + value: SepCore.UI.RoleItem, SepCore.Presentation objectReference: {fileID: 0} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} @@ -5180,7 +5231,7 @@ PrefabInstance: - target: {fileID: 8290519928564306843, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: m_Name - value: RoleItem (1) + value: RoleItem 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: []