diff --git a/Assets/AppleHillsLightingSettings.lighting b/Assets/AppleHillsLightingSettings.lighting new file mode 100644 index 00000000..af109529 --- /dev/null +++ b/Assets/AppleHillsLightingSettings.lighting @@ -0,0 +1,63 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!850595691 &4890085278179872738 +LightingSettings: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: AppleHillsLightingSettings + serializedVersion: 9 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_RealtimeEnvironmentLighting: 1 + m_BounceScale: 1 + m_AlbedoBoost: 1 + m_IndirectOutputScale: 1 + m_UsingShadowmask: 1 + m_BakeBackend: 1 + m_LightmapMaxSize: 1024 + m_LightmapSizeFixed: 0 + m_UseMipmapLimits: 1 + m_BakeResolution: 40 + m_Padding: 2 + m_LightmapCompression: 3 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAO: 0 + m_MixedBakeMode: 2 + m_LightmapsBakeMode: 1 + m_FilterMode: 1 + m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} + m_ExportTrainingData: 0 + m_EnableWorkerProcessBaking: 1 + m_TrainingDataDestination: TrainingData + m_RealtimeResolution: 2 + m_ForceWhiteAlbedo: 0 + m_ForceUpdates: 0 + m_PVRCulling: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_LightProbeSampleCountMultiplier: 4 + m_PVRBounces: 2 + m_PVRMinBounces: 2 + m_PVREnvironmentImportanceSampling: 1 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 1 + m_PVRFilteringGaussRadiusAO: 1 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_RespectSceneVisibilityWhenBakingGI: 0 diff --git a/Assets/AppleHillsLightingSettings.lighting.meta b/Assets/AppleHillsLightingSettings.lighting.meta new file mode 100644 index 00000000..b60fa40c --- /dev/null +++ b/Assets/AppleHillsLightingSettings.lighting.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d13be91f5840cb447b407875cd9bbefc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 4890085278179872738 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AppleHillsRenderPipeline.asset b/Assets/AppleHillsRenderPipeline.asset index d485c10c..afeed58f 100644 --- a/Assets/AppleHillsRenderPipeline.asset +++ b/Assets/AppleHillsRenderPipeline.asset @@ -22,7 +22,7 @@ MonoBehaviour: m_RequireDepthTexture: 0 m_RequireOpaqueTexture: 0 m_OpaqueDownsampling: 1 - m_SupportsTerrainHoles: 1 + m_SupportsTerrainHoles: 0 m_SupportsHDR: 0 m_HDRColorBufferPrecision: 0 m_MSAA: 1 @@ -44,7 +44,7 @@ MonoBehaviour: m_MainLightRenderingMode: 0 m_MainLightShadowsSupported: 0 m_MainLightShadowmapResolution: 2048 - m_AdditionalLightsRenderingMode: 1 + m_AdditionalLightsRenderingMode: 0 m_AdditionalLightsPerObjectLimit: 4 m_AdditionalLightShadowsSupported: 0 m_AdditionalLightsShadowmapResolution: 2048 @@ -71,8 +71,8 @@ MonoBehaviour: m_AdditionalLightsCookieFormat: 3 m_UseSRPBatcher: 1 m_SupportsDynamicBatching: 0 - m_MixedLightingSupported: 1 - m_SupportsLightCookies: 1 + m_MixedLightingSupported: 0 + m_SupportsLightCookies: 0 m_SupportsLightLayers: 0 m_DebugLevel: 0 m_StoreActionsOptimization: 0 @@ -91,7 +91,7 @@ MonoBehaviour: m_LocalShadowsAtlasResolution: 256 m_MaxPixelLights: 0 m_ShadowAtlasResolution: 256 - m_VolumeFrameworkUpdateMode: 0 + m_VolumeFrameworkUpdateMode: 1 m_VolumeProfile: {fileID: 0} apvScenesData: obsoleteSceneBounds: diff --git a/Assets/AppleHillsRenderPipeline_Renderer.asset b/Assets/AppleHillsRenderPipeline_Renderer.asset index 381dea06..7be2267a 100644 --- a/Assets/AppleHillsRenderPipeline_Renderer.asset +++ b/Assets/AppleHillsRenderPipeline_Renderer.asset @@ -53,6 +53,6 @@ MonoBehaviour: m_CameraSortingLayerDownsamplingMethod: 0 m_MaxLightRenderTextureCount: 16 m_MaxShadowRenderTextureCount: 1 - m_PostProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} - m_DefaultMaterialType: 0 + m_PostProcessData: {fileID: 0} + m_DefaultMaterialType: 1 m_DefaultCustomMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} diff --git a/Assets/Scripts/AppleHillsCamera/EdgeAnchor.cs b/Assets/Scripts/AppleHillsCamera/EdgeAnchor.cs index 8b2846f7..212ed8e0 100644 --- a/Assets/Scripts/AppleHillsCamera/EdgeAnchor.cs +++ b/Assets/Scripts/AppleHillsCamera/EdgeAnchor.cs @@ -202,7 +202,7 @@ namespace AppleHillsCamera private void FindCameraAdapter() { // Try to find the camera adapter in the scene - var adapters = FindObjectsOfType(); + var adapters = FindObjectsByType(FindObjectsSortMode.None); if (adapters != null && adapters.Length > 0) { // Prioritize any adapter that's on the same camera we're using diff --git a/Assets/Scripts/UI/CardSystem/BoosterOpeningPage.cs b/Assets/Scripts/UI/CardSystem/BoosterOpeningPage.cs index eb908fad..b340a8c4 100644 --- a/Assets/Scripts/UI/CardSystem/BoosterOpeningPage.cs +++ b/Assets/Scripts/UI/CardSystem/BoosterOpeningPage.cs @@ -54,7 +54,7 @@ namespace UI.CardSystem private void Awake() { _cardManager = CardSystemManager.Instance; - _cardAlbumUI = FindObjectOfType(); + _cardAlbumUI = FindFirstObjectByType(); // Set up button listeners if (openBoosterButton != null)