修改引导文字和自动识别reset部分操作

Assets/BowArrow/InfraredCamera/InfraredDemo.cs

@@ -1440,6 +1440,8 @@ public class InfraredDemo : JCUnityLib.ViewBase
 
     void OnClick_ScreenLocateManualAuto()
     {
+        ResetCenterOffset();
+        ResetPositioningData();
         infraredCameraHelper.EnterScreenLocateManualAuto();
     }
 

Assets/BowArrow/InfraredCamera/Resources/InfraredDemo.prefab

@@ -360,7 +360,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 571.7, y: -255.7}
+  m_AnchoredPosition: {x: 550, y: -255.7}
   m_SizeDelta: {x: 1035.5265, y: 433.9756}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4280650962688814737
@@ -1217,7 +1217,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -150, y: -30}
+  m_AnchoredPosition: {x: 0, y: -30}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 1, y: 1}
 --- !u!114 &8704207769956337179
@@ -1234,7 +1234,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Padding:
     m_Left: 0
-    m_Right: 0
+    m_Right: 54
     m_Top: 0
     m_Bottom: 0
   m_ChildAlignment: 2
@@ -18269,7 +18269,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 571.7, y: -695.78784}
+  m_AnchoredPosition: {x: 550, y: -695.78784}
   m_SizeDelta: {x: 1035.5265, y: 433.9756}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &8828268174565667606
@@ -18785,7 +18785,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 493.4, y: 30}
+  m_SizeDelta: {x: 506.85, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2317138061932921812
 MonoBehaviour:
@@ -18805,7 +18805,7 @@ MonoBehaviour:
     m_Top: 0
     m_Bottom: 0
   m_ChildAlignment: 2
-  m_Spacing: 0
+  m_Spacing: 4.45
   m_ChildForceExpandWidth: 1
   m_ChildForceExpandHeight: 1
   m_ChildControlWidth: 0

Assets/BowArrow/Modules/InfraredGuider/InfraredGuider.prefab

@@ -2189,7 +2189,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 950, y: 168}
+  m_SizeDelta: {x: 1400, y: 168}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6403133998221557019
 CanvasRenderer:
@@ -2229,7 +2229,7 @@ MonoBehaviour:
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
-    m_HorizontalOverflow: 1
+    m_HorizontalOverflow: 0
     m_VerticalOverflow: 1
     m_LineSpacing: 1
   m_Text: "Double click the button on the device to calibrate the center of gravity.\nThen,
@@ -2649,7 +2649,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 950, y: 168}
+  m_SizeDelta: {x: 1400, y: 168}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &767148841805902699
 CanvasRenderer:
@@ -2681,7 +2681,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
-    m_FontSize: 37
+    m_FontSize: 36
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 3
@@ -2689,13 +2689,13 @@ MonoBehaviour:
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
-    m_HorizontalOverflow: 1
+    m_HorizontalOverflow: 0
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: "Remove the magazine module, double-click the button on it to calibrate
-    the center \nof sight, quickly reinstall the magazine, aim at the target with
-    a three-point line\n shooting posture, and complete the center of sight calibration
-    after 10 seconds."
+  m_Text: Remove the magazine module and double-click the button on it to calibrate
+    the crosshair. Quickly reinsert the magazine, then aim at the target center using
+    a three-point shooting posture. After {0} seconds, the crosshair will move to
+    the target center, completing the crosshair calibration.
 --- !u!114 &4107198112651785395
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -4190,7 +4190,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: "\u5355\u51FB\u6A21\u5757\u4E0A\u7684 <sprite=0> \u6309\u952E\uFF0C\u8FD9\u662F\u8FDB\u5165\u51C6\u5FC3\u8C03\u6574\u754C\u9762\u7684\u5F00/\u5173\uFF0C\n\u8BF7\u8FDE\u7EED\u64CD\u4F5C\u4E24\u6B21\u3002"
+  m_text: "\u5355\u51FB\u8BBE\u5907\u4E0A\u7684\u6309\u952E\uFF0C\u8FD9\u662F\u8FDB\u5165\u51C6\u5FC3\u8C03\u6574\u754C\u9762\u7684\u5F00/\u5173\uFF0C\\n\u8BF7\u5355\u51FB\u4E24\u6B21\uFF08\u95F4\u9694\u4E00\u79D2\uFF09\u3002"
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: bbcfb1567bce0b641adc9310d760d234, type: 2}
   m_sharedMaterial: {fileID: -8666424993308654677, guid: bbcfb1567bce0b641adc9310d760d234, type: 2}
@@ -4271,7 +4271,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  textKey: TopTip_CrossHair
+  textKey: TopTip_CrossHairPro
   layoutRebuildObject: {fileID: 0}
   languageFontSizes:
   - language: 0
@@ -6626,10 +6626,9 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: Press and hold the button<sprite=0>on the module for 3 seconds to calibrate
-    the center of sight. Then, use the normal bow position and aim at the target
-    with the head of the arrow tube as the reference point. After 10 seconds, complete
-    the center of sight calibration
+  m_text: Press and hold the button on the device <sprite=0>, then assume a normal
+    bow-drawing posture. Aim the arrowhead at the target center, and after 10 seconds,
+    the crosshair will move to the target center, completing the crosshair calibration.
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: bbcfb1567bce0b641adc9310d760d234, type: 2}
   m_sharedMaterial: {fileID: -8666424993308654677, guid: bbcfb1567bce0b641adc9310d760d234, type: 2}
@@ -6656,8 +6655,8 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 37
-  m_fontSizeBase: 37
+  m_fontSize: 36
+  m_fontSizeBase: 36
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18

Assets/BowArrow/Scripts/Components/TextAutoLanguage2/Resources/TextAutoLanguage2/cn.json

@@ -552,12 +552,13 @@
   手动识别部分
   **/
   "TitleTip1": "调整激光定位器的角度和位置，\n使整个电视屏幕完整地位于梯形框内",
