逐步退出功能

Assets/Art/UIPrefab/UIRightTop.prefab

@@ -59,12 +59,16 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 82127b0f7165d8448836e4fba0bce5b7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  homeIcon: {fileID: 4524484033761581281}
   homeBtn: {fileID: 6786675438613954589}
   Score: {fileID: 2505519175557592291}
+  scoreIcon: {fileID: 5356868582514685091}
   scoreBtn: {fileID: 4619332097827032469}
+  desIcon: {fileID: 7353137941944010191}
   desBtn: {fileID: 7919768696017877647}
-  set: {fileID: 6232319401915539582}
+  setIcon: {fileID: 1693275654294396572}
   setBtn: {fileID: 1379509841866064611}
+  closeIcon: {fileID: 4865587638182302959}
   closeBtn: {fileID: 8552533863496002200}
   backBtn: {fileID: 1270587477707133155}
   Title: {fileID: 6296270029272226998}
@@ -408,8 +412,10 @@ GameObject:
   - component: {fileID: 7233145839152708537}
   - component: {fileID: 1402148308183576929}
   - component: {fileID: 8746992706770596963}
+  - component: {fileID: 5356868582514685091}
+  - component: {fileID: 8349855814183288798}
   m_Layer: 5
-  m_Name: score
+  m_Name: scoreIcon
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -456,7 +462,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 0
+  m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -472,6 +478,66 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!114 &5356868582514685091
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1701073165711765044}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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: 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_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: 8746992706770596963}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &8349855814183288798
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1701073165711765044}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0d51f3a7c41ab0346b49ae50d456bece, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  MarkType: 0
+  CustomComponentName: scoreIcon
+  CustomComment: 
+  mComponentName: UnityEngine.UI.Button
 --- !u!1 &2001560243448814407
 GameObject:
   m_ObjectHideFlags: 0
@@ -483,8 +549,10 @@ GameObject:
   - component: {fileID: 6525947030875717277}
   - component: {fileID: 789589784473835523}
   - component: {fileID: 7028470492342371926}
+  - component: {fileID: 4865587638182302959}
+  - component: {fileID: 4951605237632423165}
   m_Layer: 5
-  m_Name: close
+  m_Name: closeIcon
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -531,7 +599,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 0
+  m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -547,6 +615,66 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!114 &4865587638182302959
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2001560243448814407}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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: 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_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: 7028470492342371926}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &4951605237632423165
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2001560243448814407}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0d51f3a7c41ab0346b49ae50d456bece, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  MarkType: 0
+  CustomComponentName: 
+  CustomComment: 
+  mComponentName: 
 --- !u!1 &2066591663383786163
 GameObject:
   m_ObjectHideFlags: 0
@@ -1879,8 +2007,10 @@ GameObject:
   - component: {fileID: 4996884698751205362}
   - component: {fileID: 3501697170914416043}
   - component: {fileID: 3350829478237842021}
+  - component: {fileID: 4524484033761581281}
+  - component: {fileID: 28784141111070070}
   m_Layer: 5
-  m_Name: home
+  m_Name: homeIcon
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1927,7 +2057,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 0
+  m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -1943,6 +2073,66 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!114 &4524484033761581281
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7034543108323079013}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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: 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_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: 3350829478237842021}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &28784141111070070
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7034543108323079013}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0d51f3a7c41ab0346b49ae50d456bece, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  MarkType: 0
+  CustomComponentName: scoreIcon
+  CustomComment: 
+  mComponentName: UnityEngine.UI.Button
 --- !u!1 &7666388055021823954
 GameObject:
   m_ObjectHideFlags: 0
@@ -2030,8 +2220,9 @@ GameObject:
   - component: {fileID: 3057372319391471786}
   - component: {fileID: 4079667323957122093}
   - component: {fileID: 25235571411346071}
+  - component: {fileID: 1693275654294396572}
   m_Layer: 5
-  m_Name: set
+  m_Name: setIcon
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -2079,7 +2270,7 @@ MonoBehaviour:
   MarkType: 0
   CustomComponentName: set
   CustomComment: 
