Ver código fonte

新手引导

lvjincheng 3 anos atrás
pai
commit
9de69a3051

+ 5 - 4
Assets/BowArrow/Modules/NewUserGuider/NewUserGuider.prefab

@@ -142,7 +142,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 1ad2cf6c2f09744489d8c60b3fe3bab2, type: 3}
-    m_FontSize: 22
+    m_FontSize: 30
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
@@ -490,6 +490,7 @@ MonoBehaviour:
       m_Calls: []
   _target: {fileID: 0}
   isTargetRectCanThrough: 1
+  autoUpdate: 0
 --- !u!114 &2364853294900156540
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1019,7 +1020,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 40}
+  m_SizeDelta: {x: 0, y: 45}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5250191685094206404
 CanvasRenderer:
@@ -1096,7 +1097,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 40}
+  m_SizeDelta: {x: 0, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2480793609954951955
 CanvasRenderer:
@@ -1128,7 +1129,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 1ad2cf6c2f09744489d8c60b3fe3bab2, type: 3}
-    m_FontSize: 25
+    m_FontSize: 32
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2

+ 7 - 4
Assets/BowArrow/Modules/NewUserGuider/NewUserGuiderManager.cs

@@ -316,7 +316,8 @@ public class NewUserGuiderManager : MonoBehaviour
             g.hollowOutMask.isTargetRectCanThrough = false;
             g.config.hitPos = RectTransformUtils.GetPositionByPivot(btn, new Vector2(0.5f, 0.6f));
             g.config.pointerPos = RectTransformUtils.GetPositionByPivot(btn, new Vector2(0.8f, 0.9f));
-            g.config.frameTipPos = RectTransformUtils.GetPositionByPivot(btn, Vector2.zero);
+            g.config.frameTipPos = RectTransformUtils.GetPositionByPivot(btn, Vector2.zero)
+                + RectTransformUtils.CanvasV3ToScreenV3(Vector3.left * 150f, g.iconPointer);
         };
         configs.Add(config.key, config);
 
@@ -330,7 +331,8 @@ public class NewUserGuiderManager : MonoBehaviour
             // g.hollowOutMask.isTargetRectCanThrough = false;
             g.config.hitPos = RectTransformUtils.GetPositionByPivot(btn, new Vector2(0.5f, 0.6f));
             g.config.pointerPos = RectTransformUtils.GetPositionByPivot(btn, new Vector2(0.8f, 0.9f));
-            g.config.frameTipPos = RectTransformUtils.GetPositionByPivot(btn, Vector2.zero);
+            g.config.frameTipPos = RectTransformUtils.GetPositionByPivot(btn, Vector2.zero)
+                + RectTransformUtils.CanvasV3ToScreenV3(Vector3.left * 150f, g.iconPointer);
         };
         config.onStart = (g) => {
             g.GetMaskClickedEvent().RemoveAllListeners();
@@ -360,7 +362,8 @@ public class NewUserGuiderManager : MonoBehaviour
             g.config.hitPos = RectTransformUtils.GetPositionByPivot(btn, Vector2.one * 0.5f);
             g.config.pointerRotZ = 180;
             g.config.pointerPos = RectTransformUtils.GetPositionByPivot(btn, new Vector2(0.2f, 0.3f));
-            g.config.frameTipPos = RectTransformUtils.GetPositionByPivot(btn, new Vector2(0.4f, 0.15f));
+            g.config.frameTipPos = RectTransformUtils.GetPositionByPivot(btn, new Vector2(0.4f, 0.15f))
+                + RectTransformUtils.CanvasV3ToScreenV3(Vector3.left * 150f, g.iconPointer);
         };
         config.onStart = (g) => {
             g.GetMaskClickedEvent().RemoveAllListeners();
@@ -418,7 +421,7 @@ public class NewUserGuiderManager : MonoBehaviour
 
             RectTransform iconHumanShoot = g.transform.Find("IconHumanShoot") as RectTransform;
             iconHumanShoot.pivot = Vector2.one * 0.5f;
-            iconHumanShoot.anchoredPosition = new Vector2(-193, -85);
+            iconHumanShoot.anchoredPosition = new Vector2(-350, -85);
             iconHumanShoot.gameObject.SetActive(true);
 
             GameMode gameMode = GameMgr.ins.gameMode;

+ 1 - 1
Assets/BowArrow/Resources/Prefabs/Views/AutoResetView.prefab

@@ -143,7 +143,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 1ad2cf6c2f09744489d8c60b3fe3bab2, type: 3}
-    m_FontSize: 22
+    m_FontSize: 30
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2

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

@@ -29,11 +29,11 @@
     "course_btn_see": "see",
     
     "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 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_模块开机": "Press and hold the <color=#FFA500>\"Power on\"</color> \nkey on the module, and when \nthe green light flashes, the \nmodule is in the state of \nwaiting for connection.",
+    "new-user-guider_tip_连接设备": "Click <color=#FFA500>\"Connect\"</color> and wait for the device \nto prompt that the connection is \nsuccessful. At this time, the module \nis in the green state.",
+    "new-user-guider_tip_弓箭详情": "Click the <color=#FFA500>arrow</color> to enter the device \ninterface for module calibration.",
+    "new-user-guider_tip_设备-陀螺仪校准": "Place the smart bow with the module <color=#FFA500>installed \non a plane</color>, and then click GyrCalibrate.",
+    "new-user-guider_tip_设备-地磁计校准": "Rotate the smart bow with modules <color=#FFA500>installed along \neach axis</color>, until prompted that calibration is completed.",
     "new-user-guider_tip_查看设置": "Click <color=#FFA500>SetUp</color> to learn more",
     "new-user-guider_tip_查看商城": "Click to view the <color=#FFA500>Shop</color>",
     "new-user-guider_tip_切换好友/排行榜": "Click to switch <color=#FFA500>friend/rand</color>",
@@ -42,9 +42,9 @@
     "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 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>",
+    "new-user-guider_tip_视角归位-触发": "Click this button, <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_教程结束": "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>",
 
     "setup_fix-game-bg": "FixGameBG",
     "setup_train-mode": "TrainMode",