-  "TitleTipHasData": "如定位白框与电视屏幕匹配，可点击“确认”按键，跳过定位流程否则调整激光定位器的角度和位置，使整个电视屏幕完整地位于梯形框内，点击“自动”按键",
+  "TitleTipHasData": "如定位白框与电视屏幕位置一致，可点击“确认”按键，跳过定位流程；否则调整激光定位器的角度和位置，使整个电视屏幕完整的位于梯形框内，点击“自动定位”按键",
   "TitleTip2": "如自动识别不准确，可调整激光定位器或调整图像对比度，使屏幕\n边缘更清晰后，再次自动识别；\n如多次自动识别不成功，可点击手动功能，并用手指拖动定位区域\n四个角进行调整，点击确认进入下一步。",
   "TitleTipManual": "用手动拖动白色线条框来标记出电视屏幕的显示区域",
   "Withdrawal": "撤销",
   "Automatic": "自动",
   "Manual": "手动",
+  "ManualSetting": "手动设置",
   "Confirm": "确认",
   "Finish": "完成",
   "Reset": "重置",
@@ -567,7 +568,7 @@
   "TitleTipMarker-HOUYIPro": "HOUYI Pro瞄准模块",
   "TitleTipMarker-ArtemisPro": "Artemis Pro",
   "TitleTipMarker-M9": "操作M9手枪依次瞄准屏幕的四个角\n扣动扳机进行标记（四角位置标签）",
-  "TitleTipMarker2": "操作设备对准电视，按提示依次用光点瞄准梯形框中电视屏幕内定位框的四个角，并单击准心键进行标记。标记需位于定位框内。",
+  "TitleTipMarker2": "操作瞄准器设备对准电视，按提示依次用红外光点瞄准摄像头中显示区域内白框的四个角，并单击瞄准器的准心键进行标记。\n①  如白框与电视屏幕显示区域位置一致，点击“完成”按键\n②  如标记中发现白框与电视屏幕显示区域差异较大，点击“自动定位”按键,\n重新进行自动识别\n③  如多次自动识别无效后，点击“手动设置”按键，进入手动设置方式",
   "TipMiddle": "请标记：{0}角的点",
   "TipTopLeft": "左上",
   "TipTopRight": "右上",
@@ -576,8 +577,8 @@
   "TipMarkComplete": "标记完成!",
   "TipMarkerError": "定位失败，需按要求重新标记。",
   "TipQuadError": "定位失败，不是有效的四边形。",
-  "TipAutoEnd": "① 如无法识别出屏幕，需屏蔽环境干扰光源后，点击“自动”按键重新识别\n② 如白框与电视屏幕匹配，点击“确认”按键，跳过定位流程 \n③ 如白框与电视屏幕不匹配，点击“环境测光”按键，继续定位流程",
-  "TipLightCtrl": "操作设备对准电视，将光点位于梯形框中电视屏幕，红色十字会在光点上，并随光点移动；如没有，需要找出干扰光源关闭它、调整激光定位器位置或调小亮度和对比度",
+  "TipAutoEnd": "① 如无法识别出屏幕，需屏蔽环境干扰光源后，点击“自动定位”按键重新识别\n② 如白框与电视屏幕显示区域位置一致，点击“确认”按键，跳过定位流程\n③ 如白框与电视屏幕显示区域位置不一致，点击“环境测光”按键，继续定位流程",
+  "TipLightCtrl": "操作设备对准电视，将瞄准器的红外光点位于梯形框内的电视屏幕，红色十字会在光点上，并随光点移动；如没有，需要找出干扰光源关闭它或调小亮度和对比度",
 
 
   "ScreenPositioningSuccessful-title": "\u3000\u3000请用手指点击选择最合适的屏幕区域结果。如未发现明显差异，请任选其一。如识别到的屏幕区域不合适，请点击“返回”重新识别。",
@@ -593,9 +594,9 @@
   "TopTip_CrossHair": "单击模块上的 <sprite=0> 按键，这是进入准心调整界面的开/关，\n请单击两次（间隔一秒）。",
   "TopTip_CrossHairPro": "单击设备上的按键，这是进入准心调整界面的开/关，\n请单击两次（间隔一秒）。",
   "TopTip_CrossHairGunPro": "取出弹夹模块，单击其上的按键，这是进入准心\n调整界面的开/关，请单击两次（间隔一秒）。",
-  "TopTip_ARTEMISPro": " 双击设备上的按键进行准心校准，之后请用正常的拉弓姿势，\n以箭筒头部瞄准靶心，{0}秒后准心会移动到靶心，完成准心校准。",
+  "TopTip_ARTEMISPro": " 双击设备上的按键，之后用正常的拉弓姿势,\n以箭筒头部瞄准靶心，10秒后准心会移动到靶心，完成准心校准。",
   "TopTip_GunPro": "取出弹夹模块，双击其上的按键进行准心校准，快速装回弹夹后，\n用三点一线的射击姿势瞄准靶心，{0}秒后准心会移动到靶心，完成准心校准。",
-  "TopTip": " 长按模块上的按键 <sprite=0> 3秒进行准心校准，之后请用正常的拉弓姿势，以箭筒头部瞄准靶心，{0}秒后准心会移动到靶心，完成准心校准。",
+  "TopTip": " 长按设备上的按键 <sprite=0>，之后用正常的拉弓姿势，以箭筒头部瞄准靶心，10秒后准心会移动到靶心，完成准心校准。",
   "TopTip2": "准心已校准，请射中靶子后，自动退出界面。",
   "LeftTitle": "异常问题检测",
   "LeftTip": "1、如发现光标不顺滑，或光标的移动范围不够大，请调整图像亮度或重新进行屏幕定位。\n\n2、如发现光标移动时有延时的现象，请调整分辨率或更换性能更好的手机后，再重新进行测试。\n\n3、如发现光标会随机闪烁不同的位置，或无法移动时，请点击环境测光寻找干扰源，并屏蔽干扰源。",

Assets/BowArrow/Scripts/Components/TextAutoLanguage2/Resources/TextAutoLanguage2/en.json

