marcin/beyond
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixeds

Browse Source
This commit is contained in:
marcin
2025-02-26 13:21:50 +01:00
parent b7e10c6df1
commit 37371bcde0
7 changed files with 1109 additions and 976 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2038
Assets/Scenes/Land_01/Land_Of_Death_Demo.unity
View File

File diff suppressed because it is too large Load Diff

5
Assets/Scripts/Effects/HiddenObject.cs
View File

@@ -20,7 +20,7 @@ namespace Beyond
{ {
if (SilentPeekController.instance != null) if (SilentPeekController.instance != null)
SilentPeekController.instance.m_OnStateChanged.AddListener(OnSilentPeek); SilentPeekController.instance.m_OnStateChanged.AddListener(OnSilentPeek);
if (m_actionCollider) if (m_actionCollider && !m_reverseAction)
m_actionCollider.enabled = false; m_actionCollider.enabled = false;
} }
@@ -38,7 +38,8 @@ namespace Beyond
return; return;
} }
if (m_actionCollider) if (m_actionCollider)
m_actionCollider.enabled = !m_reverseAction; m_actionCollider.enabled = enabled ^ m_reverseAction;
} }
public void MarkAsAlreadyUsed() public void MarkAsAlreadyUsed()

4
Assets/Settings/LWRP-HighQuality.asset
View File

@@ -82,9 +82,9 @@ MonoBehaviour:
m_UseFastSRGBLinearConversion: 0 m_UseFastSRGBLinearConversion: 0
m_SupportDataDrivenLensFlare: 1 m_SupportDataDrivenLensFlare: 1
m_SupportScreenSpaceLensFlare: 1 m_SupportScreenSpaceLensFlare: 1
m_GPUResidentDrawerMode: 0 m_GPUResidentDrawerMode: 1
m_SmallMeshScreenPercentage: 0 m_SmallMeshScreenPercentage: 0
m_GPUResidentDrawerEnableOcclusionCullingInCameras: 0 m_GPUResidentDrawerEnableOcclusionCullingInCameras: 1
m_ShadowType: 2 m_ShadowType: 2
m_LocalShadowsSupported: 1 m_LocalShadowsSupported: 1
m_LocalShadowsAtlasResolution: 1024 m_LocalShadowsAtlasResolution: 1024

22
Assets/Textures/Land_lighta.lighting
View File

@@ -7,9 +7,8 @@ LightingSettings:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: Land_lighta m_Name: Land_lighta
serializedVersion: 3 serializedVersion: 9
m_GIWorkflowMode: 1 m_EnableBakedLightmaps: 1
m_EnableBakedLightmaps: 0
m_EnableRealtimeLightmaps: 0 m_EnableRealtimeLightmaps: 0
m_RealtimeEnvironmentLighting: 1 m_RealtimeEnvironmentLighting: 1
m_BounceScale: 1 m_BounceScale: 1
@@ -18,9 +17,11 @@ LightingSettings:
m_UsingShadowmask: 1 m_UsingShadowmask: 1
m_BakeBackend: 1 m_BakeBackend: 1
m_LightmapMaxSize: 512 m_LightmapMaxSize: 512
m_LightmapSizeFixed: 0
m_UseMipmapLimits: 1
m_BakeResolution: 40 m_BakeResolution: 40
m_Padding: 2 m_Padding: 2
m_TextureCompression: 1 m_LightmapCompression: 3
m_AO: 0 m_AO: 0
m_AOMaxDistance: 1 m_AOMaxDistance: 1
m_CompAOExponent: 1 m_CompAOExponent: 1
@@ -31,23 +32,21 @@ LightingSettings:
m_FilterMode: 1 m_FilterMode: 1
m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0}
m_ExportTrainingData: 0 m_ExportTrainingData: 0
m_EnableWorkerProcessBaking: 1
m_TrainingDataDestination: TrainingData m_TrainingDataDestination: TrainingData
m_RealtimeResolution: 2 m_RealtimeResolution: 2
m_ForceWhiteAlbedo: 0 m_ForceWhiteAlbedo: 0
m_ForceUpdates: 0 m_ForceUpdates: 0
m_FinalGather: 0
m_FinalGatherRayCount: 256
m_FinalGatherFiltering: 1
m_PVRCulling: 1 m_PVRCulling: 1
m_PVRSampling: 1 m_PVRSampling: 1
m_PVRDirectSampleCount: 32 m_PVRDirectSampleCount: 32
m_PVRSampleCount: 150 m_PVRSampleCount: 128
m_PVREnvironmentSampleCount: 125 m_PVREnvironmentSampleCount: 128
m_PVREnvironmentReferencePointCount: 2048 m_PVREnvironmentReferencePointCount: 2048
m_LightProbeSampleCountMultiplier: 4 m_LightProbeSampleCountMultiplier: 4
m_PVRBounces: 2 m_PVRBounces: 2
m_PVRMinBounces: 1 m_PVRMinBounces: 2
m_PVREnvironmentMIS: 1 m_PVREnvironmentImportanceSampling: 1
m_PVRFilteringMode: 1 m_PVRFilteringMode: 1
m_PVRDenoiserTypeDirect: 1 m_PVRDenoiserTypeDirect: 1
m_PVRDenoiserTypeIndirect: 1 m_PVRDenoiserTypeIndirect: 1
@@ -61,3 +60,4 @@ LightingSettings:
m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaDirect: 0.5
m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaIndirect: 2
m_PVRFilteringAtrousPositionSigmaAO: 1 m_PVRFilteringAtrousPositionSigmaAO: 1
m_RespectSceneVisibilityWhenBakingGI: 0

