1.添加一个校准2d图标。适配海外版本。

Assets/BowArrow/Modules/InfraredGuider/InfraredGuider.prefab

@@ -740,7 +740,10 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   textKey: LeftTip
   layoutRebuildObject: {fileID: 0}
-  languageFontSizes: []
+  languageFontSizes:
+  - language: 1
+    fontSize: 28
+    lineSpacing: 1
 --- !u!1 &3013476522543646493
 GameObject:
   m_ObjectHideFlags: 0
@@ -821,7 +824,9 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: TopTip_ARTEMISPro
+  m_Text: "If no abnormal issues are found, please align the head of the arrow barrel\nvertically
+    with the screen and aim it at the center of the 10 meter arrow target,\nand double-click
+    the button on the bow to calibrate the center of gravity\u3002"
 --- !u!114 &3504678814842224122
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -839,8 +844,10 @@ MonoBehaviour:
   languageFontSizes:
   - language: 0
     fontSize: 40
+    lineSpacing: -1
   - language: 1
     fontSize: 37
+    lineSpacing: -1
 --- !u!1 &3316149295125559177
 GameObject:
   m_ObjectHideFlags: 0
@@ -1175,11 +1182,11 @@ RectTransform:
   m_Father: {fileID: 3835120308163295950}
   m_RootOrder: 3
   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: 51, y: 503}
-  m_SizeDelta: {x: 1380, y: 160.80002}
-  m_Pivot: {x: 0.5, y: 0.5}
+  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_Pivot: {x: 0.5, y: 1}
 --- !u!1 &4943436891779681838
 GameObject:
   m_ObjectHideFlags: 0
@@ -1278,8 +1285,10 @@ MonoBehaviour:
   languageFontSizes:
   - language: 0
     fontSize: 40
+    lineSpacing: -1
   - language: 1
     fontSize: 37
+    lineSpacing: -1
 --- !u!1 &5344047455704414540
 GameObject:
   m_ObjectHideFlags: 0
@@ -1412,7 +1421,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: -27.099976, y: -40}
+  m_AnchoredPosition: {x: -27.099854, y: -40}
   m_SizeDelta: {x: 442, y: 100}
   m_Pivot: {x: 1, y: 1}
 --- !u!114 &8074554273402571161
@@ -1776,7 +1785,10 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   textKey: LeftTitle
   layoutRebuildObject: {fileID: 0}
-  languageFontSizes: []
+  languageFontSizes:
+  - language: 1
+    fontSize: 36
+    lineSpacing: 0
 --- !u!1 &6829860169755776206
 GameObject:
   m_ObjectHideFlags: 0
@@ -2440,11 +2452,11 @@ RectTransform:
   m_Father: {fileID: 5023516867516367148}
   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.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 1380, y: 168}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &9141924007110992019
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -2474,8 +2486,8 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_text: If no abnormal issues are found, please align the head of the arrow barrel
-    vertically with the screen and aim it at the center of the 10 meter arrow target,
-    and long press the <sprite=0> button on the module for 3 seconds to perform center
+    vertically with the screen and aim it at the center of the 10 meter arrow target,\nand
+    long press the <sprite=0> button on the module for 3 seconds to perform center
     calibration.
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: bbcfb1567bce0b641adc9310d760d234, type: 2}
@@ -2539,7 +2551,7 @@ MonoBehaviour:
   m_VertexBufferAutoSizeReduction: 0
   m_useMaxVisibleDescender: 1
   m_pageToDisplay: 1
-  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_margin: {x: 0, y: 0, z: 0, w: 5.3380737}
   m_isUsingLegacyAnimationComponent: 0
   m_isVolumetricText: 0
   m_hasFontAssetChanged: 0
@@ -2562,5 +2574,7 @@ MonoBehaviour:
   languageFontSizes:
   - language: 0
     fontSize: 40
+    lineSpacing: 31
   - language: 1
     fontSize: 37
+    lineSpacing: 0

Assets/BowArrow/Modules/InfraredGuider/InfraredLightGuider.prefab

@@ -811,6 +811,7 @@ Canvas:
   m_OverrideSorting: 0
   m_OverridePixelPerfect: 0
   m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
   m_AdditionalShaderChannelsFlag: 0
   m_SortingLayerID: 0
   m_SortingOrder: 1

Assets/BowArrow/Scenes/GameChallengeScene/校准用的靶子/TargetObject.mat

@@ -2,14 +2,15 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: TargetObject
   m_Shader: {fileID: 10760, guid: 0000000000000000f000000000000000, type: 0}
-  m_ShaderKeywords: 
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

Assets/BowArrow/Scenes/GameChallengeScene/校准用的靶子/TargetObject2D.prefab

@@ -0,0 +1,91 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &6996483751777965607
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5956873247306950790}
+  - component: {fileID: 8104374185026126055}
+  - component: {fileID: 7201364884107489749}
+  - component: {fileID: 3289135366177489764}
+  m_Layer: 5
+  m_Name: TargetObject2D
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5956873247306950790
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6996483751777965607}
+  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: 0}
+  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: 0}
+  m_SizeDelta: {x: 200, y: 200}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8104374185026126055
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6996483751777965607}
+  m_CullTransparentMesh: 1
+--- !u!114 &7201364884107489749
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6996483751777965607}
+  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: 1, g: 1, b: 1, a: 0.5882353}
+  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: a6ca034c14c5e46418c3e4d31d3ae246, type: 3}
+  m_Type: 0
+  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 &3289135366177489764
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6996483751777965607}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fba4c80fe5844664ab053b308fd12a84, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 

Assets/BowArrow/Scenes/GameChallengeScene/校准用的靶子/TargetObject2D.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 8d260cea079d7c3499396e68e067274f
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/BowArrow/Scenes/Login.unity