@@ -601,13 +601,13 @@
   手动识别部分
   **/
   "TitleTip1": "Adjust the angle and position of the laser locator,so that the \nentire TV screen fits completely within the trapezoidal frame.",
-  "TitleTipHasData": "If the white positioning frame matches the TV screen, you can click the 'Confirm' button to skip the positioning process; otherwise, adjust the angle and position of the laser locator so that the entire TV screen fits completely within the trapezoidal frame, then click the 'Auto' button.",
-
+  "TitleTipHasData": "If the positioned white frame matches the TV screen's position, click the 'Confirm' button to skip the positioning process. Otherwise, adjust the angle and position of the laser locator so that the entire TV screen is fully within the trapezoidal frame, then click the 'Auto Positioning' button.",
   "TitleTip2": "If the automatic recognition is not accurate, you can adjust the laser locator or adjust the \nimage contrast to make the screen edge clearer and then automatically recognize it again; \n If automatic recognition fails multiple times, click the manual function and drag the four \ncorners of the positioning area with your finger to adjust. Click OK to proceed to the next step. ",
   "TitleTipManual": "Manually drag the white line frame to mark the display area of the TV screen.",
   "Withdrawal": "Revoke",
   "Automatic": "Automatic",
   "Manual": "Manual",
+  "ManualSetting": "Manual Setting",
   "Confirm": "Confirm",
   "Finish": "Finish",
   "Reset": "Reset",
@@ -617,7 +617,7 @@
   "TitleTipMarker-HOUYIPro": "HOUYI Pro Aiming Module",
   "TitleTipMarker-ArtemisPro": "Artemis Pro",
   "TitleTipMarker-M9": "Operate M9 pistol to aim at the four corners of the screen \nin sequence, pull the trigger to mark (four corner position label)",
-  "TitleTipMarker2": "Position the device facing the TV, and follow the instructions to aim the light point at the four corners of the target box within the TV screen one by one. Click the reticle button to mark each corner. The marks must be within the target box.",
+  "TitleTipMarker2": "Operate the aiming device to face the TV, and follow the instructions to aim the infrared light dot at the four corners of the white frame within the displayed area on the camera. Press the crosshair button on the aiming device to mark each corner.\n① If the white frame matches the TV screen's display area, click the 'Finish' button.\n② If there is a significant difference between the white frame and the TV screen's display area during marking, click the 'Auto Positioning' button to retry automatic detection.\n③ If multiple automatic detections fail, click the 'Manual Setup' button to enter manual setup mode.",
   "TipMiddle": "Please mark: Point at the {0} corner",
   "TipTopLeft": "Top-Left",
   "TipTopRight": "Top-Right",
@@ -626,8 +626,8 @@
   "TipMarkComplete": "Mark Complete!",
   "TipMarkerError": "Positioning failed. You need to re-mark as instructed.",
   "TipQuadError": "Positioning failed. The shape is not a valid quadrilateral.",
-  "TipAutoEnd": "① If the screen cannot be recognized, block the environmental light interference and click the 'Auto' button to re-recognize.\n② If the white frame matches the TV screen, click the 'Confirm' button to skip the positioning process.\n③ If the white frame does not match the TV screen, click the 'Environment Light Measurement' button to continue the positioning process.",
-  "TipLightCtrl": "Position the device facing the TV, placing the light point within the trapezoidal frame on the TV screen. A red cross will appear at the light point and move with it. If not, identify and turn off the interfering light source, adjust the position of the laser locator, or reduce the brightness and contrast.",
+  "TipAutoEnd": "① If the screen cannot be detected, eliminate any ambient light interference and click the 'Auto Positioning' button to retry detection.\n② If the white frame matches the TV screen's display area, click the 'Confirm' button to skip the positioning process.\n③ If the white frame does not match the TV screen's display area, click the 'Ambient Light Measurement' button to continue the positioning process.",
+  "TipLightCtrl": "Position the device facing the TV and ensure the infrared light dot from the aiming device is within the TV screen inside the trapezoidal frame. A red cross should appear on the light dot and move with it. If not, identify and eliminate any interfering light sources or reduce the brightness and contrast.",
 
   "ScreenPositioningSuccessful-title": "\u3000\u3000Please tap with your finger to select the most suitable screen region result. If no obvious difference is found, choose any one. If the identified screen region is not suitable, click 'Back' to re-recognize.",
   "FirstResult": "First Result",
@@ -642,10 +642,9 @@
   "TopTip_CrossHair": "Click the <sprite=0> button on the module to enter the center adjustment \n interface. Please click twice (with an interval of one second)",
   "TopTip_CrossHairPro": "Click the button on the device. This toggles the crosshair adjustment interface on/off.Please click twice (with an interval of one second).",
   "TopTip_CrossHairGunPro": "Remove the magazine module and click the button on it. This is the on/off button to enter the alignment adjustment interface. Please click twice (with an interval of one second)",
-  "TopTip_ARTEMISPro": "Double-click the button on the device for reticle calibration. Then, use \nthe normal bow-drawing posture, aim the bow at the bullseye, and after {0} seconds, \nthe reticle will move to the bullseye, completing the calibration.",
-  "TopTip_GunPro": "Remove the magazine module, double-click the button on it for reticle calibration. \nAfter quickly reattaching the magazine, use a three-point alignment shooting posture \nto aim at the bullseye. After {0} seconds, the reticle will move to the bullseye, completing the calibration.",
-  "TopTip": "Press and hold the button on the module <sprite=0> for 3 seconds to calibrate the reticle. Then, use the normal bow-drawing posture, aim the bow at the bullseye, and after {0} seconds, the reticle will move to the bullseye, completing the calibration.",
-
+  "TopTip_ARTEMISPro": "Double-click the button on the device, then assume a normal bow-drawing posture. Aim the arrowhead at the target center, and after 10 seconds, the crosshair will move to the target center, completing the crosshair calibration.",
+  "TopTip_GunPro": "Remove the magazine module and double-click the button on it to calibrate the crosshair. Quickly reinsert the magazine, then aim at the target center using a three-point shooting posture. After {0} seconds, the crosshair will move to the target center, completing the crosshair calibration.",
+  "TopTip": "Press and hold the button on the device <sprite=0>, then assume a normal bow-drawing posture. Aim the arrowhead at the target center, and after 10 seconds, the crosshair will move to the target center, completing the crosshair calibration.",
 
   "TopTip2": "Accurate heart calibration, please hit the target and automatically exit the interface.",
   "LeftTitle": "Abnormal Problem Detection",

