diff --git a/FlufflParty/Assets/BlenderFiles/DriedTree.blend b/FlufflParty/Assets/BlenderFiles/DriedTree.blend index 93c2d2f..fb551b4 100644 Binary files a/FlufflParty/Assets/BlenderFiles/DriedTree.blend and b/FlufflParty/Assets/BlenderFiles/DriedTree.blend differ diff --git a/FlufflParty/Assets/BlenderFiles/DriedTree.blend1 b/FlufflParty/Assets/BlenderFiles/DriedTree.blend1 index 1539356..93c2d2f 100644 Binary files a/FlufflParty/Assets/BlenderFiles/DriedTree.blend1 and b/FlufflParty/Assets/BlenderFiles/DriedTree.blend1 differ diff --git a/FlufflParty/Assets/BlenderFiles/DriedTree.png b/FlufflParty/Assets/BlenderFiles/DriedTree.png index fc5b6f8..f951b9a 100644 Binary files a/FlufflParty/Assets/BlenderFiles/DriedTree.png and b/FlufflParty/Assets/BlenderFiles/DriedTree.png differ diff --git a/FlufflParty/Assets/BlenderFiles/Fence_1.blend b/FlufflParty/Assets/BlenderFiles/Fence_1.blend new file mode 100644 index 0000000..cbca189 Binary files /dev/null and b/FlufflParty/Assets/BlenderFiles/Fence_1.blend differ diff --git a/FlufflParty/Assets/BlenderFiles/Fence_1.blend.meta b/FlufflParty/Assets/BlenderFiles/Fence_1.blend.meta new file mode 100644 index 0000000..61b243e --- /dev/null +++ b/FlufflParty/Assets/BlenderFiles/Fence_1.blend.meta @@ -0,0 +1,106 @@ +fileFormatVersion: 2 +guid: 1c3596e2807e0274c99d9c566c166edc +ModelImporter: + serializedVersion: 21300 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 1 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/FlufflParty/Assets/BlenderFiles/Fence_1.blend1 b/FlufflParty/Assets/BlenderFiles/Fence_1.blend1 new file mode 100644 index 0000000..03019c5 Binary files /dev/null and b/FlufflParty/Assets/BlenderFiles/Fence_1.blend1 differ diff --git a/FlufflParty/Assets/BlenderFiles/Fence_1.blend1.meta b/FlufflParty/Assets/BlenderFiles/Fence_1.blend1.meta new file mode 100644 index 0000000..aca500a --- /dev/null +++ b/FlufflParty/Assets/BlenderFiles/Fence_1.blend1.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a8130ed1b3bcd4d4d9cc3915487e1750 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FlufflParty/Assets/Scenes/Test.unity b/FlufflParty/Assets/Scenes/Test.unity index 2cbfda8..f4f7104 100644 --- a/FlufflParty/Assets/Scenes/Test.unity +++ b/FlufflParty/Assets/Scenes/Test.unity @@ -1374,7 +1374,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 30.973, y: 49.515, z: 103.288} --- !u!1001 &721223427 PrefabInstance: @@ -1765,6 +1765,63 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1029850237 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 1c3596e2807e0274c99d9c566c166edc, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 1c3596e2807e0274c99d9c566c166edc, type: 3} + propertyPath: m_LocalPosition.x + value: 93.02872 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 1c3596e2807e0274c99d9c566c166edc, type: 3} + propertyPath: m_LocalPosition.y + value: -0.000002861023 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 1c3596e2807e0274c99d9c566c166edc, type: 3} + propertyPath: m_LocalPosition.z + value: 87.050766 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 1c3596e2807e0274c99d9c566c166edc, type: 3} + propertyPath: m_LocalRotation.w + value: -0.4508685 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 1c3596e2807e0274c99d9c566c166edc, type: 3} + propertyPath: m_LocalRotation.x + value: 0.8925904 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 1c3596e2807e0274c99d9c566c166edc, type: 3} + propertyPath: m_LocalRotation.y + value: -0.000000026873863 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 1c3596e2807e0274c99d9c566c166edc, type: 3} + propertyPath: m_LocalRotation.z + value: 0.000000053202534 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 1c3596e2807e0274c99d9c566c166edc, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 1c3596e2807e0274c99d9c566c166edc, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 1c3596e2807e0274c99d9c566c166edc, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 1c3596e2807e0274c99d9c566c166edc, type: 3} + propertyPath: m_Name + value: Fence_1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1c3596e2807e0274c99d9c566c166edc, type: 3} --- !u!1001 &1055831131 PrefabInstance: m_ObjectHideFlags: 0 @@ -3305,7 +3362,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &2112959183 PrefabInstance: diff --git a/FlufflParty/UserSettings/Layouts/default-2021.dwlt b/FlufflParty/UserSettings/Layouts/default-2021.dwlt index 400c2eb..9fd2170 100644 --- a/FlufflParty/UserSettings/Layouts/default-2021.dwlt +++ b/FlufflParty/UserSettings/Layouts/default-2021.dwlt @@ -10,16 +10,16 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: 2249 - y: 302.5 - width: 1206 - height: 715 + x: 8 + y: 51 + width: 1904 + height: 1093 m_ShowMode: 4 - m_Title: + m_Title: Scene m_RootView: {fileID: 6} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -34,8 +34,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Children: - {fileID: 9} - {fileID: 3} @@ -43,12 +43,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 30 - width: 1206 - height: 665 - m_MinSize: {x: 679, y: 492} - m_MaxSize: {x: 14002, y: 14042} + width: 1904 + height: 1043 + m_MinSize: {x: 300, y: 200} + m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 119 + controlID: 89 --- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 @@ -59,15 +59,15 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 921 + x: 1454 y: 0 - width: 285 - height: 665 + width: 450 + height: 1043 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 13} @@ -85,15 +85,15 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 y: 0 - width: 228 - height: 394 + width: 360 + height: 618 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 14} @@ -112,14 +112,14 @@ MonoBehaviour: m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} m_Name: ProjectBrowser - m_EditorClassIdentifier: + m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 394 - width: 921 - height: 271 + y: 618 + width: 1454 + height: 425 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} m_ActualView: {fileID: 12} @@ -138,8 +138,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12008, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Children: - {fileID: 7} - {fileID: 2} @@ -148,10 +148,14 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1206 - height: 715 + width: 1904 + height: 1093 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} + m_UseTopView: 1 + m_TopViewHeight: 30 + m_UseBottomView: 1 + m_BottomViewHeight: 20 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -162,19 +166,18 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12011, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1206 + width: 1904 height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} - m_LoadedToolbars: [] - m_LastLoadedLayoutName: Default + m_LastLoadedLayoutName: --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -185,14 +188,14 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12042, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 695 - width: 1206 + y: 1073 + width: 1904 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -206,8 +209,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Children: - {fileID: 10} - {fileID: 5} @@ -215,12 +218,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 921 - height: 665 - m_MinSize: {x: 403, y: 492} - m_MaxSize: {x: 10001, y: 14042} + width: 1454 + height: 1043 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 92 + controlID: 90 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -231,8 +234,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Children: - {fileID: 4} - {fileID: 11} @@ -240,12 +243,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 921 - height: 394 - m_MinSize: {x: 403, y: 221} - m_MaxSize: {x: 8003, y: 4021} + width: 1454 + height: 618 + m_MinSize: {x: 200, y: 100} + m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 93 + controlID: 91 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -256,15 +259,15 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 228 + x: 360 y: 0 - width: 693 - height: 394 + width: 1094 + height: 618 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 15} @@ -283,53 +286,57 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_MinSize: {x: 230, y: 250} m_MaxSize: {x: 10000, y: 10000} m_TitleContent: m_Text: Project m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: + m_Tooltip: m_Pos: serializedVersion: 2 - x: 2249 - y: 726.5 - width: 920 - height: 250 + x: 8 + y: 699 + width: 1453 + height: 404 m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] m_SearchFilter: - m_NameFilter: + m_NameFilter: m_ClassNames: [] m_AssetLabels: [] m_AssetBundleNames: [] m_VersionControlStates: [] m_SoftLockControlStates: [] - m_ReferencingInstanceIDs: - m_SceneHandles: + m_ReferencingInstanceIDs: + m_SceneHandles: m_ShowAllHits: 0 m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - Assets m_Globs: [] + m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - Assets m_LastFoldersGridSize: -1 - m_LastProjectPath: U:\layout + m_LastProjectPath: F:\Unity\flufflparty\FlufflParty m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: f4350000 - m_LastClickedID: 13812 - m_ExpandedIDs: 00000000f435000000ca9a3b + m_SelectedIDs: e25b0000 + m_LastClickedID: 23522 + m_ExpandedIDs: 00000000e25b0000e45b000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 @@ -342,22 +349,22 @@ MonoBehaviour: m_OriginalEventType: 11 m_IsRenamingFilename: 1 m_ClientGUIView: {fileID: 0} - m_SearchString: + m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 - m_Path: + m_Path: m_Icon: {fileID: 0} - m_ResourceFile: + m_ResourceFile: m_AssetTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: + m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000f4350000 + m_ExpandedIDs: 00000000e25b0000e45b0000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 @@ -370,22 +377,22 @@ MonoBehaviour: m_OriginalEventType: 11 m_IsRenamingFilename: 1 m_ClientGUIView: {fileID: 0} - m_SearchString: + m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 - m_Path: + m_Path: m_Icon: {fileID: 0} - m_ResourceFile: + m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: + m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 @@ -401,9 +408,9 @@ MonoBehaviour: m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 - m_Path: + m_Path: m_Icon: {fileID: 0} - m_ResourceFile: + m_ResourceFile: m_NewAssetIndexInList: -1 m_ScrollPosition: {x: 0, y: 0} m_GridSize: 64 @@ -419,31 +426,34 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_MinSize: {x: 275, y: 50} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Inspector m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: + m_Tooltip: m_Pos: serializedVersion: 2 - x: 3170 - y: 332.5 - width: 284 - height: 644 + x: 1462 + y: 81 + width: 449 + height: 1022 m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] m_ObjectsLockedBeforeSerialization: [] - m_InstanceIDsLockedBeforeSerialization: + m_InstanceIDsLockedBeforeSerialization: m_PreviewResizer: m_CachedPref: 160 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 m_LastVerticalScrollValue: 0 - m_AssetGUID: - m_InstanceID: 0 + m_GlobalObjectId: + m_InspectorMode: 0 m_LockTracker: m_IsLocked: 0 m_PreviewWindow: {fileID: 0} @@ -457,31 +467,34 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Hierarchy m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: + m_Tooltip: m_Pos: serializedVersion: 2 - x: 2249 - y: 332.5 - width: 227 - height: 373 + x: 8 + y: 81 + width: 359 + height: 597 m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: + m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 42fbffff + m_ExpandedIDs: 32fbffff m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 @@ -494,7 +507,7 @@ MonoBehaviour: m_OriginalEventType: 11 m_IsRenamingFilename: 0 m_ClientGUIView: {fileID: 0} - m_SearchString: + m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 m_LockTracker: @@ -511,22 +524,211 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12013, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Scene m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: + m_Tooltip: m_Pos: serializedVersion: 2 - x: 2477 - y: 332.5 - width: 691 - height: 373 + x: 368 + y: 81 + width: 1092 + height: 597 m_ViewDataDictionary: {fileID: 0} - m_ShowContextualTools: 0 + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: + - dockPosition: 0 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: -101, y: -26} + snapCorner: 3 + id: Tool Settings + index: 0 + layout: 1 + - dockPosition: 0 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: -141, y: 149} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 1 + id: unity-grid-and-snap-toolbar + index: 1 + layout: 1 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-scene-view-toolbar + index: 0 + layout: 1 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 1 + id: unity-search-toolbar + index: 1 + layout: 1 + - dockPosition: 0 + containerId: overlay-container--left + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-transform-toolbar + index: 0 + layout: 2 + - dockPosition: 0 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 67.5, y: 86} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Orientation + index: 0 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Light Settings + index: 0 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Camera + index: 1 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Cloth Constraints + index: 2 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Cloth Collisions + index: 3 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Navmesh Display + index: 4 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Agent Display + index: 5 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Obstacle Display + index: 6 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Occlusion Culling + index: 7 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Physics Debugger + index: 8 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Scene Visibility + index: 9 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Particles + index: 10 + layout: 4 m_WindowGUID: cc27987af1a868c49b0894db9c0f5429 m_Gizmos: 1 m_OverrideSceneCullingMask: 6917529027641081856 @@ -537,9 +739,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 0, y: 0, z: 0} + m_Target: {x: 135.21684, y: -23.159435, z: 119.330414} speed: 2 - m_Value: {x: 0, y: 0, z: 0} + m_Value: {x: 135.21684, y: -23.159435, z: 119.330414} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -549,13 +751,14 @@ MonoBehaviour: m_DoValidateTrueMetals: 0 m_ExposureSliderValue: 0 m_SceneViewState: + m_AlwaysRefresh: 0 showFog: 1 - showMaterialUpdate: 0 showSkybox: 1 showFlares: 1 showImageEffects: 1 showParticleSystems: 1 showVisualEffectGraphs: 1 + m_FxEnabled: 1 m_Grid: xGrid: m_Fade: @@ -585,11 +788,11 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_Target: {x: -0.21297622, y: -0.444286, z: 0.10951643, w: -0.863397} speed: 2 - m_Value: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_Value: {x: -0.21279073, y: -0.44553667, z: 0.10982494, w: -0.86264455} m_Size: - m_Target: 10 + m_Target: 31.611065 speed: 2 m_Value: 10 m_Ortho: @@ -604,7 +807,7 @@ MonoBehaviour: m_EasingEnabled: 1 m_EasingDuration: 0.4 m_AccelerationEnabled: 1 - m_FieldOfView: 90 + m_FieldOfViewHorizontalOrVertical: 60 m_NearClip: 0.03 m_FarClip: 10000 m_DynamicClip: 1 @@ -612,7 +815,7 @@ MonoBehaviour: m_LastSceneViewRotation: {x: 0, y: 0, z: 0, w: 0} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} - m_ReplacementString: + m_ReplacementString: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 @@ -626,14 +829,14 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Game m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: + m_Tooltip: m_Pos: serializedVersion: 2 x: 507 @@ -641,17 +844,20 @@ MonoBehaviour: width: 1532 height: 790 m_ViewDataDictionary: {fileID: 0} - m_SerializedViewsNames: [] - m_SerializedViewsValues: [] + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_SerializedViewNames: [] + m_SerializedViewValues: [] m_PlayModeViewName: GameView m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 640, y: 480} + m_TargetSize: {x: 1532, y: 769} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 0 - m_MaximizeOnPlay: 0 + m_EnterPlayModeBehavior: 0 m_UseMipMap: 0 m_VSyncEnabled: 0 m_Gizmos: 0 @@ -664,8 +870,8 @@ MonoBehaviour: vZoomLockedByDefault: 0 m_HBaseRangeMin: -766 m_HBaseRangeMax: 766 - m_VBaseRangeMin: -395 - m_VBaseRangeMax: 395 + m_VBaseRangeMin: -384.5 + m_VBaseRangeMax: 384.5 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -682,11 +888,11 @@ MonoBehaviour: m_DrawArea: serializedVersion: 2 x: 0 - y: 0 + y: 21 width: 1532 - height: 790 + height: 769 m_Scale: {x: 1, y: 1} - m_Translation: {x: 766, y: 395} + m_Translation: {x: 766, y: 384.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 @@ -694,9 +900,9 @@ MonoBehaviour: m_LastShownAreaInsideMargins: serializedVersion: 2 x: -766 - y: -395 + y: -384.5 width: 1532 - height: 790 + height: 769 m_MinimalGUI: 1 m_defaultScale: 1 m_LastWindowPixelSize: {x: 1532, y: 790} @@ -715,14 +921,14 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Console m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: + m_Tooltip: m_Pos: serializedVersion: 2 x: 2249 @@ -730,4 +936,6 @@ MonoBehaviour: width: 920 height: 250 m_ViewDataDictionary: {fileID: 0} - + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: []