lvjincheng 3 лет назад
Родитель
Сommit
a2b2307a95

+ 65 - 21
Assets/BowArrow/Resources/Prefabs/Views/DeviceCalibrateView.prefab

@@ -130,8 +130,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 400, y: -60}
-  m_SizeDelta: {x: 600, y: 80}
+  m_AnchoredPosition: {x: 430, y: -60}
+  m_SizeDelta: {x: 660, y: 80}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7443348416631847223
 --- !u!222 &7443348416631847223
 CanvasRenderer:
 CanvasRenderer:
@@ -174,7 +174,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
     m_LineSpacing: 1
-  m_Text: "\u5C06\u5B89\u88C5\u4E86\u6A21\u5757\u7684\u667A\u80FD\u5F13\u7BAD\u9759\u7F6E\u5728\u4E00\u4E2A\u5E73\u9762\u4E0A\uFF0C\n\u518D\u70B9\u51FB\u9640\u87BA\u4EEA\u6821\u51C6\u3002"
+  m_Text: "\u5C06\u7784\u51C6\u6A21\u5757\u4ECE\u667A\u80FD\u5F13\u7BAD\u4E0A\u62C6\u4E0B\uFF0C\u5C06\u5176\u9759\u7F6E\u5728\u4E00\u4E2A\u5E73\u9762\u4E0A\uFF0C\u518D\u70B9\u51FB\u9640\u87BA\u4EEA\u521D\u59CB\u5316\u3002"
 --- !u!114 &7940388700229382266
 --- !u!114 &7940388700229382266
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -201,6 +201,7 @@ GameObject:
   - component: {fileID: 3607728147322063901}
   - component: {fileID: 3607728147322063901}
   - component: {fileID: 7737138581533007275}
   - component: {fileID: 7737138581533007275}
   - component: {fileID: 4744954966947914981}
   - component: {fileID: 4744954966947914981}
+  - component: {fileID: 3286550758340359792}
   m_Layer: 5
   m_Layer: 5
   m_Name: Icon
   m_Name: Icon
   m_TagString: Untagged
   m_TagString: Untagged
@@ -265,6 +266,26 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
   m_PixelsPerUnitMultiplier: 1
+--- !u!114 &3286550758340359792
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1056620916311805549}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 0
+  m_MinWidth: 40
+  m_MinHeight: 38
+  m_PreferredWidth: 40
+  m_PreferredHeight: 38
+  m_FlexibleWidth: -1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1
 --- !u!1 &1848034465720062135
 --- !u!1 &1848034465720062135
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -397,11 +418,11 @@ RectTransform:
   m_Father: {fileID: 6984168369663618349}
   m_Father: {fileID: 6984168369663618349}
   m_RootOrder: 0
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   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: 0, y: -150}
-  m_SizeDelta: {x: 740, y: 120}
-  m_Pivot: {x: 0.5, y: 1}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 150}
+  m_SizeDelta: {x: 800, y: 120}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5295794106384234576
 --- !u!222 &5295794106384234576
 CanvasRenderer:
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -478,7 +499,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
   m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
-  m_HorizontalFit: 2
+  m_HorizontalFit: 0
   m_VerticalFit: 2
   m_VerticalFit: 2
 --- !u!1 &4191779401114789372
 --- !u!1 &4191779401114789372
 GameObject:
 GameObject:
@@ -1219,7 +1240,7 @@ MonoBehaviour:
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 0.60784316}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.7372549}
   m_RaycastTarget: 1
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_Maskable: 1
@@ -1464,6 +1485,7 @@ GameObject:
   - component: {fileID: 6984168369211798934}
   - component: {fileID: 6984168369211798934}
   - component: {fileID: 6984168369211799016}
   - component: {fileID: 6984168369211799016}
   - component: {fileID: 6984168369211798935}
   - component: {fileID: 6984168369211798935}
+  - component: {fileID: 8912415406592895511}
   m_Layer: 5
   m_Layer: 5
   m_Name: Icon
   m_Name: Icon
   m_TagString: Untagged
   m_TagString: Untagged
@@ -1487,7 +1509,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 60, y: -60}
+  m_AnchoredPosition: {x: 60, y: -120}
   m_SizeDelta: {x: 40, y: 38}
   m_SizeDelta: {x: 40, y: 38}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6984168369211799016
 --- !u!222 &6984168369211799016
@@ -1528,6 +1550,26 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
   m_PixelsPerUnitMultiplier: 1
+--- !u!114 &8912415406592895511
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6984168369211798933}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 0
+  m_MinWidth: 40
+  m_MinHeight: 38
+  m_PreferredWidth: 40
+  m_PreferredHeight: 38
+  m_FlexibleWidth: -1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1
 --- !u!1 &6984168369405797695
 --- !u!1 &6984168369405797695
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -1764,11 +1806,11 @@ RectTransform:
   m_Father: {fileID: 6984168368599178995}
   m_Father: {fileID: 6984168368599178995}
   m_RootOrder: 0
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   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: 0, y: -150}
-  m_SizeDelta: {x: 800, y: 120}
-  m_Pivot: {x: 0.5, y: 1}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 150}
+  m_SizeDelta: {x: 1000, y: 240}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6984168369480428196
 --- !u!222 &6984168369480428196
 CanvasRenderer:
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -1845,7 +1887,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
   m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
