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

Compare commits

base: JiNan:e43eb4bed0cbe86aca984be66d8016083bb0d598
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:6f2bfbb4985ec285b3a4a0e48b124955fc97aad2
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. "e43eb4bed0cbe86aca984be66d8016083bb0d598" and "6f2bfbb4985ec285b3a4a0e48b124955fc97aad2" have entirely different histories.
e43eb4bed0 ... 6f2bfbb498

3 changed files with 30 additions and 30 deletions
Show Stats Expand all files Collapse all files

2
Assets/Art/UIPrefab/UITextWindow.prefab
View File

@ -1314,7 +1314,7 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0 m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1 m_Maskable: 1
m_OnCullStateChanged: m_OnCullStateChanged:

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

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

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

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