Skip to content

Commit 8dd0ec6

Browse files
authored
Merge pull request #10 from NoTaskStudios/fix-subgraphic-transition-on-start
Fix subgraphic transition on start
2 parents 3190564 + f52e953 commit 8dd0ec6

11 files changed

Lines changed: 234 additions & 87 deletions

Assets/Package/Runtime/Core/CustomButtonBase.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,10 @@ public SelectionState selectionState
7474
#endregion
7575

7676
#region Built-in
77-
private void Awake()
78-
{
79-
rectTransform = GetComponent<RectTransform>();
80-
UpdateButtonState();
81-
}
77+
78+
private void Awake() => rectTransform = GetComponent<RectTransform>();
79+
80+
private void Start() => UpdateButtonState();
8281

8382
private void OnEnable()
8483
{

Assets/Settings/UniversalRP.asset

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -99,35 +99,35 @@ MonoBehaviour:
9999
obsoleteHasProbeVolumes:
100100
m_Keys: []
101101
m_Values:
102-
m_PrefilteringModeMainLightShadows: 1
102+
m_PrefilteringModeMainLightShadows: 4
103103
m_PrefilteringModeAdditionalLight: 4
104-
m_PrefilteringModeAdditionalLightShadows: 1
105-
m_PrefilterXRKeywords: 0
106-
m_PrefilteringModeForwardPlus: 1
107-
m_PrefilteringModeDeferredRendering: 1
108-
m_PrefilteringModeScreenSpaceOcclusion: 1
109-
m_PrefilterDebugKeywords: 0
110-
m_PrefilterWriteRenderingLayers: 0
111-
m_PrefilterHDROutput: 0
112-
m_PrefilterAlphaOutput: 0
113-
m_PrefilterSSAODepthNormals: 0
114-
m_PrefilterSSAOSourceDepthLow: 0
115-
m_PrefilterSSAOSourceDepthMedium: 0
116-
m_PrefilterSSAOSourceDepthHigh: 0
117-
m_PrefilterSSAOInterleaved: 0
118-
m_PrefilterSSAOBlueNoise: 0
119-
m_PrefilterSSAOSampleCountLow: 0
120-
m_PrefilterSSAOSampleCountMedium: 0
121-
m_PrefilterSSAOSampleCountHigh: 0
122-
m_PrefilterDBufferMRT1: 0
123-
m_PrefilterDBufferMRT2: 0
124-
m_PrefilterDBufferMRT3: 0
125-
m_PrefilterSoftShadowsQualityLow: 0
126-
m_PrefilterSoftShadowsQualityMedium: 0
127-
m_PrefilterSoftShadowsQualityHigh: 0
104+
m_PrefilteringModeAdditionalLightShadows: 0
105+
m_PrefilterXRKeywords: 1
106+
m_PrefilteringModeForwardPlus: 0
107+
m_PrefilteringModeDeferredRendering: 0
108+
m_PrefilteringModeScreenSpaceOcclusion: 0
109+
m_PrefilterDebugKeywords: 1
110+
m_PrefilterWriteRenderingLayers: 1
111+
m_PrefilterHDROutput: 1
112+
m_PrefilterAlphaOutput: 1
113+
m_PrefilterSSAODepthNormals: 1
114+
m_PrefilterSSAOSourceDepthLow: 1
115+
m_PrefilterSSAOSourceDepthMedium: 1
116+
m_PrefilterSSAOSourceDepthHigh: 1
117+
m_PrefilterSSAOInterleaved: 1
118+
m_PrefilterSSAOBlueNoise: 1
119+
m_PrefilterSSAOSampleCountLow: 1
120+
m_PrefilterSSAOSampleCountMedium: 1
121+
m_PrefilterSSAOSampleCountHigh: 1
122+
m_PrefilterDBufferMRT1: 1
123+
m_PrefilterDBufferMRT2: 1
124+
m_PrefilterDBufferMRT3: 1
125+
m_PrefilterSoftShadowsQualityLow: 1
126+
m_PrefilterSoftShadowsQualityMedium: 1
127+
m_PrefilterSoftShadowsQualityHigh: 1
128128
m_PrefilterSoftShadows: 0
129-
m_PrefilterScreenCoord: 0
130-
m_PrefilterNativeRenderPass: 0
129+
m_PrefilterScreenCoord: 1
130+
m_PrefilterNativeRenderPass: 1
131131
m_PrefilterUseLegacyLightmaps: 0
132132
m_ShaderVariantLogLevel: 0
133133
m_ShadowCascades: 0

Assets/UniversalRenderPipelineGlobalSettings.asset

Lines changed: 132 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,13 @@ MonoBehaviour:
5555
- rid: 9008751203876077587
5656
- rid: 9008751203876077588
5757
- rid: 2943466992099655680
58+
- rid: 3142686841296388096
59+
- rid: 3142686841296388097
60+
- rid: 3142686841296388098
61+
- rid: 3142686841296388099
62+
- rid: 6755419950775009280
63+
- rid: 6755419950775009281
64+
- rid: 6755419950775009282
5865
m_RuntimeSettings:
5966
m_List: []
6067
m_AssetVersion: 8
@@ -84,15 +91,135 @@ MonoBehaviour:
8491
type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
8592
data:
8693
m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, type: 2}
94+
- rid: 3142686841296388096
95+
type: {class: PostProcessData/ShaderResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
96+
data:
97+
stopNanPS: {fileID: 4800000, guid: 1121bb4e615ca3c48b214e79e841e823, type: 3}
98+
subpixelMorphologicalAntialiasingPS: {fileID: 4800000, guid: 63eaba0ebfb82cc43bde059b4a8c65f6, type: 3}
99+
gaussianDepthOfFieldPS: {fileID: 4800000, guid: 5e7134d6e63e0bc47a1dd2669cedb379, type: 3}
100+
bokehDepthOfFieldPS: {fileID: 4800000, guid: 2aed67ad60045d54ba3a00c91e2d2631, type: 3}
101+
cameraMotionBlurPS: {fileID: 4800000, guid: 1edcd131364091c46a17cbff0b1de97a, type: 3}
102+
paniniProjectionPS: {fileID: 4800000, guid: a15b78cf8ca26ca4fb2090293153c62c, type: 3}
103+
lutBuilderLdrPS: {fileID: 4800000, guid: 65df88701913c224d95fc554db28381a, type: 3}
104+
lutBuilderHdrPS: {fileID: 4800000, guid: ec9fec698a3456d4fb18cf8bacb7a2bc, type: 3}
105+
bloomPS: {fileID: 4800000, guid: 5f1864addb451f54bae8c86d230f736e, type: 3}
106+
temporalAntialiasingPS: {fileID: 4800000, guid: 9c70c1a35ff15f340b38ea84842358bf, type: 3}
107+
LensFlareDataDrivenPS: {fileID: 4800000, guid: 6cda457ac28612740adb23da5d39ea92, type: 3}
108+
LensFlareScreenSpacePS: {fileID: 4800000, guid: 701880fecb344ea4c9cd0db3407ab287, type: 3}
109+
scalingSetupPS: {fileID: 4800000, guid: e8ee25143a34b8c4388709ea947055d1, type: 3}
110+
easuPS: {fileID: 4800000, guid: 562b7ae4f629f144aa97780546fce7c6, type: 3}
111+
uberPostPS: {fileID: 4800000, guid: e7857e9d0c934dc4f83f270f8447b006, type: 3}
112+
finalPostPassPS: {fileID: 4800000, guid: c49e63ed1bbcb334780a3bd19dfed403, type: 3}
113+
m_ShaderResourcesVersion: 0
114+
- rid: 3142686841296388097
115+
type: {class: ScreenSpaceAmbientOcclusionDynamicResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
116+
data:
117+
m_BlueNoise256Textures:
118+
- {fileID: 2800000, guid: 36f118343fc974119bee3d09e2111500, type: 3}
119+
- {fileID: 2800000, guid: 4b7b083e6b6734e8bb2838b0b50a0bc8, type: 3}
120+
- {fileID: 2800000, guid: c06cc21c692f94f5fb5206247191eeee, type: 3}
121+
- {fileID: 2800000, guid: cb76dd40fa7654f9587f6a344f125c9a, type: 3}
122+
- {fileID: 2800000, guid: e32226222ff144b24bf3a5a451de54bc, type: 3}
123+
- {fileID: 2800000, guid: 3302065f671a8450b82c9ddf07426f3a, type: 3}
124+
- {fileID: 2800000, guid: 56a77a3e8d64f47b6afe9e3c95cb57d5, type: 3}
125+
m_Version: 0
126+
- rid: 3142686841296388098
127+
type: {class: ScreenSpaceAmbientOcclusionPersistentResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
128+
data:
129+
m_Shader: {fileID: 4800000, guid: 0849e84e3d62649e8882e9d6f056a017, type: 3}
130+
m_Version: 0
131+
- rid: 3142686841296388099
132+
type: {class: PostProcessData/TextureResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
133+
data:
134+
blueNoise16LTex:
135+
- {fileID: 2800000, guid: 81200413a40918d4d8702e94db29911c, type: 3}
136+
- {fileID: 2800000, guid: d50c5e07c9911a74982bddf7f3075e7b, type: 3}
137+
- {fileID: 2800000, guid: 1134690bf9216164dbc75050e35b7900, type: 3}
138+
- {fileID: 2800000, guid: 7ce2118f74614a94aa8a0cdf2e6062c3, type: 3}
139+
- {fileID: 2800000, guid: 2ca97df9d1801e84a8a8f2c53cb744f0, type: 3}
140+
- {fileID: 2800000, guid: e63eef8f54aa9dc4da9a5ac094b503b5, type: 3}
141+
- {fileID: 2800000, guid: 39451254daebd6d40b52899c1f1c0c1b, type: 3}
142+
- {fileID: 2800000, guid: c94ad916058dff743b0f1c969ddbe660, type: 3}
143+
- {fileID: 2800000, guid: ed5ea7ce59ca8ec4f9f14bf470a30f35, type: 3}
144+
- {fileID: 2800000, guid: 071e954febf155243a6c81e48f452644, type: 3}
145+
- {fileID: 2800000, guid: 96aaab9cc247d0b4c98132159688c1af, type: 3}
146+
- {fileID: 2800000, guid: fc3fa8f108657e14486697c9a84ccfc5, type: 3}
147+
- {fileID: 2800000, guid: bfed3e498947fcb4890b7f40f54d85b9, type: 3}
148+
- {fileID: 2800000, guid: d512512f4af60a442ab3458489412954, type: 3}
149+
- {fileID: 2800000, guid: 47a45908f6db0cb44a0d5e961143afec, type: 3}
150+
- {fileID: 2800000, guid: 4dcc0502f8586f941b5c4a66717205e8, type: 3}
151+
- {fileID: 2800000, guid: 9d92991794bb5864c8085468b97aa067, type: 3}
152+
- {fileID: 2800000, guid: 14381521ff11cb74abe3fe65401c23be, type: 3}
153+
- {fileID: 2800000, guid: d36f0fe53425e08499a2333cf423634c, type: 3}
154+
- {fileID: 2800000, guid: d4044ea2490d63b43aa1765f8efbf8a9, type: 3}
155+
- {fileID: 2800000, guid: c9bd74624d8070f429e3f46d161f9204, type: 3}
156+
- {fileID: 2800000, guid: d5c9b274310e5524ebe32a4e4da3df1f, type: 3}
157+
- {fileID: 2800000, guid: f69770e54f2823f43badf77916acad83, type: 3}
158+
- {fileID: 2800000, guid: 10b6c6d22e73dea46a8ab36b6eebd629, type: 3}
159+
- {fileID: 2800000, guid: a2ec5cbf5a9b64345ad3fab0912ddf7b, type: 3}
160+
- {fileID: 2800000, guid: 1c3c6d69a645b804fa232004b96b7ad3, type: 3}
161+
- {fileID: 2800000, guid: d18a24d7b4ed50f4387993566d9d3ae2, type: 3}
162+
- {fileID: 2800000, guid: c989e1ed85cf7154caa922fec53e6af6, type: 3}
163+
- {fileID: 2800000, guid: ff47e5a0f105eb34883b973e51f4db62, type: 3}
164+
- {fileID: 2800000, guid: fa042edbfc40fbd4bad0ab9d505b1223, type: 3}
165+
- {fileID: 2800000, guid: 896d9004736809c4fb5973b7c12eb8b9, type: 3}
166+
- {fileID: 2800000, guid: 179f794063d2a66478e6e726f84a65bc, type: 3}
167+
filmGrainTex:
168+
- {fileID: 2800000, guid: 654c582f7f8a5a14dbd7d119cbde215d, type: 3}
169+
- {fileID: 2800000, guid: dd77ffd079630404e879388999033049, type: 3}
170+
- {fileID: 2800000, guid: 1097e90e1306e26439701489f391a6c0, type: 3}
171+
- {fileID: 2800000, guid: f0b67500f7fad3b4c9f2b13e8f41ba6e, type: 3}
172+
- {fileID: 2800000, guid: 9930fb4528622b34687b00bbe6883de7, type: 3}
173+
- {fileID: 2800000, guid: bd9e8c758250ef449a4b4bfaad7a2133, type: 3}
174+
- {fileID: 2800000, guid: 510a2f57334933e4a8dbabe4c30204e4, type: 3}
175+
- {fileID: 2800000, guid: b4db8180660810945bf8d55ab44352ad, type: 3}
176+
- {fileID: 2800000, guid: fd2fd78b392986e42a12df2177d3b89c, type: 3}
177+
- {fileID: 2800000, guid: 5cdee82a77d13994f83b8fdabed7c301, type: 3}
178+
smaaAreaTex: {fileID: 2800000, guid: d1f1048909d55cd4fa1126ab998f617e, type: 3}
179+
smaaSearchTex: {fileID: 2800000, guid: 51eee22c2a633ef4aada830eed57c3fd, type: 3}
180+
m_TexturesResourcesVersion: 0
181+
- rid: 6755419950775009280
182+
type: {class: RenderingDebuggerRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
183+
data:
184+
m_version: 0
185+
- rid: 6755419950775009281
186+
type: {class: VrsRenderPipelineRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
187+
data:
188+
m_TextureComputeShader: {fileID: 7200000, guid: cacb30de6c40c7444bbc78cb0a81fd2a, type: 3}
189+
m_VisualizationShader: {fileID: 4800000, guid: 620b55b8040a88d468e94abe55bed5ba, type: 3}
190+
m_VisualizationLookupTable:
191+
m_Data:
192+
- {r: 1, g: 0, b: 0, a: 1}
193+
- {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
194+
- {r: 1, g: 1, b: 1, a: 1}
195+
- {r: 0, g: 1, b: 0, a: 1}
196+
- {r: 0.75, g: 0.75, b: 0, a: 1}
197+
- {r: 0, g: 0.75, b: 0.55, a: 1}
198+
- {r: 0.5, g: 0, b: 0.5, a: 1}
199+
- {r: 0.5, g: 0.5, b: 0.5, a: 1}
200+
- {r: 0, g: 0, b: 1, a: 1}
201+
m_ConversionLookupTable:
202+
m_Data:
203+
- {r: 1, g: 0, b: 0, a: 1}
204+
- {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
205+
- {r: 1, g: 1, b: 1, a: 1}
206+
- {r: 0, g: 1, b: 0, a: 1}
207+
- {r: 0.75, g: 0.75, b: 0, a: 1}
208+
- {r: 0, g: 0.75, b: 0.55, a: 1}
209+
- {r: 0.5, g: 0, b: 0.5, a: 1}
210+
- {r: 0.5, g: 0.5, b: 0.5, a: 1}
211+
- {r: 0, g: 0, b: 1, a: 1}
212+
- rid: 6755419950775009282
213+
type: {class: LightmapSamplingSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
214+
data:
215+
m_Version: 1
216+
m_UseBicubicLightmapSampling: 0
87217
- rid: 9008751203876077568
88218
type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
89219
data:
90220
m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3}
91221
m_AutodeskInteractiveTransparent: {fileID: 4800000, guid: 5c81372d981403744adbdda4433c9c11, type: 3}
92222
m_AutodeskInteractiveMasked: {fileID: 4800000, guid: 80aa867ac363ac043847b06ad71604cd, type: 3}
93-
m_TerrainDetailLit: {fileID: 4800000, guid: f6783ab646d374f94b199774402a5144, type: 3}
94-
m_TerrainDetailGrassBillboard: {fileID: 4800000, guid: 29868e73b638e48ca99a19ea58c48d90, type: 3}
95-
m_TerrainDetailGrass: {fileID: 4800000, guid: e507fdfead5ca47e8b9a768b51c291a1, type: 3}
96223
m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3}
97224
m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3}
98225
m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3}
@@ -175,6 +302,8 @@ MonoBehaviour:
175302
m_CopyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3}
176303
m_CameraMotionVector: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf, type: 3}
177304
m_StencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3}
305+
m_ClusterDeferred: {fileID: 4800000, guid: 222cce62363a44a380c36bf03b392608, type: 3}
306+
m_StencilDitherMaskSeedPS: {fileID: 4800000, guid: 8c3ee818f2efa514c889881ccb2e95a2, type: 3}
178307
m_DBufferClear: {fileID: 4800000, guid: f056d8bd2a1c7e44e9729144b4c70395, type: 3}
179308
- rid: 9008751203876077579
180309
type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime}

Packages/manifest.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
"com.unity.2d.tilemap": "1.0.0",
55
"com.unity.analytics": "3.8.1",
66
"com.unity.feature.2d": "2.0.1",
7-
"com.unity.ide.rider": "3.0.34",
7+
"com.unity.ide.rider": "3.0.38",
88
"com.unity.ide.visualstudio": "2.0.23",
9-
"com.unity.render-pipelines.universal": "17.0.4",
10-
"com.unity.test-framework": "1.5.1",
11-
"com.unity.timeline": "1.8.7",
9+
"com.unity.render-pipelines.universal": "17.2.0",
10+
"com.unity.test-framework": "1.6.0",
11+
"com.unity.timeline": "1.8.9",
1212
"com.unity.ugui": "2.0.0",
13-
"com.unity.visualscripting": "1.9.6",
13+
"com.unity.visualscripting": "1.9.7",
1414
"com.unity.modules.accessibility": "1.0.0",
1515
"com.unity.modules.androidjni": "1.0.0",
1616
"com.unity.modules.animation": "1.0.0",

0 commit comments

Comments
 (0)