-  mComponentName: RectTransform
+  mComponentName: UnityEngine.UI.Button
 --- !u!114 &25235571411346071
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2110,6 +2301,50 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!114 &1693275654294396572
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8846098100972990084}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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: 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_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: 25235571411346071}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &9012140064018885816
 GameObject:
   m_ObjectHideFlags: 0
@@ -2121,8 +2356,10 @@ GameObject:
   - component: {fileID: 8926716519125320169}
   - component: {fileID: 3215134167559067386}
   - component: {fileID: 4690001865151866587}
+  - component: {fileID: 7353137941944010191}
+  - component: {fileID: 1176537812628747561}
   m_Layer: 5
-  m_Name: des
+  m_Name: desIcon
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -2169,7 +2406,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 0
+  m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -2185,3 +2422,63 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!114 &7353137941944010191
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9012140064018885816}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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: 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_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: 4690001865151866587}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &1176537812628747561
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9012140064018885816}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0d51f3a7c41ab0346b49ae50d456bece, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  MarkType: 0
+  CustomComponentName: 
+  CustomComment: 
+  mComponentName: 

Assets/Scripts/Controller/DeviceController.cs

@@ -31,7 +31,8 @@ public class DeviceController : MonoSingleton<DeviceController>
     {
         foreach (var item in deviceDict)
         {
-            item.Value.item.Close();
+            item.Value.item?.Close();
+            item.Value.device = null;
         }
         deviceDict.Clear();
     }

Assets/Scripts/Item/DeviceItem.cs

@@ -44,7 +44,6 @@ public class DeviceItem : MonoBehaviour
     {
         device = null;
         tipItem = null;
-        Debug.LogError(gameObject.name);
         StringEventSystem.Global.UnRegister<string[]>(Global.HighLightTrigger, OnHighLightTriggerEvent);
     }
 

Assets/Scripts/UI/UIRightTop.Designer.cs

@@ -5,24 +5,32 @@ using QFramework;
 
 namespace QFramework.Example
 {
-	// Generate Id:c0117dd8-dba4-4b88-a9a4-9d2a475f39e4
+	// Generate Id:b281c961-e874-477e-aab7-2b6e6869f621
 	public partial class UIRightTop
 	{
 		public const string Name = "UIRightTop";
 		
+		[SerializeField]
+		public UnityEngine.UI.Button homeIcon;
 		[SerializeField]
 		public UnityEngine.UI.Button homeBtn;
 		[SerializeField]
 		public RectTransform Score;
 		[SerializeField]
+		public UnityEngine.UI.Button scoreIcon;
+		[SerializeField]
 		public UnityEngine.UI.Button scoreBtn;
 		[SerializeField]
+		public UnityEngine.UI.Button desIcon;
+		[SerializeField]
 		public UnityEngine.UI.Button desBtn;
 		[SerializeField]
-		public RectTransform set;
+		public UnityEngine.UI.Button setIcon;
 		[SerializeField]
 		public UnityEngine.UI.Button setBtn;
 		[SerializeField]
+		public UnityEngine.UI.Button closeIcon;
+		[SerializeField]
 		public UnityEngine.UI.Button closeBtn;
 		[SerializeField]
 		public UnityEngine.UI.Button backBtn;
@@ -33,12 +41,16 @@ namespace QFramework.Example
 		
 		protected override void ClearUIComponents()
 		{
+			homeIcon = null;
 			homeBtn = null;
 			Score = null;
+			scoreIcon = null;
 			scoreBtn = null;
+			desIcon = null;
 			desBtn = null;
-			set = null;
+			setIcon = null;
 			setBtn = null;
+			closeIcon = null;
 			closeBtn = null;
 			backBtn = null;
 			Title = null;

Assets/Scripts/UI/UIRightTop.cs

@@ -13,36 +13,80 @@ namespace QFramework.Example
         protected override void OnInit(IUIData uiData = null)
         {
             mData = uiData as UIRightTopData ?? new UIRightTopData();
-            setBtn.onClick.AddListener(() =>
+            setBtn.onClick.AddListener(OnSetClick);
+            setIcon.onClick.AddListener(OnSetClick);
+            closeBtn.onClick.AddListener(OnCloseClick);
+            closeIcon.onClick.AddListener(OnCloseClick);
+            backBtn.onClick.AddListener(OnBackClick);
+            homeIcon.onClick.AddListener(OnHomeClick);
+            homeBtn.onClick.AddListener(OnHomeClick);
+
+            desBtn.onClick.AddListener(OnDesClick);
+            desIcon.onClick.AddListener(OnDesClick);
+
+            scoreBtn.onClick.AddListener(OnScoreClick);
+            scoreIcon.onClick.AddListener(OnScoreClick);
+        }
+        public void OnScoreClick()
+        {
+            UIKit.OpenPanelAsync<UIScore>(canvasLevel: UILevel.PopUI).ToAction().StartGlobal();
+        }
+        public void OnDesClick()
+        {
+            UIKit.OpenPanelAsync<UIInstruction>(canvasLevel: UILevel.PopUI).ToAction().StartGlobal();
+        }
+        public void OnSetClick()
+        {
+            UIKit.OpenPanelAsync<UISetting>(canvasLevel: UILevel.PopUI).ToAction().StartGlobal();
+        }
+        public void OnCloseClick()
+        {
+
+            UITipWindowData data = new UITipWindowData();
+            data.txt = "是否关闭软件？";
+            data.btns.Add(new UITipWindowData.ItemData() { txt = "是", OnClick = () => Application.Quit() });
+            data.btns.Add(new UITipWindowData.ItemData() { txt = "否" });
+            UIKit.OpenPanelAsync<UITipWindow>(uiData: data, canvasLevel: UILevel.PopUI).ToAction().StartGlobal();
+        }
+        public void OnBackClick()
+        {
+            int count = 0;
+            foreach (var item in Global.Instance.appData.Modules)
             {
-                UIKit.OpenPanelAsync<UISetting>(canvasLevel: UILevel.PopUI).ToAction().StartGlobal();
+                if (item.type == Global.Instance.curModule.type)
-            });
+                {
-            closeBtn.onClick.AddListener(() =>
+                    count++;
+                }
+            }
+            Debug.LogError(count);
+            if (count > 1)
             {
                 UITipWindowData data = new UITipWindowData();
-                data.txt = "是否关闭软件？";
+                data.txt = "是否退出当前模块？";
-                data.btns.Add(new UITipWindowData.ItemData() { txt = "是", OnClick = () => Application.Quit() });
+                data.btns.Add(new UITipWindowData.ItemData()
+                {
+                    txt = "是",
+                    OnClick = () =>
+                    {
+                        Hide();
+                        TypeEventSystem.Global.Send<OnModuleQuit>();
+                        UIKit.OpenPanelAsync<UIModuleSelect>().ToAction().StartGlobal();
+                    }
+                });
                 data.btns.Add(new UITipWindowData.ItemData() { txt = "·ñ" });
                 UIKit.OpenPanelAsync<UITipWindow>(uiData: data, canvasLevel: UILevel.PopUI).ToAction().StartGlobal();
-            });
+            }
-            backBtn.onClick.AddListener(Home);
+            else
-            homeBtn.onClick.AddListener(Home);
-
-            desBtn.onClick.AddListener(() =>
             {
-                UIKit.OpenPanelAsync<UIInstruction>(canvasLevel: UILevel.PopUI).ToAction().StartGlobal();
+                OnHomeClick();
-            });
+            }
 
-            scoreBtn.onClick.AddListener(() =>
-            {
-                UIKit.OpenPanelAsync<UIScore>(canvasLevel: UILevel.PopUI).ToAction().StartGlobal();
-            });
         }
 
-        public void Home()
+        public void OnHomeClick()
         {
             UITipWindowData data = new UITipWindowData();
-            data.txt = "是否退出当前模块？";
+            data.txt = "是否返回首页？";
             data.btns.Add(new UITipWindowData.ItemData()
             {
                 txt = "ÊÇ",