Преглед на файлове

完善流程,替换部分文字

slambb преди 11 месеца
родител
ревизия
a47404e9ac

+ 6 - 6
Assets/BowArrow/Modules/InfraredGuider/InfraredLightGuider2.prefab

@@ -111,7 +111,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 63.39, y: 0}
+  m_SizeDelta: {x: 120, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3001701286983933858
 CanvasRenderer:
@@ -188,8 +188,8 @@ RectTransform:
   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_AnchoredPosition: {x: 0.6252, y: -90}
-  m_SizeDelta: {x: 1301.4, y: 60}
+  m_AnchoredPosition: {x: 0.6252, y: -145}
+  m_SizeDelta: {x: 1301.4, y: 120}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &6932389852952640046
 MonoBehaviour:
@@ -1140,8 +1140,8 @@ RectTransform:
   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_AnchoredPosition: {x: 0.6252, y: -90}
-  m_SizeDelta: {x: 1301.4, y: 60}
+  m_AnchoredPosition: {x: 0.6252, y: -145}
+  m_SizeDelta: {x: 1301.4, y: 120}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1400118621012379427
 MonoBehaviour:
@@ -2214,7 +2214,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 63.39, y: 0}
+  m_SizeDelta: {x: 120, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6458405316219943095
 CanvasRenderer:

+ 4 - 5
Assets/BowArrow/Scripts/Components/TextAutoLanguage2/Resources/TextAutoLanguage2/cn.json

@@ -581,9 +581,8 @@
   "TipMarkComplete": "标记完成!",
   "TipMarkerError": "定位失败,需按要求重新标记。",
   "TipQuadError": "定位失败,不是有效的四边形。",
-  "TipAutoEnd": "① 如无法识别出屏幕,需屏蔽环境干扰光源后,点击“自动定位”按键重新识别\n② 如白框与电视屏幕显示区域位置一致,点击“确认”按键,跳过定位流程\n③ 如白框与电视屏幕显示区域位置不一致,点击“环境测光”按键,继续定位流程",
-  "TipLightCtrl": "操作设备对准电视,将瞄准器的红外光点位于梯形框内的电视屏幕,红色十字会在光点上,并随光点移动;如没有,需要找出干扰光源关闭它或调小亮度和对比度",
-
+  "TipAutoEnd": "① 如无法识别出屏幕,需屏蔽环境干扰光源后,点击“自动定位”按键重新识别\n② 如多次无法识别出屏幕,说明屏幕亮度不足,点击“环境测光”按键,通过屏幕\n标记或手动设置对屏幕进行手动标记",
+  "TipLightCtrl": "① 操作设备对准电视,将瞄准器的红外光点位于梯形框内的电视屏幕,红色十字会在光点上,并随光点移动;如没有,需要找出干扰光源关闭它或调小亮度和对比度\n② 如多次设置,仍无法实现红色十字随光点移动,点击“手动设置”按键,进入手动设置方式",
 
   "ScreenPositioningSuccessful-title": "\u3000\u3000请用手指点击选择最合适的屏幕区域结果。如未发现明显差异,请任选其一。如识别到的屏幕区域不合适,请返回到相应界面进行重新识别。",
   "FirstResult": "结果一",
@@ -598,11 +597,11 @@
   "TopTip_CrossHair": "单击设备上的按键 <sprite=0>,进入准心调整界面的开/关,\n请单击两次(间隔一秒)。",
   "TopTip_CrossHairPro": "单击设备上的按键,进入准心调整界面的开/关,\n请单击两次(间隔一秒)。",
   "TopTip_CrossHairGunPro": "取出弹夹模块,单击其上的按键,这是进入准心\n调整界面的开/关,请单击两次(间隔一秒)。",
-  
+
   "TopTip_ARTEMISPro": "双击设备上的按键,之后用正常的拉弓姿势,\n以箭筒头部瞄准靶心,{0}秒后准心会移动到靶心,完成准心校准。",
   "TopTip_GunPro": "取出弹夹模块,双击其上的按键进行准心校准,快速装回弹夹后,\n用三点一线的射击姿势瞄准靶心,{0}秒后准心会移动到靶心,完成准心校准。",
   "TopTip": "长按设备上的按键 <sprite=0>,之后用正常的拉弓姿势,\n以箭筒头部瞄准靶心,{0}秒后准心会移动到靶心,完成准心校准。",
-  
+
   "TopTip2": "准心已校准,请射中靶子后,自动退出界面。",
   "LeftTitle": "异常问题检测",
   "LeftTip": "1、如发现光标不顺滑,或光标的移动范围不够大,请调整图像亮度或重新进行屏幕定位。\n\n2、如发现光标移动时有延时的现象,请调整分辨率或更换性能更好的手机后,再重新进行测试。\n\n3、如发现光标会随机闪烁不同的位置,或无法移动时,请点击环境测光寻找干扰源,并屏蔽干扰源。",

+ 4 - 4
Assets/BowArrow/Scripts/Components/TextAutoLanguage2/Resources/TextAutoLanguage2/en.json

@@ -631,8 +631,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 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.",
+  "TipAutoEnd": "① If the screen cannot be detected, eliminate any ambient light interference and click the 'Auto Positioning' button to retry detection.\n② If the screen cannot be detected multiple times, it indicates insufficient screen brightness. Click the 'Ambient Light Measurement' button to manually mark the screen using screen marking or manual setup.",
+  "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.\n② If, after multiple attempts, the red cross still does not move with the light dot, click the 'Manual Setup' button to enter manual setup mode.",
 
   "ScreenPositioningSuccessful-title": "\u3000\u3000Please use your finger to select the most suitable screen area result. If no significant difference is found, choose any one. If the detected screen area is not suitable, return to the corresponding interface for re-detection.",
   "FirstResult": "First Result",
@@ -647,11 +647,11 @@
   "TopTip_CrossHair": "Click the button on the device <sprite=0> to toggle the crosshair adjustment interface on/off. Please click twice with a one-second interval.",
   "TopTip_CrossHairPro": "Click the button on the device to toggle the crosshair adjustment interface on/off. Please click twice with a one-second interval.",
   "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, then assume a normal bow-drawing posture. Aim the arrowhead at the target center, and after {0} 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 {0} 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",
   "LeftTip": "1、If the cursor is not smooth or its movement range is insufficient, please adjust the image brightness or reposition the screen.\n\n2、If you notice a delay when the cursor moves, try adjusting the resolution or switching to a higher-performance phone, then retest.\n\n3、If the cursor randomly flickers to different positions or cannot move, please click on ambient light measurement to locate the interference source and block it.",

+ 2 - 1
Assets/InfraredProject/WebCamera/Script/ZIM/ScreenLocate.cs

@@ -858,7 +858,8 @@ public partial class ScreenLocate : MonoBehaviour
             mUVCCameraInfo.SetSize(webCam.webCamTexture.width, webCam.webCamTexture.height);
         }
 
