|
|
@@ -106,7 +106,6 @@ public class NewUserGuiderManager : MonoBehaviour
|
|
|
config = new NewUserGuiderConfig();
|
|
|
config.key = "连接设备";
|
|
|
config.frameTipPivot = "lb";
|
|
|
- config.frameTipText = TextAutoLanguage2.GetTextByKey("new-user-guider_tip_" + config.key);
|
|
|
config.onPrepare = (g) => {
|
|
|
RectTransform btn = GameObject.Find("HomeView/HomeViewRenderBow/Btn").GetComponent<RectTransform>();
|
|
|
g.hollowOutMask.SetTarget(btn);
|
|
|
@@ -116,6 +115,7 @@ public class NewUserGuiderManager : MonoBehaviour
|
|
|
g.config.hitPos = btn.position;
|
|
|
g.config.pointerPos = btn.position + RectTransformUtils.CanvasV3ToScreenV3(Vector3.up * 80f, btn);
|
|
|
g.config.frameTipPos = btn.position + RectTransformUtils.CanvasV3ToScreenV3(Vector3.up * 150f, btn);
|
|
|
+ g.hollowOutMask.autoUpdate = true;
|
|
|
};
|
|
|
config.onStart = (g) => {
|
|
|
g.GetMaskClickedEvent().RemoveAllListeners();
|
|
|
@@ -214,9 +214,13 @@ public class NewUserGuiderManager : MonoBehaviour
|
|
|
Action onclickTarget = () => {
|
|
|
g.gameObject.SetActive(false);
|
|
|
DeviceCalibrateView.ins.action_OnDestroy += () => {
|
|
|
- FindObjectOfType<DeviceView1>()?.OnClick_Back();
|
|
|
- g.clickedWillPlayAudioBtn = false;
|
|
|
- g.OnClick_ToNext();
|
|
|
+ if (AimHandler.ins.MagCalibrater.Complete) {
|
|
|
+ FindObjectOfType<DeviceView1>()?.OnClick_Back();
|
|
|
+ g.clickedWillPlayAudioBtn = false;
|
|
|
+ g.OnClick_ToNext();
|
|
|
+ } else {
|
|
|
+ g.gameObject.SetActive(true);
|
|
|
+ }
|
|
|
};
|
|
|
};
|
|
|
DeviceView1.ins.action_OnClickMag += onclickTarget;
|