Assets/SmartBow/Resources/SmartBow/Prefabs/Views/Home/InfraredScreenPositioningView.prefab

@@ -934,7 +934,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
-    m_FontSize: 60
+    m_FontSize: 55
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
@@ -942,10 +942,10 @@ MonoBehaviour:
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
-    m_HorizontalOverflow: 1
+    m_HorizontalOverflow: 0
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: "\u624B\u52A8"
+  m_Text: "\u624B\u52A8\u8BBE\u7F6E"
 --- !u!114 &3334780981443562083
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -958,7 +958,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  textKey: Manual
+  textKey: ManualSetting
   layoutRebuildObject: {fileID: 0}
   languageFontSizes:
   - language: 1
@@ -2046,13 +2046,14 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2486637195272658313}
+  - {fileID: 113191178417432141}
   m_Father: {fileID: 2385600522496170982}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
   m_AnchoredPosition: {x: 0, y: 200}
-  m_SizeDelta: {x: 442, y: 176.2}
+  m_SizeDelta: {x: 1160.29, y: 176.2}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &3124998863955411776
 MonoBehaviour:
@@ -2072,9 +2073,9 @@ MonoBehaviour:
     m_Top: 0
     m_Bottom: 0
   m_ChildAlignment: 4
-  m_Spacing: 0
-  m_ChildForceExpandWidth: 1
-  m_ChildForceExpandHeight: 1
+  m_Spacing: 254.6
+  m_ChildForceExpandWidth: 0
+  m_ChildForceExpandHeight: 0
   m_ChildControlWidth: 0
   m_ChildControlHeight: 0
   m_ChildScaleWidth: 0
@@ -3212,10 +3213,10 @@ RectTransform:
   m_Father: {fileID: 6037001556489618093}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 693, y: 137}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6573496150500277273
 CanvasRenderer:
@@ -3255,7 +3256,7 @@ MonoBehaviour:
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
-    m_HorizontalOverflow: 1
+    m_HorizontalOverflow: 0
     m_VerticalOverflow: 1
     m_LineSpacing: 1
   m_Text: "\u786E\u8BA4"
@@ -3275,7 +3276,7 @@ MonoBehaviour:
   layoutRebuildObject: {fileID: 0}
   languageFontSizes:
   - language: 1
-    fontSize: 40
+    fontSize: 50
     lineSpacing: 0
 --- !u!1 &1112973431528079354
 GameObject:
@@ -4140,7 +4141,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: -40}
-  m_SizeDelta: {x: 1450, y: 272.3826}
+  m_SizeDelta: {x: 1420, y: 272.3826}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1394633538497114316
 CanvasRenderer:
@@ -4172,7 +4173,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
-    m_FontSize: 43
+    m_FontSize: 40
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 0
@@ -4183,7 +4184,9 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 1
     m_LineSpacing: 1.2
-  m_Text: "\u2460\u3000\u5982\u65E0\u6CD5\u8BC6\u522B\u51FA\u5C4F\u5E55\uFF0C\u9700\u5C4F\u853D\u73AF\u5883\u5E72\u6270\u5149\u6E90\u540E\uFF0C\u70B9\u51FB\u201C\u81EA\u52A8\u201D\u6309\u952E\u91CD\u65B0\u8BC6\u522B\t\r\n\u2461\u3000\u5982\u767D\u6846\u4E0E\u7535\u89C6\u5C4F\u5E55\u5339\u914D\uFF0C\u70B9\u51FB\u201C\u786E\u8BA4\u201D\u6309\u952E\uFF0C\u8DF3\u8FC7\u5B9A\u4F4D\u6D41\u7A0B\r\n\u2462\u3000\u5982\u767D\u6846\u4E0E\u7535\u89C6\u5C4F\u5E55\u4E0D\u5339\u914D\uFF0C\u70B9\u51FB\u201C\u73AF\u5883\u6D4B\u5149\u201D\u6309\u952E\uFF0C\u7EE7\u7EED\u5B9A\u4F4D\u6D41\u7A0B"
+  m_Text: "\u2460 \u5982\u65E0\u6CD5\u8BC6\u522B\u51FA\u5C4F\u5E55\uFF0C\u9700\u5C4F\u853D\u73AF\u5883\u5E72\u6270\u5149\u6E90\u540E\uFF0C\u70B9\u51FB\u201C\u81EA\u52A8\u5B9A\u4F4D\u201D\u6309\u952E\u91CD\u65B0\u8BC6\u522B\n\u2461
+    \u5982\u767D\u6846\u4E0E\u7535\u89C6\u5C4F\u5E55\u663E\u793A\u533A\u57DF\u4F4D\u7F6E\u4E00\u81F4\uFF0C\u70B9\u51FB\u201C\u786E\u8BA4\u201D\u6309\u952E\uFF0C\u8DF3\u8FC7\u5B9A\u4F4D\u6D41\u7A0B\r\n\u2462
+    \u5982\u767D\u6846\u4E0E\u7535\u89C6\u5C4F\u5E55\u663E\u793A\u533A\u57DF\u4F4D\u7F6E\u4E0D\u4E00\u81F4\uFF0C\u70B9\u51FB\u201C\u73AF\u5883\u6D4B\u5149\u201D\u6309\u952E\uFF0C\u7EE7\u7EED\u5B9A\u4F4D\u6D41\u7A0B"
 --- !u!114 &6118189460175673255
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -4201,7 +4204,7 @@ MonoBehaviour:
   languageFontSizes:
   - language: 1
     fontSize: 35
