diff --git a/Assets/Resources/UI/UI_Panel/UI_InstallAndDismantleTicketPanel.prefab b/Assets/Resources/UI/UI_Panel/UI_InstallAndDismantleTicketPanel.prefab index cbb9f6c..d3ff6cf 100644 --- a/Assets/Resources/UI/UI_Panel/UI_InstallAndDismantleTicketPanel.prefab +++ b/Assets/Resources/UI/UI_Panel/UI_InstallAndDismantleTicketPanel.prefab @@ -29793,7 +29793,7 @@ MonoBehaviour: m_Elasticity: 0.1 m_Inertia: 1 m_DecelerationRate: 0.135 - m_ScrollSensitivity: 1 + m_ScrollSensitivity: 8 m_Viewport: {fileID: 5092569755324715940} m_HorizontalScrollbar: {fileID: 0} m_VerticalScrollbar: {fileID: 5092569753790709666} diff --git a/Assets/Scenes/05_LiveScene.unity b/Assets/Scenes/05_LiveScene.unity index 2cb69f1..8af8759 100644 --- a/Assets/Scenes/05_LiveScene.unity +++ b/Assets/Scenes/05_LiveScene.unity @@ -312,8 +312,34 @@ PrefabInstance: propertyPath: m_Name value: "\u573A\u5730" objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 92b1a298e95fb664cb2aa2aff35920e0, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2588606950836171102, guid: 92b1a298e95fb664cb2aa2aff35920e0, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 92b1a298e95fb664cb2aa2aff35920e0, type: 3} +--- !u!1 &159466234 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2588606950836171102, guid: 92b1a298e95fb664cb2aa2aff35920e0, type: 3} + m_PrefabInstance: {fileID: 159466233} + m_PrefabAsset: {fileID: 0} +--- !u!65 &159466235 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 159466234} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 500, y: 761.86084, z: 1.2776842} + m_Center: {x: 0, y: 119.0697, z: -0.60743433} --- !u!1 &192342789 GameObject: m_ObjectHideFlags: 0 @@ -6235,24 +6261,6 @@ Transform: m_Father: {fileID: 1501092962} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -57, y: -68, z: 71} ---- !u!1 &1968113507 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: -7138000903914520420, guid: 92b1a298e95fb664cb2aa2aff35920e0, type: 3} - m_PrefabInstance: {fileID: 159466233} - m_PrefabAsset: {fileID: 0} ---- !u!65 &1968113511 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1968113507} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 500.00397, y: 519.947, z: 0.18053252} - m_Center: {x: -0.0019607544, y: 240.02661, z: 0.09030101} --- !u!114 &1983640178 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2576541080334431885, guid: 10f4454f32eb20e4298912d896f6020e, type: 3} diff --git a/Assets/Scripts/Project/UI/UI_Panel/UI_MainTitlePanel.cs b/Assets/Scripts/Project/UI/UI_Panel/UI_MainTitlePanel.cs index c22d01e..03f95bf 100644 --- a/Assets/Scripts/Project/UI/UI_Panel/UI_MainTitlePanel.cs +++ b/Assets/Scripts/Project/UI/UI_Panel/UI_MainTitlePanel.cs @@ -95,7 +95,14 @@ public class UI_MainTitlePanel : BasePanel case "closeBtn": print("退出应用"); GameManager.UIMgr.ShowPanel(E_UI_Layer.System, - (panel) => { panel.Init("提示", "确定退出应用吗?", E_MessageType.Warning, () => { Application.Quit(); }); }); + (panel) => { panel.Init("提示", "确定退出应用吗?", E_MessageType.Error, () => + { + Debug.Log("退出"); + Application.Quit(); + }, () => + { + Debug.Log("取消"); + }); }); break; case "upExamBtn": print("交卷");