Merge remote-tracking branch 'remotes/origin/master' into insertcoin

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: 1400, y: 168}
+  m_SizeDelta: {x: 1550, y: 168}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6403133998221557019
 CanvasRenderer:
@@ -2221,7 +2221,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
-    m_FontSize: 37
+    m_FontSize: 36
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 3
@@ -2252,8 +2252,8 @@ MonoBehaviour:
     fontSize: 40
     lineSpacing: -1
   - language: 1
-    fontSize: 37
-    lineSpacing: -1
+    fontSize: 35
+    lineSpacing: 1.1
 --- !u!1 &3073941200769008743
 GameObject:
   m_ObjectHideFlags: 0
@@ -2647,7 +2647,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: 1400, y: 168}
+  m_SizeDelta: {x: 1550, y: 168}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &767148841805902699
 CanvasRenderer:
@@ -2679,7 +2679,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
-    m_FontSize: 36
+    m_FontSize: 35
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 3
@@ -2713,8 +2713,8 @@ MonoBehaviour:
     fontSize: 40
     lineSpacing: -1
   - language: 1
-    fontSize: 37
-    lineSpacing: -1
+    fontSize: 35
+    lineSpacing: 1.1
 --- !u!1 &3829436517265363255
 GameObject:
   m_ObjectHideFlags: 0
@@ -3224,8 +3224,8 @@ 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: 51.000046, y: 0}
-  m_SizeDelta: {x: 1380, y: 160.80005}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 1380, y: 160}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!1 &4511179957908358967
 GameObject:
@@ -3494,7 +3494,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 &585303466636653301
 CanvasRenderer:
@@ -3526,7 +3526,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 6b6cc7ab59ef00947950b61fdca2d042, type: 3}
-    m_FontSize: 37
+    m_FontSize: 36
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 3
@@ -3534,7 +3534,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: "\u51C6\u5FC3\u5DF2\u6821\u51C6\uFF0C\u8BF7\u5C04\u4E2D\u9776\u5B50\u540E\uFF0C\u81EA\u52A8\u9000\u51FA\u754C\u9762\u3002"
@@ -3557,7 +3557,7 @@ MonoBehaviour:
     fontSize: 40
     lineSpacing: -1
   - language: 1
-    fontSize: 37
+    fontSize: 36
     lineSpacing: -1
 --- !u!1 &5344047455704414540
 GameObject:
@@ -4158,7 +4158,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 1390, y: 168}
+  m_SizeDelta: {x: 1550, y: 168}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &6597713496557728260
 CanvasRenderer:
@@ -4215,8 +4215,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
@@ -4276,7 +4276,7 @@ MonoBehaviour:
     fontSize: 40
     lineSpacing: 31
   - language: 1
-    fontSize: 37
+    fontSize: 35
     lineSpacing: 0
 --- !u!1 &5684977118825489760
 GameObject:
@@ -5124,7 +5124,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 1390, y: 168}
+  m_SizeDelta: {x: 1550, y: 168}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &5187876345794075619
 CanvasRenderer:
@@ -5181,8 +5181,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
@@ -5242,7 +5242,7 @@ MonoBehaviour:
     fontSize: 40
     lineSpacing: 31
   - language: 1
-    fontSize: 37
+    fontSize: 35
     lineSpacing: 0
 --- !u!1 &7009910643302002191
 GameObject:
@@ -5434,7 +5434,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 1390, y: 168}
+  m_SizeDelta: {x: 1550, y: 168}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &3964220995963824728
 CanvasRenderer:
@@ -5491,8 +5491,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
@@ -5552,7 +5552,7 @@ MonoBehaviour:
     fontSize: 40
     lineSpacing: 31
   - language: 1
-    fontSize: 37
+    fontSize: 35
     lineSpacing: 0
 --- !u!1 &7472447488809975816
 GameObject:
@@ -6624,7 +6624,9 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: "\u957F\u6309\u8BBE\u5907\u4E0A\u7684\u6309\u952E <sprite=0>\uFF0C\u4E4B\u540E\u7528\u6B63\u5E38\u7684\u62C9\u5F13\u59FF\u52BF\uFF0C\n\u4EE5\u7BAD\u7B52\u5934\u90E8\u7784\u51C6\u9776\u5FC3\uFF0C10\u79D2\u540E\u51C6\u5FC3\u4F1A\u79FB\u52A8\u5230\u9776\u5FC3\uFF0C\u5B8C\u6210\u51C6\u5FC3\u6821\u51C6"
+  m_text: Press and hold the button on the device <sprite=0>, maintain a standard
+    archery stance, and aim the arrowhead at the bullseye. After {0} seconds, the
+    reticle will automatically align with the bullseye, completing the calibration.
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: bbcfb1567bce0b641adc9310d760d234, type: 2}
   m_sharedMaterial: {fileID: -8666424993308654677, guid: bbcfb1567bce0b641adc9310d760d234, type: 2}
@@ -6659,11 +6661,11 @@ MonoBehaviour:
   m_fontSizeMax: 72
   m_fontStyle: 1
   m_HorizontalAlignment: 2
-  m_VerticalAlignment: 512
+  m_VerticalAlignment: 256
   m_textAlignment: 65535
   m_characterSpacing: 0
   m_wordSpacing: 0
-  m_lineSpacing: 31
+  m_lineSpacing: 0
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
@@ -6712,5 +6714,5 @@ MonoBehaviour:
     fontSize: 40
     lineSpacing: 31
   - language: 1
-    fontSize: 37
+    fontSize: 35
     lineSpacing: 0

Assets/BowArrow/Scripts/CommonConfig.cs

@@ -7,7 +7,7 @@ using UnityEngine;
 public class CommonConfig
 {
     //青凤鸾 WONDERFITTER ，WONDER FITTER Pro ，WONDER FITTER 运动
-    public static readonly string[] AppNames = { "WONDER FITTER Pro", "WONDER FITTER" , "WONDERFITTER PRO B" };
+    public static readonly string[] AppNames = { "WONDERFITTER Pro 运动", "WONDER FITTER Pro", "WONDERFITTER PRO B" };
     //App地区（0：国内版；1：海外版；）
     public static int AppArea
     {

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

@@ -602,7 +602,7 @@
   手动识别部分
   **/
   "TitleTip1": "Adjust the angle and position of the laser positioning system \nto ensure the entire TV screen is fully within the \ntrapezoidal frame.",
-  "TitleTipHasData": "If the white frame is aligned with the TV screen, click the 'Confirm' button to skip the positioning process. Otherwise, adjust the angle and position of the laser locator to ensure the entire TV screen is inside the trapezoidal frame, then tap the 'Auto Positioing' button.",
+  "TitleTipHasData": "If the white frame is aligned with the TV screen, click the 'Confirm' button to skip the positioning process. Otherwise, adjust the angle and position of the laser locator to ensure the entire TV screen is inside the trapezoidal frame, then tap the 'Auto Positioning' button.",
   "TitleTip2": "If the Auto Positioning is inaccurate, adjust the laser positioning system or adjust the \nImage Contrast to make the screen edges clearer, then try Auto Positioning again.\n If Auto Positioning fails multiple times, tap the Manual option and use your finger \nto drag the four corners of the positioning area for adjustment, then tap Confirm to proceed to the next step. ",
   "TitleTipManual": "Drag the four corners of the white frame to align it with the TV screen display area, then tap the 'Done' button.",
   "Withdrawal": "Undo",
@@ -623,9 +623,9 @@
   "TitleTipMarker-HOUYIPro": "HOUYI Pro Aiming Module",
   "TitleTipMarker-ArtemisPro": "Artemis Pro",
   "TitleTipMarker-M9": "Aim the M9 pistol at the four corners of the screen in sequence, \nthen pull the trigger to mark (label the positions of the four corners).",
-  "TitleTipMarker2": "Align the aiming device with the TV and follow the on-screen prompts to sequentially aim the infrared dot at the four corners of the white frame in the camera's display area, {0}.tap the 'Done' button.\n① If there is a significant mismatch between the white frame and the TV screen display, tap the 'Auto Position' button to perform automatic recognition again.\n② If automatic recognition fails multiple times, tap the 'Manual Setup' button to enter manual adjustment mode.",
-  "TitleTipMarker2-Common": "Tap the reticle button on the device to mark.",
-  "TitleTipMarker2-ArtemisPro": "Tap the button on the device to mark.",
+  "TitleTipMarker2": "Align the aiming device with the TV and follow the on-screen prompts to sequentially aim the infrared dot at the four corners of the white frame in the camera's display area, {0}. tap the 'Marking Complete' button.\n① If there is a significant mismatch between the white frame and the TV screen display, tap the 'Auto Positioning' button to perform automatic recognition again.\n② If automatic recognition fails multiple times, tap the 'Manual Setup' button to enter manual adjustment mode.",
+  "TitleTipMarker2-Common": "Tap the reticle button on the device to mark",
+  "TitleTipMarker2-ArtemisPro": "Tap the button on the device to mark",
 
   "TipMiddle": "Please mark the point at the {0} corner.",
   "TipTopLeft": "Top-Left",
@@ -635,8 +635,8 @@
   "TipMarkComplete": "Marking Complete!",
   "TipMarkerError": "Positioning failed, please re-mark as instructed.",
   "TipQuadError": "Positioning failed, the marked area is not a valid quadrilateral.",
-  "TipAutoEnd": "① If the screen cannot be detected, block any environmental light interference and tap the 'Auto Position' button to retry recognition.\n② If the screen cannot be detected after multiple attempts, the screen brightness may be insufficient. Tap the 'Measure Ambient Light' button to manually mark the screen using screen marking or manual settings.",
-  "TipAutoEndHas": "① If the screen cannot be detected, block any environmental light interference and tap the 'Auto Position' button to retry recognition.\n② If the white frame is aligned with the TV screen display, tap the 'Confirm' button to skip the positioning process.\n③ If the white frame does not align with the TV screen display, tap the 'Measure Ambient Light' button to continue the positioning process.",
+  "TipAutoEnd": "① If the screen cannot be detected, block any environmental light interference and tap the 'Auto Positioning' button to retry recognition.\n② If the screen cannot be detected after multiple attempts, the screen brightness may be insufficient. Tap the 'Measure Ambient Light' button to manually mark the screen using screen marking or manual settings.",
+  "TipAutoEndHas": "① If the screen cannot be detected, block any environmental light interference and tap the 'Auto Positioning' button to retry recognition.\n② If the white frame is aligned with the TV screen display, tap the 'Confirm' button to skip the positioning process.\n③ If the white frame does not align with the TV screen display, tap the 'Measure Ambient Light' button to continue the positioning process.",
 
   "TipLightCtrl": "① Align the device with the TV and position the infrared dot of the reticle within the trapezoidal frame on the TV screen. The red cross will appear on the dot and move along with it. Tap the “Screen Marking” button to mark the position.\n② If the red cross does not move with the dot, identify and turn off any interfering light sources, or lower the brightness and contrast.\n③ If, after multiple attempts, the red cross still does not follow the dot, tap the “Manual Setup” button to enter manual adjustment mode.",
   "TipLightCtrlHas": "Align the device with the TV and position the infrared dot of the reticle within the trapezoidal frame on the TV screen. The red cross will appear on the dot and move along with it. If the red cross does not appear, check for interfering light sources and turn them off, or reduce the brightness and contrast.",
@@ -657,7 +657,7 @@
 
   "TopTip_ARTEMISPro": "Double-click the button on the device, then adopt a standard archery stance, aiming the arrowhead at the bullseye. After {0} seconds, the reticle will automatically move to the bullseye, completing the calibration.",
   "TopTip_GunPro": "Remove the magazine module and double-click the button on it to begin reticle calibration. After quickly reattaching the magazine, adopt a three-point shooting stance and aim at the bullseye. After {0} seconds, the reticle will automatically align with the bullseye, completing the calibration.",
-  "TopTip": "Press and hold the button on the device<sprite=0>,, maintain a standard archery stance, and aim the arrowhead at the bullseye. After {0} seconds, the reticle will automatically align with the bullseye, completing the calibration.",
+  "TopTip": "Press and hold the button on the device <sprite=0>, maintain a standard archery stance, and aim the arrowhead at the bullseye. After {0} seconds, the reticle will automatically align with the bullseye, completing the calibration.",
 
   "TopTip2": "The reticle has been calibrated. After hitting the bullseye, the system will automatically exit the calibration interface.",
   "LeftTitle": "Issue Detection",
@@ -704,7 +704,7 @@
   Infrared Demo 界面字段
   **/
   "ManualPositioning": "Manual Positioning",
-  "AutomaticPositioning": "Automatic Positioning",
+  "AutomaticPositioning": "Auto Positioning",
   "QuasiCenterOffset": "Quasi Center Offset",
   "Export": "Export",
   "ExportAll": "Export All",

Assets/BowArrow/Scripts/Editor/MenuChangeAppLanguage.cs

@@ -41,12 +41,20 @@ public class MenuChangeAppLanguage
     [MenuItem("APP语言版本切换/英文")]
     static void ToEN() 
     {
-        PlayerSettings.productName = CommonConfig.AppNames[1];
-        #if UNITY_IOS
+        //PlayerSettings.productName = CommonConfig.AppNames[1];
+        PlayerSettings.productName = CommonConfig.StandaloneModeOrPlatformB ? CommonConfig.AppNames[2] : CommonConfig.AppNames[1];
+#if UNITY_IOS
         PlayerSettings.SetApplicationIdentifier(BuildTargetGroup.iOS, "com.xmjssvr.BowArrowEn");
-        #endif
-        #if UNITY_ANDROID
-        PlayerSettings.SetApplicationIdentifier(BuildTargetGroup.Android, "com.xmjssvr.BowArrowEn");//com.xmjssvr.BowArrow.mi
+#endif
+#if UNITY_ANDROID
+        if (CommonConfig.StandaloneModeOrPlatformB)
+        {
+            PlayerSettings.SetApplicationIdentifier(BuildTargetGroup.Android, "com.xmjssvr.BowArrowEn.BClient"); //com.xmjssvr.BowArrow
+        }
+        else
+        {
+            PlayerSettings.SetApplicationIdentifier(BuildTargetGroup.Android, "com.xmjssvr.BowArrowEn");//com.xmjssvr.BowArrow.mi
+        }
 #endif
         SetIosAppIcon(1);
     }