diff --git a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml index 06fb798..56a6629 100644 --- a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml +++ b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml @@ -105,7 +105,7 @@ - + diff --git a/FlufflParty/ProjectSettings/ProjectSettings.asset b/FlufflParty/ProjectSettings/ProjectSettings.asset index d0dee88..8414421 100644 --- a/FlufflParty/ProjectSettings/ProjectSettings.asset +++ b/FlufflParty/ProjectSettings/ProjectSettings.asset @@ -17,7 +17,7 @@ PlayerSettings: defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} - m_ShowUnitySplashScreen: 1 + m_ShowUnitySplashScreen: 0 m_ShowUnitySplashLogo: 1 m_SplashScreenOverlayOpacity: 1 m_SplashScreenAnimation: 1 @@ -88,7 +88,7 @@ PlayerSettings: bakeCollisionMeshes: 0 forceSingleInstance: 0 useFlipModelSwapchain: 1 - resizableWindow: 0 + resizableWindow: 1 useMacAppStoreValidation: 0 macAppStoreCategory: public.app-category.games gpuSkinning: 1 @@ -246,7 +246,7 @@ PlayerSettings: useCustomBaseGradleTemplate: 0 useCustomGradlePropertiesTemplate: 0 useCustomProguardFile: 0 - AndroidTargetArchitectures: 3 + AndroidTargetArchitectures: 2 AndroidTargetDevices: 0 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} @@ -734,7 +734,7 @@ PlayerSettings: allowUnsafeCode: 0 useDeterministicCompilation: 1 enableRoslynAnalyzers: 1 - selectedPlatform: 0 + selectedPlatform: 2 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 1 diff --git a/FlufflParty/UserSettings/Layouts/default-2021.dwlt b/FlufflParty/UserSettings/Layouts/default-2021.dwlt index 766a519..537d151 100644 --- a/FlufflParty/UserSettings/Layouts/default-2021.dwlt +++ b/FlufflParty/UserSettings/Layouts/default-2021.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1920 height: 1117 m_ShowMode: 4 - m_Title: Console + m_Title: Hierarchy m_RootView: {fileID: 6} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -48,7 +48,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 58 + controlID: 18 --- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 @@ -68,8 +68,8 @@ MonoBehaviour: y: 0 width: 473 height: 1067 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 16} m_Panes: - {fileID: 16} @@ -120,8 +120,8 @@ MonoBehaviour: y: 686 width: 1447 height: 381 - m_MinSize: {x: 101, y: 121} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 18} m_Panes: - {fileID: 15} @@ -223,7 +223,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 59 + controlID: 45 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -248,7 +248,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 50 + controlID: 46 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -672,14 +672,14 @@ MonoBehaviour: m_OverrideSceneCullingMask: 6917529027641081856 m_SceneIsLit: 1 m_SceneLighting: 1 - m_2DMode: 1 + m_2DMode: 0 m_isRotationLocked: 0 m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 549.13434, y: 382.2807, z: 0.39464524} + m_Target: {x: 98.8307, y: 8.411106, z: 123.58132} speed: 2 - m_Value: {x: 549.13434, y: 382.2807, z: 0.39464524} + m_Value: {x: 98.8307, y: 8.411106, z: 123.58132} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -726,17 +726,17 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0, y: 0, z: 0, w: 1} + m_Target: {x: -0.44589415, y: 0.51905, z: -0.27737507, w: -0.6744397} speed: 2 - m_Value: {x: 0, y: 0, z: 0, w: 1} + m_Value: {x: -0.44588518, y: 0.5190396, z: -0.27736947, w: -0.67442614} m_Size: - m_Target: 441.54617 + m_Target: 2.1001658 speed: 2 - m_Value: 441.54617 + m_Value: 2.1001658 m_Ortho: - m_Target: 1 + m_Target: 0 speed: 2 - m_Value: 1 + m_Value: 0 m_CameraSettings: m_Speed: 1.005 m_SpeedNormalized: 0.5 @@ -750,7 +750,7 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: -0.13503443, y: -0.86239696, z: 0.32290962, w: -0.36766163} + m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: @@ -798,22 +798,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scripts/Start + - Assets/Scenes m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Scripts/Start + - Assets/Scenes m_LastFoldersGridSize: -1 m_LastProjectPath: F:\Projects\Unity\flufflparty\FlufflParty m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: dc630000 - m_LastClickedID: 25564 - m_ExpandedIDs: 000000001c6300001e6300002063000000ca9a3b + m_SelectedIDs: 766a0000 + m_LastClickedID: 27254 + m_ExpandedIDs: 00000000225d0000245d0000265d000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -841,7 +841,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000001c6300001e63000020630000 + m_ExpandedIDs: 00000000225d0000245d0000265d0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -971,7 +971,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 48f0ffff30f3ffff04fbffff + m_ExpandedIDs: a450fcffe450fcffc657fcffd657fcff625afcffa45afcff8661fcff9661fcff3a64fcff7c64fcff5e6bfcff6e6bfcff466ffcff886ffcff6a76fcff7a76fcff6682fcffa682fcff8889fcff9889fcffe692fcff2893fcff0a9afcff1a9afcff069cfcff469cfcff28a3fcff38a3fcff38acfcff78acfcff5ab3fcff6ab3fcff44b5fcff84b5fcff66bcfcff76bcfcff12cbfcff46f7fcff86f7fcff68fefcff78fefcff9608fdffd608fdffb80ffdffc80ffdff961ffdffd61ffdffb826fdffc826fdff502ffdff902ffdff7236fdff8236fdff163ffdff563ffdff3846fdff4846fdffd847fdff9c4dfdffd04efdffb250fdff0051fdffc857fdffe457fdffaa5ffdfffa5ffdff7861fdff5a63fdffa863fdff706afdff8c6afdff587ffdff7a8bfdffbc8bfdffa292fdffb692fdff5899fdff769afdff16a1fdff3ea7fdffc0a8fdff00a9fdffe2affdfff2affdff44b8fdffc8c0fdff80c9fdff06cbfdff46cbfdff2ad2fdff3ad2fdff74dafdff62e2fdff8ae9fdff2ef5fdff6ef5fdff52fcfdff62fcfdff8003feff8404feff5005feff9005feff740cfeff840cfeff0e14feff3e15feffcc16feff1a17feffe21dfefffe1dfeffce26feff2c2efeffa22ffefff02ffeffa036feffbc36feff6459feffbc59feff2260feff7268feff9269feff786cfeffb86cfeff8073feff9c73feff187cfeffee83feff2e84feff128bfeff228bfeff2e92feff2e93feffbe94fefffe94feffc69bfeffe29bfeff86a2feffd0a8fefff0a9feff1cadfeff5cadfeff24b4feff40b4feff6ac3feff18cbfeff58cbfeff3cd2feff4cd2feffcadafeff64dcfeffa4dcfeff88e3feff98e3feff48ecfeff88ecfeff6cf3feff7cf3feff32fcfeff74fcfeff5803ffff6803ffff760bffffb60bffff9a12ffffaa12ffffce1fffff0e20fffff226ffff0227ffffee3cfffff43dffff5c3fffff9c3fffff6246ffff7e46ffffba4effffbc55ffffc256ffff1a58ffff5a58ffff245fffff405fffffa468ffffbe6fffffe870ffff9272ffffe072ffffaa79ffffc679ffffe288fffffe94ffff4095ffff249cffff349cffffbea4fffffea4ffffe2abfffff2abffff3ab5ffff7ab5ffff5ebcffff6ebcfffff6c4ffff38c5ffff1cccffff2cccffffe6d4ffff28d5ffff0cdcffff1cdcfffffceeffff3eefffff22f6ffff32f6ffff04fbffff32d10100b87f0200bea00200 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -987,7 +987,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 4} + m_ClientGUIView: {fileID: 3} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 diff --git a/Server/.idea/workspace.xml b/Server/.idea/workspace.xml index c5b2cf1..c4bb450 100644 --- a/Server/.idea/workspace.xml +++ b/Server/.idea/workspace.xml @@ -71,7 +71,7 @@