-        //识别结束后,也要判断半自动数据,即P5?
+        // 前面的数据ContainsNaN(quadUnityVectorList) 如果没处理到,这里再进行判断一次
+        // 识别结束后,也要判断半自动数据,即P5?
         if (screenIdentification.QuadAuto == null && screenIdentification.QuadSemiAuto == null)
         {
             InfraredCameraHelper?.InvokeOnUVCPosUpdate(new List<Vector2>());

+ 251 - 15
Assets/SmartBow/Resources/SmartBow/Prefabs/Views/Home/InfraredScreenPositioningView.prefab

@@ -2048,6 +2048,7 @@ RectTransform:
   m_Children:
   - {fileID: 2486637195272658313}
   - {fileID: 113191178417432141}
+  - {fileID: 4863671655275579077}
   m_Father: {fileID: 2385600522496170982}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -2119,8 +2120,8 @@ RectTransform:
   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_AnchoredPosition: {x: 0.6252, y: -90}
-  m_SizeDelta: {x: 1301.4, y: 60}
+  m_AnchoredPosition: {x: 0.6252, y: -145}
+  m_SizeDelta: {x: 1301.4, y: 120}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &445937460444285362
 MonoBehaviour:
@@ -4188,8 +4189,7 @@ MonoBehaviour:
     m_VerticalOverflow: 1
     m_LineSpacing: 1.2
   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"
+    \u5982\u591A\u6B21\u65E0\u6CD5\u8BC6\u522B\u51FA\u5C4F\u5E55\uFF0C\u8BF4\u660E\u5C4F\u5E55\u4EAE\u5EA6\u4E0D\u8DB3\uFF0C\u70B9\u51FB\u201C\u73AF\u5883\u6D4B\u5149\u201D\u6309\u952E\uFF0C\u901A\u8FC7\u5C4F\u5E55\n\u6807\u8BB0\u6216\u624B\u52A8\u8BBE\u7F6E\u5BF9\u5C4F\u5E55\u8FDB\u884C\u624B\u52A8\u6807\u8BB0"
 --- !u!114 &6118189460175673255
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -5246,7 +5246,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
@@ -5257,7 +5257,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 1
     m_LineSpacing: 1.2
-  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"
+  m_Text: "\u2460\u3000\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\r\n\u2461\u3000\u5982\u591A\u6B21\u8BBE\u7F6E\uFF0C\u4ECD\u65E0\u6CD5\u5B9E\u73B0\u7EA2\u8272\u5341\u5B57\u968F\u5149\u70B9\u79FB\u52A8\uFF0C\u70B9\u51FB\u201C\u624B\u52A8\u8BBE\u7F6E\u201D\u6309\u952E\uFF0C\u8FDB\u5165\u624B\u52A8\u8BBE\u7F6E\u65B9\u5F0F"
 --- !u!114 &5012688958417105386
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -5272,7 +5272,10 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   textKey: TipLightCtrl
   layoutRebuildObject: {fileID: 0}
-  languageFontSizes: []
+  languageFontSizes:
+  - language: 1
+    fontSize: 32
+    lineSpacing: 0
 --- !u!1 &1942886445203018693
 GameObject:
   m_ObjectHideFlags: 0
@@ -5801,7 +5804,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5775, y: 0}
   m_AnchorMax: {x: 0.5775, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 63.39, y: 0}
