diff --git a/FlufflParty/Assets/Scenes/WesternMap.unity b/FlufflParty/Assets/Scenes/WesternMap.unity index 1c3240a..583d2c6 100644 --- a/FlufflParty/Assets/Scenes/WesternMap.unity +++ b/FlufflParty/Assets/Scenes/WesternMap.unity @@ -1298,8 +1298,8 @@ ParticleSystem: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 - value: 0.7297306 + time: 0.008106232 + value: 0.689188 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1307,8 +1307,8 @@ ParticleSystem: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.53486794 - value: 0.80264115 + time: 0.57541054 + value: 0.4783156 inSlope: -0.19598381 outSlope: -0.19598381 tangentMode: 0 @@ -1317,7 +1317,7 @@ ParticleSystem: outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: 0.67568123 + value: 0.43243706 inSlope: -0.11902377 outSlope: -0.11902377 tangentMode: 0 @@ -7853,8 +7853,8 @@ ParticleSystem: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 - value: 0.7297306 + time: 0.008106232 + value: 0.689188 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -7862,8 +7862,8 @@ ParticleSystem: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.53486794 - value: 0.80264115 + time: 0.57541054 + value: 0.4783156 inSlope: -0.19598381 outSlope: -0.19598381 tangentMode: 0 @@ -7872,7 +7872,7 @@ ParticleSystem: outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: 0.67568123 + value: 0.43243706 inSlope: -0.11902377 outSlope: -0.11902377 tangentMode: 0 @@ -15701,8 +15701,8 @@ ParticleSystem: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 - value: 0.7297306 + time: 0.008106232 + value: 0.689188 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -15710,8 +15710,8 @@ ParticleSystem: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.53486794 - value: 0.80264115 + time: 0.57541054 + value: 0.4783156 inSlope: -0.19598381 outSlope: -0.19598381 tangentMode: 0 @@ -15720,7 +15720,7 @@ ParticleSystem: outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: 0.67568123 + value: 0.43243706 inSlope: -0.11902377 outSlope: -0.11902377 tangentMode: 0 @@ -28984,8 +28984,8 @@ ParticleSystem: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 - value: 0.7297306 + time: 0.008106232 + value: 0.689188 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -28993,8 +28993,8 @@ ParticleSystem: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.53486794 - value: 0.80264115 + time: 0.57541054 + value: 0.4783156 inSlope: -0.19598381 outSlope: -0.19598381 tangentMode: 0 @@ -29003,7 +29003,7 @@ ParticleSystem: outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: 0.67568123 + value: 0.43243706 inSlope: -0.11902377 outSlope: -0.11902377 tangentMode: 0 @@ -38956,8 +38956,8 @@ ParticleSystem: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 - value: 0.7297306 + time: 0.008106232 + value: 0.689188 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -38965,8 +38965,8 @@ ParticleSystem: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.53486794 - value: 0.80264115 + time: 0.57541054 + value: 0.4783156 inSlope: -0.19598381 outSlope: -0.19598381 tangentMode: 0 @@ -38975,7 +38975,7 @@ ParticleSystem: outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: 0.67568123 + value: 0.43243706 inSlope: -0.11902377 outSlope: -0.11902377 tangentMode: 0 @@ -46463,8 +46463,8 @@ ParticleSystem: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 - value: 0.7297306 + time: 0.008106232 + value: 0.689188 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -46472,8 +46472,8 @@ ParticleSystem: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.53486794 - value: 0.80264115 + time: 0.57541054 + value: 0.4783156 inSlope: -0.19598381 outSlope: -0.19598381 tangentMode: 0 @@ -46482,7 +46482,7 @@ ParticleSystem: outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: 0.67568123 + value: 0.43243706 inSlope: -0.11902377 outSlope: -0.11902377 tangentMode: 0 diff --git a/FlufflParty/ProjectSettings/ProjectSettings.asset b/FlufflParty/ProjectSettings/ProjectSettings.asset index e767941..df99f39 100644 --- a/FlufflParty/ProjectSettings/ProjectSettings.asset +++ b/FlufflParty/ProjectSettings/ProjectSettings.asset @@ -137,9 +137,7 @@ PlayerSettings: 16:9: 1 Others: 1 bundleVersion: 0.14 - preloadedAssets: - - {fileID: -6230802382160794249, guid: 90cd1b71078984c4980fcd1aa03eaaa3, type: 2} - - {fileID: 11400000, guid: 48bf7376b3770c44cbfe3f40e77359ab, type: 2} + preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 diff --git a/FlufflParty/UserSettings/EditorUserSettings.asset b/FlufflParty/UserSettings/EditorUserSettings.asset index 299540d..bac6747 100644 --- a/FlufflParty/UserSettings/EditorUserSettings.asset +++ b/FlufflParty/UserSettings/EditorUserSettings.asset @@ -12,10 +12,10 @@ EditorUserSettings: value: 55010d0300055a5a595a592641730d44104e4c287b2e71662c7b186bb3b86069 flags: 0 RecentlyUsedSceneGuid-2: - value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a + value: 0000025f04075d0f0c0a5c7149205a4417154f782e7923357e7a4560e3b4653b flags: 0 RecentlyUsedSceneGuid-3: - value: 0000025f04075d0f0c0a5c7149205a4417154f782e7923357e7a4560e3b4653b + value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a flags: 0 UnityRemoteDevice: value: 225f4d46245b0d4902070862342649191512 diff --git a/FlufflParty/UserSettings/Layouts/default-2021.dwlt b/FlufflParty/UserSettings/Layouts/default-2021.dwlt index dcb0356..2ed3b79 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: Project + m_Title: Game 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: 121 + controlID: 72 --- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 @@ -68,8 +68,8 @@ MonoBehaviour: y: 0 width: 436 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: 13} m_Panes: - {fileID: 13} @@ -223,7 +223,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 111 + controlID: 73 --- !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: 112 + controlID: 18 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -259,7 +259,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: SceneView + m_Name: GameView m_EditorClassIdentifier: m_Children: [] m_Position: @@ -268,14 +268,14 @@ MonoBehaviour: y: 0 width: 1149 height: 687 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 15} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 16} m_Panes: - {fileID: 15} - {fileID: 16} - m_Selected: 0 - m_LastSelected: 1 + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -317,22 +317,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/BlenderFiles + - Assets/Scenes m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/BlenderFiles + - Assets/Scenes m_LastFoldersGridSize: -1 m_LastProjectPath: D:\Unity\flufflparty\FlufflParty m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 406b0000 - m_LastClickedID: 27456 - m_ExpandedIDs: 000000002e6b000000ca9a3b + m_SelectedIDs: 8ab70000 + m_LastClickedID: 46986 + m_ExpandedIDs: 0000000072b7000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -360,7 +360,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000002e6b0000 + m_ExpandedIDs: 0000000072b70000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -488,9 +488,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 806b0000 + m_SelectedIDs: 728b0000 m_LastClickedID: 0 - m_ExpandedIDs: 06fbffff3e61000044640000 + m_ExpandedIDs: 8454ffff4a58ffff9058ffff685cffff985cffffd8adffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -733,7 +733,7 @@ MonoBehaviour: containerId: overlay-container--right floating: 0 collapsed: 0 - displayed: 0 + displayed: 1 snapOffset: {x: 0, y: 0} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 @@ -772,9 +772,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 91.13886, y: 8.005933, z: 127.417274} + m_Target: {x: 88.6739, y: 8.351816, z: 117.96452} speed: 2 - m_Value: {x: 91.13886, y: 8.005933, z: 127.417274} + m_Value: {x: 88.6739, y: 8.351816, z: 117.96452} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -821,9 +821,9 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.07268254, y: -0.9251275, z: 0.22817028, w: -0.29470053} + m_Target: {x: -0.10165058, y: -0.898271, z: 0.30950254, w: -0.29506528} speed: 2 - m_Value: {x: 0.07268254, y: 0.92512745, z: -0.22817026, w: 0.29470053} + m_Value: {x: -0.10164657, y: -0.89823556, z: 0.30949032, w: -0.29505363} m_Size: m_Target: 0.6738208 speed: 2 @@ -913,7 +913,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 0 + m_EnableMouseInput: 1 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1