Bag Fix

Author: alecs000

Assets/Plugins/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset

@@ -4,7 +4,7 @@
 
 public class CameraMovement : MonoBehaviour, IDragHandler, IPointerDownHandler, IPointerUpHandler
 {
-    private const string idCamera = "Camera";
+    public const string idCamera = "Camera";
     private Camera cameraForMove;
     [SerializeField] private float duration = 1;
     [SerializeField] private float startSpeed = 3;

Assets/Scripts/Code/Camera/CameraMovement.cs

@@ -0,0 +1,19 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class RoomService : MonoBehaviour
+{
+    public RoomItems[] roomItems;
+    public RoomItems[] roomSecondItems;
+    void Start()
+    {
+        RoomForFilling.instance.SetRooms(this);
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}

Assets/Scripts/Code/RoomService.cs

@@ -15,8 +15,10 @@ private void Start()
         if (!_isFirstTime)
             return;
         _isFirstTime = false;
+        if(bar == null)
+            return;
         bar.DOFillAmount(1, duration).SetEase(Ease.OutSine)
-        .OnKill(() => playButton.DOFade(1, durationBauutonFade).OnKill(() =>
+        .OnKill(() => playButton?.DOFade(1, durationBauutonFade).OnKill(() =>
         {
             playButton.interactable = true;
             playButton.blocksRaycasts = true;

Assets/Scripts/Code/RoomService.cs.meta

@@ -7,27 +7,45 @@
 public class RoomForFilling : MonoBehaviour
 {
     private const string RoomForFillingIndex = "RoomForFilling";
-    [SerializeField] private RoomItems[] roomItems;
-    [SerializeField] private RoomItems[] roomSecondItems;
+
+    public static RoomForFilling instance = null;
     [SerializeField] private CompleteTask completeTask; 
     [SerializeField] private NovelController novelController;
     private bool _isPrepared;
     private int _fillingIndex;
+
+    private static RoomService roomService;
+    private void Awake()
+    {
+        if (instance == null)
+        {
+            instance = this;
+        }
+        else
+        {
+            Destroy(gameObject);
+        }
+        DontDestroyOnLoad(gameObject);
+    }
     private void Start()
     {
         if (PlayerPrefs.HasKey(RoomForFillingIndex))
         {
             _fillingIndex = PlayerPrefs.GetInt(RoomForFillingIndex);
         }
     }
+    public void SetRooms(RoomService roomService)
+    {
+        RoomForFilling.roomService = roomService;
+    }
     public void ItemsSwitch(UnityAction onSwiched)
     {
-        roomItems[_fillingIndex].SwitchFade(onSwiched);
+        roomService.roomItems[_fillingIndex].SwitchFade(onSwiched);
         _fillingIndex++;
     }
     public void ItemsSwitchNext(UnityAction onSwiched)
     {
-        roomSecondItems[0].SwitchFade(onSwiched);
+        roomService.roomSecondItems[0].SwitchFade(onSwiched);
     }
     private void OnDestroy()
     {

Assets/Scripts/Code/StartGame/StartGameBar.cs

@@ -35,7 +35,7 @@ public class TasksController : MonoBehaviour
     [SerializeField] private TaskScriptableObject[] secondScriptableObjects;
     [SerializeField] private NovelController novelController;
     [SerializeField] private CanvasController canvasController;
-    [SerializeField] private RoomForFilling roomForFilling;
+    private RoomForFilling roomForFilling;
 
     private int _currentTask;
     private bool _isTwoActive;
@@ -49,6 +49,7 @@ public class TasksController : MonoBehaviour
     private bool isSecondTaskExecute;
     private void Start()
     {
+        roomForFilling = RoomForFilling.instance;
         _taskComplite = completeTask;
         _barRefreshed = barTask;
         _taskComplite.Initialize(OnTaskComplete);

Assets/Scripts/Code/Tasks/RoomFilling/RoomForFilling.cs

@@ -17,8 +17,14 @@ public class BarTask : BankDefault, IInit<BarRefreshed>
     private const string precent = "precent";
 
     private event BarRefreshed _barRefreshed;
+    private static bool isFirstTime = true;
     private void Start()
     {
+        if (!isFirstTime)
+        {
+            return;
+        }
+        isFirstTime = false;
         if (PlayerPrefs.HasKey(precent))
         {
             Add(PlayerPrefs.GetInt(precent));
@@ -36,7 +42,7 @@ public override void Add(int addValue)
     }
     public void RefreshBar()
     {
-        barImage.DOFillAmount((float)Value / 100, duration).OnComplete(() =>_barRefreshed?.Invoke());
+        barImage?.DOFillAmount((float)Value / 100, duration).OnComplete(() =>_barRefreshed?.Invoke());
         barText.text = Value.ToString() + "%";
         PlayerPrefs.SetInt(precent, Value);
     }

Assets/Scripts/Code/Tasks/TasksController.cs

@@ -1,7 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
-
+using DG.Tweening;
 namespace Assets.Scripts.Code.UI
 {
     public class CanvasSetter
@@ -18,6 +18,7 @@ public void SetCanvasGroup(CanvasGroup newGroup)
             }
             if (newGroup == null)
                 return;
+            DOTween.Kill(CameraMovement.idCamera);
             _curentCanvas = newGroup;
             _curentCanvas.alpha = 1;
             _curentCanvas.interactable = true;

Assets/Scripts/Code/UI/BarTask.cs

@@ -0,0 +1,14 @@
+{
+  "MonoBehaviour": {
+    "Version": 4,
+    "EnableBurstCompilation": true,
+    "EnableOptimisations": true,
+    "EnableSafetyChecks": false,
+    "EnableDebugInAllBuilds": false,
+    "CpuMinTargetX32": 0,
+    "CpuMaxTargetX32": 0,
+    "CpuMinTargetX64": 0,
+    "CpuMaxTargetX64": 0,
+    "OptimizeFor": 0
+  }
+}