-    lineSpacing: 1.2
+    lineSpacing: 1.1
 --- !u!1 &1364628557557858923
 GameObject:
   m_ObjectHideFlags: 0
@@ -5140,7 +5143,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
-    m_FontSize: 60
+    m_FontSize: 55
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
@@ -5250,7 +5253,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 1
     m_LineSpacing: 1.2
-  m_Text: "\u64CD\u4F5C\u8BBE\u5907\u5BF9\u51C6\u7535\u89C6\uFF0C\u5C06\u5149\u70B9\u4F4D\u4E8E\u68AF\u5F62\u6846\u4E2D\u7535\u89C6\u5C4F\u5E55\uFF0C\u7EA2\u8272\u5341\u5B57\u4F1A\u5728\u5149\u70B9\u4E0A\uFF0C\u5E76\u968F\u5149\u70B9\u79FB\u52A8\uFF1B\u5982\u6CA1\u6709\uFF0C\u9700\u8981\u627E\u51FA\u5E72\u6270\u5149\u6E90\u5173\u95ED\u5B83\u3001\u8C03\u6574\u6FC0\u5149\u5B9A\u4F4D\u5668\u4F4D\u7F6E\u6216\u8C03\u5C0F\u4EAE\u5EA6\u548C\u5BF9\u6BD4\u5EA6"
+  m_Text: "\u64CD\u4F5C\u8BBE\u5907\u5BF9\u51C6\u7535\u89C6\uFF0C\u5C06\u7784\u51C6\u5668\u7684\u7EA2\u5916\u5149\u70B9\u4F4D\u4E8E\u68AF\u5F62\u6846\u5185\u7684\u7535\u89C6\u5C4F\u5E55\uFF0C\u7EA2\u8272\u5341\u5B57\u4F1A\u5728\u5149\u70B9\u4E0A\uFF0C\u5E76\u968F\u5149\u70B9\u79FB\u52A8\uFF1B\u5982\u6CA1\u6709\uFF0C\u9700\u8981\u627E\u51FA\u5E72\u6270\u5149\u6E90\u5173\u95ED\u5B83\u6216\u8C03\u5C0F\u4EAE\u5EA6\u548C\u5BF9\u6BD4\u5EA6"
 --- !u!114 &5012688958417105386
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -5941,10 +5944,10 @@ RectTransform:
   m_Father: {fileID: 6315183146887789583}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 693, y: 137}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3822561043505649587
 CanvasRenderer:
@@ -5984,10 +5987,10 @@ MonoBehaviour:
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
-    m_HorizontalOverflow: 1
+    m_HorizontalOverflow: 0
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: "\u81EA\u52A8"
+  m_Text: "\u81EA\u52A8\u5B9A\u4F4D"
 --- !u!114 &4384337689032104129
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -6000,11 +6003,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  textKey: Automatic
+  textKey: AutomaticPositioning
   layoutRebuildObject: {fileID: 0}
   languageFontSizes:
   - language: 1
-    fontSize: 40
+    fontSize: 50
     lineSpacing: 0
 --- !u!1 &2379855393249115299
 GameObject:
@@ -6042,8 +6045,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 446.76, y: -136.1913}
-  m_SizeDelta: {x: 1450, y: 272.3826}
+  m_AnchoredPosition: {x: 446.76, y: -160}
+  m_SizeDelta: {x: 1420, y: 320}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6316589309443947248
 CanvasRenderer:
@@ -6075,18 +6078,21 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
-    m_FontSize: 45
+    m_FontSize: 40
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 0
     m_MaxSize: 55
-    m_Alignment: 1
+    m_Alignment: 0
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 1
-    m_LineSpacing: 1.2
-  m_Text: "\u64CD\u4F5C\u8BBE\u5907\u5BF9\u51C6\u7535\u89C6\uFF0C\u6309\u63D0\u793A\u4F9D\u6B21\u7528\u5149\u70B9\u7784\u51C6\u68AF\u5F62\u6846\u4E2D\u7535\u89C6\u5C4F\u5E55\u5185\u5B9A\u4F4D\u6846\u7684\u56DB\u4E2A\u89D2\uFF0C\u5E76\u5355\u51FB\u51C6\u5FC3\u952E\u8FDB\u884C\u6807\u8BB0\u3002\u6807\u8BB0\u9700\u4F4D\u4E8E\u5B9A\u4F4D\u6846\u5185\u3002"
+    m_LineSpacing: 1.1
+  m_Text: "\u64CD\u4F5C\u7784\u51C6\u5668\u8BBE\u5907\u5BF9\u51C6\u7535\u89C6\uFF0C\u6309\u63D0\u793A\u4F9D\u6B21\u7528\u7EA2\u5916\u5149\u70B9\u7784\u51C6\u6444\u50CF\u5934\u4E2D\u663E\u793A\u533A\u57DF\u5185\u767D\u6846\u7684\u56DB\u4E2A\u89D2\uFF0C\u5E76\u5355\u51FB\u7784\u51C6\u5668\u7684\u51C6\u5FC3\u952E\u8FDB\u884C\u6807\u8BB0\u3002\n\u2460 
+    \u5982\u767D\u6846\u4E0E\u7535\u89C6\u5C4F\u5E55\u663E\u793A\u533A\u57DF\u4F4D\u7F6E\u4E00\u81F4\uFF0C\u70B9\u51FB\u201C\u5B8C\u6210\u201D\u6309\u952E\n\u2461 
+    \u5982\u6807\u8BB0\u4E2D\u53D1\u73B0\u767D\u6846\u4E0E\u7535\u89C6\u5C4F\u5E55\u663E\u793A\u533A\u57DF\u5DEE\u5F02\u8F83\u5927\uFF0C\u70B9\u51FB\u201C\u81EA\u52A8\u5B9A\u4F4D\u201D\u6309\u952E\uFF0C\n\u91CD\u65B0\u8FDB\u884C\u81EA\u52A8\u8BC6\u522B\r\n\u2462 
+    \u5982\u591A\u6B21\u81EA\u52A8\u8BC6\u522B\u65E0\u6548\u540E\uFF0C\u70B9\u51FB\u201C\u624B\u52A8\u8BBE\u7F6E\u201D\u6309\u952E\uFF0C\u8FDB\u5165\u624B\u52A8\u8BBE\u7F6E\u65B9\u5F0F"
 --- !u!114 &6358852571920578420
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -6101,7 +6107,10 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   textKey: TitleTipMarker2
   layoutRebuildObject: {fileID: 0}