4
Assets/testy/Marcin/TesttRenderer.asset
View File

@@ -119,8 +119,8 @@ MonoBehaviour:
- {fileID: -8401544187620710908} - {fileID: -8401544187620710908}
- {fileID: 8705260567137607853} - {fileID: 8705260567137607853}
m_RendererFeatureMap: da69d7b3bdd6aeb26de13b70aa75ef177f447f3a64df181a0386cf88a7053a04e16c5c3b3c1da21a04a61e1c13b8678bade073055d4ccf78 m_RendererFeatureMap: da69d7b3bdd6aeb26de13b70aa75ef177f447f3a64df181a0386cf88a7053a04e16c5c3b3c1da21a04a61e1c13b8678bade073055d4ccf78
m_UseNativeRenderPass: 0 m_UseNativeRenderPass: 1
xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} xrSystemData: {fileID: 0}
postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2}
m_AssetVersion: 2 m_AssetVersion: 2
m_OpaqueLayerMask: m_OpaqueLayerMask:

1
Packages/manifest.json
View File

@@ -1,5 +1,6 @@
{ {
"dependencies": { "dependencies": {
"com.coffee.softmask-for-ugui": "https://github.com/mob-sakai/SoftMaskForUGUI.git?path=Packages/src",
"com.unity.ide.visualstudio": "2.0.22", "com.unity.ide.visualstudio": "2.0.22",
"com.unity.localization": "1.5.4", "com.unity.localization": "1.5.4",
"com.unity.multiplayer.center": "1.0.0", "com.unity.multiplayer.center": "1.0.0",

11
Packages/packages-lock.json
View File

@@ -1,5 +1,14 @@
{ {
"dependencies": { "dependencies": {
"com.coffee.softmask-for-ugui": {
"version": "https://github.com/mob-sakai/SoftMaskForUGUI.git?path=Packages/src",
"depth": 0,
"source": "git",
"dependencies": {
"com.unity.ugui": "1.0.0"
},
"hash": "02cf05485ac0bbd9f61e7b829dd6526db7c9dba5"
},
"com.unity.addressables": { "com.unity.addressables": {
"version": "2.2.2", "version": "2.2.2",
"depth": 1, "depth": 1,
@@ -209,7 +218,7 @@
}, },
"com.unity.ugui": { "com.unity.ugui": {
"version": "2.0.0", "version": "2.0.0",
"depth": 2, "depth": 1,
"source": "builtin", "source": "builtin",
"dependencies": { "dependencies": {
"com.unity.modules.ui": "1.0.0", "com.unity.modules.ui": "1.0.0",