From ba2ba988969a4d8b57aa1ddf7e07c60ec7c12e6f Mon Sep 17 00:00:00 2001 From: Dane Miller Date: Sun, 21 Jul 2024 11:03:03 -0500 Subject: [PATCH] feature: added loading screen able to transition to zones with single player --- .idea/.idea.evershade/.idea/workspace.xml | 394 +- Assets/Art/.DS_Store | Bin 10244 -> 10244 bytes .../AutoSave [StartMenu.unity] 09h12m.unity | 25394 ---------------- .../AutoSave [StartMenu.unity] 09h19m.unity | 25394 ---------------- .../AutoSave [StartMenu.unity] 09h59m.unity | 25394 ---------------- .../AutoSave [StartMenu.unity] 10h12m.unity | 22653 ++++++++++++++ ...oSave [StartMenu.unity] 10h12m.unity.meta} | 0 .../AutoSave [StartMenu.unity] 10h17m.unity | 22653 ++++++++++++++ ...oSave [StartMenu.unity] 10h17m.unity.meta} | 0 .../AutoSave [StartMenu.unity] 10h22m.unity | 22653 ++++++++++++++ ...oSave [StartMenu.unity] 10h22m.unity.meta} | 0 .../AutoSave [StartMenu.unity] 10h26m.unity | 25394 ---------------- ...> AutoSave [StartMenu.unity] 10h27m.unity} | 3262 +- ...oSave [StartMenu.unity] 10h27m.unity.meta} | 0 .../AutoSave [StartMenu.unity] 10h31m.unity | 25394 ---------------- ...> AutoSave [StartMenu.unity] 10h33m.unity} | 3262 +- ...oSave [StartMenu.unity] 10h33m.unity.meta} | 0 .../AutoSave [StartMenu.unity] 10h36m.unity | 25394 ---------------- ...> AutoSave [StartMenu.unity] 10h38m.unity} | 3312 +- ...oSave [StartMenu.unity] 10h38m.unity.meta} | 0 ...> AutoSave [StartMenu.unity] 10h43m.unity} | 3313 +- ...oSave [StartMenu.unity] 10h43m.unity.meta} | 0 .../AutoSave [StartMenu.unity] 10h48m.unity | 22804 ++++++++++++++ ...oSave [StartMenu.unity] 10h48m.unity.meta} | 0 .../AutoSave [StartMenu.unity] 10h53m.unity | 22804 ++++++++++++++ ...oSave [StartMenu.unity] 10h53m.unity.meta} | 0 .../AutoSave [StartMenu.unity] 11h00m.unity | 22804 ++++++++++++++ ...oSave [StartMenu.unity] 11h00m.unity.meta} | 0 Assets/DefaultPrefabObjects.asset | 1 + Assets/DraggableUIPanel.cs | 49 + Assets/DraggableUIPanel.cs.meta | 11 + .../Prefabs/EnvironmentManager.prefab | 160 + .../Prefabs/EnvironmentManager.prefab.meta | 7 + Assets/Resources/Prefabs/GameManager.prefab | 82 +- Assets/Resources/Prefabs/Main Camera.prefab | 16 +- .../Resources/Prefabs/NetworkManager.prefab | 2 +- Assets/Resources/Prefabs/Player.prefab | 1168 + .../Prefabs/SimpleGameManager.prefab | 5 +- Assets/Resources/Prefabs/UI/UICanvas.prefab | 1546 +- Assets/Scenes/FarmMap.unity | 236 +- Assets/Scenes/StartMenu.unity | 449 +- .../Grid/BoxInteractiveComponent.cs | 1 + Assets/Scripts/GameInit.cs | 23 +- Assets/Scripts/Managers/GameManager.cs | 7 +- Assets/Scripts/Managers/GameTimeManager.cs | 60 +- Assets/Scripts/Managers/PlayerManager.cs | 12 +- Assets/Scripts/Managers/UIManager.cs | 318 +- Assets/Scripts/SceneLoader.cs | 3 + Assets/Scripts/UI/EquipmentUIController.cs | 7 + Assets/Scripts/UI/GameTimeUIManager.cs | 265 + Assets/Scripts/UI/GameTimeUIManager.cs.meta | 3 + Assets/Scripts/UI/InventoryUIController.cs | 1 - .../Scripts/UI/LoadingScreenUIController.cs | 54 + .../UI/LoadingScreenUIController.cs.meta | 3 + Assets/Scripts/UI/ToolbarUIController.cs | 6 +- Assets/SideBarUIController.cs | 10 +- 56 files changed, 141100 insertions(+), 165683 deletions(-) delete mode 100644 Assets/AutoSave/AutoSave [StartMenu.unity] 09h12m.unity delete mode 100644 Assets/AutoSave/AutoSave [StartMenu.unity] 09h19m.unity delete mode 100644 Assets/AutoSave/AutoSave [StartMenu.unity] 09h59m.unity create mode 100644 Assets/AutoSave/AutoSave [StartMenu.unity] 10h12m.unity rename Assets/AutoSave/{AutoSave [StartMenu.unity] 10h31m.unity.meta => AutoSave [StartMenu.unity] 10h12m.unity.meta} (100%) create mode 100644 Assets/AutoSave/AutoSave [StartMenu.unity] 10h17m.unity rename Assets/AutoSave/{AutoSave [StartMenu.unity] 10h36m.unity.meta => AutoSave [StartMenu.unity] 10h17m.unity.meta} (100%) create mode 100644 Assets/AutoSave/AutoSave [StartMenu.unity] 10h22m.unity rename Assets/AutoSave/{AutoSave [StartMenu.unity] 08h51m.unity.meta => AutoSave [StartMenu.unity] 10h22m.unity.meta} (100%) delete mode 100644 Assets/AutoSave/AutoSave [StartMenu.unity] 10h26m.unity rename Assets/AutoSave/{AutoSave [StartMenu.unity] 08h51m.unity => AutoSave [StartMenu.unity] 10h27m.unity} (83%) rename Assets/AutoSave/{AutoSave [StartMenu.unity] 08h56m.unity.meta => AutoSave [StartMenu.unity] 10h27m.unity.meta} (100%) delete mode 100644 Assets/AutoSave/AutoSave [StartMenu.unity] 10h31m.unity rename Assets/AutoSave/{AutoSave [StartMenu.unity] 08h56m.unity => AutoSave [StartMenu.unity] 10h33m.unity} (83%) rename Assets/AutoSave/{AutoSave [StartMenu.unity] 09h02m.unity.meta => AutoSave [StartMenu.unity] 10h33m.unity.meta} (100%) delete mode 100644 Assets/AutoSave/AutoSave [StartMenu.unity] 10h36m.unity rename Assets/AutoSave/{AutoSave [StartMenu.unity] 09h02m.unity => AutoSave [StartMenu.unity] 10h38m.unity} (83%) rename Assets/AutoSave/{AutoSave [StartMenu.unity] 09h07m.unity.meta => AutoSave [StartMenu.unity] 10h38m.unity.meta} (100%) rename Assets/AutoSave/{AutoSave [StartMenu.unity] 09h07m.unity => AutoSave [StartMenu.unity] 10h43m.unity} (83%) rename Assets/AutoSave/{AutoSave [StartMenu.unity] 09h19m.unity.meta => AutoSave [StartMenu.unity] 10h43m.unity.meta} (100%) create mode 100644 Assets/AutoSave/AutoSave [StartMenu.unity] 10h48m.unity rename Assets/AutoSave/{AutoSave [StartMenu.unity] 09h12m.unity.meta => AutoSave [StartMenu.unity] 10h48m.unity.meta} (100%) create mode 100644 Assets/AutoSave/AutoSave [StartMenu.unity] 10h53m.unity rename Assets/AutoSave/{AutoSave [StartMenu.unity] 09h59m.unity.meta => AutoSave [StartMenu.unity] 10h53m.unity.meta} (100%) create mode 100644 Assets/AutoSave/AutoSave [StartMenu.unity] 11h00m.unity rename Assets/AutoSave/{AutoSave [StartMenu.unity] 10h26m.unity.meta => AutoSave [StartMenu.unity] 11h00m.unity.meta} (100%) create mode 100644 Assets/DraggableUIPanel.cs create mode 100644 Assets/DraggableUIPanel.cs.meta create mode 100644 Assets/Resources/Prefabs/EnvironmentManager.prefab create mode 100644 Assets/Resources/Prefabs/EnvironmentManager.prefab.meta create mode 100644 Assets/Scripts/UI/GameTimeUIManager.cs create mode 100644 Assets/Scripts/UI/GameTimeUIManager.cs.meta create mode 100644 Assets/Scripts/UI/LoadingScreenUIController.cs create mode 100644 Assets/Scripts/UI/LoadingScreenUIController.cs.meta diff --git a/.idea/.idea.evershade/.idea/workspace.xml b/.idea/.idea.evershade/.idea/workspace.xml index dacc7d08e..2fffc8807 100644 --- a/.idea/.idea.evershade/.idea/workspace.xml +++ b/.idea/.idea.evershade/.idea/workspace.xml @@ -5,330 +5,75 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - + + + + + + + + + + +