1.修改准心按钮文字背景自适应

2.隐藏打猎场景的tip按钮
3.修改中英文视频

Assets/BowArrow/Scenes/Game.unity

@@ -641,7 +641,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   textKey: CrossHairButton
-  layoutRebuildObject: {fileID: 0}
+  layoutRebuildObject: {fileID: 1032459394}
   languageFontSizes: []
 --- !u!1 &64265627
 GameObject:
@@ -6337,15 +6337,15 @@ RectTransform:
   m_GameObject: {fileID: 592326761}
   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_LocalScale: {x: 0.98, y: 0.98, z: 0.98}
+  m_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 1964354870}
   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_AnchoredPosition: {x: 0, y: 15}
+  m_AnchoredPosition: {x: 0, y: 18}
   m_SizeDelta: {x: 65, y: 67}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &592326763
@@ -24213,7 +24213,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   textKey: CalibrationOffset
-  layoutRebuildObject: {fileID: 0}
+  layoutRebuildObject: {fileID: 1219175805}
   languageFontSizes: []
 --- !u!1 &1996118518
 GameObject:

Assets/BowArrow/Scenes/GameChallengeScene/GameChallenge.unity

@@ -2313,7 +2313,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: -39.999756, y: 151}
+  m_AnchoredPosition: {x: -39.999756, y: 141.9}
   m_SizeDelta: {x: 120, y: 120}
   m_Pivot: {x: 1, y: 0}
 --- !u!114 &91536359
@@ -9480,15 +9480,15 @@ RectTransform:
   m_GameObject: {fileID: 410574887}
   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_LocalScale: {x: 0.98, y: 0.98, z: 0.98}
+  m_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 91536358}
   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_AnchoredPosition: {x: 0, y: 15}
+  m_AnchoredPosition: {x: 0, y: 18}
   m_SizeDelta: {x: 65, y: 67}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &410574889
@@ -34736,7 +34736,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: -40, y: 31}
+  m_AnchoredPosition: {x: -40, y: 21.899994}
   m_SizeDelta: {x: 120, y: 120}
   m_Pivot: {x: 1, y: 0}
 --- !u!114 &1495053854
@@ -41603,7 +41603,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   textKey: CalibrationOffset
-  layoutRebuildObject: {fileID: 0}
+  layoutRebuildObject: {fileID: 1301234375}
   languageFontSizes: []
 --- !u!114 &1827374452
 MonoBehaviour:
@@ -47156,7 +47156,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   textKey: CrossHairButton
-  layoutRebuildObject: {fileID: 0}
+  layoutRebuildObject: {fileID: 1615012327}
   languageFontSizes: []
 --- !u!114 &2052740747
 MonoBehaviour:

Assets/BowArrow/Scripts/CommonConfig.cs

@@ -143,6 +143,12 @@ public class CommonConfig
     //是否禁用蓝牙（目前是b端端口连接情况下设置）
     public static bool bDisableBluetooth { get; } = false;
 
+
+    /// <summary>
+    /// 视频链接区分
+    /// </summary>
+    public static bool bInfraredURL { get; } = true;
+
     #endregion
 
 

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

@@ -90,6 +90,12 @@
   "course_title_104": "十字准心设置",
   "course_title_105": "智能弓箭垫使用说明",
 
+  "course_title_106": "M9智能枪设备使用指南",
+  "course_title_107": "HOUYI Pro智能反曲弓设备使用指南",
+  "course_title_108": "ARTEMIS Pro设备使用指南",
+
+
+
   "course_title_20": "HOUYI智能弓箭安装视频（英文）",
   "course_title_21": "HOUYI智能弓箭使用指南（英文）",
   "course_title_22": "ARTEMIS智能弓箭安装视频（英文）",
@@ -102,6 +108,13 @@
   "course_title_205": "游戏难度设置（英文）",
   "course_title_206": "智能弓箭垫使用说明（英文）",
 
+
+  "course_title_207": "M9智能枪设备使用指南（英文）",
+  "course_title_208": "HOUYI Pro智能反曲弓设备安装指南（英文）",
+  "course_title_209": "HOUYI Pro智能反曲弓设备使用指南（英文）",
+  "course_title_210": "ARTEMIS Pro设备使用指南（英文）",
+
+
   "course_btn_see": "查看",
 
   "device-calibrate_gyr-tip": "将瞄准模块从智能弓箭上拆下，将其静置在一个平面上，再点击陀螺仪初始化。",

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

@@ -91,6 +91,10 @@
   "course_title_104": "Crosshair Settings (Chinese) ",
   "course_title_105": "Smart Archery Mat Instructions (Chinese) ",
 
+  "course_title_106": "How To Use M9",
+  "course_title_107": "How To Use HOUYI PRO",
+  "course_title_108": "How To Use ARTEMIS PRO",
+
   "course_title_20": "How To Install HOUYI (EN)",
   "course_title_21": "How To Use HOUYI (EN)",
   "course_title_22": "How To Install ARTEMIS（EN）",
@@ -103,6 +107,12 @@
   "course_title_205": "Game Difficulty Settings (EN) ",
   "course_title_206": "Smart Archery Mat Instructions (EN) ",
 
+
+  "course_title_207": "How To Use M9 (EN)",
+  "course_title_208": "How To Install HOUYI PRO (EN)",
+  "course_title_209": "How To Use HOUYI PRO (EN)",
+  "course_title_210": "How To Use ARTEMIS PRO (EN)",
+
   "course_btn_see": "see",
 
   "device-calibrate_gyr-tip": "Remove the aiming module from the smart bow and place it on a plane, and then click Gyr Init.",

Assets/BowArrow/Scripts/Game/GameAssistUI.cs

@@ -45,8 +45,10 @@ public class GameAssistUI : MonoBehaviour
 
         Button guideBtn = this.transform.Find("Button1").GetComponent<Button>();
         btnScaleAim = this.transform.Find("Button2").GetComponent<Button>();
-
-        guideBtn.gameObject.SetActive(!CommonConfig.StandaloneModeOrPlatformB);
+        if (GameMgr.gameType == 1 || GameMgr.gameType == 2 || GameMgr.gameType == 9)
+            guideBtn.gameObject.SetActive(!CommonConfig.StandaloneModeOrPlatformB);
+        else
+            guideBtn.gameObject.SetActive(false);
         btnScaleAim.gameObject.SetActive(!CommonConfig.StandaloneModeOrPlatformB);
         btnScaleShoot = this.transform.Find("Button3").GetComponent<Button>();
 

Assets/DuckHunter/Scenes/DuckHunter.unity

@@ -687,7 +687,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   textKey: CrossHairButton
-  layoutRebuildObject: {fileID: 0}
+  layoutRebuildObject: {fileID: 2020931715}
   languageFontSizes: []
 --- !u!1 &195083053
 GameObject:
@@ -1343,15 +1343,15 @@ RectTransform:
   m_GameObject: {fileID: 344433410}
   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_LocalScale: {x: 0.98, y: 0.98, z: 0.98}
+  m_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 851424818}
   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_AnchoredPosition: {x: 0, y: 20.6}
+  m_AnchoredPosition: {x: 0, y: 22}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &344433412

Assets/FruitMaster/Scenes/FruitMaster.unity

@@ -34020,7 +34020,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   textKey: CalibrationOffset
-  layoutRebuildObject: {fileID: 0}
+  layoutRebuildObject: {fileID: 1798399867}
   languageFontSizes: []
 --- !u!114 &1926577327
 MonoBehaviour:
@@ -35156,7 +35156,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   textKey: CrossHairButton
-  layoutRebuildObject: {fileID: 0}
+  layoutRebuildObject: {fileID: 1685500126}
   languageFontSizes: []
 --- !u!114 &1967484681
 MonoBehaviour:

Assets/Game_Hyperspace/Resources/UIManager.prefab

@@ -625,7 +625,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   textKey: CalibrationOffset
-  layoutRebuildObject: {fileID: 0}
+  layoutRebuildObject: {fileID: 6629930265536528580}
   languageFontSizes: []
 --- !u!1 &3131933930451277027
 GameObject:
@@ -654,15 +654,15 @@ RectTransform:
   m_GameObject: {fileID: 3131933930451277027}
   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_LocalScale: {x: 0.98, y: 0.98, z: 0.98}
+  m_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 7837712520795988635}
   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_AnchoredPosition: {x: 0, y: 20.6}
+  m_AnchoredPosition: {x: 0, y: 22}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &825736267791874755
@@ -916,7 +916,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   textKey: CrossHairButton
-  layoutRebuildObject: {fileID: 0}
+  layoutRebuildObject: {fileID: 7307977513774410462}
   languageFontSizes: []
 --- !u!1 &5144520312343963377
 GameObject:

Assets/SmartBow/Scripts/Views/SettingsViewParts/BoxNewUser.cs

@@ -14,64 +14,94 @@ public class BoxNewUser : MonoBehaviour
     void Start()
     {
         titleIds.Add(0);
-        if (CommonConfig.AppLanguage == 0)
+        if (CommonConfig.bInfraredURL)
         {
-            //titleIds.Add(12);
-            //videoUrlDict.Add(12, "https://www.bilibili.com/video/BV1o84y1K7C9/?vd_source=b030b3eb3477713cd294deb164dcb109");
-            //titleIds.Add(13);
-            //videoUrlDict.Add(13, "https://www.bilibili.com/video/BV1hj411c7Mx/?vd_source=b030b3eb3477713cd294deb164dcb109");
+            if (CommonConfig.AppLanguage == 0)
+            {
+                titleIds.Add(106);//M9智能枪设备使用指南
+                videoUrlDict.Add(106, "https://www.bilibili.com/video/BV1SeDpY1Ezb/?share_source=copy_web&vd_source=b791a035cf3891b3cc2848f981d5fe8b");
+                titleIds.Add(107);//HOUYI Pro智能反曲弓设备使用指南
+                videoUrlDict.Add(107, "https://www.bilibili.com/video/BV1SeDpY1EeL/?share_source=copy_web&vd_source=b791a035cf3891b3cc2848f981d5fe8b");
+                titleIds.Add(108);//ARTEMIS Pro设备使用指南
+                videoUrlDict.Add(108, "https://www.bilibili.com/video/BV19GCAYCEFz/?share_source=copy_web&vd_source=b791a035cf3891b3cc2848f981d5fe8b");
 
-            titleIds.Add(15);
-            videoUrlDict.Add(15, "https://www.bilibili.com/video/BV1Eu4y1L7gh/?vd_source=ab2d11694c7b3b358b665454a7089856");
-            titleIds.Add(16);
-            videoUrlDict.Add(16, "https://www.bilibili.com/video/BV1Ku4y1c74Y/?vd_source=ab2d11694c7b3b358b665454a7089856");
-            titleIds.Add(17);
-            videoUrlDict.Add(17, "https://www.bilibili.com/video/BV1B64y1L7n1/?vd_source=ab2d11694c7b3b358b665454a7089856");
-            titleIds.Add(18);
-            videoUrlDict.Add(18, "https://www.bilibili.com/video/BV1eC4y1y75u/?vd_source=ab2d11694c7b3b358b665454a7089856");
-            titleIds.Add(19);
-            videoUrlDict.Add(19, "https://www.bilibili.com/video/BV1qc411Q7Xy/?vd_source=ab2d11694c7b3b358b665454a7089856");
+            }
+            else
+            {
+
+                titleIds.Add(207);
+                videoUrlDict.Add(207, "https://youtu.be/IONZrLmuCSg");//How To Use M9 (EN)
+                titleIds.Add(208);
+                videoUrlDict.Add(208, "https://youtu.be/Krn_ApJz5Vo?feature=shared");//How To Install HOUYI PRO (EN)
+                titleIds.Add(209);
+                videoUrlDict.Add(209, "https://youtu.be/W1yyhwqXcLE?feature=shared");//How To Use HOUYI PRO (EN)
+                titleIds.Add(210);
+                videoUrlDict.Add(210, "https://youtu.be/pNuhSflI9P8?feature=shared");//How To Use ARTEMIS PRO (EN)
+            }
 
-            titleIds.Add(101);
-            videoUrlDict.Add(101, "https://www.bilibili.com/video/BV1Se41117qt/");
-            titleIds.Add(102);
-            videoUrlDict.Add(102, "https://www.bilibili.com/video/BV1394y1K7yT/");
-            titleIds.Add(103);
-            videoUrlDict.Add(103, "https://www.bilibili.com/video/BV1sc411Y7QW/");
-            titleIds.Add(104);
-            videoUrlDict.Add(104, "https://www.bilibili.com/video/BV1U5411k7ZT/");
-            titleIds.Add(105);
-            videoUrlDict.Add(105, "https://www.bilibili.com/video/BV1Cz421Q7f9/");
-           
         }
-        else
-        {
-            //titleIds.Add(14);
-            //videoUrlDict.Add(14, "https://youtu.be/5AfYbdeFv54");
+        else {
+            if (CommonConfig.AppLanguage == 0)
+            {
+                //titleIds.Add(12);
+                //videoUrlDict.Add(12, "https://www.bilibili.com/video/BV1o84y1K7C9/?vd_source=b030b3eb3477713cd294deb164dcb109");
+                //titleIds.Add(13);
+                //videoUrlDict.Add(13, "https://www.bilibili.com/video/BV1hj411c7Mx/?vd_source=b030b3eb3477713cd294deb164dcb109");
+
+                titleIds.Add(15);
+                videoUrlDict.Add(15, "https://www.bilibili.com/video/BV1Eu4y1L7gh/?vd_source=ab2d11694c7b3b358b665454a7089856");
+                titleIds.Add(16);
+                videoUrlDict.Add(16, "https://www.bilibili.com/video/BV1Ku4y1c74Y/?vd_source=ab2d11694c7b3b358b665454a7089856");
+                titleIds.Add(17);
+                videoUrlDict.Add(17, "https://www.bilibili.com/video/BV1B64y1L7n1/?vd_source=ab2d11694c7b3b358b665454a7089856");
+                titleIds.Add(18);
+                videoUrlDict.Add(18, "https://www.bilibili.com/video/BV1eC4y1y75u/?vd_source=ab2d11694c7b3b358b665454a7089856");
+                titleIds.Add(19);
+                videoUrlDict.Add(19, "https://www.bilibili.com/video/BV1qc411Q7Xy/?vd_source=ab2d11694c7b3b358b665454a7089856");
+
+                titleIds.Add(101);
+                videoUrlDict.Add(101, "https://www.bilibili.com/video/BV1Se41117qt/");
+                titleIds.Add(102);
+                videoUrlDict.Add(102, "https://www.bilibili.com/video/BV1394y1K7yT/");
+                titleIds.Add(103);
+                videoUrlDict.Add(103, "https://www.bilibili.com/video/BV1sc411Y7QW/");
+                titleIds.Add(104);
+                videoUrlDict.Add(104, "https://www.bilibili.com/video/BV1U5411k7ZT/");
+                titleIds.Add(105);
+                videoUrlDict.Add(105, "https://www.bilibili.com/video/BV1Cz421Q7f9/");
+
+            }
+            else
+            {
+                //titleIds.Add(14);
+                //videoUrlDict.Add(14, "https://youtu.be/5AfYbdeFv54");
+
+                titleIds.Add(20);
+                videoUrlDict.Add(20, "https://youtu.be/SWuFjGNDTbk");
+                titleIds.Add(21);
+                videoUrlDict.Add(21, "https://youtu.be/5Ve9e81fbfc");
+                titleIds.Add(22);
+                videoUrlDict.Add(22, "https://youtu.be/yvBTbYjEKG4");
+                titleIds.Add(23);
+                videoUrlDict.Add(23, "https://youtu.be/CEY8LWODknI");
 
-            titleIds.Add(20);
-            videoUrlDict.Add(20, "https://youtu.be/SWuFjGNDTbk");
-            titleIds.Add(21);
-            videoUrlDict.Add(21, "https://youtu.be/5Ve9e81fbfc");
-            titleIds.Add(22);
-            videoUrlDict.Add(22, "https://youtu.be/yvBTbYjEKG4");
-            titleIds.Add(23);
-            videoUrlDict.Add(23, "https://youtu.be/CEY8LWODknI");
+                titleIds.Add(201);
+                videoUrlDict.Add(201, "https://youtu.be/DG0oKrXf390");
+                titleIds.Add(202);
+                videoUrlDict.Add(202, "https://youtu.be/6vV2EcxsRLk");
+                titleIds.Add(203);
+                videoUrlDict.Add(203, "https://youtu.be/R6jrrifMiiw");
+                titleIds.Add(204);
+                videoUrlDict.Add(204, "https://youtu.be/as5wvjRVcS0");
+                titleIds.Add(205);
+                videoUrlDict.Add(205, "https://youtu.be/EOC8bFgF0Zo");
+                titleIds.Add(206);
+                videoUrlDict.Add(206, "https://youtu.be/QPoVLZMpS-8");
 
-            titleIds.Add(201);
-            videoUrlDict.Add(201, "https://youtu.be/DG0oKrXf390");
-            titleIds.Add(202);
-            videoUrlDict.Add(202, "https://youtu.be/6vV2EcxsRLk");
-            titleIds.Add(203);
-            videoUrlDict.Add(203, "https://youtu.be/R6jrrifMiiw");
-            titleIds.Add(204);
-            videoUrlDict.Add(204, "https://youtu.be/as5wvjRVcS0");
-            titleIds.Add(205);
-            videoUrlDict.Add(205, "https://youtu.be/EOC8bFgF0Zo");
-            titleIds.Add(206);
-            videoUrlDict.Add(206, "https://youtu.be/QPoVLZMpS-8");
+            }
 
         }
+        
         scrollViewContentItem.SetActive(false);
         int titleSeq = 1;
         for (int i = 1; i < titleIds.Count; i++)