+  m_SizeDelta: {x: 120, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5013542109409030359
 CanvasRenderer:
@@ -6820,8 +6823,8 @@ RectTransform:
   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_AnchoredPosition: {x: 0.6252, y: -90}
-  m_SizeDelta: {x: 1301.4, y: 60}
+  m_AnchoredPosition: {x: 0.6252, y: -145}
+  m_SizeDelta: {x: 1301.4, y: 120}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &236129132674385549
 MonoBehaviour:
@@ -9007,7 +9010,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &113191178417432141
 RectTransform:
   m_ObjectHideFlags: 0
@@ -9026,7 +9029,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: 917.44507, y: -88.1}
+  m_AnchoredPosition: {x: 884.6, y: -88.1}
   m_SizeDelta: {x: 420, y: 137}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5847788856332703345
@@ -9758,6 +9761,140 @@ MonoBehaviour:
   textKey: TitleTipManual
   layoutRebuildObject: {fileID: 0}
   languageFontSizes: []
+--- !u!1 &4214711009608652147
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4863671655275579077}
+  - component: {fileID: 6032131944725297731}
+  - component: {fileID: 8194998013738675162}
+  - component: {fileID: 2826849913862208130}
+  m_Layer: 5
+  m_Name: manualButton
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4863671655275579077
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4214711009608652147}
+  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: 534535303409334979}
+  m_Father: {fileID: 4487564021397169090}
+  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: 917.44495, y: -88.1}
+  m_SizeDelta: {x: 420, y: 137}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6032131944725297731
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4214711009608652147}
+  m_CullTransparentMesh: 1
+--- !u!114 &8194998013738675162
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4214711009608652147}
+  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 &2826849913862208130
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4214711009608652147}
+  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: 8194998013738675162}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 1598515592738749058}
+        m_TargetAssemblyTypeName: InfraredScreenPositioningView, Assembly-CSharp
+        m_MethodName: OnClick_EnterManual
+        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 &4255960308957596623
 GameObject:
   m_ObjectHideFlags: 0
@@ -13860,6 +13997,105 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!1 &6294782327478885414
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 534535303409334979}
+  - component: {fileID: 3798681776434492015}
+  - component: {fileID: 6123924833181416718}
+  - component: {fileID: 1243317692559805783}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &534535303409334979
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6294782327478885414}
+  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: 4863671655275579077}
+  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 &3798681776434492015
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6294782327478885414}
+  m_CullTransparentMesh: 0
+--- !u!114 &6123924833181416718
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6294782327478885414}
+  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: 55
+    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: "\u624B\u52A8\u8BBE\u7F6E"
+--- !u!114 &1243317692559805783
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6294782327478885414}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textKey: ManualSetting
+  layoutRebuildObject: {fileID: 0}
+  languageFontSizes:
+  - language: 1
+    fontSize: 40
+    lineSpacing: 0
 --- !u!1 &6462439576816496882
 GameObject:
   m_ObjectHideFlags: 0
@@ -15857,7 +16093,7 @@ RectTransform:
   m_AnchorMin: {x: 0.4975, y: 0}
   m_AnchorMax: {x: 0.4975, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 63.39, y: 0}
+  m_SizeDelta: {x: 120, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1705622206951083254
 CanvasRenderer:
@@ -18570,7 +18806,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Texture: {fileID: 2800000, guid: 24d1e577dc42aaf4ba6e64be26be3845, type: 3}
+  m_Texture: {fileID: 2800000, guid: 98ec0f05c7042a741b730f25ef36fed9, type: 3}
   m_UVRect:
     serializedVersion: 2
     x: 0
@@ -19405,7 +19641,7 @@ MonoBehaviour:
         m_CallState: 2
       - m_Target: {fileID: 1598515592738749058}
         m_TargetAssemblyTypeName: InfraredScreenPositioningView, Assembly-CSharp
-        m_MethodName: OnClick_EnterMarker
+        m_MethodName: OnClick_EnterLightCtrl
         m_Mode: 1
         m_Arguments:
           m_ObjectArgument: {fileID: 0}

+ 1 - 0
Assets/SmartBow/Scripts/Views/InfraredViewParts/InfraredScreenPositioningView.cs

@@ -497,6 +497,7 @@ public class InfraredScreenPositioningView : JCUnityLib.ViewBase
                 //setPointsLocation(ScreenLocate.quadUnityVectorList, pointsParent.gameObject, true);
                 break;
             case ScreenPositioningStep.Manual:
+                maskLine.SetDrawMask(true);
                 SaveStartOldLinePosition();
                 perStepView = ScreenPositioningStep.Manual;
                 bMarkerFinish = false;