-  languageFontSizes: []
+  languageFontSizes:
+  - language: 1
+    fontSize: 35
+    lineSpacing: 1
 --- !u!1 &2479122546828753154
 GameObject:
   m_ObjectHideFlags: 0
@@ -7383,10 +7392,10 @@ RectTransform:
   m_Father: {fileID: 6736615683481670348}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 693, y: 137}
+  m_SizeDelta: {x: -9.999993, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &35991511305739642
 CanvasRenderer:
@@ -7421,12 +7430,12 @@ MonoBehaviour:
     m_FontSize: 60
     m_FontStyle: 1
     m_BestFit: 0
-    m_MinSize: 2
+    m_MinSize: 0
     m_MaxSize: 78
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
-    m_HorizontalOverflow: 1
+    m_HorizontalOverflow: 0
     m_VerticalOverflow: 1
     m_LineSpacing: 1
   m_Text: "\u73AF\u5883\u6D4B\u5149"
@@ -7446,7 +7455,7 @@ MonoBehaviour:
   layoutRebuildObject: {fileID: 0}
   languageFontSizes:
   - language: 1
-    fontSize: 40
+    fontSize: 50
     lineSpacing: 0
 --- !u!1 &3145356883047440800
 GameObject:
@@ -7618,12 +7627,12 @@ RectTransform:
   m_Children:
   - {fileID: 6741438984227752152}
   m_Father: {fileID: 7936200563081898397}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 810, y: -80}
-  m_SizeDelta: {x: 400, y: 160}
+  m_AnchoredPosition: {x: 1380, y: -80}
+  m_SizeDelta: {x: 420, y: 137}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6683168247904551942
 CanvasRenderer:
@@ -8270,7 +8279,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
-    m_FontSize: 60
+    m_FontSize: 55
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
@@ -8278,10 +8287,10 @@ MonoBehaviour:
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
-    m_HorizontalOverflow: 1
+    m_HorizontalOverflow: 0
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: "\u81EA\u52A8"
+  m_Text: "\u81EA\u52A8\u5B9A\u4F4D"
 --- !u!114 &7130614949901140465
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -8294,7 +8303,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  textKey: Automatic
+  textKey: AutomaticPositioning
   layoutRebuildObject: {fileID: 0}
   languageFontSizes:
   - language: 1
@@ -8644,8 +8653,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 1085, y: -80}
-  m_SizeDelta: {x: 400, y: 160}
+  m_AnchoredPosition: {x: 1095, y: -80}
+  m_SizeDelta: {x: 420, y: 134}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6459928076372703
 CanvasRenderer:
@@ -8976,6 +8985,140 @@ MonoBehaviour:
     m_VerticalOverflow: 1
     m_LineSpacing: 1
   m_Text: 2
+--- !u!1 &3891474830549072765
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 113191178417432141}
+  - component: {fileID: 5847788856332703345}
+  - component: {fileID: 5703328729674361316}
+  - component: {fileID: 8388084543296419793}
+  m_Layer: 5
+  m_Name: ReturnButton
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &113191178417432141
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3891474830549072765}
+  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: 5131692391292585474}
+  m_Father: {fileID: 4487564021397169090}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 917.44507, y: -88.1}
+  m_SizeDelta: {x: 420, y: 137}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5847788856332703345
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3891474830549072765}
+  m_CullTransparentMesh: 1
+--- !u!114 &5703328729674361316
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3891474830549072765}
+  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.14509805, g: 0.7490196, b: 0.7490196, 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: 3d8675433a508ec47b8f895201eacf20, type: 3}
+  m_Type: 1
+  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!114 &8388084543296419793
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3891474830549072765}
+  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: 5703328729674361316}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 1598515592738749058}
+        m_TargetAssemblyTypeName: InfraredScreenPositioningView, Assembly-CSharp
+        m_MethodName: OnClick_BackLayoutStart
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!1 &4045245623524848592
 GameObject:
   m_ObjectHideFlags: 0
@@ -9440,7 +9583,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 446.76, y: -314.8826}
+  m_AnchoredPosition: {x: 446.76, y: -362.5}
   m_SizeDelta: {x: 1450, y: 85}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7700196897521753072
@@ -9787,10 +9930,10 @@ RectTransform:
   m_Father: {fileID: 7708239540463103243}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 693, y: 137}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6301499011725830438
 CanvasRenderer:
@@ -9830,7 +9973,7 @@ MonoBehaviour:
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
-    m_HorizontalOverflow: 1
+    m_HorizontalOverflow: 0
     m_VerticalOverflow: 1
     m_LineSpacing: 1
   m_Text: "\u786E\u8BA4"
@@ -9850,7 +9993,7 @@ MonoBehaviour:
   layoutRebuildObject: {fileID: 0}
   languageFontSizes:
   - language: 1
-    fontSize: 40
+    fontSize: 50
     lineSpacing: 0
 --- !u!1 &4389102567783386378
 GameObject:
@@ -9921,11 +10064,11 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
-    m_FontSize: 50
+    m_FontSize: 60
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 3
-    m_MaxSize: 50
+    m_MaxSize: 60
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -9947,7 +10090,10 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   textKey: Marker
   layoutRebuildObject: {fileID: 0}
-  languageFontSizes: []
+  languageFontSizes:
+  - language: 1
+    fontSize: 50
+    lineSpacing: 0
 --- !u!1 &4390009615133161721
 GameObject:
   m_ObjectHideFlags: 0
@@ -10441,6 +10587,105 @@ MonoBehaviour:
   textKey: Dark
   layoutRebuildObject: {fileID: 0}
   languageFontSizes: []
