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

+ 5 - 0
Assets/BowArrow/Modules/NewUserGuider/NewUserGuiderManager.cs

@@ -416,6 +416,11 @@ public class NewUserGuiderManager : MonoBehaviour
             g.config.pointerPos = btn4_img.position + RectTransformUtils.CanvasV3ToScreenV3(new Vector3(-60, 60), btn4);
             g.config.frameTipPos = btn4_img.position + RectTransformUtils.CanvasV3ToScreenV3(new Vector3(-120, 120), btn4);
 
+            RectTransform iconHumanShoot = g.transform.Find("IconHumanShoot") as RectTransform;
+            iconHumanShoot.pivot = Vector2.one * 0.5f;
+            iconHumanShoot.anchoredPosition = new Vector2(-193, -85);
+            iconHumanShoot.gameObject.SetActive(true);
+
             GameMode gameMode = GameMgr.ins.gameMode;
             if (gameMode.GetType().Equals(typeof(TimeLimitGameMode))) {
                 gameMode.PauseTimeCounting(g);

+ 3 - 3
Assets/BowArrow/Resources/Prefabs/Views/PKGameSettleView.prefab

@@ -323,7 +323,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 35.033554, y: 0}
+  m_AnchoredPosition: {x: 36, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4192900400895089148
@@ -450,7 +450,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 113.55704, y: 0}
+  m_AnchoredPosition: {x: 116, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1871444126788684677
@@ -2345,7 +2345,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u540C\u4E00\u5C40\u518D\u6B21\u5F00\u59CB"
+  m_Text: "\u518D\u6B21\u6311\u6218"
 --- !u!114 &5965867083297420718
 MonoBehaviour:
   m_ObjectHideFlags: 0

+ 5 - 5
Assets/BowArrow/Resources/Prefabs/Views/TimeLimitGameSettleView.prefab

@@ -767,7 +767,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 35.033554, y: 0}
+  m_AnchoredPosition: {x: 36, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1584491533125695203
@@ -969,7 +969,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 113.55704, y: 0}
+  m_AnchoredPosition: {x: 116, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5393253313812614068
@@ -1612,7 +1612,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 33.8255, y: 0}
+  m_AnchoredPosition: {x: 35, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2732726379489701053
@@ -1722,7 +1722,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 83.52348, y: 0}
+  m_AnchoredPosition: {x: 86.5, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &199998092357563418
@@ -1860,7 +1860,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u540C\u4E00\u5C40\u518D\u6B21\u5F00\u59CB"
+  m_Text: "\u518D\u6B21\u6311\u6218"
 --- !u!114 &7676655703676878566
 MonoBehaviour:
   m_ObjectHideFlags: 0

+ 1 - 1
Assets/BowArrow/Scenes/GameChallengeScene/GameChallenge.unity

@@ -34453,7 +34453,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u540C\u4E00\u5C40\u518D\u6B21\u5F00\u59CB"
+  m_Text: "\u518D\u6B21\u6311\u6218"
 --- !u!222 &1544215147
 CanvasRenderer:
   m_ObjectHideFlags: 0

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

@@ -31,7 +31,7 @@
     "new-user-guider_btn_skip": "跳过教程",
     "new-user-guider_tip_模块开机": "长按模块上的<color=#FFA500>“开机”</color>键,当绿灯闪\n烁时,即模块处于等待连接的状态。",
     "new-user-guider_tip_连接设备": "点击<color=#FFA500>“连接”</color>等待设备提示连接成功,\n此时模块是绿灯常亮的状态。",
-    "new-user-guider_tip_弓箭详情": "点击<color=#FFA500>弓箭</color>,查看更多信息。",
+    "new-user-guider_tip_弓箭详情": "点击<color=#FFA500>弓箭</color>,进入设备界面进行模块校准。",
     "new-user-guider_tip_设备-陀螺仪校准": "将安装了模块的智能弓箭<color=#FFA500>静置在一个平面上</color>,\n再点击陀螺仪校准。",
     "new-user-guider_tip_设备-地磁计校准": "将安装了模块的智能弓箭<color=#FFA500>沿着每一个轴旋转</color>,\n直到提示校准完成。",
     "new-user-guider_tip_查看设置": "点击<color=#FFA500>设置</color>了解更多",
@@ -42,8 +42,8 @@
     "new-user-guider_tip_开始游戏": "点击<color=#FFA500>开始游戏</color>,开始对局吧!",
     "new-user-guider_tip_开始-限时游戏": "点击<color=#FFA500>“限时游戏”</color>选择游戏类型",
     "new-user-guider_tip_限时游戏-选择距离": "选择距离<color=#FFA500>“10米”</color>开始游戏吧!",
-    "new-user-guider_tip_视角归位-触发": "点击<color=#FFA500>视角归位按键之后,立刻以标准射箭\n姿势瞄准靶心</color>,3秒后完成视角的自动归位。",
-    "new-user-guider_tip_视角归位-瞄准": "请参考图中姿势,立即瞄准靶心,\n<size=40><color=#FFA500>{0}</color></size>秒后完成视角的自动归位。",
+    "new-user-guider_tip_视角归位-触发": "点击该按键,<color=#FFA500>参考图中姿势将弓箭瞄准\n靶心</color>,3秒后完成视角归位。",
+    "new-user-guider_tip_视角归位-瞄准": "请参考图中姿势,立即瞄准靶心,\n<size=40><color=#FFA500>{0}</color></size>秒后完成视角归位。",
     "new-user-guider_tip_教程结束": "恭喜您完成了本次新手教程,下次如果还\n要<color=#FFA500>了解本教程</color>,请在<color=#FFA500>设置中查看新手指导</color>。",
     
     "setup_fix-game-bg": "固定游戏背景",
@@ -97,9 +97,9 @@
     "game_crosshair_outbound_2": "瞄准方向已超出视野范围,请将弓往下移动!",
     "game_crosshair_outbound_3": "瞄准方向已超出视野范围,请将弓往上移动!",
     "game_timelimit_distance_unit": "{0}米",
-    "game_timelimit_settle_again": "同一局再次开始",
+    "game_timelimit_settle_again": "再次挑战",
     "game_timelimit_settle_back": "返回上一页",
-    "game_challenge_settle_again": "同一局再次开始",
+    "game_challenge_settle_again": "再次挑战",
     "game_challenge_settle_back": "返回上一页",
     "game_challenge_settle_next-level": "下一关",
     "agreement_user": "用户协议",

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

@@ -31,7 +31,7 @@
     "new-user-guider_btn_skip": "Skip Tutorial",
     "new-user-guider_tip_模块开机": "Press and hold the <color=#FFA500>\"Power on\"</color> key \non the module, and when the green \nlight flashes, the module is in the \nstate of waiting for connection.",
     "new-user-guider_tip_连接设备": "Click <color=#FFA500>\"Connect\"</color> and wait for the device to \nprompt that the connection is successful. \nAt this time, the module is in the green state.",
-    "new-user-guider_tip_弓箭详情": "Click the <color=#FFA500>arrow</color> to see more information.",
+    "new-user-guider_tip_弓箭详情": "Click the <color=#FFA500>arrow</color> to enter the device interface for module calibration.",
     "new-user-guider_tip_设备-陀螺仪校准": "Place the smart bow with the module <color=#FFA500>installed on a plane</color>, \nand then click GyrCalibrate.",
     "new-user-guider_tip_设备-地磁计校准": "Rotate the smart bow with modules <color=#FFA500>installed along each axis</color>, \nuntil prompted that calibration is completed.",
     "new-user-guider_tip_查看设置": "Click <color=#FFA500>SetUp</color> to learn more",
@@ -42,8 +42,8 @@
     "new-user-guider_tip_开始游戏": "Click to <color=#FFA500>Start</color> and start the game!",
     "new-user-guider_tip_开始-限时游戏": "Click <color=#FFA500>\"Target\"</color> to select a game type",
     "new-user-guider_tip_限时游戏-选择距离": "Choose <color=#FFA500>\"10M\"</color> to start the game!",
-    "new-user-guider_tip_视角归位-触发": "Click <color=#FFA500>the aim reset button, and immediately aim at the bull's-eye \nin the standard archery posture after pressing the button</color>, and then \ncomplete the automatic angle homing 3 seconds later.",
-    "new-user-guider_tip_视角归位-瞄准": "Please refer to the pose in the figure, aim at the bull's-eye immediately, \nthe automatic homing of the viewing angle will be completed in <size=40><color=#FFA500>{0}</color></size> seconds.",
+    "new-user-guider_tip_视角归位-触发": "Click this button, aim the bow and arrow at the bull's eye with reference to the posture in the picture, and then complete the visual angle return in 3 seconds.",
+    "new-user-guider_tip_视角归位-瞄准": "Please refer to the pose in the figure, aim at the bull's-eye immediately, \nthe visual angle return will be completed in <size=40><color=#FFA500>{0}</color></size> seconds.",
     "new-user-guider_tip_教程结束": "Congratulations on completing this novice tutorial. If you want to <color=#FFA500>know this \ntutorial</color> next time, please <color=#FFA500>see the novice guidance in the setup.</color>",
 
     "setup_fix-game-bg": "FixGameBG",