JiNan/VirtualFramework
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: JiNan:8c9209050e00e8e6c30d663815b4308b774ab126
Branches Tags
JiNan:NewMaster
JiNan:AnHui_SheYing
JiNan:ShuangHe_Math
JiNan:LanZhou_HuaGong
JiNan:LanZhou_ShiHua
JiNan:LanZhou_FanYingJingLiu
JiNan:AnHui_BaoShi
JiNan:3DBody
JiNan:LouDi_Quan
JiNan:LouDi_Pig
JiNan:main
..
compare: JiNan:95e81da8b7090341d5d07bb763eccb02cd7d5000
Branches Tags
JiNan:AnHui_SheYing
JiNan:ShuangHe_Math
JiNan:NewMaster
JiNan:LanZhou_HuaGong
JiNan:LanZhou_ShiHua
JiNan:LanZhou_FanYingJingLiu
JiNan:AnHui_BaoShi
JiNan:3DBody
JiNan:LouDi_Quan
JiNan:LouDi_Pig
JiNan:main

No commits in common. "8c9209050e00e8e6c30d663815b4308b774ab126" and "95e81da8b7090341d5d07bb763eccb02cd7d5000" have entirely different histories.
8c9209050e ... 95e81da8b7

1 changed files with 2 additions and 5 deletions
Show Stats Expand all files Collapse all files

7
Assets/Scripts/UI/UICameraSwitch.cs
View File

@ -79,10 +79,7 @@ namespace QFramework.Example
Near.gameObject.SetActive(mData.nearPos != default); Near.gameObject.SetActive(mData.nearPos != default);
Far.gameObject.SetActive(mData.normalPos != default); Far.gameObject.SetActive(mData.normalPos != default);
#if VR
Near.gameObject.SetActive(false);
Far.gameObject.SetActive(false);
#endif
if (string.IsNullOrEmpty(mData.isOn)) if (string.IsNullOrEmpty(mData.isOn))
{ {
if (Near.isOn && Near.gameObject.activeSelf) if (Near.isOn && Near.gameObject.activeSelf)
@ -126,7 +123,7 @@ namespace QFramework.Example
private void Update() private void Update()
{ {
#if UNITY_STANDALONE_WIN && !VR #if UNITY_STANDALONE_WIN
if (Near.isOn == true || Far.isOn == true) if (Near.isOn == true || Far.isOn == true)
{ {
if (Input.GetKeyDown(KeyCode.W) || Input.GetKeyDown(KeyCode.A) || Input.GetKeyDown(KeyCode.S) || Input.GetKeyDown(KeyCode.D)) if (Input.GetKeyDown(KeyCode.W) || Input.GetKeyDown(KeyCode.A) || Input.GetKeyDown(KeyCode.S) || Input.GetKeyDown(KeyCode.D))