@@ -1380,8 +1380,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -103.49997, y: 0}
-  m_SizeDelta: {x: -253.00006, y: 0}
+  m_AnchoredPosition: {x: 11.5000305, y: 0}
+  m_SizeDelta: {x: -23.000061, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &122606338
 MonoBehaviour:
@@ -1878,8 +1878,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 11.5, y: 0}
-  m_SizeDelta: {x: -23, y: 0}
+  m_AnchoredPosition: {x: -88.5, y: 0}
+  m_SizeDelta: {x: -223, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &181478207
 MonoBehaviour:
@@ -6817,8 +6817,10 @@ MonoBehaviour:
   languageFontSizes:
   - language: 0
     fontSize: 28
+    lineSpacing: -1
   - language: 1
     fontSize: 22
+    lineSpacing: -1
 --- !u!1 &751308049
 GameObject:
   m_ObjectHideFlags: 0
@@ -13533,8 +13535,10 @@ MonoBehaviour:
   languageFontSizes:
   - language: 0
     fontSize: 28
+    lineSpacing: -1
   - language: 1
     fontSize: 22
+    lineSpacing: -1
 --- !u!1 &1557644639
 GameObject:
   m_ObjectHideFlags: 0
@@ -14308,8 +14312,10 @@ MonoBehaviour:
   languageFontSizes:
   - language: 0
     fontSize: 28
+    lineSpacing: -1
   - language: 1
     fontSize: 22
+    lineSpacing: -1
 --- !u!1 &1634501522
 GameObject:
   m_ObjectHideFlags: 0
@@ -17711,8 +17717,10 @@ MonoBehaviour:
   languageFontSizes:
   - language: 0
     fontSize: 28
+    lineSpacing: -1
   - language: 1
     fontSize: 22
+    lineSpacing: -1
 --- !u!1 &1906664772
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -127,7 +127,7 @@
   "new-user-guider_tip_限时游戏-选择距离": "Choose <color=#FFA500>\"10M\"</color> to start the game!",
   "new-user-guider_tip_视角归位-触发": "Short press the <color=#FFA500>\"Aim Reset\"</color> \nkey on the module, <color=#FFA500>aim the bow \nand arrow at the bull's eye with \nreference to the posture in the \npicture</color>, and then complete the \nvisual angle return in 3 seconds.",
   "new-user-guider_tip_视角归位-瞄准": "Please refer to the pose in the figure, aim \nat the bull's-eye immediately, the visual \nangle return will be completed in <size=40><color=#FFA500>{0}</color></size> seconds.",
-  "new-user-guider_tip_视角归位-瞄准-infrared": "Please refer to the posture in the image, using the arrowhead as a reference point, \nand aim at the target center immediately.<size=40><color=#FFA500>{0}</color></size> seconds later, the crosshair calibration will be completed.",
+  "new-user-guider_tip_视角归位-瞄准-infrared": "Please refer to the posture in the image, using the arrowhead \nas a reference point,and aim at the target center immediately.\n<size=40><color=#FFA500>{0}</color></size> seconds later, the crosshair calibration will be completed.",
   "new-user-guider_tip_教程结束": "Congratulations on completing this novice tutorial. If you want \nto <color=#FFA500>know this tutorial</color> next time, please <color=#FFA500>see the novice guidance \nin the setup.</color>",
   "new-user-guider_tip_准心高亮": "Please follow the prompts to \nshoot an arrow towards the \ntarget, complete the manual \nsetup, and return to the \nconnection page.",
   "new-user-guider_btn_ok": "OK",
@@ -263,9 +263,9 @@
 
   "RelateValidateView-email00": "Bind email",
   "RelateValidateView-email0": "Email verification",
-  "RelateValidateView-email1": "Please enter your email account",
+  "RelateValidateView-email1": "Please enter your email \naccount",
   "RelateValidateView-email2": "Please enter the verification code",
-  "RelateValidateView-email22": "Please enter the \n verification code",
+  "RelateValidateView-email22": "Please enter the verification code",
   "RelateValidateView-email3": "Send verification code",
   "RelateValidateView-email4": "Submit",
 
@@ -569,8 +569,8 @@
   /**
   手动识别部分
   **/
-  "TitleTip1": "Adjust the position and angle of the laser locator so that it can clearly capture the four corners of the screen.\nFirst, click the auto button to perform screen recognition. The screen will display black and white images, and the software will identify the display area of the screen.",
-  "TitleTip2": "If automatic recognition is inaccurate, you can adjust the position of the laser locator or the image contrast to make the screen edges clearer, then try automatic recognition again.\nIf multiple attempts at automatic recognition fail, you can click the manual function and use your finger to click and drag the four corners of the positioning area to adjust.\nClick the confirm button to proceed to the next step.",
+  "TitleTip1": "Adjust the position and angle of the laser locator so that it \ncan clearly capture the four corners of the screen.First, click \nthe auto button to perform screen recognition. The screen will \ndisplay black and white images, and the software will identify \nthe display area of the screen.",
+  "TitleTip2": "If automatic recognition is inaccurate, you can adjust the position \nof the laser locator or the image contrast to make the screen edges \nclearer,then try automatic recognition again.If multiple attempts \nat automatic recognition fail, you can click the manual function and \nuse your finger to click and drag the four corners of the positioning \narea to adjust.Click the confirm button to proceed to the next step.",
   "Withdrawal": "Withdrawal",
   "Automatic": "Automatic",
   "Manual": "Manual",
@@ -579,7 +579,7 @@
   /**
    红外连接后游戏射击页面
   **/
-  "TopTip_ARTEMISPro": "If no abnormal issues are found, please align the head of the arrow barrel vertically with the screen and aim it at the center of the 10 meter arrow target,\nand double-click the button on the bow to calibrate the center of gravity。",
+  "TopTip_ARTEMISPro": "If no abnormal issues are found, please align the head of the arrow barrel \nvertically with the screen and aim it at the center of the 10 meter arrow target,\nand double-click the button on the bow to calibrate the center of gravity。",
   "TopTip": "If no abnormal issues are found, please align the head of the arrow barrel vertically with the screen and aim it at the center of the 10 meter arrow target,\nand long press the <sprite=0> button on the module for 3 seconds to perform center calibration.",
   "TopTip2": "Accurate heart calibration, please hit the target and automatically exit the interface.",
   "LeftTitle": "Abnormal Problem Detection",
@@ -595,7 +595,7 @@
   **/
   "ShootingTest": "Shooting Test",
   "ImageContrast": "Image Contrast",
-  "ShootingTestTip": "Keep the screen in the picture free of white light spots. If there are light spots, you need to find the interfering light source and turn it off, or adjust the camera bracket position to block it.",
+  "ShootingTestTip": "Keep the screen in the picture free of white light spots. If there are light \nspots, you need to find the interfering light source and turn it off, or adjust \nthe camera bracket position to block it.",
 
   "ModifyResolution": "Modify Resolution",
   "HighResolution": "High Resolution",

Assets/BowArrow/Scripts/Components/TextAutoLanguage2/TextAutoLanguage2.cs

@@ -109,7 +109,8 @@ public class TextAutoLanguage2 : MonoBehaviour
                 {
                     if (languageFontSize.language == currentLanguageEnum)
                     {
-                        textComp.fontSize = languageFontSize.fontSize;
+                        if(languageFontSize.fontSize > 0) textComp.fontSize = languageFontSize.fontSize;
+                        if(languageFontSize.lineSpacing > 0) textComp.lineSpacing = languageFontSize.lineSpacing;
                         break;
                     }
                 }
@@ -123,10 +124,10 @@ public class TextAutoLanguage2 : MonoBehaviour
             TextMeshProUGUI textMeshProUGUI = GetComponent<TextMeshProUGUI>();
             textMeshProUGUI.text = text;
             //如果是中文，设置一个间距
-            if (currentLanguageEnum == LanguageEnum.Chinese)
-            {
-               textMeshProUGUI.lineSpacing = 31;
-            }
+            //if (currentLanguageEnum == LanguageEnum.Chinese)
+            //{
+            //   textMeshProUGUI.lineSpacing = 31;
+            //}
 
             //如果有指定当前语言的字体大小，就更新字体大小，否则恢复默认字体大小
             if (defaultFontSize == -1)
@@ -143,7 +144,8 @@ public class TextAutoLanguage2 : MonoBehaviour
                 {
                     if (languageFontSize.language == currentLanguageEnum)
                     {
-                        textMeshProUGUI.fontSize = languageFontSize.fontSize;
+                        if(languageFontSize.fontSize >0) textMeshProUGUI.fontSize = languageFontSize.fontSize;
+                        if (languageFontSize.lineSpacing > 0) textMeshProUGUI.lineSpacing = languageFontSize.lineSpacing;
                         break;
                     }
                 }
@@ -170,6 +172,7 @@ public class TextAutoLanguage2 : MonoBehaviour
 public class LanguageFontSize {
     public LanguageEnum language;
     public int fontSize;
+    public float lineSpacing;
 }
 public enum LanguageEnum {
     Chinese, English

Assets/BowArrow/Scripts/Expand/AutoResetView.cs

@@ -103,7 +103,12 @@ public class AutoResetView : MonoBehaviour
              
             }
             catch (Exception) {}
-            Destroy(gameObject);
+            //先隐藏子物体
+            foreach (Transform child in transform)
+            {
+                child.gameObject.SetActive(false);
+            }
+            Destroy(gameObject,2.0f);
         } else {
             int curTime = Mathf.CeilToInt(prepareTime);
             if (showedPrepareTime != curTime) {

Assets/DuckHunter/Scenes/DuckHunter.unity

@@ -490,7 +490,7 @@ RectTransform:
   - {fileID: 944357611}
   - {fileID: 507735683}
   m_Father: {fileID: 1372090167}
-  m_RootOrder: 7
+  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -2123,7 +2123,7 @@ RectTransform:
   - {fileID: 212105003}
   - {fileID: 1870892486}
   m_Father: {fileID: 1372090167}
-  m_RootOrder: 8
+  m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 0}
@@ -2758,7 +2758,7 @@ RectTransform:
   m_Children:
   - {fileID: 2091624734}
   m_Father: {fileID: 1372090167}
-  m_RootOrder: 6
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -3433,7 +3433,7 @@ RectTransform:
   - {fileID: 344433411}
   - {fileID: 2020931715}
   m_Father: {fileID: 1372090167}
-  m_RootOrder: 11
+  m_RootOrder: 12
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
@@ -4971,7 +4971,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1372090167}
-  m_RootOrder: 12
+  m_RootOrder: 13
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
@@ -5400,6 +5400,7 @@ RectTransform:
   - {fileID: 175331358}
   - {fileID: 1985182447}
   - {fileID: 367874032}
