diff --git a/Assets/Plugins/Zenject/OptionalExtras/ReflectionBaking/Zenject-ReflectionBaking.csproj.meta b/Assets/Plugins/Zenject/OptionalExtras/ReflectionBaking/Zenject-ReflectionBaking.csproj.meta new file mode 100644 index 0000000..172ff92 --- /dev/null +++ b/Assets/Plugins/Zenject/OptionalExtras/ReflectionBaking/Zenject-ReflectionBaking.csproj.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 91b0b4c77fdd1d24aa1af646e9d29960 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Zenject/OptionalExtras/Signals/Zenject-Signals.csproj.meta b/Assets/Plugins/Zenject/OptionalExtras/Signals/Zenject-Signals.csproj.meta new file mode 100644 index 0000000..4ec1270 --- /dev/null +++ b/Assets/Plugins/Zenject/OptionalExtras/Signals/Zenject-Signals.csproj.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: aebd7ef925dd4fe4690c3238e879f914 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Zenject/Source/Zenject.csproj.meta b/Assets/Plugins/Zenject/Source/Zenject.csproj.meta new file mode 100644 index 0000000..774fd7a --- /dev/null +++ b/Assets/Plugins/Zenject/Source/Zenject.csproj.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8645273165cb7f54290d6eaa1e10ab37 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index 6bfa50a..77d67d3 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -624,7 +624,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 117.06, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &926923760 diff --git a/Assets/Scripts/Core/MainMenu/Authorization.cs b/Assets/Scripts/Core/MainMenu/Authorization.cs index 7b3882f..46a78d8 100644 --- a/Assets/Scripts/Core/MainMenu/Authorization.cs +++ b/Assets/Scripts/Core/MainMenu/Authorization.cs @@ -29,24 +29,6 @@ public class Authorization : MonoBehaviour if (_clientDataService.data != null) { Debug.LogWarning($"данные клианта {_clientDataService.data.id} загружены: город - {(Cities)_clientDataService.data.city}, найдено тэгов - {_clientDataService.data.games.Count}"); - // UniTask.Void(async ()=> - // { - // Response result = new Response(); - // int counter = 0; - - // while(result.responseData == 0) - // { - // Debug.LogWarning($"ещё не все метки найдены ({counter})"); - // result = await _networkService.GetAsync("game/find", $"id={_clientDataService.data.id}", $"game={counter}"); - // Debug.LogWarning(result.responseCode + "/" + result.responseData); - // counter++; - - // await UniTask.Delay(500); - // } - - // Debug.LogWarning($"поздравляем! Ваше место в общем зачете - {result.responseData}"); - // }); - return; } @@ -115,4 +97,4 @@ public class Authorization : MonoBehaviour _menu.Reset(); } } -} +} \ No newline at end of file diff --git a/Assets/Scripts/Installers/AppInstaller.cs b/Assets/Scripts/Installers/AppInstaller.cs index 5ee0867..69df966 100644 --- a/Assets/Scripts/Installers/AppInstaller.cs +++ b/Assets/Scripts/Installers/AppInstaller.cs @@ -8,6 +8,7 @@ public class AppInstaller : MonoInstaller Container.Bind().AsSingle().NonLazy(); Container.Bind().AsSingle(); Container.Bind().AsSingle(); + Container.Bind().AsSingle(); Container.Bind().FromComponentInHierarchy().AsSingle(); } diff --git a/Assets/Scripts/Services/QuestService.cs b/Assets/Scripts/Services/QuestService.cs new file mode 100644 index 0000000..2f4171c --- /dev/null +++ b/Assets/Scripts/Services/QuestService.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +using Cysharp.Threading.Tasks; +using YandexQuest.Models; + +public class QuestService +{ + public QuestService(NetworkService networkService, ClientDataService clientDataService) + { + _networkService = networkService; + _clientDataService = clientDataService; + } + + private readonly NetworkService _networkService; + private readonly ClientDataService _clientDataService; +} diff --git a/Assets/Scripts/Services/QuestService.cs.meta b/Assets/Scripts/Services/QuestService.cs.meta new file mode 100644 index 0000000..ad4ea47 --- /dev/null +++ b/Assets/Scripts/Services/QuestService.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b3fa020437f048c45a0cab622b3d4ef5 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Services/SceneLoadingService.cs b/Assets/Scripts/Services/SceneLoadingService.cs index 1d9ffb4..1cb3063 100644 --- a/Assets/Scripts/Services/SceneLoadingService.cs +++ b/Assets/Scripts/Services/SceneLoadingService.cs @@ -18,4 +18,4 @@ public class SceneLoadingService await SceneManager .LoadSceneAsync(name, LoadSceneMode.Single); } -} +} \ No newline at end of file diff --git a/Assets/Scripts/UI/TagDescriptionsPanel.cs b/Assets/Scripts/UI/TagDescriptionsPanel.cs index 5de2f83..7ee8b7a 100644 --- a/Assets/Scripts/UI/TagDescriptionsPanel.cs +++ b/Assets/Scripts/UI/TagDescriptionsPanel.cs @@ -31,4 +31,4 @@ public class TagDescriptionsPanel : MonoBehaviour } } } -} +} \ No newline at end of file