From 8bec2f0cf8a87ff35782261b02ee6a15d695d2b3 Mon Sep 17 00:00:00 2001 From: trubkokrtek Date: Sun, 17 May 2026 12:32:20 +0200 Subject: [PATCH] conflict resolve --- Assets/Build Profiles.meta | 8 +++ Assets/GameManager.meta | 2 +- Assets/GameManager/ITask.cs | 54 ++++---------------- Assets/GameManager/ITask.cs.meta | 2 +- Assets/InputSystem_Actions.inputactions.meta | 2 +- Assets/Materials.meta | 2 +- Assets/SampleScene.unity.meta | 7 +++ Assets/Scenes.meta | 2 +- Assets/Scenes/SampleScene.unity.meta | 2 +- Assets/Scripts.meta | 2 +- Assets/Settings.meta | 2 +- Assets/Settings/Build Profiles.meta | 2 +- 12 files changed, 35 insertions(+), 52 deletions(-) create mode 100644 Assets/Build Profiles.meta create mode 100644 Assets/SampleScene.unity.meta diff --git a/Assets/Build Profiles.meta b/Assets/Build Profiles.meta new file mode 100644 index 0000000..1341744 --- /dev/null +++ b/Assets/Build Profiles.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 92df50b8fba934144a4c4dcaf506f9b4 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameManager.meta b/Assets/GameManager.meta index 873ff1f..4511a02 100644 --- a/Assets/GameManager.meta +++ b/Assets/GameManager.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 74c99196e7d046a4497d6aa5ba358650 +guid: bbd26b895bc2b894b8989c08d9fd9197 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/GameManager/ITask.cs b/Assets/GameManager/ITask.cs index 954850d..d38cd2c 100644 --- a/Assets/GameManager/ITask.cs +++ b/Assets/GameManager/ITask.cs @@ -1,53 +1,21 @@ - +//using GeoSus.Client; using System; using UnityEngine; public enum TaskType { - Task //TODO: Typy úkolù + Task } - - public interface ITask { - public string TaskID { get; } // Unikátní ID úkolu pro server - public TaskType TaskType { get; } // Typ úkolu - public string TaskName { get; } // Viditelný název úkolu - public (double, double) TaskLocation { get; } // Polohy na mapì - public bool IsCompleted { get; } // Stav dokonèení úkolu + public string TaskID { get; set; } // Unikátní ID úkolu pro server + public TaskType TaskType { get; set; } // Typ úkolu + public string TaskName { get; set; } // Viditelný název úkolu + public (double, double) TaskLocation { get; set; } // Poloha na mapě + public bool IsCompleted { get; } // Stav dokončení úkolu - void Initialize(Action onCompleted); // Vytvoøení tasku + naètení postupu - void ExitTask(Action onExit); // Pøi opuštìní úkolu poslat hotovo / uložit postup / reset - void Complete(); // Oznaèit úkol jako dokonèený, poslat na server a zavøít - -} -/* Ukázoková implementace ITask -public class Wires : ITask{ - public string TaskID { get; set; } // Unikátní ID úkolu pro server - public TaskType TaskType { get; set; } // Typ úkolu - public string TaskName { get; set; } // Viditelný název úkolu - public (double, double) TaskLocation { get; set; } // Poloha na mapì - public bool IsCompleted { get; private set; } // Stav dokonèení úkolu - private Action _onCompleted; - - public void Initialize(Action onCompleted) // Vytvoøení tasku - { - IsCompleted = false; - _onCompleted = onCompleted; - } - public void ExitTask(Action onExit) //Zavøení tasku - { - onExit?.Invoke(this); - } - public void Complete() // Dokonèení tasku a zavøení - { - IsCompleted = true; - _onCompleted?.Invoke(this); - ExitTask(null); - } - - - -} -*/ \ No newline at end of file + void Initialize(Action onCompleted); // Vytvoření tasku + void ExitTask(Action onExit); // Při opuštění úkolu + void Complete(); // Označit úkol jako dokončený +} \ No newline at end of file diff --git a/Assets/GameManager/ITask.cs.meta b/Assets/GameManager/ITask.cs.meta index 13f9691..699bcbd 100644 --- a/Assets/GameManager/ITask.cs.meta +++ b/Assets/GameManager/ITask.cs.meta @@ -1,2 +1,2 @@ fileFormatVersion: 2 -guid: 743fed9d96a90254c88556de9fee92b0 \ No newline at end of file +guid: 00f17be43b5049645915f193bf99516b \ No newline at end of file diff --git a/Assets/InputSystem_Actions.inputactions.meta b/Assets/InputSystem_Actions.inputactions.meta index fd7a0e1..aa786fd 100644 --- a/Assets/InputSystem_Actions.inputactions.meta +++ b/Assets/InputSystem_Actions.inputactions.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bfd97d0fee743f945a3d47b571fe9f20 +guid: 55b6abf6106d3da4d9a6d0550a804f3b DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Materials.meta b/Assets/Materials.meta index 79c20b5..266e4ff 100644 --- a/Assets/Materials.meta +++ b/Assets/Materials.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2f6ce7f674a77664ead5dbb89193e587 +guid: 2230bf768ecb84610af77bea6cdd7074 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/SampleScene.unity.meta b/Assets/SampleScene.unity.meta new file mode 100644 index 0000000..26ca479 --- /dev/null +++ b/Assets/SampleScene.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8afa6ce05eb7dba4c894b910786e3baf +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes.meta b/Assets/Scenes.meta index 8127f0b..7cef089 100644 --- a/Assets/Scenes.meta +++ b/Assets/Scenes.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fe6cecdde8bb6e1489d0b7e5b793ce84 +guid: 5e17b3a6c19f5404d8d097400a844a60 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scenes/SampleScene.unity.meta b/Assets/Scenes/SampleScene.unity.meta index a99c8c0..26ca479 100644 --- a/Assets/Scenes/SampleScene.unity.meta +++ b/Assets/Scenes/SampleScene.unity.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6a18d9b328b6a794da5d050347950362 +guid: 8afa6ce05eb7dba4c894b910786e3baf DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Scripts.meta b/Assets/Scripts.meta index deb330a..d373b7b 100644 --- a/Assets/Scripts.meta +++ b/Assets/Scripts.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b8ce5b30e6200134bae071db3ae43149 +guid: 50c3453b214b4c24487f630d82fff48b folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Settings.meta b/Assets/Settings.meta index ffe1a26..2c0538e 100644 --- a/Assets/Settings.meta +++ b/Assets/Settings.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3c41f51487bbe394b9b8568d1b254bd4 +guid: 148cdcfbaffe4a24b85ef92b75ce4ff7 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Settings/Build Profiles.meta b/Assets/Settings/Build Profiles.meta index 13cdcd4..1341744 100644 --- a/Assets/Settings/Build Profiles.meta +++ b/Assets/Settings/Build Profiles.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bbad6d4e785a4584da7dda5f1bda30d5 +guid: 92df50b8fba934144a4c4dcaf506f9b4 folderAsset: yes DefaultImporter: externalObjects: {}