+  - {fileID: 3289135366177489762}
   - {fileID: 641915358}
   - {fileID: 172697116}
   - {fileID: 537447197}
@@ -6901,7 +6902,7 @@ RectTransform:
   - {fileID: 637586908}
   - {fileID: 694502272}
   m_Father: {fileID: 1372090167}
-  m_RootOrder: 14
+  m_RootOrder: 15
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
@@ -7460,7 +7461,7 @@ RectTransform:
   - {fileID: 2048197240}
   - {fileID: 981139914}
   m_Father: {fileID: 1372090167}
-  m_RootOrder: 13
+  m_RootOrder: 14
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
@@ -7760,7 +7761,7 @@ RectTransform:
   - {fileID: 1860787493}
   - {fileID: 1889026898}
   m_Father: {fileID: 1372090167}
-  m_RootOrder: 10
+  m_RootOrder: 11
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
@@ -8529,7 +8530,7 @@ RectTransform:
   m_Children:
   - {fileID: 1183945743}
   m_Father: {fileID: 1372090167}
-  m_RootOrder: 9
+  m_RootOrder: 10
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -8759,6 +8760,108 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 175639cb090a3804a9c8994b80e99570, type: 3}
+--- !u!1001 &3289135366177489761
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 1372090167}
+    m_Modifications:
+    - target: {fileID: 5956873247306950790, guid: 8d260cea079d7c3499396e68e067274f, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5956873247306950790, guid: 8d260cea079d7c3499396e68e067274f, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5956873247306950790, guid: 8d260cea079d7c3499396e68e067274f, type: 3}
+      propertyPath: m_RootOrder
+      value: 6
+      objectReference: {fileID: 0}
+    - target: {fileID: 5956873247306950790, guid: 8d260cea079d7c3499396e68e067274f, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5956873247306950790, guid: 8d260cea079d7c3499396e68e067274f, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5956873247306950790, guid: 8d260cea079d7c3499396e68e067274f, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5956873247306950790, guid: 8d260cea079d7c3499396e68e067274f, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5956873247306950790, guid: 8d260cea079d7c3499396e68e067274f, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 300
+      objectReference: {fileID: 0}
+    - target: {fileID: 5956873247306950790, guid: 8d260cea079d7c3499396e68e067274f, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 300
+      objectReference: {fileID: 0}
+    - target: {fileID: 5956873247306950790, guid: 8d260cea079d7c3499396e68e067274f, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5956873247306950790, guid: 8d260cea079d7c3499396e68e067274f, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5956873247306950790, guid: 8d260cea079d7c3499396e68e067274f, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5956873247306950790, guid: 8d260cea079d7c3499396e68e067274f, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5956873247306950790, guid: 8d260cea079d7c3499396e68e067274f, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5956873247306950790, guid: 8d260cea079d7c3499396e68e067274f, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5956873247306950790, guid: 8d260cea079d7c3499396e68e067274f, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5956873247306950790, guid: 8d260cea079d7c3499396e68e067274f, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5956873247306950790, guid: 8d260cea079d7c3499396e68e067274f, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5956873247306950790, guid: 8d260cea079d7c3499396e68e067274f, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5956873247306950790, guid: 8d260cea079d7c3499396e68e067274f, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5956873247306950790, guid: 8d260cea079d7c3499396e68e067274f, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6996483751777965607, guid: 8d260cea079d7c3499396e68e067274f, type: 3}
+      propertyPath: m_Name
+      value: TargetObject2D
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 8d260cea079d7c3499396e68e067274f, type: 3}
+--- !u!224 &3289135366177489762 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 5956873247306950790, guid: 8d260cea079d7c3499396e68e067274f, type: 3}
+  m_PrefabInstance: {fileID: 3289135366177489761}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &5552883106791833017
 PrefabInstance:
   m_ObjectHideFlags: 0

