修改根据不同连接的tip

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

@@ -572,8 +572,10 @@
   "TitleTipMarker-HOUYIPro": "HOUYI Pro瞄准模块",
   "TitleTipMarker-ArtemisPro": "Artemis Pro",
   "TitleTipMarker-M9": "操作M9手枪依次瞄准屏幕的四个角\n扣动扳机进行标记（四角位置标签）",
-  "TitleTipMarker2": "操作瞄准器设备对准电视，按提示依次用红外光点瞄准摄像头中显示区域内白框的四个角，并单击瞄准器的准心键进行标记。\n①　如白框与电视屏幕显示区域位置一致，点击“完成”按键\n②　如标记中发现白框与电视屏幕显示区域差异较大，点击“自动定位”按键,\n重新进行自动识别\n③　如多次自动识别无效后，点击“手动设置”按键，进入手动设置方式",
- 
+  "TitleTipMarker2": "操作瞄准器设备对准电视，按提示依次用红外光点瞄准摄像头中显示区域内白框的四个角，{0}\n①　如白框与电视屏幕显示区域位置一致，点击“完成”按键\n②　如标记中发现白框与电视屏幕显示区域差异较大，点击“自动定位”按键,\n重新进行自动识别\n③　如多次自动识别无效后，点击“手动设置”按键，进入手动设置方式",
+  "TitleTipMarker2-Common": "单击瞄准器的准心键进行标记。",
+  "TitleTipMarker2-ArtemisPro": "单击瞄准器的按键进行标记。",
+
   "TipMiddle": "请标记：{0}角的点",
   "TipTopLeft": "左上",
   "TipTopRight": "右上",

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

@@ -622,8 +622,10 @@
   "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": "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.",
- 
+  "TitleTipMarker2": "Operate the aiming device to face the TV. Use the infrared light dot to aim at the four corners of the white frame displayed in the camera's view, {0}.\n① If the white frame matches the TV screen display area, click the 'Finish' button.\n② If there is a significant difference between the white frame and the TV screen display area during marking, click the 'Auto Positioning' button to reattempt automatic detection.\n③ If automatic detection fails multiple times, click the 'Manual Setup' button to enter manual setup mode.",
+  "TitleTipMarker2-Common": "Click the aiming device's crosshair button to mark.",
+  "TitleTipMarker2-ArtemisPro": "Click the aiming device's button to mark.",
+
   "TipMiddle": "Please mark: Point at the {0} corner",
   "TipTopLeft": "Top-Left",
   "TipTopRight": "Top-Right",

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

@@ -2665,8 +2665,8 @@ MonoBehaviour:
   layoutRebuildObject: {fileID: 0}
   languageFontSizes:
   - language: 1
-    fontSize: 46
-    lineSpacing: 1.2
+    fontSize: 44
+    lineSpacing: 1.1
 --- !u!1 &970105690680797401
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -230,6 +230,16 @@ public class InfraredScreenPositioningView : JCUnityLib.ViewBase
         //        markerTextAutoLanguage2.textFormatArgs = new object[] { name };
         //    }
         //}
+        if (markerTextAutoLanguage2 != null)
+        {
+            string name = TextAutoLanguage2.GetTextByKey("TitleTipMarker2-Common");
+            if (BluetoothAim.ins.isMainConnectToARTEMISPRO())
+            {
+                name = TextAutoLanguage2.GetTextByKey("TitleTipMarker2-ArtemisPro");
+            }
+            markerTextAutoLanguage2.textFormatArgs = new object[] { name };
+            //markerTextAutoLanguage2.ApplyToText();
+        }
         //手动不高亮
         //ResetButton(btnHandMovement);