diff --git a/ProjectNLD/Assets/Editor/MapEditor/MapEditorUtils.cs b/ProjectNLD/Assets/Editor/MapEditor/MapEditorUtils.cs index bfdc9483af1..04603f47d0a 100644 --- a/ProjectNLD/Assets/Editor/MapEditor/MapEditorUtils.cs +++ b/ProjectNLD/Assets/Editor/MapEditor/MapEditorUtils.cs @@ -12,6 +12,7 @@ using UnityEngine; using UnityEngine.SceneManagement; using UnityEngine.UIElements; using static UnityEditor.Searcher.SearcherWindow.Alignment; +using Cell = TGS.Cell; public class EditorMap diff --git a/ProjectNLD/Assets/PhxhSDK b/ProjectNLD/Assets/PhxhSDK index 0682b3eedcf..74d089b2d54 160000 --- a/ProjectNLD/Assets/PhxhSDK +++ b/ProjectNLD/Assets/PhxhSDK @@ -1 +1 @@ -Subproject commit 0682b3eedcf56c2bfb7bc8b94ca93ebcc3248313 +Subproject commit 74d089b2d546ff9050401093a411dd59882e1faf diff --git a/ProjectNLD/ProjectSettings/ProjectSettings.asset b/ProjectNLD/ProjectSettings/ProjectSettings.asset index ed3576f1504..330830bae20 100644 --- a/ProjectNLD/ProjectSettings/ProjectSettings.asset +++ b/ProjectNLD/ProjectSettings/ProjectSettings.asset @@ -827,7 +827,7 @@ PlayerSettings: webGLMemoryGeometricGrowthCap: 96 webGLPowerPreference: 2 scriptingDefineSymbols: - Android: ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;ODIN_VALIDATOR;ODIN_VALIDATOR_3_1;USE_HCLR;USE_YOO;NODECANVAS + Android: ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;ODIN_VALIDATOR;ODIN_VALIDATOR_3_1;USE_HCLR;USE_YOO;NODECANVAS;FLOWCANVAS Standalone: ODIN_VALIDATOR;ODIN_VALIDATOR_3_1;ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;TEST_TAPTAP;USE_YOO;USE_HCLR;NODECANVAS Windows Store Apps: ODIN_VALIDATOR;ODIN_VALIDATOR_3_1;ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1 iPhone: ODIN_VALIDATOR;ODIN_VALIDATOR_3_1;ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;USE_YOO;USE_HCLR