+--- !u!1 &4657178749850829980
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5131692391292585474}
+  - component: {fileID: 3676947351791135098}
+  - component: {fileID: 7341301036481638669}
+  - component: {fileID: 2170156183624274445}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5131692391292585474
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4657178749850829980}
+  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: 113191178417432141}
+  m_RootOrder: 0
+  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 &3676947351791135098
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4657178749850829980}
+  m_CullTransparentMesh: 0
+--- !u!114 &7341301036481638669
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4657178749850829980}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData:
+    m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
+    m_FontSize: 60
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 78
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 1
+    m_LineSpacing: 1
+  m_Text: "\u8FD4\u56DE"
+--- !u!114 &2170156183624274445
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4657178749850829980}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textKey: common_return
+  layoutRebuildObject: {fileID: 0}
+  languageFontSizes:
+  - language: 1
+    fontSize: 50
+    lineSpacing: 0
 --- !u!1 &4686575222115268413
 GameObject:
   m_ObjectHideFlags: 0
@@ -11137,7 +11382,7 @@ MonoBehaviour:
   bDrawMask: 0
   maskColor: {r: 0.4117647, g: 0.4117647, b: 0.4117647, a: 1}
   bDrawFan: 1
-  fanColor: {r: 1, g: 1, b: 1, a: 1}
+  fanColor: {r: 1, g: 1, b: 1, a: 0.3019608}
   fanSegments: 15
   fanOuterRadius: 90
   bDrawArrow: 0
@@ -11216,7 +11461,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
     m_FontSize: 60
-    m_FontStyle: 0
+    m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 78
@@ -11243,7 +11488,7 @@ MonoBehaviour:
   layoutRebuildObject: {fileID: 0}
   languageFontSizes:
   - language: 1
-    fontSize: 40
+    fontSize: 50
     lineSpacing: 0
 --- !u!1 &5327879598302597208
 GameObject:
@@ -11543,7 +11788,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 400, y: 160}
+  m_SizeDelta: {x: 420, y: 134}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4934355984803657532
 CanvasRenderer:
@@ -11629,7 +11874,7 @@ MonoBehaviour:
       m_Calls:
       - m_Target: {fileID: 1598515592738749058}
         m_TargetAssemblyTypeName: InfraredScreenPositioningView, Assembly-CSharp
-        m_MethodName: OnClick_Auto
+        m_MethodName: OnClick_EnterAuto
         m_Mode: 1
         m_Arguments:
           m_ObjectArgument: {fileID: 0}
@@ -11811,7 +12056,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -150}
+  m_AnchoredPosition: {x: 0, y: -123.17}
   m_SizeDelta: {x: 893.52, y: 133}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8275450892580246600
@@ -12958,7 +13203,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
-    m_FontSize: 60
+    m_FontSize: 55
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
@@ -13292,12 +13537,12 @@ RectTransform:
   m_Children:
   - {fileID: 1206276497842860774}
   m_Father: {fileID: 7936200563081898397}
-  m_RootOrder: 2
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 1360, y: -80}
-  m_SizeDelta: {x: 400, y: 160}
+  m_AnchoredPosition: {x: 810, y: -80}
+  m_SizeDelta: {x: 420, y: 137}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4097994269845191714
 CanvasRenderer:
@@ -13883,8 +14128,8 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6315183146887789583}
-  - {fileID: 7708239540463103243}
   - {fileID: 6736615683481670348}
+  - {fileID: 7708239540463103243}
   m_Father: {fileID: 4423893524894772476}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -14952,10 +15197,10 @@ RectTransform:
   m_Father: {fileID: 6648240867118372392}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 693, y: 137}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6273814643582115512
 CanvasRenderer:
@@ -14995,10 +15240,10 @@ MonoBehaviour:
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
-    m_HorizontalOverflow: 1
+    m_HorizontalOverflow: 0
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: "\u81EA\u52A8"
+  m_Text: "\u81EA\u52A8\u5B9A\u4F4D"
 --- !u!114 &6335643801137955043
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -15011,11 +15256,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  textKey: Automatic
+  textKey: AutomaticPositioning
   layoutRebuildObject: {fileID: 0}
   languageFontSizes:
   - language: 1
-    fontSize: 40
+    fontSize: 50
     lineSpacing: 0
 --- !u!1 &7301378980541865753
 GameObject:
@@ -15855,8 +16100,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 260, y: -80}
-  m_SizeDelta: {x: 400, y: 160}
+  m_AnchoredPosition: {x: 240, y: -80}
+  m_SizeDelta: {x: 420, y: 137}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2083800552970647720
 CanvasRenderer:
@@ -15942,7 +16187,7 @@ MonoBehaviour:
       m_Calls:
       - m_Target: {fileID: 1598515592738749058}
         m_TargetAssemblyTypeName: InfraredScreenPositioningView, Assembly-CSharp
-        m_MethodName: OnClick_Auto
+        m_MethodName: OnClick_EnterAuto
         m_Mode: 1
         m_Arguments:
           m_ObjectArgument: {fileID: 0}
@@ -16827,8 +17072,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 221, y: -88.1}
-  m_SizeDelta: {x: 420, y: 160}
+  m_AnchoredPosition: {x: 242.84503, y: -88.1}
+  m_SizeDelta: {x: 420, y: 137}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4890893490615340598
 CanvasRenderer:
@@ -17945,7 +18190,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 1
     m_LineSpacing: 1.1
