diff --git a/Assets/Art/UIPrefab/UIFengGuangJingBSKPanel.prefab b/Assets/Art/UIPrefab/UIFengGuangJingBSKPanel.prefab index 375fa399..caaa580b 100644 --- a/Assets/Art/UIPrefab/UIFengGuangJingBSKPanel.prefab +++ b/Assets/Art/UIPrefab/UIFengGuangJingBSKPanel.prefab @@ -1,155 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &245612521623318670 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4400931688608373254} - - component: {fileID: 8923319816696407404} - - component: {fileID: 6075514389944279939} - m_Layer: 0 - m_Name: Select - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4400931688608373254 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 245612521623318670} - 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: 6011775577914970479} - 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 &8923319816696407404 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 245612521623318670} - m_CullTransparentMesh: 1 ---- !u!114 &6075514389944279939 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 245612521623318670} - 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: 0, b: 0, 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: 0e805239848f9c44b87be0f85df16d61, 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 &733917479717641838 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3446037301447624399} - - component: {fileID: 208882674730373619} - - component: {fileID: 2461091442151016789} - m_Layer: 0 - m_Name: Select - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3446037301447624399 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 733917479717641838} - 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: 6964935188091213829} - 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 &208882674730373619 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 733917479717641838} - m_CullTransparentMesh: 1 ---- !u!114 &2461091442151016789 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 733917479717641838} - 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: 0, b: 0, 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: 0e805239848f9c44b87be0f85df16d61, 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 &1188093450717408531 GameObject: m_ObjectHideFlags: 0 @@ -161,8 +11,8 @@ GameObject: - component: {fileID: 6011775577914970479} - component: {fileID: 4130686404148430186} - component: {fileID: 1616875333924214468} - - component: {fileID: 3936709721245352197} - component: {fileID: 486256519019130174} + - component: {fileID: 6709708130949964274} m_Layer: 0 m_Name: BS m_TagString: Untagged @@ -183,7 +33,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4965883580935368250} - - {fileID: 4400931688608373254} m_Father: {fileID: 8237056657714220677} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -229,7 +78,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &3936709721245352197 +--- !u!114 &486256519019130174 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -238,7 +87,23 @@ MonoBehaviour: m_GameObject: {fileID: 1188093450717408531} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} + m_Script: {fileID: 11500000, guid: 0d51f3a7c41ab0346b49ae50d456bece, type: 3} + m_Name: + m_EditorClassIdentifier: + MarkType: 0 + CustomComponentName: BS + CustomComment: + mComponentName: UnityEngine.UI.Button +--- !u!114 &6709708130949964274 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1188093450717408531} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: m_Navigation: @@ -248,10 +113,10 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 0 + m_Transition: 1 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_HighlightedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, 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} @@ -270,29 +135,9 @@ MonoBehaviour: m_DisabledTrigger: Disabled m_Interactable: 1 m_TargetGraphic: {fileID: 1616875333924214468} - toggleTransition: 1 - graphic: {fileID: 6075514389944279939} - m_Group: {fileID: 0} - onValueChanged: + m_OnClick: m_PersistentCalls: m_Calls: [] - m_IsOn: 0 ---- !u!114 &486256519019130174 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1188093450717408531} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0d51f3a7c41ab0346b49ae50d456bece, type: 3} - m_Name: - m_EditorClassIdentifier: - MarkType: 0 - CustomComponentName: BS - CustomComment: - mComponentName: UnityEngine.UI.Toggle --- !u!1 &1451789683083834900 GameObject: m_ObjectHideFlags: 0 @@ -343,86 +188,11 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: BG: {fileID: 5718192909736743919} - BS: {fileID: 3936709721245352197} - ZML: {fileID: 8669372980508939918} - HBS: {fileID: 440056641149070528} - HSJJS: {fileID: 437501760258099554} - LBS: {fileID: 3253261707183770305} ---- !u!1 &2518336069518431763 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 176761116136950126} - - component: {fileID: 4925867606445369195} - - component: {fileID: 4716287115442656733} - m_Layer: 0 - m_Name: Select - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &176761116136950126 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2518336069518431763} - 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: 2907480360995089285} - 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 &4925867606445369195 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2518336069518431763} - m_CullTransparentMesh: 1 ---- !u!114 &4716287115442656733 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2518336069518431763} - 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: 0, b: 0, 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: 0e805239848f9c44b87be0f85df16d61, 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 + BS: {fileID: 6709708130949964274} + ZML: {fileID: 6713405407853448314} + HBS: {fileID: 628413599163576066} + HSJJS: {fileID: 5584418044055829014} + LBS: {fileID: 7879226516965856019} --- !u!1 &2874087143200518682 GameObject: m_ObjectHideFlags: 0 @@ -557,81 +327,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &3065826369225756405 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 443292388066025261} - - component: {fileID: 4652046901736245056} - - component: {fileID: 4703247978910171692} - m_Layer: 0 - m_Name: Select - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &443292388066025261 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3065826369225756405} - 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: 1564421279174366907} - 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 &4652046901736245056 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3065826369225756405} - m_CullTransparentMesh: 1 ---- !u!114 &4703247978910171692 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3065826369225756405} - 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: 0, b: 0, 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: 0e805239848f9c44b87be0f85df16d61, 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 &4416340883036905822 GameObject: m_ObjectHideFlags: 0 @@ -643,8 +338,8 @@ GameObject: - component: {fileID: 1564421279174366907} - component: {fileID: 1337086403439944225} - component: {fileID: 6125973039140500944} - - component: {fileID: 437501760258099554} - component: {fileID: 6440429134403349727} + - component: {fileID: 5584418044055829014} m_Layer: 0 m_Name: HSJJS m_TagString: Untagged @@ -665,7 +360,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6483354936470552200} - - {fileID: 443292388066025261} m_Father: {fileID: 8237056657714220677} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -711,7 +405,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &437501760258099554 +--- !u!114 &6440429134403349727 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -720,7 +414,23 @@ MonoBehaviour: m_GameObject: {fileID: 4416340883036905822} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} + m_Script: {fileID: 11500000, guid: 0d51f3a7c41ab0346b49ae50d456bece, type: 3} + m_Name: + m_EditorClassIdentifier: + MarkType: 0 + CustomComponentName: HSJJS + CustomComment: + mComponentName: UnityEngine.UI.Button +--- !u!114 &5584418044055829014 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4416340883036905822} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: m_Navigation: @@ -730,10 +440,10 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 0 + m_Transition: 1 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_HighlightedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, 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} @@ -752,29 +462,9 @@ MonoBehaviour: m_DisabledTrigger: Disabled m_Interactable: 1 m_TargetGraphic: {fileID: 6125973039140500944} - toggleTransition: 1 - graphic: {fileID: 4703247978910171692} - m_Group: {fileID: 0} - onValueChanged: + m_OnClick: m_PersistentCalls: m_Calls: [] - m_IsOn: 0 ---- !u!114 &6440429134403349727 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4416340883036905822} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0d51f3a7c41ab0346b49ae50d456bece, type: 3} - m_Name: - m_EditorClassIdentifier: - MarkType: 0 - CustomComponentName: HSJJS - CustomComment: - mComponentName: UnityEngine.UI.Toggle --- !u!1 &4718688674692515840 GameObject: m_ObjectHideFlags: 0 @@ -909,81 +599,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &5726847422535462870 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8228209654029537572} - - component: {fileID: 6660183095876588985} - - component: {fileID: 7007669620651627673} - m_Layer: 0 - m_Name: Select - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8228209654029537572 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5726847422535462870} - 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: 3057403847873081201} - 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 &6660183095876588985 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5726847422535462870} - m_CullTransparentMesh: 1 ---- !u!114 &7007669620651627673 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5726847422535462870} - 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: 0, b: 0, 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: 0e805239848f9c44b87be0f85df16d61, 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 &6066876710006599984 GameObject: m_ObjectHideFlags: 0 @@ -1253,8 +868,8 @@ GameObject: - component: {fileID: 3057403847873081201} - component: {fileID: 2800219667894763811} - component: {fileID: 9222813328872616946} - - component: {fileID: 8669372980508939918} - component: {fileID: 727672495495987765} + - component: {fileID: 6713405407853448314} m_Layer: 0 m_Name: ZML m_TagString: Untagged @@ -1275,7 +890,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6227475394816681756} - - {fileID: 8228209654029537572} m_Father: {fileID: 8237056657714220677} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -1321,7 +935,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &8669372980508939918 +--- !u!114 &727672495495987765 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1330,7 +944,23 @@ MonoBehaviour: m_GameObject: {fileID: 7372938972572630095} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} + m_Script: {fileID: 11500000, guid: 0d51f3a7c41ab0346b49ae50d456bece, type: 3} + m_Name: + m_EditorClassIdentifier: + MarkType: 0 + CustomComponentName: ZML + CustomComment: + mComponentName: UnityEngine.UI.Button +--- !u!114 &6713405407853448314 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7372938972572630095} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: m_Navigation: @@ -1340,10 +970,10 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 0 + m_Transition: 1 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_HighlightedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, 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} @@ -1362,29 +992,9 @@ MonoBehaviour: m_DisabledTrigger: Disabled m_Interactable: 1 m_TargetGraphic: {fileID: 9222813328872616946} - toggleTransition: 1 - graphic: {fileID: 7007669620651627673} - m_Group: {fileID: 0} - onValueChanged: + m_OnClick: m_PersistentCalls: m_Calls: [] - m_IsOn: 0 ---- !u!114 &727672495495987765 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7372938972572630095} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0d51f3a7c41ab0346b49ae50d456bece, type: 3} - m_Name: - m_EditorClassIdentifier: - MarkType: 0 - CustomComponentName: ZML - CustomComment: - mComponentName: UnityEngine.UI.Toggle --- !u!1 &8012232615399820769 GameObject: m_ObjectHideFlags: 0 @@ -1396,8 +1006,8 @@ GameObject: - component: {fileID: 2907480360995089285} - component: {fileID: 4217289839999687671} - component: {fileID: 1134618089577283093} - - component: {fileID: 440056641149070528} - component: {fileID: 334559411429811764} + - component: {fileID: 628413599163576066} m_Layer: 0 m_Name: HBS m_TagString: Untagged @@ -1418,7 +1028,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7477163879175306558} - - {fileID: 176761116136950126} m_Father: {fileID: 8237056657714220677} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -1464,7 +1073,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &440056641149070528 +--- !u!114 &334559411429811764 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1473,7 +1082,23 @@ MonoBehaviour: m_GameObject: {fileID: 8012232615399820769} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} + m_Script: {fileID: 11500000, guid: 0d51f3a7c41ab0346b49ae50d456bece, type: 3} + m_Name: + m_EditorClassIdentifier: + MarkType: 0 + CustomComponentName: HBS + CustomComment: + mComponentName: UnityEngine.UI.Button +--- !u!114 &628413599163576066 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8012232615399820769} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: m_Navigation: @@ -1483,10 +1108,10 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 0 + m_Transition: 1 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_HighlightedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, 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} @@ -1505,29 +1130,9 @@ MonoBehaviour: m_DisabledTrigger: Disabled m_Interactable: 1 m_TargetGraphic: {fileID: 1134618089577283093} - toggleTransition: 1 - graphic: {fileID: 4716287115442656733} - m_Group: {fileID: 0} - onValueChanged: + m_OnClick: m_PersistentCalls: m_Calls: [] - m_IsOn: 0 ---- !u!114 &334559411429811764 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8012232615399820769} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0d51f3a7c41ab0346b49ae50d456bece, type: 3} - m_Name: - m_EditorClassIdentifier: - MarkType: 0 - CustomComponentName: HBS - CustomComment: - mComponentName: UnityEngine.UI.Toggle --- !u!1 &8759581086094972216 GameObject: m_ObjectHideFlags: 0 @@ -1539,8 +1144,8 @@ GameObject: - component: {fileID: 6964935188091213829} - component: {fileID: 2514327259063647267} - component: {fileID: 3947212024060706049} - - component: {fileID: 3253261707183770305} - component: {fileID: 7346726665149178486} + - component: {fileID: 7879226516965856019} m_Layer: 0 m_Name: LBS m_TagString: Untagged @@ -1561,7 +1166,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1057300044088813862} - - {fileID: 3446037301447624399} m_Father: {fileID: 8237056657714220677} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -1607,7 +1211,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &3253261707183770305 +--- !u!114 &7346726665149178486 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1616,7 +1220,23 @@ MonoBehaviour: m_GameObject: {fileID: 8759581086094972216} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} + m_Script: {fileID: 11500000, guid: 0d51f3a7c41ab0346b49ae50d456bece, type: 3} + m_Name: + m_EditorClassIdentifier: + MarkType: 0 + CustomComponentName: LBS + CustomComment: + mComponentName: UnityEngine.UI.Button +--- !u!114 &7879226516965856019 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8759581086094972216} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: m_Navigation: @@ -1626,10 +1246,10 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 0 + m_Transition: 1 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_HighlightedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, 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} @@ -1648,29 +1268,9 @@ MonoBehaviour: m_DisabledTrigger: Disabled m_Interactable: 1 m_TargetGraphic: {fileID: 3947212024060706049} - toggleTransition: 1 - graphic: {fileID: 2461091442151016789} - m_Group: {fileID: 0} - onValueChanged: + m_OnClick: m_PersistentCalls: m_Calls: [] - m_IsOn: 0 ---- !u!114 &7346726665149178486 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8759581086094972216} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0d51f3a7c41ab0346b49ae50d456bece, type: 3} - m_Name: - m_EditorClassIdentifier: - MarkType: 0 - CustomComponentName: LBS - CustomComment: - mComponentName: UnityEngine.UI.Toggle --- !u!1 &8782735311277281394 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/UI/UIFengGuangJingBSKPanel.Designer.cs b/Assets/Scripts/UI/UIFengGuangJingBSKPanel.Designer.cs index a5916dac..e09d2d11 100644 --- a/Assets/Scripts/UI/UIFengGuangJingBSKPanel.Designer.cs +++ b/Assets/Scripts/UI/UIFengGuangJingBSKPanel.Designer.cs @@ -13,15 +13,15 @@ namespace QFramework.Example [SerializeField] public UnityEngine.UI.Image BG; [SerializeField] - public UnityEngine.UI.Toggle BS; + public UnityEngine.UI.Button BS; [SerializeField] - public UnityEngine.UI.Toggle ZML; + public UnityEngine.UI.Button ZML; [SerializeField] - public UnityEngine.UI.Toggle HBS; + public UnityEngine.UI.Button HBS; [SerializeField] - public UnityEngine.UI.Toggle HSJJS; + public UnityEngine.UI.Button HSJJS; [SerializeField] - public UnityEngine.UI.Toggle LBS; + public UnityEngine.UI.Button LBS; private UIFengGuangJingBSKPanelData mPrivateData = null; diff --git a/Assets/Scripts/UI/UIFengGuangJingBSKPanel.cs b/Assets/Scripts/UI/UIFengGuangJingBSKPanel.cs index 11fd0055..1fcb8696 100644 --- a/Assets/Scripts/UI/UIFengGuangJingBSKPanel.cs +++ b/Assets/Scripts/UI/UIFengGuangJingBSKPanel.cs @@ -41,34 +41,30 @@ namespace QFramework.Example protected override void OnShow() { - BS.onValueChanged.RemoveAllListeners(); - ZML.onValueChanged.RemoveAllListeners(); - HBS.onValueChanged.RemoveAllListeners(); - HSJJS.onValueChanged.RemoveAllListeners(); - LBS.onValueChanged.RemoveAllListeners(); + BS.onClick.RemoveAllListeners(); + ZML.onClick.RemoveAllListeners(); + HBS.onClick.RemoveAllListeners(); + HSJJS.onClick.RemoveAllListeners(); + LBS.onClick.RemoveAllListeners(); - BS.GetComponent().isOn = false; - ZML.GetComponent().isOn = false; - HBS.GetComponent().isOn = false; - HSJJS.GetComponent().isOn = false; - LBS.GetComponent().isOn = false; - BS.GetComponent().onValueChanged.AddListener((isOn) => + + BS.GetComponent