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

合并

Browse Source
This commit is contained in:
shenjianxing 2025-03-31 16:50:13 +08:00
commit 6f2bfbb498
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1032,7 +1032,7 @@ Canvas:
m_OverridePixelPerfect: 0 m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0 m_SortingBucketNormalizedSize: 0
m_VertexColorAlwaysGammaSpace: 0 m_VertexColorAlwaysGammaSpace: 0
m_AdditionalShaderChannelsFlag: 0 m_AdditionalShaderChannelsFlag: 25
m_UpdateRectTransformForStandalone: 0 m_UpdateRectTransformForStandalone: 0
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingOrder: 0 m_SortingOrder: 0

10
Assets/Scenes/Main.unity
View File

@ -25,8 +25,8 @@ RenderSettings:
m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
m_AmbientIntensity: 1 m_AmbientIntensity: 1
m_AmbientMode: 0 m_AmbientMode: 0
m_SubtractiveShadowColor: {r: 0.13296545, g: 0.19145328, b: 0.33962262, a: 1} m_SubtractiveShadowColor: {r: 1, g: 1, b: 1, a: 1}
m_SkyboxMaterial: {fileID: 2100000, guid: 0ffaa0b7117ba8c47a9d05ae701d4b4d, type: 2} m_SkyboxMaterial: {fileID: 0}
m_HaloStrength: 0.5 m_HaloStrength: 0.5
m_FlareStrength: 1 m_FlareStrength: 1
m_FlareFadeSpeed: 3 m_FlareFadeSpeed: 3
@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1 m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0} m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0} m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.37933365, g: 0.4104958, b: 0.42596278, a: 1} m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
m_UseRadianceAmbientProbe: 0 m_UseRadianceAmbientProbe: 0
--- !u!157 &3 --- !u!157 &3
LightmapSettings: LightmapSettings:
@ -255,8 +255,8 @@ Camera:
y: 0 y: 0
width: 1 width: 1
height: 1 height: 1
near clip plane: 0.01 near clip plane: 0.3
far clip plane: 100000 far clip plane: 1000
field of view: 60 field of view: 60
orthographic: 0 orthographic: 0
orthographic size: 5 orthographic size: 5

2
Assets/Scripts/Item/DeviceItem.cs
View File

@ -16,6 +16,7 @@ public class DeviceItem : MonoBehaviour
public void Init(XMLTool.Device device) public void Init(XMLTool.Device device)
{ {
this.device = device; this.device = device;
TypeEventSystem.Global.Register<OnModuleQuit>(OnModuleQuitEvent);
if (string.IsNullOrEmpty(device.HighColor) == false) if (string.IsNullOrEmpty(device.HighColor) == false)
{ {
var effect = gameObject.GetOrAddComponent<HighlightEffect>(); var effect = gameObject.GetOrAddComponent<HighlightEffect>();
@ -24,7 +25,6 @@ public class DeviceItem : MonoBehaviour
effect.outlineColor = Utility.ToColor(device.HighColor); effect.outlineColor = Utility.ToColor(device.HighColor);
StringEventSystem.Global.Register<string[]>(Global.HighLightTrigger, OnHighLightTriggerEvent); StringEventSystem.Global.Register<string[]>(Global.HighLightTrigger, OnHighLightTriggerEvent);
TypeEventSystem.Global.Register<StepStatusOnChange>(OnStepChanged); TypeEventSystem.Global.Register<StepStatusOnChange>(OnStepChanged);
TypeEventSystem.Global.Register<OnModuleQuit>(OnModuleQuitEvent);
#if VR #if VR
effect.constantWidth = false; effect.constantWidth = false;

3
Assets/Scripts/UI/UIRightTop.cs
View File

@ -2,6 +2,7 @@ using UnityEngine;
using UnityEngine.UI; using UnityEngine.UI;
using QFramework; using QFramework;
using System.Data.Common; using System.Data.Common;
using UnityEngine.SceneManagement;
namespace QFramework.Example namespace QFramework.Example
{ {
@ -93,7 +94,7 @@ namespace QFramework.Example
txt = "ÊÇ", txt = "ÊÇ",
OnClick = () => OnClick = () =>
{ {
Hide(); Hide();
TypeEventSystem.Global.Send<OnModuleQuit>(); TypeEventSystem.Global.Send<OnModuleQuit>();
UIKit.OpenPanelAsync<UIModeSelect>().ToAction().StartGlobal(); UIKit.OpenPanelAsync<UIModeSelect>().ToAction().StartGlobal();
} }