diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index f78f9750..c7bed3ad 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -9252,9 +9252,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 'Build date: 2024-02-23 + m_text: 'Build date: 2024-02-27 - Commit #592a236b' + Commit #ad14706' m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2100000, guid: 79459efec17a4d00a321bdcc27bbc385, type: 2} @@ -9558,7 +9558,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -58.700195, y: -206.89996} + m_AnchoredPosition: {x: -58.700134, y: -206.89996} m_SizeDelta: {x: -116, y: 257} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &821904126 diff --git a/Assets/Scripts/OgreeClasses/Room.cs b/Assets/Scripts/OgreeClasses/Room.cs index e1c90306..1d0ef30c 100644 --- a/Assets/Scripts/OgreeClasses/Room.cs +++ b/Assets/Scripts/OgreeClasses/Room.cs @@ -49,7 +49,7 @@ public void SetAreas(SMargin _resDim, SMargin _techDim) reservedZone.localPosition = new(technicalZone.localPosition.x, reservedZone.localPosition.y, technicalZone.localPosition.z); // If tileOffset in template, apply it - if (!string.IsNullOrEmpty(attributes["template"]) && GameManager.instance.roomTemplates.ContainsKey(attributes["template"])) + if (attributes.HasKeyAndValue("template") && GameManager.instance.roomTemplates.ContainsKey(attributes["template"])) { SRoomFromJson template = GameManager.instance.roomTemplates[attributes["template"]]; if (template.tileOffset != null && template.tileOffset.Count != 0) diff --git a/Assets/Scripts/OgreeGenerators/BuildingGenerator.cs b/Assets/Scripts/OgreeGenerators/BuildingGenerator.cs index 179ee047..32ce5161 100644 --- a/Assets/Scripts/OgreeGenerators/BuildingGenerator.cs +++ b/Assets/Scripts/OgreeGenerators/BuildingGenerator.cs @@ -19,7 +19,7 @@ public Building CreateBuilding(SApiObject _bd, Transform _parent) } SBuildingFromJson template = new(); - if (!string.IsNullOrEmpty(_bd.attributes["template"])) + if (_bd.attributes.HasKeyAndValue("template")) { if (GameManager.instance.buildingTemplates.ContainsKey(_bd.attributes["template"])) template = GameManager.instance.buildingTemplates[_bd.attributes["template"]]; @@ -108,7 +108,7 @@ public Room CreateRoom(SApiObject _ro, Transform _parent) } SRoomFromJson template = new(); - if (!string.IsNullOrEmpty(_ro.attributes["template"])) + if (_ro.attributes.HasKeyAndValue("template")) { if (GameManager.instance.roomTemplates.ContainsKey(_ro.attributes["template"])) template = GameManager.instance.roomTemplates[_ro.attributes["template"]]; diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index afc66915..0d197333 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -136,7 +136,7 @@ PlayerSettings: vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 loadStoreDebugModeEnabled: 0 - bundleVersion: 3.3.0 + bundleVersion: 3.3.1 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 @@ -160,7 +160,7 @@ PlayerSettings: applicationIdentifier: Standalone: com.Orness.OGrEE3D buildNumber: - Standalone: 3.3.0 + Standalone: 3.3.1 VisionOS: 0 iPhone: 0 tvOS: 0 @@ -726,10 +726,10 @@ PlayerSettings: PointOfService: False RecordedCallsFolder: False Contacts: False - Proximity: False InternetClient: False CodeGeneration: False BackgroundMediaPlayback: False + Proximity: False metroTargetDeviceFamilies: Desktop: False Holographic: False