Merge branch 'implement_task_UI' into feature/task-emote

2025-12-16 18:28:53 +07:00
parent 61b54ee1ba ff50d807a7
commit d8c4bd5e4c
2 changed files with 3 additions and 3 deletions
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e3e518641de396e1b30dd202ff94dc35518476c7efd747501f45f10021136ca7
+oid sha256:dacbdce679588961c84b8352291bd17e3716bc1ee2561e3dd140add411b495c6
 size 10723
@@ -93,11 +93,11 @@ namespace BrewMonster.Network
            m_pElementDataMan = ElementDataManProvider.GetElementDataMan();

 #if UNITY_EDITOR
-         /*   if (TaskTest.Instance &&
+            if (TaskTest.Instance &&
                TaskTest.m_pTaskMan != null)
            {
                m_pTaskMan = TaskTest.m_pTaskMan;
-            }*/
+            }
 #endif
            //	Load task templates
            if (m_pTaskMan == null) m_pTaskMan = new ATaskTemplMan();