fix: 恢复出厂设置时增加密码校验逻辑

1.  修复恢复出厂设置未校验密码的问题，未设置密码时直接弹出密码校验页
2.  修复密码校验页返回逻辑，正确恢复上一级返回动作
3.  调整设备信息页面UI布局并添加密码校验页面预制体

Assets/Res/ui/common/解锁页.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: f36c17ce6ded959448d362a2d614b4b4
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/ui/deviceinfopage/deviceInfoPage.prefab

@@ -464,10 +464,10 @@ RectTransform:
   - {fileID: 4609011310532597752}
   m_Father: {fileID: 8005538612006455264}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 345, y: -50}
+  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 630, y: 100}
+  m_SizeDelta: {x: 0, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4006412589619313151
 CanvasRenderer:
@@ -875,10 +875,10 @@ RectTransform:
   - {fileID: 33602996101251923}
   m_Father: {fileID: 1366632145333145909}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 345, y: -50}
+  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 630, y: 100}
+  m_SizeDelta: {x: 0, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3329145665577600330
 CanvasRenderer:
@@ -1330,10 +1330,10 @@ RectTransform:
   - {fileID: 328406420134697016}
   m_Father: {fileID: 5018484518019782322}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 345, y: -151}
+  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 630, y: 100}
+  m_SizeDelta: {x: 0, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &771658931027156644
 CanvasRenderer:
@@ -1734,10 +1734,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 5018484518019782322}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 345, y: -100.5}
+  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 630, y: 1}
+  m_SizeDelta: {x: 0, y: 1}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3848967349033737734
 CanvasRenderer:
@@ -2968,10 +2968,10 @@ RectTransform:
   - {fileID: 1946287221376316342}
   m_Father: {fileID: 503033813885924184}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 345, y: -50}
+  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 630, y: 100}
+  m_SizeDelta: {x: 0, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7996113364207296638
 CanvasRenderer:
@@ -3891,10 +3891,10 @@ RectTransform:
   - {fileID: 74553931593278143}
   m_Father: {fileID: 5018484518019782322}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 345, y: -50}
+  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 630, y: 100}
+  m_SizeDelta: {x: 0, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4370531631496196709
 CanvasRenderer:
@@ -4175,10 +4175,10 @@ RectTransform:
   - {fileID: 4933027616088231354}
   m_Father: {fileID: 1172958604836262128}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 345, y: -151}
+  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 630, y: 100}
+  m_SizeDelta: {x: 0, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8004227277440916935
 CanvasRenderer:
@@ -5542,7 +5542,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &3686824535575650104
 RectTransform:
   m_ObjectHideFlags: 0
@@ -5843,10 +5843,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 1172958604836262128}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 345, y: -100.5}
+  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 630, y: 1}
+  m_SizeDelta: {x: 0, y: 1}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5806169704626625923
 CanvasRenderer:
@@ -6945,10 +6945,10 @@ RectTransform:
   - {fileID: 3069542178971349398}
   m_Father: {fileID: 1172958604836262128}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 345, y: -50}
