|
@@ -956,7 +956,14 @@ public class InfraredScreenPositioningView : JCUnityLib.ViewBase
|
|
|
Debug.Log("-----进入射箭场景!");
|
|
Debug.Log("-----进入射箭场景!");
|
|
|
NewUserGuiderManager newUserGuiderManager = FindObjectOfType<NewUserGuiderManager>();
|
|
NewUserGuiderManager newUserGuiderManager = FindObjectOfType<NewUserGuiderManager>();
|
|
|
newUserGuiderManager.curConfigKey = "开始-红外调整";
|
|
newUserGuiderManager.curConfigKey = "开始-红外调整";
|
|
|
- newUserGuiderManager.isNewModule = AimHandler.ins.aimDeviceInfo.type == (int)AimDeviceType.HOUYIPRO || AimHandler.ins.aimDeviceInfo.type == (int)AimDeviceType.Gun || AimHandler.ins.aimDeviceInfo.type == (int)AimDeviceType.ARTEMISPRO;
|
|
|
|
|
|
|
+ //b端都是红外设备流程
|
|
|
|
|
+ if (CommonConfig.StandaloneModeOrPlatformB)
|
|
|
|
|
+ {
|
|
|
|
|
+ newUserGuiderManager.isNewModule = true;
|
|
|
|
|
+ }
|
|
|
|
|
+ else {
|
|
|
|
|
+ newUserGuiderManager.isNewModule = AimHandler.ins.aimDeviceInfo.type == (int)AimDeviceType.HOUYIPRO || AimHandler.ins.aimDeviceInfo.type == (int)AimDeviceType.Gun || AimHandler.ins.aimDeviceInfo.type == (int)AimDeviceType.ARTEMISPRO;
|
|
|
|
|
+ }
|
|
|
//进入射箭场景
|
|
//进入射箭场景
|
|
|
GlobalData.pkMatchType = PKMatchType.None;
|
|
GlobalData.pkMatchType = PKMatchType.None;
|
|
|
GameMgr.gameType = 1;
|
|
GameMgr.gameType = 1;
|
|
@@ -1122,20 +1129,20 @@ public class InfraredScreenPositioningView : JCUnityLib.ViewBase
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
//这个脚本存在时候。任何切换操作都直接处理删除
|
|
//这个脚本存在时候。任何切换操作都直接处理删除
|
|
|
- void OnSceneUnloaded(Scene scene)
|
|
|
|
|
- {
|
|
|
|
|
- ViewManager2.HideView(ViewManager2.Path_ConnectGuidanceView);
|
|
|
|
|
- ViewManager2.HideView(ViewManager2.Path_InfraredScreenPositioningView);
|
|
|
|
|
- }
|
|
|
|
|
- void OnEnable()
|
|
|
|
|
- {
|
|
|
|
|
- SceneManager.sceneUnloaded += OnSceneUnloaded;
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- void OnDisable()
|
|
|
|
|
- {
|
|
|
|
|
- SceneManager.sceneUnloaded -= OnSceneUnloaded;
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ //void OnSceneUnloaded(Scene scene)
|
|
|
|
|
+ //{
|
|
|
|
|
+ // ViewManager2.HideView(ViewManager2.Path_ConnectGuidanceView);
|
|
|
|
|
+ // ViewManager2.HideView(ViewManager2.Path_InfraredScreenPositioningView);
|
|
|
|
|
+ //}
|
|
|
|
|
+ //void OnEnable()
|
|
|
|
|
+ //{
|
|
|
|
|
+ // SceneManager.sceneUnloaded += OnSceneUnloaded;
|
|
|
|
|
+ //}
|
|
|
|
|
+
|
|
|
|
|
+ //void OnDisable()
|
|
|
|
|
+ //{
|
|
|
|
|
+ // SceneManager.sceneUnloaded -= OnSceneUnloaded;
|
|
|
|
|
+ //}
|
|
|
|
|
|
|
|
#endregion
|
|
#endregion
|
|
|
}
|
|
}
|