fix: issues with menus not displaying
This commit is contained in:
Dane Miller
parent
d4d08d9d02
commit
55f783ca18
|
|
@ -5,102 +5,63 @@
|
|||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="47606719-2968-4305-803e-946819e5b507" name="Changes" comment="">
|
||||
<change afterPath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 08h29m.unity" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 08h29m.unity.meta" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 09h11m.unity" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 09h11m.unity.meta" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 11h02m.unity" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 11h02m.unity.meta" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 11h07m.unity" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 11h07m.unity.meta" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 11h12m.unity" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 11h12m.unity.meta" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 11h18m.unity" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 11h18m.unity.meta" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 11h28m.unity" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 11h28m.unity.meta" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 11h33m.unity" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 11h33m.unity.meta" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 11h52m.unity" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 11h52m.unity.meta" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 12h13m.unity" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 12h13m.unity.meta" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Assets/Resources/Prefabs/UI/LabeledInput.prefab" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Assets/Resources/Prefabs/UI/LabeledInput.prefab.meta" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Assets/Resources/Prefabs/UI/LeftOutButton.prefab" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Assets/Resources/Prefabs/UI/LeftOutButton.prefab.meta" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Assets/Resources/Prefabs/UI/RightOutButton.prefab" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Assets/Resources/Prefabs/UI/RightOutButton.prefab.meta" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Assets/Scripts/UI/NewGameMenuUIController.cs" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Assets/Scripts/UI/NewGameMenuUIController.cs.meta" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Assets/Scripts/Utils/GameLogger.cs" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Assets/Scripts/Utils/GameLogger.cs.meta" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Assets/Art/Selected Item.png" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Assets/Art/Selected Item.png.meta" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 03h51m.unity" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 03h51m.unity.meta" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 07h35m.unity" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 07h35m.unity.meta" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 10h59m.unity" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 10h59m.unity.meta" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 11h04m.unity" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 11h04m.unity.meta" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 11h09m.unity" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 11h09m.unity.meta" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 11h14m.unity" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 11h14m.unity.meta" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 11h19m.unity" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 11h19m.unity.meta" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 11h24m.unity" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 11h24m.unity.meta" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 11h30m.unity" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 11h30m.unity.meta" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 11h35m.unity" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 11h35m.unity.meta" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 11h44m.unity" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 11h44m.unity.meta" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/.idea.evershade/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.evershade/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Art/Unorganized/Simple Pixel Gui #1/Pre made/Character/All elements/Name element 01.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Art/Unorganized/Simple Pixel Gui #1/Pre made/Character/All elements/Name element 01.png.meta" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 17h13m.unity" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 17h13m.unity.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 17h18m.unity" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 17h18m.unity.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 17h21m.unity" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 17h21m.unity.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 17h26m.unity" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 17h26m.unity.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 17h31m.unity" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 17h31m.unity.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 17h36m.unity" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 17h36m.unity.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 17h41m.unity" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 17h41m.unity.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 17h46m.unity" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 17h46m.unity.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 17h51m.unity" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 17h51m.unity.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 17h56m.unity" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 17h56m.unity.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/DefaultPrefabObjects.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/DefaultPrefabObjects.asset" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Resources/Prefabs/SceneChangeTrigger.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Prefabs/SceneChangeTrigger.prefab" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Resources/Prefabs/SimpleGameManager.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Prefabs/SimpleGameManager.prefab" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Resources/Prefabs/UI/DefaultPanel.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Prefabs/UI/DefaultPanel.prefab" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Resources/Prefabs/UI/SliderGroup.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Prefabs/UI/SliderGroup.prefab" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Resources/Prefabs/UI/UICanvas.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Prefabs/UI/UICanvas.prefab" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 08h29m.unity" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 08h29m.unity.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 09h11m.unity" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 09h11m.unity.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 11h02m.unity" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 11h02m.unity.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 11h07m.unity" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 11h07m.unity.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 11h12m.unity" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 11h12m.unity.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 11h18m.unity" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 11h18m.unity.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 11h28m.unity" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 11h28m.unity.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 11h33m.unity" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 11h33m.unity.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 11h52m.unity" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 11h52m.unity.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 12h13m.unity" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/AutoSave/AutoSave [StartMenu.unity] 12h13m.unity.meta" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Resources/Prefabs/Player.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Prefabs/Player.prefab" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scenes/StartMenu.unity" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scenes/StartMenu.unity" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Components/UI/ItemComponent.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Components/UI/ItemComponent.cs" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Components/UI/SlotComponent.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Components/UI/SlotComponent.cs" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scripts/ConnectionStarter.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/ConnectionStarter.cs" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scripts/GameInit.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/GameInit.cs" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Handlers/InteractiveHander.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Handlers/InteractiveHander.cs" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Handlers/ItemHandler.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Handlers/ItemHandler.cs" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Handlers/SlotHandler.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Handlers/SlotHandler.cs" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Handlers/TileHandler.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Handlers/TileHandler.cs" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Managers/CropManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Managers/CropManager.cs" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Managers/GameManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Managers/GameManager.cs" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Managers/GameTimeManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Managers/GameTimeManager.cs" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Managers/GridManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Managers/GridManager.cs" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Managers/HotkeyManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Managers/HotkeyManager.cs" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Managers/InteractableManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Managers/InteractableManager.cs" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Managers/Item/EquipmentManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Managers/Item/EquipmentManager.cs" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Managers/Item/InventoryManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Managers/Item/InventoryManager.cs" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Managers/MapManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Managers/MapManager.cs" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Managers/PlayerManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Managers/PlayerManager.cs" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Managers/PrefabManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Managers/PrefabManager.cs" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Managers/SaveManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Managers/SaveManager.cs" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Managers/UIManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Managers/UIManager.cs" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scripts/PlayerController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/PlayerController.cs" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scripts/SceneLoader.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/SceneLoader.cs" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Types/GamePlayer.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Types/GamePlayer.cs" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scripts/UI/BoxUIController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/UI/BoxUIController.cs" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scripts/UI/EquipmentUIController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/UI/EquipmentUIController.cs" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scripts/UI/GameTimeUIManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/UI/GameTimeUIManager.cs" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scripts/UI/HotkeyUIController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/UI/HotkeyUIController.cs" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scripts/UI/InventoryUIController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/UI/InventoryUIController.cs" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scripts/UI/LoadMenuUIController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/UI/LoadMenuUIController.cs" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scripts/UI/MainMenuUIController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/UI/MainMenuUIController.cs" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scripts/UI/NetworkChatUIController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/UI/NetworkChatUIController.cs" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scripts/UI/LoadingScreenUIController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/UI/LoadingScreenUIController.cs" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scripts/UI/NetworkUIController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/UI/NetworkUIController.cs" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scripts/UI/SettingsMenuUIController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/UI/SettingsMenuUIController.cs" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scripts/UI/ToolbarUIController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/UI/ToolbarUIController.cs" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Utils/NetworkManagerHelper.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Utils/NetworkManagerHelper.cs" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/TextMesh Pro/Fonts/Retro Gaming.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/TextMesh Pro/Fonts/Retro Gaming.asset" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scripts/UI/NewGameMenuUIController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/UI/NewGameMenuUIController.cs" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/SideBarUIController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/SideBarUIController.cs" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/evershade.tiled-session" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/evershade.tiled-session" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
|
|
@ -112,6 +73,7 @@
|
|||
</component>
|
||||
<component name="HighlightingSettingsPerFile">
|
||||
<setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/0cb224eb538e444dafbd4350240431dcc5200/7b/5da1809e/LocalConnectionState.cs" root0="SKIP_HIGHLIGHTING" />
|
||||
<setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/92f8bbba597a4c848e8aa06f7ebfe3ad175800/74/2d17ae27/GameObject.cs" root0="SKIP_HIGHLIGHTING" />
|
||||
<setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/SourcesCache/d44b17e136d09081da1e8fd0e8c83fde60e11818b9f2442d7ed8cb733fae895e/System.Collections.Generic.cs" root0="SKIP_HIGHLIGHTING" />
|
||||
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.firstgeargames.fishnet@c0fc71e014/CodeGenerating/Extension/FieldDefinitionExtensions.cs" root0="SKIP_HIGHLIGHTING" />
|
||||
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.firstgeargames.fishnet@c0fc71e014/CodeGenerating/Processing/SyncTypeProcessor.cs" root0="SKIP_HIGHLIGHTING" />
|
||||
|
|
@ -119,8 +81,12 @@
|
|||
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.firstgeargames.fishnet@c0fc71e014/Runtime/Generated/Component/Spawning/PlayerSpawner.cs" root0="SKIP_HIGHLIGHTING" />
|
||||
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.firstgeargames.fishnet@c0fc71e014/Runtime/InstanceFinder.cs" root0="SKIP_HIGHLIGHTING" />
|
||||
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.firstgeargames.fishnet@c0fc71e014/Runtime/Managing/Client/ClientManager.cs" root0="SKIP_HIGHLIGHTING" />
|
||||
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.firstgeargames.fishnet@c0fc71e014/Runtime/Managing/Logging/LevelLoggingConfiguration.cs" root0="SKIP_HIGHLIGHTING" />
|
||||
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.firstgeargames.fishnet@c0fc71e014/Runtime/Managing/Logging/LevelLoggingConfiguration.cs" root0="FORCE_HIGHLIGHTING" />
|
||||
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.firstgeargames.fishnet@c0fc71e014/Runtime/Managing/NetworkManager.Logging.cs" root0="FORCE_HIGHLIGHTING" />
|
||||
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.firstgeargames.fishnet@c0fc71e014/Runtime/Managing/NetworkManager.cs" root0="SKIP_HIGHLIGHTING" />
|
||||
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.firstgeargames.fishnet@c0fc71e014/Runtime/Managing/Scened/Events/LoadSceneEventArgs.cs" root0="SKIP_HIGHLIGHTING" />
|
||||
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.firstgeargames.fishnet@c0fc71e014/Runtime/Managing/Scened/LoadUnloadDatas/SceneLoadData.cs" root0="FORCE_HIGHLIGHTING" />
|
||||
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.firstgeargames.fishnet@c0fc71e014/Runtime/Managing/Scened/SceneManager.cs" root0="SKIP_HIGHLIGHTING" />
|
||||
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.firstgeargames.fishnet@c0fc71e014/Runtime/Managing/Server/Object/ServerObjects.cs" root0="SKIP_HIGHLIGHTING" />
|
||||
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.firstgeargames.fishnet@c0fc71e014/Runtime/Managing/Server/ServerManager.cs" root0="SKIP_HIGHLIGHTING" />
|
||||
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.firstgeargames.fishnet@c0fc71e014/Runtime/Managing/Timing/TimeManager.cs" root0="SKIP_HIGHLIGHTING" />
|
||||
|
|
@ -129,9 +95,12 @@
|
|||
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.firstgeargames.fishnet@c0fc71e014/Runtime/Object/Synchronizing/SyncVar.cs" root0="SKIP_HIGHLIGHTING" />
|
||||
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.firstgeargames.fishnet@c0fc71e014/Runtime/Transporting/EventStructures.cs" root0="SKIP_HIGHLIGHTING" />
|
||||
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.firstgeargames.fishnet@c0fc71e014/Runtime/Utility/Performance/DefaultObjectPool.cs" root0="SKIP_HIGHLIGHTING" />
|
||||
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.unity.cinemachine@2.10.0/Runtime/Behaviours/CinemachineBrain.cs" root0="SKIP_HIGHLIGHTING" />
|
||||
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.unity.render-pipelines.core@14.0.10/Runtime/PostProcessing/Shaders/ffx/ffx_fsr1.hlsl" root0="SKIP_HIGHLIGHTING" />
|
||||
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.unity.textmeshpro@3.0.6/Scripts/Runtime/TMP_Text.cs" root0="SKIP_HIGHLIGHTING" />
|
||||
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.unity.ugui@1.0.0/Editor/UI/SpriteDrawUtility.cs" root0="SKIP_HIGHLIGHTING" />
|
||||
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.unity.ugui@1.0.0/Runtime/EventSystem/EventSystem.cs" root0="SKIP_HIGHLIGHTING" />
|
||||
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.unity.ugui@1.0.0/Runtime/UI/Core/FontUpdateTracker.cs" root0="SKIP_HIGHLIGHTING" />
|
||||
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.unity.ugui@1.0.0/Runtime/UI/Core/Layout/LayoutGroup.cs" root0="SKIP_HIGHLIGHTING" />
|
||||
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.unity.ugui@1.0.0/Runtime/UI/Core/Utility/ReflectionMethodsCache.cs" root0="SKIP_HIGHLIGHTING" />
|
||||
<setting file="file://$PROJECT_DIR$/../evershade_clone_0/Assets/Scripts/Managers/GameManager.cs" root0="SKIP_HIGHLIGHTING" />
|
||||
|
|
@ -239,7 +208,10 @@
|
|||
<workItem from="1721672428730" duration="19126000" />
|
||||
<workItem from="1721839050036" duration="5350000" />
|
||||
<workItem from="1721912978679" duration="6819000" />
|
||||
<workItem from="1721919814861" duration="5050000" />
|
||||
<workItem from="1721919814861" duration="8460000" />
|
||||
<workItem from="1722261682858" duration="9394000" />
|
||||
<workItem from="1722273413223" duration="7847000" />
|
||||
<workItem from="1722873425185" duration="3443000" />
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
After Width: | Height: | Size: 353 B |
|
|
@ -0,0 +1,127 @@
|
|||
fileFormatVersion: 2
|
||||
guid: dccb66f2958234e71a4a68c4657a2140
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
serializedVersion: 12
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
flipGreenChannel: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
vTOnly: 0
|
||||
ignoreMipmapLimit: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 0
|
||||
aniso: 1
|
||||
mipBias: 0
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 0
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 32
|
||||
spriteBorder: {x: 10, y: 10, z: 10, w: 10}
|
||||
spriteGenerateFallbackPhysicsShape: 0
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
flipbookRows: 1
|
||||
flipbookColumns: 1
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
ignorePngGamma: 0
|
||||
applyGammaDecoding: 0
|
||||
swizzle: 50462976
|
||||
cookieLightType: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 3
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 0
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: WebGL
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 5e97eb03825dee720800000000000000
|
||||
internalID: 1537655665
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
nameFileIdTable: {}
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -1163,7 +1163,6 @@ GameObject:
|
|||
- component: {fileID: 111811051}
|
||||
- component: {fileID: 111811050}
|
||||
- component: {fileID: 111811049}
|
||||
- component: {fileID: 111811053}
|
||||
m_Layer: 5
|
||||
m_Name: Canvas
|
||||
m_TagString: Untagged
|
||||
|
|
@ -1228,7 +1227,7 @@ Canvas:
|
|||
m_OverrideSorting: 0
|
||||
m_OverridePixelPerfect: 0
|
||||
m_SortingBucketNormalizedSize: 0
|
||||
m_VertexColorAlwaysGammaSpace: 1
|
||||
m_VertexColorAlwaysGammaSpace: 0
|
||||
m_AdditionalShaderChannelsFlag: 25
|
||||
m_UpdateRectTransformForStandalone: 0
|
||||
m_SortingLayerID: 0
|
||||
|
|
@ -1255,52 +1254,6 @@ RectTransform:
|
|||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0, y: 0}
|
||||
--- !u!114 &111811053
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 111811048}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 26b716c41e9b56b4baafaf13a523ba2e, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
<IsNested>k__BackingField: 0
|
||||
<ComponentIndex>k__BackingField: 0
|
||||
<PredictedSpawn>k__BackingField: {fileID: 0}
|
||||
_networkBehaviours:
|
||||
- {fileID: 0}
|
||||
<SerializedRootNetworkBehaviour>k__BackingField: {fileID: 0}
|
||||
<NestedRootNetworkBehaviours>k__BackingField: []
|
||||
SerializedTransformProperties:
|
||||
Position: {x: 0, y: 0, z: 0}
|
||||
Rotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
LocalScale: {x: 0.015625, y: 0.015625, z: 0.015625}
|
||||
_isNetworked: 1
|
||||
_isSpawnable: 1
|
||||
_isGlobal: 0
|
||||
_initializeOrder: 0
|
||||
_defaultDespawnType: 0
|
||||
NetworkObserver: {fileID: 0}
|
||||
_enablePrediction: 0
|
||||
_predictionType: 0
|
||||
_graphicalObject: {fileID: 0}
|
||||
_detachGraphicalObject: 0
|
||||
_enableStateForwarding: 1
|
||||
_networkTransform: {fileID: 0}
|
||||
_ownerInterpolation: 1
|
||||
_ownerSmoothedProperties: 255
|
||||
_adaptiveInterpolation: 3
|
||||
_spectatorSmoothedProperties: 255
|
||||
_spectatorInterpolation: 2
|
||||
_enableTeleport: 0
|
||||
_teleportThreshold: 1
|
||||
<PrefabId>k__BackingField: 0
|
||||
<SpawnableCollectionId>k__BackingField: 0
|
||||
<SceneId>k__BackingField: 4276043767
|
||||
<AssetPathHash>k__BackingField: 0
|
||||
--- !u!1 &130547985
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1816,7 +1769,19 @@ MonoBehaviour:
|
|||
m_TargetGraphic: {fileID: 182014008}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 1616399201}
|
||||
m_TargetAssemblyTypeName: UI.NetworkUIController, Assembly-CSharp
|
||||
m_MethodName: OnClick_HostSave
|
||||
m_Mode: 1
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 0}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||
m_IntArgument: 0
|
||||
m_FloatArgument: 0
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
--- !u!114 &182014008
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -5860,11 +5825,11 @@ PrefabInstance:
|
|||
- target: {fileID: 5186788049215247401, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: _networkBehaviours.Array.data[2]
|
||||
value:
|
||||
objectReference: {fileID: 802857225}
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5186788049215247401, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: _networkBehaviours.Array.data[3]
|
||||
value:
|
||||
objectReference: {fileID: 802857225}
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5551679991364744983, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: _networkObjectCache
|
||||
value:
|
||||
|
|
@ -5883,9 +5848,6 @@ PrefabInstance:
|
|||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents:
|
||||
- targetCorrespondingSourceObject: {fileID: 3463712308332304479, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 802857225}
|
||||
- targetCorrespondingSourceObject: {fileID: 3463712308332304479, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 802857226}
|
||||
|
|
@ -8407,7 +8369,19 @@ MonoBehaviour:
|
|||
m_TargetGraphic: {fileID: 749609760}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 1616399201}
|
||||
m_TargetAssemblyTypeName: UI.NetworkUIController, Assembly-CSharp
|
||||
m_MethodName: OnClick_HostNew
|
||||
m_Mode: 1
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 0}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||
m_IntArgument: 0
|
||||
m_FloatArgument: 0
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
--- !u!114 &749609760
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -9051,23 +9025,6 @@ GameObject:
|
|||
m_CorrespondingSourceObject: {fileID: 3463712308332304479, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
m_PrefabInstance: {fileID: 508924468}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &802857225
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 802857222}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 624abc0263964a90b146b5a469faec83, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_componentIndexCache: 2
|
||||
_addedNetworkObject: {fileID: 508924470}
|
||||
_networkObjectCache: {fileID: 508924470}
|
||||
sceneName: FarmMap
|
||||
spawnPosition: {x: 30, y: -30, z: 0}
|
||||
--- !u!114 &802857226
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -18481,9 +18438,10 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: 7c3b98530e3241059bebd2507fba1aeb, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
NewGameMenuPanel: {fileID: 1806475497}
|
||||
newGameMenuPanel: {fileID: 0}
|
||||
startButton: {fileID: 145700808}
|
||||
closeButton: {fileID: 189243196}
|
||||
sceneLoaderPrefab: {fileID: 3463712308332304479, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
--- !u!1 &1809992728
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -19164,6 +19122,81 @@ RectTransform:
|
|||
m_AnchoredPosition: {x: -0, y: 0}
|
||||
m_SizeDelta: {x: 200, y: 50}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &1883866845
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1883866846}
|
||||
- component: {fileID: 1883866848}
|
||||
- component: {fileID: 1883866847}
|
||||
m_Layer: 5
|
||||
m_Name: Selected
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1883866846
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1883866845}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 2076652141}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 17.66, y: -70.4}
|
||||
m_SizeDelta: {x: 84.13, y: 32.55}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1883866847
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1883866845}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: dccb66f2958234e71a4a68c4657a2140, type: 3}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!222 &1883866848
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1883866845}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &1917908165
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -20626,6 +20659,7 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 762579828}
|
||||
- {fileID: 733574051}
|
||||
- {fileID: 1883866846}
|
||||
- {fileID: 1616399198}
|
||||
- {fileID: 1806475496}
|
||||
- {fileID: 194685434}
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: cb967f40f2f644396ba5d8822b0a9b79
|
||||
guid: a3d490847ad2340dfadcc9adf0e709dc
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
|
@ -156,10 +156,10 @@ RectTransform:
|
|||
- {fileID: 240183719}
|
||||
m_Father: {fileID: 2004223566}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 123.95, y: -15}
|
||||
m_SizeDelta: {x: 247.9, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &573576
|
||||
MonoBehaviour:
|
||||
|
|
@ -12704,7 +12704,7 @@ RectTransform:
|
|||
m_Father: {fileID: 1546412293}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 2.5, y: -1.0999985}
|
||||
m_SizeDelta: {x: 20, y: 20}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
|
|
@ -16676,7 +16676,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &1616399198
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -16797,7 +16797,7 @@ RectTransform:
|
|||
m_Father: {fileID: 1232391833}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 20, y: 20}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
|
|
@ -18438,7 +18438,7 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: 7c3b98530e3241059bebd2507fba1aeb, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
NewGameMenuPanel: {fileID: 1806475497}
|
||||
newGameMenuPanel: {fileID: 0}
|
||||
startButton: {fileID: 145700808}
|
||||
closeButton: {fileID: 189243196}
|
||||
sceneLoaderPrefab: {fileID: 3463712308332304479, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
|
|
@ -20961,7 +20961,7 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4266674212497729599, guid: 694b3c4677563481197ae69c6aa2041a, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -156,10 +156,10 @@ RectTransform:
|
|||
- {fileID: 240183719}
|
||||
m_Father: {fileID: 2004223566}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 123.95, y: -15}
|
||||
m_SizeDelta: {x: 247.9, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &573576
|
||||
MonoBehaviour:
|
||||
|
|
@ -12704,7 +12704,7 @@ RectTransform:
|
|||
m_Father: {fileID: 1546412293}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 2.5, y: -1.0999985}
|
||||
m_SizeDelta: {x: 20, y: 20}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
|
|
@ -16676,7 +16676,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &1616399198
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -16797,7 +16797,7 @@ RectTransform:
|
|||
m_Father: {fileID: 1232391833}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 20, y: 20}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
|
|
@ -18438,7 +18438,7 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: 7c3b98530e3241059bebd2507fba1aeb, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
NewGameMenuPanel: {fileID: 1806475497}
|
||||
newGameMenuPanel: {fileID: 0}
|
||||
startButton: {fileID: 145700808}
|
||||
closeButton: {fileID: 189243196}
|
||||
sceneLoaderPrefab: {fileID: 3463712308332304479, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
|
|
@ -20961,7 +20961,7 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4266674212497729599, guid: 694b3c4677563481197ae69c6aa2041a, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
|
|
@ -21123,7 +21123,7 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7604245058229439016, guid: 3deab24f1c2ea4c4b9a2f741b1f81448, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7604245058229439016, guid: 3deab24f1c2ea4c4b9a2f741b1f81448, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
|
|
@ -21131,15 +21131,15 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7604245058229439016, guid: 3deab24f1c2ea4c4b9a2f741b1f81448, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7604245058229439016, guid: 3deab24f1c2ea4c4b9a2f741b1f81448, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
value: 600
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7604245058229439016, guid: 3deab24f1c2ea4c4b9a2f741b1f81448, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 20
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7604245058229439016, guid: 3deab24f1c2ea4c4b9a2f741b1f81448, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
|
|
@ -21171,11 +21171,11 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7604245058229439016, guid: 3deab24f1c2ea4c4b9a2f741b1f81448, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
value: 300
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7604245058229439016, guid: 3deab24f1c2ea4c4b9a2f741b1f81448, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
value: -10
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7604245058229439016, guid: 3deab24f1c2ea4c4b9a2f741b1f81448, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -156,10 +156,10 @@ RectTransform:
|
|||
- {fileID: 240183719}
|
||||
m_Father: {fileID: 2004223566}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 123.95, y: -15}
|
||||
m_SizeDelta: {x: 247.9, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &573576
|
||||
MonoBehaviour:
|
||||
|
|
@ -12704,7 +12704,7 @@ RectTransform:
|
|||
m_Father: {fileID: 1546412293}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 2.5, y: -1.0999985}
|
||||
m_SizeDelta: {x: 20, y: 20}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
|
|
@ -16676,7 +16676,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &1616399198
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -16797,7 +16797,7 @@ RectTransform:
|
|||
m_Father: {fileID: 1232391833}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 20, y: 20}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
|
|
@ -18438,7 +18438,7 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: 7c3b98530e3241059bebd2507fba1aeb, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
NewGameMenuPanel: {fileID: 1806475497}
|
||||
newGameMenuPanel: {fileID: 0}
|
||||
startButton: {fileID: 145700808}
|
||||
closeButton: {fileID: 189243196}
|
||||
sceneLoaderPrefab: {fileID: 3463712308332304479, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
|
|
@ -20961,7 +20961,7 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4266674212497729599, guid: 694b3c4677563481197ae69c6aa2041a, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
|
|
@ -21123,7 +21123,7 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7604245058229439016, guid: 3deab24f1c2ea4c4b9a2f741b1f81448, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7604245058229439016, guid: 3deab24f1c2ea4c4b9a2f741b1f81448, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
|
|
@ -21131,15 +21131,15 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7604245058229439016, guid: 3deab24f1c2ea4c4b9a2f741b1f81448, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7604245058229439016, guid: 3deab24f1c2ea4c4b9a2f741b1f81448, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
value: 600
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7604245058229439016, guid: 3deab24f1c2ea4c4b9a2f741b1f81448, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
value: 20
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7604245058229439016, guid: 3deab24f1c2ea4c4b9a2f741b1f81448, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
|
|
@ -21171,11 +21171,11 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7604245058229439016, guid: 3deab24f1c2ea4c4b9a2f741b1f81448, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
value: 300
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7604245058229439016, guid: 3deab24f1c2ea4c4b9a2f741b1f81448, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
value: -10
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7604245058229439016, guid: 3deab24f1c2ea4c4b9a2f741b1f81448, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 8ada0f2b05a0a4db79462ef8434cc2ae
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1227,7 +1227,7 @@ Canvas:
|
|||
m_OverrideSorting: 0
|
||||
m_OverridePixelPerfect: 0
|
||||
m_SortingBucketNormalizedSize: 0
|
||||
m_VertexColorAlwaysGammaSpace: 1
|
||||
m_VertexColorAlwaysGammaSpace: 0
|
||||
m_AdditionalShaderChannelsFlag: 25
|
||||
m_UpdateRectTransformForStandalone: 0
|
||||
m_SortingLayerID: 0
|
||||
|
|
@ -1769,7 +1769,19 @@ MonoBehaviour:
|
|||
m_TargetGraphic: {fileID: 182014008}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 1616399201}
|
||||
m_TargetAssemblyTypeName: UI.NetworkUIController, Assembly-CSharp
|
||||
m_MethodName: OnClick_HostSave
|
||||
m_Mode: 1
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 0}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||
m_IntArgument: 0
|
||||
m_FloatArgument: 0
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
--- !u!114 &182014008
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -5804,7 +5816,7 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5186788049215247401, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: _networkBehaviours.Array.size
|
||||
value: 3
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5186788049215247401, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: _networkBehaviours.Array.data[1]
|
||||
|
|
@ -5813,11 +5825,11 @@ PrefabInstance:
|
|||
- target: {fileID: 5186788049215247401, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: _networkBehaviours.Array.data[2]
|
||||
value:
|
||||
objectReference: {fileID: 802857225}
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5186788049215247401, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: _networkBehaviours.Array.data[3]
|
||||
value:
|
||||
objectReference: {fileID: 802857225}
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5551679991364744983, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
propertyPath: _networkObjectCache
|
||||
value:
|
||||
|
|
@ -5836,9 +5848,6 @@ PrefabInstance:
|
|||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents:
|
||||
- targetCorrespondingSourceObject: {fileID: 3463712308332304479, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 802857225}
|
||||
- targetCorrespondingSourceObject: {fileID: 3463712308332304479, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 802857226}
|
||||
|
|
@ -8360,7 +8369,19 @@ MonoBehaviour:
|
|||
m_TargetGraphic: {fileID: 749609760}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 1616399201}
|
||||
m_TargetAssemblyTypeName: UI.NetworkUIController, Assembly-CSharp
|
||||
m_MethodName: OnClick_HostNew
|
||||
m_Mode: 1
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 0}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||
m_IntArgument: 0
|
||||
m_FloatArgument: 0
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
--- !u!114 &749609760
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -9004,23 +9025,6 @@ GameObject:
|
|||
m_CorrespondingSourceObject: {fileID: 3463712308332304479, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
m_PrefabInstance: {fileID: 508924468}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &802857225
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 802857222}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 624abc0263964a90b146b5a469faec83, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_componentIndexCache: 2
|
||||
_addedNetworkObject: {fileID: 508924470}
|
||||
_networkObjectCache: {fileID: 508924470}
|
||||
sceneName: FarmMap
|
||||
spawnPosition: {x: 30, y: -30, z: 0}
|
||||
--- !u!114 &802857226
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -18434,7 +18438,7 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: 7c3b98530e3241059bebd2507fba1aeb, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
NewGameMenuPanel: {fileID: 1806475497}
|
||||
newGameMenuPanel: {fileID: 0}
|
||||
startButton: {fileID: 145700808}
|
||||
closeButton: {fileID: 189243196}
|
||||
sceneLoaderPrefab: {fileID: 3463712308332304479, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -1621,6 +1621,7 @@ MonoBehaviour:
|
|||
playerCamera: {fileID: 6785728660406467129}
|
||||
gameManagerPrefab: {fileID: 1155193144633609695, guid: 04359b8867a2d794aad6b521a16e8d21, type: 3}
|
||||
isRegistered: 0
|
||||
_isInMenu: 0
|
||||
--- !u!114 &1181134292354814940
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -2022,7 +2023,7 @@ PrefabInstance:
|
|||
m_Modifications:
|
||||
- target: {fileID: 157618763571750129, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 320460718314505828, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
|
|
@ -2316,29 +2317,57 @@ PrefabInstance:
|
|||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1929022804078632436, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
- target: {fileID: 1532236118972483005, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1929022804078632436, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
- target: {fileID: 1532236118972483005, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1532236118972483005, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 200.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1532236118972483005, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 39.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1532236118972483005, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 100.25
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1532236118972483005, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -138.25
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1682424790187464037, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1929022804078632436, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1929022804078632436, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1929022804078632436, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 30.9
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1929022804078632436, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 25.4
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1929022804078632436, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 15.45
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1929022804078632436, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -95.2
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2262359052243251394, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_Name
|
||||
|
|
@ -2448,6 +2477,18 @@ PrefabInstance:
|
|||
propertyPath: m_AnchoredPosition.y
|
||||
value: -56.1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2984730737189190284, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
|
||||
value:
|
||||
objectReference: {fileID: 2078699936724435415}
|
||||
- target: {fileID: 2984730737189190284, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
|
||||
value: CloseInventory
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3101648957456640719, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
|
||||
value:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3255397465403403244, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
|
|
@ -2472,6 +2513,10 @@ PrefabInstance:
|
|||
propertyPath: m_AnchoredPosition.y
|
||||
value: -82.51
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3342032392744441512, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: uiManager
|
||||
value:
|
||||
objectReference: {fileID: 2078699936724435415}
|
||||
- target: {fileID: 3380579941407948988, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 1
|
||||
|
|
@ -2576,6 +2621,14 @@ PrefabInstance:
|
|||
propertyPath: m_AnchoredPosition.y
|
||||
value: -140.57
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4041559149283393455, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 19.23
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4041559149283393455, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 22.31
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4070775614187638475, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
|
|
@ -2836,6 +2889,34 @@ PrefabInstance:
|
|||
propertyPath: m_AnchoredPosition.y
|
||||
value: -140.57
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5125598554987319878, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5246519530799342397, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5246519530799342397, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5246519530799342397, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 200.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5246519530799342397, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 39.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5246519530799342397, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 100.25
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5246519530799342397, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -59.25
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5439853773435944144, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
|
|
@ -2860,6 +2941,18 @@ PrefabInstance:
|
|||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5778218361836535504, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5789542815333207988, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 13.7
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5789542815333207988, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 26.7
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5796062733908200081, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
|
|
@ -2886,27 +2979,27 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5839897009414103268, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5839897009414103268, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5839897009414103268, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 30.9
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5839897009414103268, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 25.4
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5839897009414103268, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 15.45
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5839897009414103268, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -67.7
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5844818509638550645, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
|
|
@ -2934,27 +3027,27 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6018311180031967986, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6018311180031967986, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6018311180031967986, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 30.9
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6018311180031967986, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 25.4
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6018311180031967986, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 15.45
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6018311180031967986, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -12.7
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6107198586478851115, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
|
|
@ -3008,6 +3101,18 @@ PrefabInstance:
|
|||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6234668215869413852, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 13.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6234668215869413852, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 26.6
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6263717416894638264, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6421013467898820123, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
|
|
@ -3032,6 +3137,10 @@ PrefabInstance:
|
|||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6423597705690819408, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6449899493565001206, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 1
|
||||
|
|
@ -3042,27 +3151,27 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6563565940347113633, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6563565940347113633, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6563565940347113633, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 30.9
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6563565940347113633, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 25.4
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6563565940347113633, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 15.45
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6563565940347113633, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -40.2
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6567496798273489898, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
|
|
@ -3140,6 +3249,30 @@ PrefabInstance:
|
|||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6868880570079974730, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6868880570079974730, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6868880570079974730, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 200.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6868880570079974730, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 39.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6868880570079974730, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 100.25
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6868880570079974730, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -19.75
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6943820065806930675, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
|
|
@ -3214,27 +3347,31 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7442694133917471020, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7442694133917471020, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7442694133917471020, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 30.9
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7442694133917471020, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 25.4
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7442694133917471020, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 15.45
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7442694133917471020, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -122.7
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7470243305192506747, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7690257595173932253, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
|
|
@ -3464,6 +3601,38 @@ PrefabInstance:
|
|||
propertyPath: m_AnchoredPosition.y
|
||||
value: -140.57
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8521363651615771926, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8521363651615771926, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8521363651615771926, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 200.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8521363651615771926, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 39.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8521363651615771926, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 100.25
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8521363651615771926, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -98.75
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8725024609188389407, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8768330466203548781, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8970731692046910391, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
|
|
@ -3513,15 +3682,403 @@ PrefabInstance:
|
|||
value: -33.5
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_RemovedGameObjects:
|
||||
- {fileID: 1029770201934424211, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_AddedComponents:
|
||||
- targetCorrespondingSourceObject: {fileID: 2262359052243251394, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 2078699936724435415}
|
||||
- targetCorrespondingSourceObject: {fileID: 3365416588740449685, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 5505355666546585058}
|
||||
- targetCorrespondingSourceObject: {fileID: 7628299643895184928, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 7720049402817523044}
|
||||
- targetCorrespondingSourceObject: {fileID: 7998464602391521352, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 7315066256011586659}
|
||||
- targetCorrespondingSourceObject: {fileID: 4681759302917858031, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 2437363220735890497}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
--- !u!224 &430849683774210523 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 1126390562507715136, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
m_PrefabInstance: {fileID: 746209673625760667}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &609367832618932074 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 157618763571750129, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
m_PrefabInstance: {fileID: 746209673625760667}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &965107097154469989 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 522327896052052990, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
m_PrefabInstance: {fileID: 746209673625760667}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2661430773780358670}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &1530821644572246873 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 2262359052243251394, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
m_PrefabInstance: {fileID: 746209673625760667}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &2078699936724435415
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1530821644572246873}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 615e946058ec7624d93af8d92cf696bd, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
UIPanel: {fileID: 1530821644572246873}
|
||||
SettingsPanel: {fileID: 8308738999612821892}
|
||||
CharacterPanel: {fileID: 6680562776802515747}
|
||||
InventoryPanel: {fileID: 3613396964266638672}
|
||||
ToolbarPanel: {fileID: 4283906255833905264}
|
||||
RelationshipPanel: {fileID: 2090301141958207230}
|
||||
HotkeyPanel: {fileID: 8774173092621471235}
|
||||
ManagementPanel: {fileID: 6858033771520117432}
|
||||
KnowledgePanel: {fileID: 6515384036109290827}
|
||||
SideBarPanel: {fileID: 609367832618932074}
|
||||
sideBarUIController: {fileID: 2610497338175513907}
|
||||
--- !u!1 &2090301141958207230 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 1682424790187464037, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
m_PrefabInstance: {fileID: 746209673625760667}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &2610497338175513907 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 3342032392744441512, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
m_PrefabInstance: {fileID: 746209673625760667}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 609367832618932074}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 3b4f085ae04214cc1991dff5d572f307, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &2661430773780358670 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 3365416588740449685, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
m_PrefabInstance: {fileID: 746209673625760667}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &5505355666546585058
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2661430773780358670}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Navigation:
|
||||
m_Mode: 3
|
||||
m_WrapAround: 0
|
||||
m_SelectOnUp: {fileID: 0}
|
||||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 1
|
||||
m_Colors:
|
||||
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||
m_ColorMultiplier: 1
|
||||
m_FadeDuration: 0.1
|
||||
m_SpriteState:
|
||||
m_HighlightedSprite: {fileID: 0}
|
||||
m_PressedSprite: {fileID: 0}
|
||||
m_SelectedSprite: {fileID: 0}
|
||||
m_DisabledSprite: {fileID: 0}
|
||||
m_AnimationTriggers:
|
||||
m_NormalTrigger: Normal
|
||||
m_HighlightedTrigger: Highlighted
|
||||
m_PressedTrigger: Pressed
|
||||
m_SelectedTrigger: Selected
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 965107097154469989}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 2078699936724435415}
|
||||
m_TargetAssemblyTypeName: Managers.UIManager, Assembly-CSharp
|
||||
m_MethodName: CloseRelationships
|
||||
m_Mode: 1
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 0}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||
m_IntArgument: 0
|
||||
m_FloatArgument: 0
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
--- !u!1 &3613396964266638672 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 4070775614187638475, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
m_PrefabInstance: {fileID: 746209673625760667}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &4283906255833905264 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 3542203927864921067, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
m_PrefabInstance: {fileID: 746209673625760667}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &5336142514230488016 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 4636131351664072779, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
m_PrefabInstance: {fileID: 746209673625760667}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7171485026002931131}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &5378391940999991668 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 4681759302917858031, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
m_PrefabInstance: {fileID: 746209673625760667}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &2437363220735890497
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5378391940999991668}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Navigation:
|
||||
m_Mode: 3
|
||||
m_WrapAround: 0
|
||||
m_SelectOnUp: {fileID: 0}
|
||||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 1
|
||||
m_Colors:
|
||||
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||
m_ColorMultiplier: 1
|
||||
m_FadeDuration: 0.1
|
||||
m_SpriteState:
|
||||
m_HighlightedSprite: {fileID: 0}
|
||||
m_PressedSprite: {fileID: 0}
|
||||
m_SelectedSprite: {fileID: 0}
|
||||
m_DisabledSprite: {fileID: 0}
|
||||
m_AnimationTriggers:
|
||||
m_NormalTrigger: Normal
|
||||
m_HighlightedTrigger: Highlighted
|
||||
m_PressedTrigger: Pressed
|
||||
m_SelectedTrigger: Selected
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 7144978417304319775}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 2078699936724435415}
|
||||
m_TargetAssemblyTypeName: Managers.UIManager, Assembly-CSharp
|
||||
m_MethodName: CloseSettings
|
||||
m_Mode: 1
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 0}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||
m_IntArgument: 0
|
||||
m_FloatArgument: 0
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
--- !u!114 &5535102517032533432 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 5083354341079010851, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
m_PrefabInstance: {fileID: 746209673625760667}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7303519813043313619}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &6515384036109290827 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 5778218361836535504, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
m_PrefabInstance: {fileID: 746209673625760667}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &6680562776802515747 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 6263717416894638264, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
m_PrefabInstance: {fileID: 746209673625760667}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &6858033771520117432 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 6158585490052921635, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
m_PrefabInstance: {fileID: 746209673625760667}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &7144978417304319775 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 7598418909027222660, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
m_PrefabInstance: {fileID: 746209673625760667}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5378391940999991668}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &7171485026002931131 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 7628299643895184928, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
m_PrefabInstance: {fileID: 746209673625760667}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &7720049402817523044
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7171485026002931131}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Navigation:
|
||||
m_Mode: 3
|
||||
m_WrapAround: 0
|
||||
m_SelectOnUp: {fileID: 0}
|
||||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 1
|
||||
m_Colors:
|
||||
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||
m_ColorMultiplier: 1
|
||||
m_FadeDuration: 0.1
|
||||
m_SpriteState:
|
||||
m_HighlightedSprite: {fileID: 0}
|
||||
m_PressedSprite: {fileID: 0}
|
||||
m_SelectedSprite: {fileID: 0}
|
||||
m_DisabledSprite: {fileID: 0}
|
||||
m_AnimationTriggers:
|
||||
m_NormalTrigger: Normal
|
||||
m_HighlightedTrigger: Highlighted
|
||||
m_PressedTrigger: Pressed
|
||||
m_SelectedTrigger: Selected
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 5336142514230488016}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 2078699936724435415}
|
||||
m_TargetAssemblyTypeName: Managers.UIManager, Assembly-CSharp
|
||||
m_MethodName: CloseKnowledge
|
||||
m_Mode: 1
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 0}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||
m_IntArgument: 0
|
||||
m_FloatArgument: 0
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
--- !u!1 &7303519813043313619 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 7998464602391521352, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
m_PrefabInstance: {fileID: 746209673625760667}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &7315066256011586659
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7303519813043313619}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Navigation:
|
||||
m_Mode: 3
|
||||
m_WrapAround: 0
|
||||
m_SelectOnUp: {fileID: 0}
|
||||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 1
|
||||
m_Colors:
|
||||
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||
m_ColorMultiplier: 1
|
||||
m_FadeDuration: 0.1
|
||||
m_SpriteState:
|
||||
m_HighlightedSprite: {fileID: 0}
|
||||
m_PressedSprite: {fileID: 0}
|
||||
m_SelectedSprite: {fileID: 0}
|
||||
m_DisabledSprite: {fileID: 0}
|
||||
m_AnimationTriggers:
|
||||
m_NormalTrigger: Normal
|
||||
m_HighlightedTrigger: Highlighted
|
||||
m_PressedTrigger: Pressed
|
||||
m_SelectedTrigger: Selected
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 5535102517032533432}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 2078699936724435415}
|
||||
m_TargetAssemblyTypeName: Managers.UIManager, Assembly-CSharp
|
||||
m_MethodName: CloseCharacter
|
||||
m_Mode: 1
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 0}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||
m_IntArgument: 0
|
||||
m_FloatArgument: 0
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
--- !u!1 &8308738999612821892 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 8725024609188389407, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
m_PrefabInstance: {fileID: 746209673625760667}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &8774173092621471235 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 8331393564685778328, guid: 39759b252d2a3b14bac95b998153b10c, type: 3}
|
||||
m_PrefabInstance: {fileID: 746209673625760667}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &1156562443328600608
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -156,10 +156,10 @@ RectTransform:
|
|||
- {fileID: 240183719}
|
||||
m_Father: {fileID: 2004223566}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 123.95, y: -15}
|
||||
m_SizeDelta: {x: 247.9, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &573576
|
||||
MonoBehaviour:
|
||||
|
|
@ -12704,7 +12704,7 @@ RectTransform:
|
|||
m_Father: {fileID: 1546412293}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 2.5, y: -1.0999985}
|
||||
m_SizeDelta: {x: 20, y: 20}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
|
|
@ -16676,7 +16676,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &1616399198
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -16797,7 +16797,7 @@ RectTransform:
|
|||
m_Father: {fileID: 1232391833}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 20, y: 20}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
|
|
@ -18438,7 +18438,7 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: 7c3b98530e3241059bebd2507fba1aeb, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
NewGameMenuPanel: {fileID: 1806475497}
|
||||
newGameMenuPanel: {fileID: 0}
|
||||
startButton: {fileID: 145700808}
|
||||
closeButton: {fileID: 189243196}
|
||||
sceneLoaderPrefab: {fileID: 3463712308332304479, guid: 71d12b53bfe275a42b91a98a3e6e2f66, type: 3}
|
||||
|
|
@ -20961,7 +20961,7 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4266674212497729599, guid: 694b3c4677563481197ae69c6aa2041a, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
|
|
|
|||
|
|
@ -347,8 +347,8 @@ namespace Managers
|
|||
|
||||
public GameTimeSettings GetTimeSettings()
|
||||
{
|
||||
GameLogger.Log("GameManager.GetTimeSettings()");
|
||||
GameLogger.Log("GameTimeSettings: " + _syncGameTimeSettings.Value);
|
||||
// GameLogger.Log("GameManager.GetTimeSettings()");
|
||||
// GameLogger.Log("GameTimeSettings: " + _syncGameTimeSettings.Value);
|
||||
return _syncGameTimeSettings.Value;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using Cinemachine;
|
||||
using Data.ScriptableObjects;
|
||||
using FishNet.Object;
|
||||
using Managers.Item;
|
||||
|
|
@ -30,7 +31,7 @@ namespace Managers
|
|||
[SerializeField] private NetworkObject gameManagerPrefab;
|
||||
|
||||
public bool isRegistered;
|
||||
|
||||
[SerializeField] private bool _isInMenu;
|
||||
|
||||
private GamePlayerSo _playerDataSo;
|
||||
|
||||
|
|
@ -38,13 +39,30 @@ namespace Managers
|
|||
{
|
||||
// _playerData.OnChange += playerData_OnChange;
|
||||
_playerDataSo = AssetDatabase.LoadAssetAtPath<GamePlayerSo>("Assets/Resources/DefaultPlayer.asset");
|
||||
_isInMenu = false;
|
||||
}
|
||||
|
||||
[RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)]
|
||||
private static void ResetStaticData()
|
||||
{
|
||||
_playerManagers.Clear();
|
||||
GameLogger.Log("playerManagers dictionary has been cleared.");
|
||||
}
|
||||
|
||||
public void SetInMenu()
|
||||
{
|
||||
_isInMenu = true;
|
||||
}
|
||||
|
||||
public void SetNotInMenu()
|
||||
{
|
||||
_isInMenu = false;
|
||||
}
|
||||
|
||||
public void SetupCamera()
|
||||
{
|
||||
playerCamera = GetComponentInChildren<Camera>();
|
||||
if (playerCamera == null)
|
||||
var camera = GetComponentInChildren<CinemachineBrain>(true);
|
||||
if (camera == null)
|
||||
{
|
||||
GameLogger.LogError("No camera found for player");
|
||||
return;
|
||||
|
|
@ -53,7 +71,7 @@ namespace Managers
|
|||
playerCamera.enabled = IsOwner;
|
||||
if (IsOwner)
|
||||
{
|
||||
Camera.main.gameObject.SetActive(false);
|
||||
camera.gameObject.SetActive(true);
|
||||
playerCamera.tag = "MainCamera";
|
||||
}
|
||||
}
|
||||
|
|
@ -142,6 +160,7 @@ namespace Managers
|
|||
GameManager.Instance.RegisterPlayerServerRpc(Owner, playerData);
|
||||
_playerManagers.Add(Owner.ClientId, this);
|
||||
isRegistered = true;
|
||||
SetupCamera();
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
|
|
@ -172,11 +191,11 @@ namespace Managers
|
|||
|
||||
public static PlayerManager GetPlayerManager(int clientId)
|
||||
{
|
||||
PrintPlayerMAnagers();
|
||||
PrintPlayerManagers();
|
||||
return _playerManagers[clientId];
|
||||
}
|
||||
|
||||
public static void PrintPlayerMAnagers()
|
||||
public static void PrintPlayerManagers()
|
||||
{
|
||||
foreach (var playerManager in _playerManagers)
|
||||
{
|
||||
|
|
@ -187,6 +206,7 @@ namespace Managers
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
public Camera GetPlayerCamera()
|
||||
{
|
||||
return playerCamera;
|
||||
|
|
@ -350,11 +370,14 @@ public void Initialize(GamePlayer data)
|
|||
// inventoryManager.AddItemToOpenSlot(item);
|
||||
}
|
||||
|
||||
//
|
||||
// [ServerRpc]
|
||||
// public void SetPlayerData(GamePlayer pd)
|
||||
// {
|
||||
// playerData.Value = pd;
|
||||
// }
|
||||
public object GetInMenuState()
|
||||
{
|
||||
return _isInMenu;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -21,8 +21,13 @@ namespace Managers
|
|||
public GameObject RelationshipPanel;
|
||||
public GameObject HotkeyPanel;
|
||||
public GameObject ManagementPanel;
|
||||
public GameObject KnowledgePanel;
|
||||
|
||||
public GameObject SideBarPanel;
|
||||
public SideBarUIController sideBarUIController;
|
||||
|
||||
private PlayerManager _playerManager;
|
||||
private int openPanels;
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
|
|
@ -31,6 +36,8 @@ namespace Managers
|
|||
Instance = this;
|
||||
else
|
||||
Destroy(gameObject);
|
||||
|
||||
if (sideBarUIController == null) sideBarUIController = GetComponent<SideBarUIController>();
|
||||
}
|
||||
|
||||
private void Start()
|
||||
|
|
@ -48,7 +55,7 @@ namespace Managers
|
|||
// close all panels
|
||||
HotkeyManager.Instance.RegisterHotkey("Close All Panels", KeyCode.Escape, () => OnClick_CloseAllPanels());
|
||||
|
||||
|
||||
_playerManager = GetComponentInParent<PlayerManager>();
|
||||
// HotkeyUIManager.Instance.PopulateHotkeyList();
|
||||
}
|
||||
|
||||
|
|
@ -63,9 +70,22 @@ namespace Managers
|
|||
}
|
||||
|
||||
HotkeyPanel.SetActive(true);
|
||||
IncrementOpenPanels();
|
||||
}
|
||||
}
|
||||
|
||||
private void IncrementOpenPanels()
|
||||
{
|
||||
openPanels++;
|
||||
if (openPanels == 1) _playerManager.SetInMenu();
|
||||
}
|
||||
|
||||
private void DecrementOpenPanels()
|
||||
{
|
||||
openPanels--;
|
||||
if (openPanels == 0) _playerManager.SetNotInMenu();
|
||||
}
|
||||
|
||||
|
||||
// Method to toggle the main UI visibility
|
||||
public void ToggleUI()
|
||||
|
|
@ -77,10 +97,18 @@ namespace Managers
|
|||
|
||||
public void OnClick_CloseAllPanels()
|
||||
{
|
||||
// if (ManagementPanel != null) ManagementPanel.SetActive(false);
|
||||
var sideBarUIController = SideBarPanel.GetComponent<SideBarUIController>();
|
||||
ClosePanels();
|
||||
}
|
||||
|
||||
public void ClosePanels()
|
||||
{
|
||||
// var sideBarUIController = SideBarPanel.GetComponent<SideBarUIController>();
|
||||
SideBarPanel.SetActive(false);
|
||||
sideBarUIController.ClosePanels();
|
||||
SettingsPanel.SetActive(false);
|
||||
KnowledgePanel.SetActive(false);
|
||||
CharacterPanel.SetActive(false);
|
||||
InventoryPanel.SetActive(false);
|
||||
RelationshipPanel.SetActive(false);
|
||||
}
|
||||
|
||||
public void OnClick_CloseMainPanels()
|
||||
|
|
@ -91,29 +119,54 @@ namespace Managers
|
|||
sideBarUIController.OnClick_Settings();
|
||||
sideBarUIController.OnClick_Character();
|
||||
sideBarUIController.OnClick_EnableInventory();
|
||||
sideBarUIController.ClosePanels();
|
||||
}
|
||||
|
||||
public void ToggleInventory()
|
||||
{
|
||||
if (InventoryPanel)
|
||||
{
|
||||
var sideBarUIController = SideBarPanel.GetComponent<SideBarUIController>();
|
||||
if (InventoryPanel.activeSelf)
|
||||
{
|
||||
// sideBarUIController.ClosePanels();
|
||||
SideBarPanel.SetActive(false);
|
||||
sideBarUIController.CloseInventory();
|
||||
CloseInventory();
|
||||
return;
|
||||
}
|
||||
|
||||
SideBarPanel.SetActive(true);
|
||||
sideBarUIController.OnClick_EnableInventory();
|
||||
}
|
||||
}
|
||||
|
||||
// InventoryPanel.SetActive(true);
|
||||
public void CloseInventory()
|
||||
{
|
||||
SideBarPanel.SetActive(false);
|
||||
InventoryPanel.SetActive(false);
|
||||
}
|
||||
|
||||
public void CloseCharacter()
|
||||
{
|
||||
SideBarPanel.SetActive(false);
|
||||
CharacterPanel.SetActive(false);
|
||||
}
|
||||
|
||||
public void CloseRelationships()
|
||||
{
|
||||
SideBarPanel.SetActive(false);
|
||||
RelationshipPanel.SetActive(false);
|
||||
}
|
||||
|
||||
public void CloseKnowledge()
|
||||
{
|
||||
SideBarPanel.SetActive(false);
|
||||
KnowledgePanel.SetActive(false);
|
||||
}
|
||||
|
||||
public void CloseSettings()
|
||||
{
|
||||
SideBarPanel.SetActive(false);
|
||||
SettingsPanel.SetActive(false);
|
||||
}
|
||||
|
||||
|
||||
public void OnClick_CloseHotkey()
|
||||
{
|
||||
GameLogger.Log("OnClick_CloseHotkey");
|
||||
|
|
@ -189,5 +242,35 @@ namespace Managers
|
|||
{
|
||||
// Show the game over screen
|
||||
}
|
||||
|
||||
public void EnableInventory()
|
||||
{
|
||||
SideBarPanel.SetActive(true);
|
||||
InventoryPanel.SetActive(true);
|
||||
}
|
||||
|
||||
public void EnableSettings()
|
||||
{
|
||||
SideBarPanel.SetActive(true);
|
||||
SettingsPanel.SetActive(true);
|
||||
}
|
||||
|
||||
public void EnableCharacter()
|
||||
{
|
||||
SideBarPanel.SetActive(true);
|
||||
CharacterPanel.SetActive(true);
|
||||
}
|
||||
|
||||
public void EnableRelationships()
|
||||
{
|
||||
SideBarPanel.SetActive(true);
|
||||
RelationshipPanel.SetActive(true);
|
||||
}
|
||||
|
||||
public void EnableKnowledge()
|
||||
{
|
||||
SideBarPanel.SetActive(true);
|
||||
KnowledgePanel.SetActive(true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -75,8 +75,9 @@ public class PlayerController : NetworkBehaviour
|
|||
private void Update()
|
||||
{
|
||||
if (!IsOwner) return;
|
||||
/*var player = playerManager.GetPlayerData();
|
||||
if (player == null) return;*/
|
||||
var isInMenu = playerManager.GetInMenuState();
|
||||
if (isInMenu.Equals(true)) return;
|
||||
|
||||
|
||||
var moveInput = new Vector2(Input.GetAxisRaw("Horizontal"), Input.GetAxisRaw("Vertical"));
|
||||
moveInput.Normalize();
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
using System.Collections.Generic;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using FishNet;
|
||||
using FishNet.Connection;
|
||||
using FishNet.Managing.Scened;
|
||||
|
|
@ -72,14 +74,34 @@ public class SceneLoader : NetworkBehaviour, IPointerClickHandler
|
|||
LoadScene(clientId);
|
||||
}
|
||||
|
||||
[RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)]
|
||||
private static void ResetStaticData()
|
||||
{
|
||||
playerScenes.Clear();
|
||||
Debug.Log("SceneLoader: playerScenes dictionary has been cleared.");
|
||||
}
|
||||
|
||||
[ServerRpc(RequireOwnership = false)]
|
||||
public void RequestSceneLoadServerRpc(int clientId)
|
||||
{
|
||||
GameLogger.Log($"Received scene load request for client {clientId}");
|
||||
if (!IsServerInitialized)
|
||||
{
|
||||
GameLogger.LogWarning(
|
||||
"RequestSceneLoadServerRpc called on client. This should only be called on the server.");
|
||||
return;
|
||||
}
|
||||
|
||||
if (!InstanceFinder.ServerManager.Clients.ContainsKey(clientId))
|
||||
{
|
||||
GameLogger.LogWarning(
|
||||
$"Client {clientId} not found in ServerManager.Clients. The client might not be fully connected yet.");
|
||||
return;
|
||||
}
|
||||
|
||||
LoadSceneForClient(clientId);
|
||||
}
|
||||
|
||||
[Server]
|
||||
/*[Server]
|
||||
private void LoadSceneForClient(int clientId)
|
||||
{
|
||||
GameLogger.Log($"Loading scene for client {clientId}");
|
||||
|
|
@ -115,7 +137,7 @@ public class SceneLoader : NetworkBehaviour, IPointerClickHandler
|
|||
UpdatePlayerPositionObserversRpc(clientId, spawnPosition);
|
||||
}
|
||||
}
|
||||
}
|
||||
}*/
|
||||
|
||||
private void SceneManager_OnLoadEnd(SceneLoadEndEventArgs data)
|
||||
{
|
||||
|
|
@ -179,14 +201,27 @@ public class SceneLoader : NetworkBehaviour, IPointerClickHandler
|
|||
[ObserversRpc]
|
||||
private void SetupPlayerCameraObserversRpc(int clientId)
|
||||
{
|
||||
GameLogger.Log("SetupPlayerCameraObserversRpc triggered for clientId: " + clientId);
|
||||
GameLogger.Log("Setting up player camera for clientId: " + clientId);
|
||||
var playerManager = PlayerManager.GetPlayerManager(clientId);
|
||||
if (playerManager == null) return;
|
||||
if (playerManager == null)
|
||||
{
|
||||
GameLogger.LogError("PlayerManager not found for client " + clientId);
|
||||
return;
|
||||
}
|
||||
|
||||
var playerGo = playerManager.GetPlayerGo();
|
||||
if (playerGo == null) return;
|
||||
if (playerGo == null)
|
||||
{
|
||||
GameLogger.LogError("PlayerGo not found for client " + clientId);
|
||||
return;
|
||||
}
|
||||
|
||||
var camera = playerGo.GetComponentInChildren<Camera>();
|
||||
if (camera == null) return;
|
||||
if (camera == null)
|
||||
{
|
||||
GameLogger.LogError("Camera not found for client " + clientId);
|
||||
return;
|
||||
}
|
||||
|
||||
// enable camera only for the local player
|
||||
camera.enabled = true;
|
||||
|
|
@ -259,6 +294,7 @@ public class SceneLoader : NetworkBehaviour, IPointerClickHandler
|
|||
[ObserversRpc]
|
||||
private void UpdatePlayerPositionObserversRpc(int playerObjectId, Vector3 position)
|
||||
{
|
||||
GameLogger.Log("Moving player to spawn position: " + spawnPosition);
|
||||
if (InstanceFinder.ClientManager.Objects.Spawned.TryGetValue(playerObjectId, out var playerObject))
|
||||
playerObject.transform.position = position;
|
||||
else
|
||||
|
|
@ -266,6 +302,125 @@ public class SceneLoader : NetworkBehaviour, IPointerClickHandler
|
|||
}
|
||||
|
||||
|
||||
[Server]
|
||||
private void LoadSceneForClient(int clientId)
|
||||
{
|
||||
GameLogger.Log($"Received scene load request for client {clientId}");
|
||||
|
||||
var connection = InstanceFinder.ServerManager.Clients[clientId];
|
||||
if (connection == null)
|
||||
{
|
||||
GameLogger.LogError($"No connection found for client {clientId}");
|
||||
return;
|
||||
}
|
||||
|
||||
var sceneLoadData = new SceneLoadData(SceneLookupData.CreateData(sceneName));
|
||||
sceneLoadData.ReplaceScenes = ReplaceOption.All;
|
||||
sceneLoadData.Options.AllowStacking = true;
|
||||
|
||||
// Subscribe to the OnLoadEnd event
|
||||
// InstanceFinder.SceneManager.OnLoadEnd += OnSceneLoadEnd;
|
||||
|
||||
// Start loading the scene
|
||||
InstanceFinder.SceneManager.LoadConnectionScenes(connection, sceneLoadData);
|
||||
|
||||
StartCoroutine(WaitForSceneLoad(clientId));
|
||||
}
|
||||
|
||||
private IEnumerator WaitForSceneLoad(int clientId)
|
||||
{
|
||||
GameLogger.Log("Waiting for scene load for client " + clientId);
|
||||
var timeout = 10f;
|
||||
var elapsedTime = 0f;
|
||||
|
||||
while (elapsedTime < timeout)
|
||||
{
|
||||
var sceneFound = !InstanceFinder.SceneManager.SceneConnections.Any(sc =>
|
||||
sc.Key.name == sceneName && sc.Value.Contains(InstanceFinder.ServerManager.Clients[clientId]));
|
||||
// GameLogger.Log("Waiting for scene load for client " + clientId);
|
||||
GameLogger.Log("Looking for scene " + sceneName);
|
||||
|
||||
if (sceneFound)
|
||||
{
|
||||
GameLogger.Log("Scene found for client " + clientId);
|
||||
OnSceneLoadComplete(clientId);
|
||||
yield break;
|
||||
}
|
||||
|
||||
elapsedTime += Time.deltaTime;
|
||||
yield return null;
|
||||
}
|
||||
|
||||
GameLogger.LogError("Timed out waiting for scene load for client " + clientId);
|
||||
}
|
||||
|
||||
private IEnumerator LoadSceneWithRetry(NetworkConnection connection, SceneLoadData sceneLoadData, int clientId,
|
||||
int maxRetries = 3)
|
||||
{
|
||||
var retryCount = 0;
|
||||
var loadSuccessful = false;
|
||||
|
||||
while (!loadSuccessful && retryCount < maxRetries)
|
||||
{
|
||||
GameLogger.Log($"Attempting to load scene for client {clientId}. Attempt {retryCount + 1} of {maxRetries}");
|
||||
|
||||
InstanceFinder.SceneManager.LoadConnectionScenes(connection, sceneLoadData);
|
||||
|
||||
// Wait for the scene to load
|
||||
yield return new WaitUntil(() =>
|
||||
InstanceFinder.SceneManager.SceneConnections.Any(sc =>
|
||||
sc.Key.name == sceneName && sc.Value.Contains(connection)));
|
||||
|
||||
if (InstanceFinder.SceneManager.SceneConnections.Any(sc =>
|
||||
sc.Key.name == sceneName && sc.Value.Contains(connection)))
|
||||
{
|
||||
loadSuccessful = true;
|
||||
GameLogger.Log($"Scene successfully loaded for client {clientId}");
|
||||
}
|
||||
else
|
||||
{
|
||||
retryCount++;
|
||||
GameLogger.LogWarning($"Scene load attempt failed for client {clientId}. Retrying...");
|
||||
yield return new WaitForSeconds(1f); // Wait before retrying
|
||||
}
|
||||
}
|
||||
|
||||
if (!loadSuccessful)
|
||||
GameLogger.LogError($"Failed to load scene for client {clientId} after {maxRetries} attempts");
|
||||
}
|
||||
|
||||
private void OnSceneLoadComplete(int clientId)
|
||||
{
|
||||
GameLogger.Log($"Scene load completed for client {clientId}");
|
||||
// Unload the previous scene for this client
|
||||
if (playerScenes.TryGetValue(clientId, out var previousScene))
|
||||
{
|
||||
GameLogger.Log($"Unloading previous scene for client {clientId}: {previousScene}");
|
||||
var connection = InstanceFinder.ServerManager.Clients[clientId];
|
||||
InstanceFinder.SceneManager.UnloadConnectionScenes(connection, new SceneUnloadData(previousScene));
|
||||
}
|
||||
|
||||
// Update the player's current scene
|
||||
playerScenes[clientId] = sceneName;
|
||||
|
||||
// Move the player to the spawn position
|
||||
var playerManager = PlayerManager.GetPlayerManager(clientId);
|
||||
if (playerManager != null)
|
||||
{
|
||||
var player = playerManager.GetPlayerGo();
|
||||
if (player != null)
|
||||
{
|
||||
player.transform.position = spawnPosition;
|
||||
UpdatePlayerPositionObserversRpc(clientId, spawnPosition);
|
||||
SetupPlayerCameraObserversRpc(clientId);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
GameLogger.LogError("PlayerManager not found for client " + clientId);
|
||||
}
|
||||
}
|
||||
|
||||
public void UnloadScene()
|
||||
{
|
||||
// if (_stackedScenceHandle == 0)
|
||||
|
|
|
|||
|
|
@ -23,6 +23,10 @@ namespace UI
|
|||
{
|
||||
Destroy(gameObject);
|
||||
}
|
||||
|
||||
if (loadingScreen == null)
|
||||
// assign this to the loading screen
|
||||
loadingScreen = gameObject;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ namespace UI
|
|||
private void OnServerConnectionState(ServerConnectionStateArgs obj)
|
||||
{
|
||||
_serverState = obj.ConnectionState;
|
||||
UpdateColor(obj.ConnectionState, ref serverIndicator);
|
||||
// UpdateColor(obj.ConnectionState, ref serverIndicator);
|
||||
}
|
||||
|
||||
private void UpdateColor(LocalConnectionState state, ref SpriteRenderer img)
|
||||
|
|
@ -98,7 +98,7 @@ namespace UI
|
|||
private void OnClientConnectionState(ClientConnectionStateArgs obj)
|
||||
{
|
||||
_clientState = obj.ConnectionState;
|
||||
UpdateColor(obj.ConnectionState, ref clientIndicator);
|
||||
// UpdateColor(obj.ConnectionState, ref clientIndicator);
|
||||
|
||||
// add player to connected players list
|
||||
/*if (_clientState == LocalConnectionState.Started)
|
||||
|
|
@ -113,7 +113,17 @@ namespace UI
|
|||
{
|
||||
GameLogger.Log("Clicked host new");
|
||||
if (_networkManager == null)
|
||||
{
|
||||
GameLogger.LogWarning("NetworkManager not found");
|
||||
// find it
|
||||
_networkManager = FindObjectOfType<NetworkManager>();
|
||||
// return;
|
||||
if (_networkManager == null)
|
||||
{
|
||||
GameLogger.LogError("NetworkManager not found");
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
// attach prefab with SystemsManager to root
|
||||
|
||||
|
|
|
|||
|
|
@ -1,17 +1,23 @@
|
|||
using System.Collections;
|
||||
using FishNet;
|
||||
using UnityEngine;
|
||||
using Utils;
|
||||
|
||||
namespace UI
|
||||
{
|
||||
public class NewGameMenuUIController : MonoBehaviour
|
||||
{
|
||||
public GameObject NewGameMenuPanel;
|
||||
public GameObject newGameMenuPanel;
|
||||
public GameObject startButton;
|
||||
public GameObject closeButton;
|
||||
|
||||
public GameObject sceneLoaderPrefab;
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
newGameMenuPanel = gameObject;
|
||||
}
|
||||
|
||||
private void Start()
|
||||
{
|
||||
}
|
||||
|
|
@ -23,14 +29,23 @@ namespace UI
|
|||
|
||||
public void OnClick_CloseButton()
|
||||
{
|
||||
Debug.Log("Close button");
|
||||
GameLogger.Log("Close button");
|
||||
// Close the panel
|
||||
NewGameMenuPanel.SetActive(false);
|
||||
newGameMenuPanel.SetActive(false);
|
||||
}
|
||||
|
||||
public void OnClick_StartButton()
|
||||
{
|
||||
Debug.Log("NewGameMenuUIController: Start button");
|
||||
GameLogger.Log("NewGameMenuUIController: Start button");
|
||||
|
||||
if (LoadingScreenUIController.Instance == null)
|
||||
{
|
||||
GameLogger.Log("NewGameMenuUIController: Creating LoadingScreenUIController");
|
||||
var loadingScreenUIController =
|
||||
new GameObject("LoadingScreenUIController").AddComponent<LoadingScreenUIController>();
|
||||
loadingScreenUIController.transform.SetParent(newGameMenuPanel.transform);
|
||||
}
|
||||
|
||||
LoadingScreenUIController.Instance.TriggerLoadingScreen();
|
||||
// NewGameMenuPanel.SetActive(false);
|
||||
|
||||
|
|
@ -38,9 +53,9 @@ namespace UI
|
|||
if (NetworkUIController.Instance == null)
|
||||
{
|
||||
//create a new network ui controller
|
||||
Debug.Log("NewGameMenuUIController: Creating NetworkUIController");
|
||||
GameLogger.Log("NewGameMenuUIController: Creating NetworkUIController");
|
||||
var networkUIController = new GameObject("NetworkUIController").AddComponent<NetworkUIController>();
|
||||
networkUIController.transform.SetParent(NewGameMenuPanel.transform);
|
||||
networkUIController.transform.SetParent(newGameMenuPanel.transform);
|
||||
}
|
||||
|
||||
NetworkUIController.Instance.OnClick_HostNew();
|
||||
|
|
@ -49,13 +64,13 @@ namespace UI
|
|||
// transport method. FishNet supports multiple transport methods, but we only want to use one at a time. Specifically,
|
||||
// we will want to use the one that is for a single player game that will allow me to still use the same code.
|
||||
|
||||
var sceneLoaderObj = Instantiate(sceneLoaderPrefab, NewGameMenuPanel.transform);
|
||||
var sceneLoaderObj = Instantiate(sceneLoaderPrefab, newGameMenuPanel.transform);
|
||||
var sceneLoader = sceneLoaderObj.GetComponent<SceneLoader>();
|
||||
|
||||
Debug.Log("NewGameMenuUIController: Spawning scene loader");
|
||||
GameLogger.Log("NewGameMenuUIController: Spawning scene loader");
|
||||
if (sceneLoader == null)
|
||||
{
|
||||
Debug.LogError("NewGameMenuUIController: SceneLoader not found");
|
||||
GameLogger.LogError("NewGameMenuUIController: SceneLoader not found");
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -64,8 +79,13 @@ namespace UI
|
|||
sceneLoader.spawnPosition = new Vector3(30, -30, 0);
|
||||
|
||||
|
||||
Debug.Log("NewGameMenuUIController: Waiting for server to start...");
|
||||
GameLogger.Log(" Waiting for server to start...");
|
||||
StartCoroutine(WaitForServerAndSpawnSceneLoader(sceneLoaderObj));
|
||||
// InstanceFinder.ServerManager.Spawn(sceneLoaderObj);
|
||||
// var clientId = InstanceFinder.ClientManager.Connection.ClientId;
|
||||
|
||||
// var sceneLoader = sceneLoaderObj.GetComponent<SceneLoader>();
|
||||
// if (sceneLoader != null) sceneLoader.RequestSceneLoadServerRpc(clientId);
|
||||
|
||||
// spawn the scene loader
|
||||
// InstanceFinder.ServerManager.Spawn(sceneLoaderObj);
|
||||
|
|
@ -77,19 +97,36 @@ namespace UI
|
|||
|
||||
private IEnumerator WaitForServerAndSpawnSceneLoader(GameObject sceneLoaderObj)
|
||||
{
|
||||
Debug.Log("NewGameMenuUIController: Waiting for server to start...");
|
||||
while (!InstanceFinder.IsHostStarted)
|
||||
GameLogger.Log("NewGameMenuUIController: Waiting for server to start...");
|
||||
while (!InstanceFinder.IsServerStarted)
|
||||
{
|
||||
Debug.Log("Waiting for server to start...");
|
||||
GameLogger.Log("Waiting for server to start...");
|
||||
yield return new WaitForSeconds(0.1f);
|
||||
}
|
||||
|
||||
Debug.Log("Server started, spawning scene loader");
|
||||
InstanceFinder.ServerManager.Spawn(sceneLoaderObj);
|
||||
var clientId = InstanceFinder.ClientManager.Connection.ClientId;
|
||||
GameLogger.Log("Server started, waiting for clients to connect...");
|
||||
while (InstanceFinder.ClientManager.Connection == null || !InstanceFinder.ClientManager.Started)
|
||||
{
|
||||
GameLogger.LogInfo("Waiting for clients to connect...");
|
||||
yield return new WaitForSeconds(0.1f);
|
||||
}
|
||||
|
||||
GameLogger.Log("Server started, spawning scene loader");
|
||||
InstanceFinder.ServerManager.Spawn(sceneLoaderObj);
|
||||
|
||||
yield return new WaitForSeconds(1f);
|
||||
|
||||
GameLogger.Log("Clients connected, spawning scene loader");
|
||||
|
||||
var clientId = InstanceFinder.ClientManager.Connection.ClientId;
|
||||
var sceneLoader = sceneLoaderObj.GetComponent<SceneLoader>();
|
||||
if (sceneLoader != null) sceneLoader.RequestSceneLoadServerRpc(clientId);
|
||||
|
||||
if (sceneLoader != null)
|
||||
sceneLoader.RequestSceneLoadServerRpc(clientId);
|
||||
else
|
||||
GameLogger.LogError("SceneLoader not found");
|
||||
|
||||
GameLogger.Log("Completed spawning scene loader");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,15 +1,18 @@
|
|||
using Managers;
|
||||
using UnityEngine;
|
||||
|
||||
public class SideBarUIController : MonoBehaviour
|
||||
{
|
||||
public GameObject InventoryPanel;
|
||||
public GameObject SettingsPanel;
|
||||
public GameObject CharacterPanel;
|
||||
public GameObject RelationshipsPanel;
|
||||
public GameObject KnowledgePanel;
|
||||
|
||||
// public GameObject InventoryPanel;
|
||||
// public GameObject SettingsPanel;
|
||||
// public GameObject CharacterPanel;
|
||||
// public GameObject RelationshipsPanel;
|
||||
// public GameObject KnowledgePanel;
|
||||
//
|
||||
public GameObject ActivePanelIndicatorImage;
|
||||
|
||||
public UIManager uiManager;
|
||||
|
||||
public int TotalPanels = 5;
|
||||
|
||||
public Vector3 initialIndicatorPosition;
|
||||
|
|
@ -18,6 +21,7 @@ public class SideBarUIController : MonoBehaviour
|
|||
private void Start()
|
||||
{
|
||||
initialIndicatorPosition = ActivePanelIndicatorImage.transform.localPosition;
|
||||
// uiManager = GetCompo
|
||||
}
|
||||
|
||||
// Update is called once per frame
|
||||
|
|
@ -26,28 +30,13 @@ public class SideBarUIController : MonoBehaviour
|
|||
}
|
||||
|
||||
|
||||
public void ClosePanels()
|
||||
{
|
||||
InventoryPanel.SetActive(false);
|
||||
SettingsPanel.SetActive(false);
|
||||
CharacterPanel.SetActive(false);
|
||||
RelationshipsPanel.SetActive(false);
|
||||
KnowledgePanel.SetActive(false);
|
||||
}
|
||||
|
||||
|
||||
public void OnClick_EnableInventory()
|
||||
{
|
||||
ClosePanels();
|
||||
InventoryPanel.SetActive(true);
|
||||
uiManager.ClosePanels();
|
||||
uiManager.EnableInventory();
|
||||
MoveIndicatorToActivePanel(3);
|
||||
}
|
||||
|
||||
public void CloseInventory()
|
||||
{
|
||||
InventoryPanel.SetActive(false);
|
||||
}
|
||||
|
||||
public void MoveIndicatorToActivePanel(int panelIndex)
|
||||
{
|
||||
ActivePanelIndicatorImage.transform.localPosition =
|
||||
|
|
@ -57,29 +46,29 @@ public class SideBarUIController : MonoBehaviour
|
|||
|
||||
public void OnClick_Settings()
|
||||
{
|
||||
ClosePanels();
|
||||
SettingsPanel.SetActive(true);
|
||||
uiManager.ClosePanels();
|
||||
uiManager.EnableSettings();
|
||||
MoveIndicatorToActivePanel(4);
|
||||
}
|
||||
|
||||
public void OnClick_Character()
|
||||
{
|
||||
ClosePanels();
|
||||
CharacterPanel.SetActive(true);
|
||||
uiManager.ClosePanels();
|
||||
uiManager.EnableCharacter();
|
||||
MoveIndicatorToActivePanel(0);
|
||||
}
|
||||
|
||||
public void OnClick_Relationships()
|
||||
{
|
||||
ClosePanels();
|
||||
RelationshipsPanel.SetActive(true);
|
||||
uiManager.ClosePanels();
|
||||
uiManager.EnableRelationships();
|
||||
MoveIndicatorToActivePanel(2);
|
||||
}
|
||||
|
||||
public void OnClick_Knowledge()
|
||||
{
|
||||
ClosePanels();
|
||||
KnowledgePanel.SetActive(true);
|
||||
uiManager.ClosePanels();
|
||||
uiManager.EnableKnowledge();
|
||||
MoveIndicatorToActivePanel(1);
|
||||
}
|
||||
}
|
||||
|
|
@ -20,11 +20,11 @@
|
|||
}
|
||||
},
|
||||
"Art/Unorganized/Ancient Ruins V 1.9.1/TiledMap Editor/Sample scene.tmx": {
|
||||
"scale": 0.6555,
|
||||
"scale": 1.1111,
|
||||
"selectedLayer": 0,
|
||||
"viewCenter": {
|
||||
"x": 2173.9130434782605,
|
||||
"y": 715.4843630816171
|
||||
"x": 1530.4653046530466,
|
||||
"y": 814.508145081451
|
||||
}
|
||||
},
|
||||
"Art/Unorganized/Ancient Ruins V 1.9.1/TiledMap Editor/Tilesets/Ancient Ruins-Animated Terrains-16 frames.tsx": {
|
||||
|
|
@ -214,8 +214,8 @@
|
|||
"scale": 1.8816,
|
||||
"selectedLayer": 0,
|
||||
"viewCenter": {
|
||||
"x": 1726.4562074829932,
|
||||
"y": 897.6403061224491
|
||||
"x": 1834.3431122448983,
|
||||
"y": 804.6343537414966
|
||||
}
|
||||
},
|
||||
"Art/Unorganized/Old Prison V1.7/TiledMap Editor New/Rules/Prison Cells-rule0-erases all generated tiles and resets them to their initial state.tmx": {
|
||||
|
|
@ -310,8 +310,8 @@
|
|||
"scale": 0.7288,
|
||||
"selectedLayer": 0,
|
||||
"viewCenter": {
|
||||
"x": -670.965971459934,
|
||||
"y": 556.3940724478595
|
||||
"x": 520.7189901207466,
|
||||
"y": 773.8748627881449
|
||||
}
|
||||
},
|
||||
"Art/Unorganized/the Mountain V1.5.1/TiledMap Editor/Sample Scene2.tmx": {
|
||||
|
|
@ -357,24 +357,24 @@
|
|||
"scale": 1.9311718749999998,
|
||||
"selectedLayer": 0,
|
||||
"viewCenter": {
|
||||
"x": -503.5802419191715,
|
||||
"y": 197.03062421619
|
||||
"x": 423.83591569238246,
|
||||
"y": 228.87657267688823
|
||||
}
|
||||
},
|
||||
"Maps/SmallTest.tmx": {
|
||||
"scale": 0.5,
|
||||
"selectedLayer": 0,
|
||||
"viewCenter": {
|
||||
"x": 959,
|
||||
"y": 988
|
||||
"x": 1253,
|
||||
"y": 1390
|
||||
}
|
||||
},
|
||||
"Maps/World.tmx": {
|
||||
"scale": 0.0625,
|
||||
"selectedLayer": 25,
|
||||
"scale": 0.33,
|
||||
"selectedLayer": 17,
|
||||
"viewCenter": {
|
||||
"x": 15664,
|
||||
"y": -64
|
||||
"x": 2436.363636363636,
|
||||
"y": 1034.8484848484848
|
||||
}
|
||||
},
|
||||
"Maps/world.tmx": {
|
||||
|
|
|
|||
Loading…
Reference in New Issue