-  m_HorizontalFit: 2
+  m_HorizontalFit: 0
   m_VerticalFit: 2
   m_VerticalFit: 2
 --- !u!1 &6984168369595007943
 --- !u!1 &6984168369595007943
 GameObject:
 GameObject:
@@ -2137,8 +2179,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 430, y: -60}
-  m_SizeDelta: {x: 660, y: 80}
+  m_AnchoredPosition: {x: 430, y: -120}
+  m_SizeDelta: {x: 660, y: 200}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6984168369721823361
 --- !u!222 &6984168369721823361
 CanvasRenderer:
 CanvasRenderer:
@@ -2181,7 +2223,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
     m_LineSpacing: 1
-  m_Text: "\u5C06\u5B89\u88C5\u4E86\u6A21\u5757\u7684\u667A\u80FD\u5F13\u7BAD\u6CBF\u7740\u4E0D\u540C\u65B9\u5411\u6301\u7EED\u7FFB\u8F6C\uFF0C\n\u76F4\u5230\u63D0\u793A\u6821\u51C6\u5B8C\u6210\u4E3A\u6B62\u3002"
+  m_Text: "\u5C06\u5355\u72EC\u7684\u7784\u51C6\u6A21\u5757\u6CBF\u7740\u4E0D\u540C\u65B9\u5411\u6301\u7EED\u7FFB\u8F6C\uFF0C\u76F4\u5230\u63D0\u793A\u521D\u59CB\u5316\u5B8C\u6210\u4E3A\u6B62\u3002\n<color=#FFA500>\u6CE8\u610F\uFF1A\u4E3A\u4E86\u907F\u514D\u7535\u5B50\u4EA7\u54C1\uFF08\u624B\u673A\u7B49\uFF09\u5BF9\u5730\u78C1\u8BA1\u521D\u59CB\u5316\u7684\u5E72\u6270\uFF0C\u8BF7\u5728\u5F00\u59CB\u5730\u78C1\u8BA1\u521D\u59CB\u5316\u524D\uFF0C\u5C06\u7784\u51C6\u6A21\u5757\u4E0E\u624B\u673A\u7B49\u4FDD\u63010.5\u7C73\uFF08\u534A\u7C73\uFF09\u4EE5\u4E0A\u7684\u8DDD\u79BB\u3002</color>"
 --- !u!114 &9171095487308935649
 --- !u!114 &9171095487308935649
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -2196,4 +2238,6 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   textKey: device-calibrate_mag-tip
   textKey: device-calibrate_mag-tip
   layoutRebuildObject: {fileID: 0}
   layoutRebuildObject: {fileID: 0}
-  languageFontSizes: []
+  languageFontSizes:
+  - language: 1
+    fontSize: 26

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

@@ -44,8 +44,8 @@
     "course_title_11": "结束动作",
     "course_title_11": "结束动作",
     "course_btn_see": "查看",
     "course_btn_see": "查看",
     
     
-    "device-calibrate_gyr-tip": "将安装了模块的智能弓箭静置在一个平面上,\n再点击陀螺仪初始化。",
-    "device-calibrate_mag-tip": "将安装了模块的智能弓箭沿着不同方向持续翻转,\n直到提示初始化完成为止。",
+    "device-calibrate_gyr-tip": "将瞄准模块从智能弓箭上拆下,将其静置在一个平面上,再点击陀螺仪初始化。",
+    "device-calibrate_mag-tip": "将单独的瞄准模块沿着不同方向持续翻转,直到提示初始化完成为止。<color=#FFA500>注意:为了避免电子产品(手机等)对地磁计初始化的干扰,请在开始地磁计初始化前,将瞄准模块与手机等保持0.5米(半米)以上的距离。</color>",
     "device-calibrate_mag-ok": "地磁计初始化已完成",
     "device-calibrate_mag-ok": "地磁计初始化已完成",
     "device-calibrate_n-connect": "请先连接模块",
     "device-calibrate_n-connect": "请先连接模块",
 
 

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

@@ -44,8 +44,8 @@
     "course_title_11": "Finish up job",
     "course_title_11": "Finish up job",
     "course_btn_see": "see",
     "course_btn_see": "see",
 
 
-    "device-calibrate_gyr-tip": "Place the smart bow with the module installed \non a plane, and then click Gyr Init.",
-    "device-calibrate_mag-tip": "Turn the smart bow and arrow with the module \ninstalled in different directions until it prompts \nthat the initialization is completed.",
+    "device-calibrate_gyr-tip": "Remove the aiming module from the smart bow and place it on a plane, and then click Gyr Init.",
+    "device-calibrate_mag-tip": "Turn the individual aiming module continuously in different directions until it prompts that the initialization is completed. <color=#FFA500>Note: In order to avoid the interference of electronic products (mobile phones, etc.) on the initialization of the magnetometer, please keep the aiming module at a distance of more than 0.5 meters (half meters) from the mobile phone, etc. before starting the initialization of the magnetometer.</color>",
     "device-calibrate_mag-ok": "Mag init completed",
     "device-calibrate_mag-ok": "Mag init completed",
     "device-calibrate_n-connect": "Please connect the module first",
     "device-calibrate_n-connect": "Please connect the module first",