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

Merge remote-tracking branch 'origin/NewMaster' into LouDi_Pig

Browse Source
This commit is contained in:
李浩 2025-04-03 13:56:57 +08:00
commit 2a8c3a4892
2 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/QFramework/Toolkits/UIKit/Scripts/Resources/VRUIRoot.prefab
View File

@ -554,11 +554,11 @@ RectTransform:
m_Children: []
m_Father: {fileID: 7801786202371978394}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
m_SizeDelta: {x: 1920, y: 0}
m_Pivot: {x: 1, y: -0.0000015497208}
--- !u!114 &5603514822568233693
MonoBehaviour:
m_ObjectHideFlags: 0

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

@ -83,28 +83,28 @@ namespace QFramework.Example
Far.gameObject.SetActive(mData.normalPos != default);
#if VR
Transform trans = UIRoot.Instance.transform.Find("ZFrame");
if (mData.vrPos != default)
{
mData.nearPos = mData.vrPos;
mData.nearRot = mData.vrRot;
mData.nearTime = mData.vrTime;
mData.isOn = "near";
}
else
{
//#if VR
// Transform trans = UIRoot.Instance.transform.Find("ZFrame");
// if (mData.vrPos != default)
// {
// mData.nearPos = mData.vrPos;
// mData.nearRot = mData.vrRot;
// mData.nearTime = mData.vrTime;
// mData.isOn = "near";
// }
// else
// {
if (mData.nearPos != default)
{
mData.isOn = "near";
}
else if (mData.normalPos != default)
{
mData.isOn = "normal";
}
}
#endif
// if (mData.nearPos != default)
// {
// mData.isOn = "near";
// }
// else if (mData.normalPos != default)
// {
// mData.isOn = "normal";
// }
// }
//#endif
if (string.IsNullOrEmpty(mData.isOn))
@ -144,10 +144,10 @@ namespace QFramework.Example
break;
}
}
#if VR
Near.gameObject.SetActive(false);
Far.gameObject.SetActive(false);
#endif
//#if VR
// Near.gameObject.SetActive(false);
// Far.gameObject.SetActive(false);
//#endif
}