Assets/DuckHunter/Scripts/CrossHair.cs

@@ -39,7 +39,13 @@ namespace DuckHunter
         }
         void Update()
         {
-            if (open) SetVisiable(onlyShow);
+            if (AutoResetView.ins != null) {
+                //进入校准时候，一定显示准心
+                SetVisiable(true);
+            } else {
+                if (open) SetVisiable(onlyShow);
+            }
+         
         }
         void OnDestroy()
         {

Assets/FineArts/GameArea/New Folder/Textures/Mapping_006 1.png.meta

@@ -0,0 +1,123 @@
+fileFormatVersion: 2
+guid: a6ca034c14c5e46418c3e4d31d3ae246
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 1
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 1537655665
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/FruitMaster/Scripts/JCFruitMaster.cs

@@ -61,8 +61,15 @@ public class JCFruitMaster : MonoBehaviour
         }
         //aimingCross.enabled = !SB_EventSystem.ins.simulateMouseIsAwaked;
 
-        if (open) SetVisiable(onlyShow && !SB_EventSystem.ins.simulateMouseIsAwaked);
-
+        if (AutoResetView.ins != null)
+        {
+            //进入校准时候，一定显示准心
+            SetVisiable(true);
+        }
+        else
+        {
+            if (open) SetVisiable(onlyShow && !SB_EventSystem.ins.simulateMouseIsAwaked);
+        }
     }
 
     public void ResetAim()

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