-  m_Text: "\u5982\u5B9A\u4F4D\u767D\u6846\u4E0E\u7535\u89C6\u5C4F\u5E55\u5339\u914D\uFF0C\u53EF\u70B9\u51FB\u201C\u786E\u8BA4\u201D\u6309\u952E\uFF0C\u8DF3\u8FC7\u5B9A\u4F4D\u6D41\u7A0B\u5426\u5219\u8C03\u6574\u6FC0\u5149\u5B9A\u4F4D\u5668\u7684\u89D2\u5EA6\u548C\u4F4D\u7F6E\uFF0C\u4F7F\u6574\u4E2A\u7535\u89C6\u5C4F\u5E55\u5B8C\u6574\u5730\u4F4D\u4E8E\u68AF\u5F62\u6846\u5185\uFF0C\u70B9\u51FB\u201C\u81EA\u52A8\u201D\u6309\u952E"
+  m_Text: "\u5982\u5B9A\u4F4D\u767D\u6846\u4E0E\u7535\u89C6\u5C4F\u5E55\u4F4D\u7F6E\u4E00\u81F4\uFF0C\u53EF\u70B9\u51FB\u201C\u786E\u8BA4\u201D\u6309\u952E\uFF0C\u8DF3\u8FC7\u5B9A\u4F4D\u6D41\u7A0B\uFF1B\u5426\u5219\u8C03\u6574\u6FC0\u5149\u5B9A\u4F4D\u5668\u7684\u89D2\u5EA6\u548C\u4F4D\u7F6E\uFF0C\u4F7F\u6574\u4E2A\u7535\u89C6\u5C4F\u5E55\u5B8C\u6574\u7684\u4F4D\u4E8E\u68AF\u5F62\u6846\u5185\uFF0C\u70B9\u51FB\u201C\u81EA\u52A8\u5B9A\u4F4D\u201D\u6309\u952E"
 --- !u!114 &1690679193384069441
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -17960,7 +18205,10 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   textKey: TitleTipHasData
   layoutRebuildObject: {fileID: 0}
-  languageFontSizes: []
+  languageFontSizes:
+  - language: 1
+    fontSize: 43
+    lineSpacing: 1.1
 --- !u!1 &8594212144589733314
 GameObject:
   m_ObjectHideFlags: 0
@@ -18037,7 +18285,7 @@ MonoBehaviour:
   bDrawMask: 0
   maskColor: {r: 0.4117647, g: 0.4117647, b: 0.4117647, a: 1}
   bDrawFan: 1
-  fanColor: {r: 1, g: 1, b: 1, a: 1}
+  fanColor: {r: 1, g: 1, b: 1, a: 0.3019608}
   fanSegments: 15
   fanOuterRadius: 90
   bDrawArrow: 0

Assets/SmartBow/Scripts/Views/InfraredViewParts/InfraredScreenPositioningView.cs

@@ -482,6 +482,7 @@ public class InfraredScreenPositioningView : JCUnityLib.ViewBase
                 //setPointsLocation(ScreenLocate.quadUnityVectorList, pointsParent.gameObject, true);
                 break;
             case ScreenPositioningStep.Manual:
+                SaveStartOldLinePosition();
                 perStepView = ScreenPositioningStep.Manual;
                 bMarkerFinish = false;
                 LayoutManual.SetActive(true);
@@ -539,8 +540,10 @@ public class InfraredScreenPositioningView : JCUnityLib.ViewBase
     /// </summary>
     public void OnClick_BackLayoutStart()
     {
-        //返回上一步操作
-        infraredDemo.RevokeCenterOffset();
+        //重置中心点0
+        infraredDemo.ResetCenterOffset();
+        //清除白线数据
+        infraredDemo.ResetPositioningData();
         SetScreenPositioningStepState(ScreenPositioningStep.Start);
     }
     /// <summary>
@@ -562,10 +565,11 @@ public class InfraredScreenPositioningView : JCUnityLib.ViewBase
     /// </summary>
     public void OnClick_BackByScreenPositioningStep()
     {
-        if(perStepView == ScreenPositioningStep.Manual)
-            SetScreenPositioningStepState(ScreenPositioningStep.Manual);
-        else
-            SetScreenPositioningStepState(ScreenPositioningStep.Marker);
+        SetScreenPositioningStepState(ScreenPositioningStep.Marker);
+        //if(perStepView == ScreenPositioningStep.Manual)
+        //    SetScreenPositioningStepState(ScreenPositioningStep.Manual);
+        //else
+        //    SetScreenPositioningStepState(ScreenPositioningStep.Marker);
     }
     /// <summary>
     /// 直接进入游戏流程
@@ -580,6 +584,7 @@ public class InfraredScreenPositioningView : JCUnityLib.ViewBase
     /// </summary>
     public void OnClick_EnterAuto()
     {
+        Debug.LogError("OnClick_EnterAuto");
         //自动按钮时候进入之前的校准流程
         //重置偏移量
         infraredDemo.ResetCenterOffset();
@@ -741,6 +746,22 @@ public class InfraredScreenPositioningView : JCUnityLib.ViewBase
         linePosition.pos = screenPositions;
         oldLinePosition.Add(linePosition);
     }
+    /// <summary>
+    /// 记录一个开始位置
+    /// </summary>
+    void SaveStartOldLinePosition() {
+        oldLinePosition.Clear();
+        //记录一个操作点的操作位置
+        List<Vector3> screenPositions = new List<Vector3>();
+        screenPositions.Add(pos1.localPosition);
+        screenPositions.Add(pos2.localPosition);
+        screenPositions.Add(pos3.localPosition);
+        screenPositions.Add(pos4.localPosition);
+        LinePosition linePosition = new LinePosition();
+        linePosition.index = 1;
+        linePosition.pos = screenPositions;
+        oldLinePosition.Add(linePosition);
+    }
 
     //转换绘制线段的点
     List<Vector2> linePosConversion(Vector3 _pos1, Vector3 _pos2, Vector3 _pos3, Vector3 _pos4)
@@ -821,9 +842,9 @@ public class InfraredScreenPositioningView : JCUnityLib.ViewBase
 
         if (oldLinePosition.Count > 1) // 确保列表不为空
         {
-            LinePosition lastElement = oldLinePosition[oldLinePosition.Count - 1];
+            //LinePosition lastElement = oldLinePosition[oldLinePosition.Count - 1];
             oldLinePosition.Clear();
-            oldLinePosition.Add(lastElement);
+            //oldLinePosition.Add(lastElement);
         }
 
         if (InfraredDemo.running)