+  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 630, y: 100}
+  m_SizeDelta: {x: 0, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3205061977118511274
 CanvasRenderer:
@@ -7083,6 +7083,7 @@ RectTransform:
   - {fileID: 537902066735883185}
   - {fileID: 1020774894406731393}
   - {fileID: 2162368835647687423}
+  - {fileID: 1898311723319101938}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -7171,6 +7172,7 @@ MonoBehaviour:
   - {fileID: 1424531373121989049}
   - {fileID: 6259534818018079}
   - {fileID: 2363466650042815415}
+  checkPasswordPage: {fileID: 4613033892917706629}
 --- !u!1 &8064406853400926337
 GameObject:
   m_ObjectHideFlags: 0
@@ -8921,6 +8923,284 @@ RectTransform:
     type: 3}
   m_PrefabInstance: {fileID: 5305376504236266476}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &7246622183667696527
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 1237914662051168101}
+    m_Modifications:
+    - target: {fileID: 461646496278835136, guid: f36c17ce6ded959448d362a2d614b4b4,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 342
+      objectReference: {fileID: 0}
+    - target: {fileID: 2636265602905865226, guid: f36c17ce6ded959448d362a2d614b4b4,
+        type: 3}
+      propertyPath: plane
+      value: 
+      objectReference: {fileID: 5664424832827336924}
+    - target: {fileID: 2636265602905865226, guid: f36c17ce6ded959448d362a2d614b4b4,
+        type: 3}
+      propertyPath: errorText
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 2636265602905865226, guid: f36c17ce6ded959448d362a2d614b4b4,
+        type: 3}
+      propertyPath: passwordInput
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 2636265602905865226, guid: f36c17ce6ded959448d362a2d614b4b4,
+        type: 3}
+      propertyPath: passwordCheckPanel
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 2822382633387485176, guid: f36c17ce6ded959448d362a2d614b4b4,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2822382633387485176, guid: f36c17ce6ded959448d362a2d614b4b4,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2822382633387485176, guid: f36c17ce6ded959448d362a2d614b4b4,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 530
+      objectReference: {fileID: 0}
+    - target: {fileID: 2822382633387485176, guid: f36c17ce6ded959448d362a2d614b4b4,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 42
+      objectReference: {fileID: 0}
+    - target: {fileID: 2822382633387485176, guid: f36c17ce6ded959448d362a2d614b4b4,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 295
+      objectReference: {fileID: 0}
+    - target: {fileID: 2822382633387485176, guid: f36c17ce6ded959448d362a2d614b4b4,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -140
+      objectReference: {fileID: 0}
+    - target: {fileID: 3030139854100474707, guid: f36c17ce6ded959448d362a2d614b4b4,
+        type: 3}
+      propertyPath: m_Name
+      value: "\u89E3\u9501\u9875"
+      objectReference: {fileID: 0}
+    - target: {fileID: 3030139854100474707, guid: f36c17ce6ded959448d362a2d614b4b4,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6018087961299166567, guid: f36c17ce6ded959448d362a2d614b4b4,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6018087961299166567, guid: f36c17ce6ded959448d362a2d614b4b4,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6018087961299166567, guid: f36c17ce6ded959448d362a2d614b4b4,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 530
+      objectReference: {fileID: 0}
+    - target: {fileID: 6018087961299166567, guid: f36c17ce6ded959448d362a2d614b4b4,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 90
+      objectReference: {fileID: 0}
+    - target: {fileID: 6018087961299166567, guid: f36c17ce6ded959448d362a2d614b4b4,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 295
+      objectReference: {fileID: 0}
+    - target: {fileID: 6018087961299166567, guid: f36c17ce6ded959448d362a2d614b4b4,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -312
+      objectReference: {fileID: 0}
+    - target: {fileID: 6101445796064624970, guid: f36c17ce6ded959448d362a2d614b4b4,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8183539346123877351, guid: f36c17ce6ded959448d362a2d614b4b4,
+        type: 3}
+      propertyPath: m_Color.a
+      value: 0.6
+      objectReference: {fileID: 0}
+    - target: {fileID: 8183539346123877351, guid: f36c17ce6ded959448d362a2d614b4b4,
+        type: 3}
+      propertyPath: m_Material
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 8993180021241971117, guid: f36c17ce6ded959448d362a2d614b4b4,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8993180021241971117, guid: f36c17ce6ded959448d362a2d614b4b4,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8993180021241971117, guid: f36c17ce6ded959448d362a2d614b4b4,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 530
+      objectReference: {fileID: 0}
+    - target: {fileID: 8993180021241971117, guid: f36c17ce6ded959448d362a2d614b4b4,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 45
+      objectReference: {fileID: 0}
+    - target: {fileID: 8993180021241971117, guid: f36c17ce6ded959448d362a2d614b4b4,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 295
+      objectReference: {fileID: 0}
+    - target: {fileID: 8993180021241971117, guid: f36c17ce6ded959448d362a2d614b4b4,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -55
+      objectReference: {fileID: 0}
+    - target: {fileID: 9135837782434876029, guid: f36c17ce6ded959448d362a2d614b4b4,
+        type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 9135837782434876029, guid: f36c17ce6ded959448d362a2d614b4b4,
+        type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 9135837782434876029, guid: f36c17ce6ded959448d362a2d614b4b4,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 9135837782434876029, guid: f36c17ce6ded959448d362a2d614b4b4,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 9135837782434876029, guid: f36c17ce6ded959448d362a2d614b4b4,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9135837782434876029, guid: f36c17ce6ded959448d362a2d614b4b4,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9135837782434876029, guid: f36c17ce6ded959448d362a2d614b4b4,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9135837782434876029, guid: f36c17ce6ded959448d362a2d614b4b4,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9135837782434876029, guid: f36c17ce6ded959448d362a2d614b4b4,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9135837782434876029, guid: f36c17ce6ded959448d362a2d614b4b4,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9135837782434876029, guid: f36c17ce6ded959448d362a2d614b4b4,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9135837782434876029, guid: f36c17ce6ded959448d362a2d614b4b4,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 9135837782434876029, guid: f36c17ce6ded959448d362a2d614b4b4,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9135837782434876029, guid: f36c17ce6ded959448d362a2d614b4b4,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9135837782434876029, guid: f36c17ce6ded959448d362a2d614b4b4,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9135837782434876029, guid: f36c17ce6ded959448d362a2d614b4b4,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9135837782434876029, guid: f36c17ce6ded959448d362a2d614b4b4,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9135837782434876029, guid: f36c17ce6ded959448d362a2d614b4b4,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9135837782434876029, guid: f36c17ce6ded959448d362a2d614b4b4,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9135837782434876029, guid: f36c17ce6ded959448d362a2d614b4b4,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects:
+    - {fileID: 5402950698256398897, guid: f36c17ce6ded959448d362a2d614b4b4, type: 3}
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: f36c17ce6ded959448d362a2d614b4b4, type: 3}
+--- !u!224 &1898311723319101938 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 9135837782434876029, guid: f36c17ce6ded959448d362a2d614b4b4,
+    type: 3}
+  m_PrefabInstance: {fileID: 7246622183667696527}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &4613033892917706629 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 2636265602905865226, guid: f36c17ce6ded959448d362a2d614b4b4,
+    type: 3}
+  m_PrefabInstance: {fileID: 7246622183667696527}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5664424832827336924}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c01492eac4baa234a9e337acce941cb2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!1 &5664424832827336924 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 3030139854100474707, guid: f36c17ce6ded959448d362a2d614b4b4,
+    type: 3}
+  m_PrefabInstance: {fileID: 7246622183667696527}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &8074878673866451466
 PrefabInstance:
   m_ObjectHideFlags: 0

Assets/Scenes/MainScene.unity

@@ -1627,8 +1627,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
+  m_Children: []
-  - {fileID: 1662670615125641637}
   m_Father: {fileID: 1547547273}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -1882,135 +1881,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2043343453}
   m_CullTransparentMesh: 1
---- !u!1001 &1662670615125641636
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 1896827481}
-    m_Modifications:
-    - target: {fileID: 1747880209013804715, guid: 41893f404b95b1f48a41f3b183109161,
-        type: 3}
-      propertyPath: m_Name
-      value: "\u6CE8\u9500\u9875"
-      objectReference: {fileID: 0}
-    - target: {fileID: 1747880209013804715, guid: 41893f404b95b1f48a41f3b183109161,
-        type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6964046110211341229, guid: 41893f404b95b1f48a41f3b183109161,
-        type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 6964046110211341229, guid: 41893f404b95b1f48a41f3b183109161,
-        type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 6964046110211341229, guid: 41893f404b95b1f48a41f3b183109161,
-        type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 6964046110211341229, guid: 41893f404b95b1f48a41f3b183109161,
-        type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 6964046110211341229, guid: 41893f404b95b1f48a41f3b183109161,
-        type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6964046110211341229, guid: 41893f404b95b1f48a41f3b183109161,
-        type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6964046110211341229, guid: 41893f404b95b1f48a41f3b183109161,
-        type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6964046110211341229, guid: 41893f404b95b1f48a41f3b183109161,
-        type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6964046110211341229, guid: 41893f404b95b1f48a41f3b183109161,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6964046110211341229, guid: 41893f404b95b1f48a41f3b183109161,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6964046110211341229, guid: 41893f404b95b1f48a41f3b183109161,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6964046110211341229, guid: 41893f404b95b1f48a41f3b183109161,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 6964046110211341229, guid: 41893f404b95b1f48a41f3b183109161,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6964046110211341229, guid: 41893f404b95b1f48a41f3b183109161,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6964046110211341229, guid: 41893f404b95b1f48a41f3b183109161,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6964046110211341229, guid: 41893f404b95b1f48a41f3b183109161,
-        type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6964046110211341229, guid: 41893f404b95b1f48a41f3b183109161,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6964046110211341229, guid: 41893f404b95b1f48a41f3b183109161,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6964046110211341229, guid: 41893f404b95b1f48a41f3b183109161,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6964046110211341229, guid: 41893f404b95b1f48a41f3b183109161,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 41893f404b95b1f48a41f3b183109161, type: 3}
---- !u!224 &1662670615125641637 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 6964046110211341229, guid: 41893f404b95b1f48a41f3b183109161,
-    type: 3}
-  m_PrefabInstance: {fileID: 1662670615125641636}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1660057539 &9223372036854775807
 SceneRoots:
   m_ObjectHideFlags: 0

Assets/Scripts/UI/Pages/DeviceInfoPage/DeviceInfoPage.cs

@@ -328,8 +328,15 @@ namespace Kill.UI.Pages
             UIManager.Instance.OpenMainPage(UIManager.PageName.homePage);
         }
         public GameObject[] restoreSettingsTips;
+        public CheckPasswordPage checkPasswordPage;
+
         public void RestoreSettings0()
         {
+            if(!DataManager.Instance.HasAnyPassword())
+            {
+                checkPasswordPage.gameObject.SetActive(true);
+                return;
+            }
             restoreSettingsTips[0].gameObject.SetActive(true);
             restoreSettingsTips[1].gameObject.SetActive(false);
             restoreSettingsTips[2].gameObject.SetActive(false);

Assets/Scripts/UI/Pages/HomePage/CheckPasswordPage.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using Kill.Managers;
@@ -37,9 +38,10 @@ namespace Kill.UI.Pages
                 remindLaterBtn.onClick.AddListener(OnRemindLaterClick);
             }
         }
-
+        Action lastBackAction;
         public void OnEnable()
         {
+            lastBackAction=UIManager.Instance.GetBackAction();
             UIManager.Instance.RegisterBackAction(OnBack);
             errorText.text="";
             // 检测当前账号是否已设置过密码，决定显示密码输入面板还是引导面板
@@ -148,7 +150,7 @@ namespace Kill.UI.Pages
 
         public void OnBack()
         {
-            UIManager.Instance.RegisterBackAction(null);
+            UIManager.Instance.RegisterBackAction(lastBackAction);
             gameObject.SetActive(false);
         }
     }