@@ -436,7 +436,10 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   textKey: ImageContrast
   layoutRebuildObject: {fileID: 0}
-  languageFontSizes: []
+  languageFontSizes:
+  - language: 1
+    fontSize: 38
+    lineSpacing: 0
 --- !u!1 &1657718194
 GameObject:
   m_ObjectHideFlags: 0
@@ -1454,7 +1457,10 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   textKey: Automatic
   layoutRebuildObject: {fileID: 0}
-  languageFontSizes: []
+  languageFontSizes:
+  - language: 1
+    fontSize: 40
+    lineSpacing: 0
 --- !u!1 &1157595948825060677
 GameObject:
   m_ObjectHideFlags: 0
@@ -2780,7 +2786,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &6291751542338047667
 RectTransform:
   m_ObjectHideFlags: 0
@@ -3025,7 +3031,10 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   textKey: Manual
   layoutRebuildObject: {fileID: 0}
-  languageFontSizes: []
+  languageFontSizes:
+  - language: 1
+    fontSize: 40
+    lineSpacing: 0
 --- !u!1 &6068488703563348653
 GameObject:
   m_ObjectHideFlags: 0
@@ -3285,7 +3294,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &213060852178376601
 RectTransform:
   m_ObjectHideFlags: 0
@@ -3949,7 +3958,10 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   textKey: Withdrawal
   layoutRebuildObject: {fileID: 0}
-  languageFontSizes: []
+  languageFontSizes:
+  - language: 1
+    fontSize: 40
+    lineSpacing: 0
 --- !u!1 &7535762986329011097
 GameObject:
   m_ObjectHideFlags: 0
@@ -4504,7 +4516,10 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   textKey: Confirm
   layoutRebuildObject: {fileID: 0}
-  languageFontSizes: []
+  languageFontSizes:
+  - language: 1
+    fontSize: 40
+    lineSpacing: 0
 --- !u!1 &8486696878974212867
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -211,9 +211,9 @@ RectTransform:
   m_Father: {fileID: 6541729197459587817}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 834.03, y: -320}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 1668.06, y: 640}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &462368352428713268
@@ -365,10 +365,10 @@ RectTransform:
   m_Father: {fileID: 1730599641784995024}
   m_RootOrder: 0
   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: -48}
-  m_SizeDelta: {x: 274.3, y: 50}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2166458721827678163
 CanvasRenderer:
@@ -680,8 +680,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: 139.86005, y: 0}
-  m_SizeDelta: {x: 615.72, y: 411}
+  m_AnchoredPosition: {x: 181.05634, y: 0}
+  m_SizeDelta: {x: 698.1127, y: 411}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6375373790729743113
 CanvasRenderer:
@@ -724,7 +724,20 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: "\u8C03\u6574\u6444\u50CF\u5934\u4F4D\u7F6E\u548C\u89D2\u5EA6\uFF0C\u5E76\u4F7F\u7535\u89C6\u5C3D\u91CF\u5360\u6EE1\u753B\u9762\uFF0C\u786E\u4FDD\u53EF\u4EE5\u62CD\u6444\u5230\u7535\u89C6\u7684\u56DB\u89D2\u3002\r\n\r\n\u5148\u70B9\u51FB\u81EA\u52A8\u529F\u80FD\u8FDB\u884C\u5C4F\u5E55\u8BC6\u522B\uFF0C\u7535\u89C6\u4E0A\u4F1A\u51FA\u73B0\u9ED1\u5C4F\u548C\u767D\u5C4F\u7684\u56FE\u50CF\uFF0C\u5E76\u901A\u8FC7\u8F6F\u4EF6\u8BC6\u522B\u7535\u89C6\u7684\u663E\u793A\u533A\u57DF\u3002\r\n\r\n\u5982\u81EA\u52A8\u8BC6\u522B\u4E0D\u51C6\u786E\uFF0C\u53EF\u4EE5\u901A\u8FC7\u8C03\u6574\u6444\u50CF\u5934\u4F4D\u7F6E\u6216\u5BF9\u56FE\u50CF\u5BF9\u6BD4\u5EA6\u8FDB\u884C\u8C03\u8282\u540E\uFF0C\u518D\u6B21\u81EA\u52A8\u8BC6\u522B\u3002\u5982\u591A\u6B21\u81EA\u52A8\u8BC6\u522B\u4E0D\u5408\u683C\uFF0C\u53EF\u70B9\u51FB\u624B\u52A8\u529F\u80FD\uFF0C\u5E76\u901A\u8FC7\u624B\u6307\u70B9\u51FB\u62D6\u52A8\u5B9A\u4F4D\u533A\u57DF\u56DB\u4E2A\u89D2\u8FDB\u884C\u8C03\u6574\u3002\r\n\r\n\u5C4F\u5E55\u4F4D\u7F6E\u53EA\u9700\u5B9A\u4F4D\u4E00\u6B21\uFF0C\u53EA\u8981\u4E0D\u79FB\u52A8\u6444\u50CF\u5934\u7684\u4F4D\u7F6E\uFF0C\u5C31\u65E0\u9700\u518D\u5B9A\u4F4D\u3002"
+  m_Text: 'Adjust the position and angle of the laser locator so that it can clearly
+    capture the four corners of the screen.
+
+
+    First, click the auto button to
+    perform screen recognition. The screen will display black and white images, and
+    the software will identify the display area of the screen.
+
+
+    If automatic
+    recognition is inaccurate, you can adjust the position of the laser locator or
+    the image contrast, then try automatic recognition again. If multiple attempts
+    at automatic recognition fail, you can click the manual function and use your
+    finger to click and drag the four corners of the positioning area to adjust.'
 --- !u!114 &5493287035359193497
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -739,7 +752,10 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   textKey: Infrared-Step2
   layoutRebuildObject: {fileID: 0}
-  languageFontSizes: []
+  languageFontSizes:
+  - language: 1
+    fontSize: 28
+    lineSpacing: 1
 --- !u!1 &5651314242315564802
 GameObject:
   m_ObjectHideFlags: 0
@@ -1384,7 +1400,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &5651314243503148123
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1405,7 +1421,7 @@ RectTransform:
   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_SizeDelta: {x: -1195, y: -424}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5651314243503148127
 CanvasRenderer:
@@ -1519,9 +1535,9 @@ RectTransform:
   m_Father: {fileID: 5651314243503148123}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 668.5, y: -320}
   m_SizeDelta: {x: 1337, y: 640}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5651314243550147655
@@ -1692,10 +1708,10 @@ RectTransform:
   m_Father: {fileID: 5651314244108234268}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 50}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 221, y: -48}
+  m_SizeDelta: {x: 140, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5651314243985302727
 CanvasRenderer:
@@ -1947,7 +1963,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &6541729197459587817
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1968,7 +1984,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: -15}
-  m_SizeDelta: {x: -863.93994, y: -570.1124}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2474763126871341944
 MonoBehaviour: