diff --git a/FlufflParty/Assets/Materials/Terrain2.mat b/FlufflParty/Assets/Materials/Terrain2.mat new file mode 100644 index 0000000..84200f9 --- /dev/null +++ b/FlufflParty/Assets/Materials/Terrain2.mat @@ -0,0 +1,84 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Terrain2 + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _TerrainHolesTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 0.65678144, b: 0.43867922, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/FlufflParty/Assets/Materials/Terrain2.mat.meta b/FlufflParty/Assets/Materials/Terrain2.mat.meta new file mode 100644 index 0000000..1c02efe --- /dev/null +++ b/FlufflParty/Assets/Materials/Terrain2.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3b347a738f9da654a8d037cebcecd4c9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/FlufflParty/Assets/Scenes/WesternMap.unity b/FlufflParty/Assets/Scenes/WesternMap.unity index 62dcf74..ba1c1d3 100644 --- a/FlufflParty/Assets/Scenes/WesternMap.unity +++ b/FlufflParty/Assets/Scenes/WesternMap.unity @@ -1441,8 +1441,8 @@ RectTransform: m_Father: {fileID: 1314511968} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -14306,7 +14306,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1436672926} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 8b9a305e18de0c04dbd257a21cd47087, type: 3} m_Name: @@ -14331,7 +14331,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1462787853 RectTransform: m_ObjectHideFlags: 0 @@ -18882,8 +18882,8 @@ RectTransform: m_Father: {fileID: 360384492} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -19153,7 +19153,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1903920336 RectTransform: m_ObjectHideFlags: 0 diff --git a/FlufflParty/Assets/Scenes/WesternMap_Profiles/PostProcessing Profile.asset b/FlufflParty/Assets/Scenes/WesternMap_Profiles/PostProcessing Profile.asset index 19b61d6..defe2b4 100644 --- a/FlufflParty/Assets/Scenes/WesternMap_Profiles/PostProcessing Profile.asset +++ b/FlufflParty/Assets/Scenes/WesternMap_Profiles/PostProcessing Profile.asset @@ -32,7 +32,7 @@ MonoBehaviour: value: 1 gradingMode: overrideState: 1 - value: 1 + value: 0 externalLut: overrideState: 1 value: {fileID: 0} @@ -121,9 +121,9 @@ MonoBehaviour: value: {x: 1, y: 0.9939278, z: 0.98910296, w: 0} gamma: overrideState: 1 - value: {x: 1, y: 0.79991716, z: 0.7952631, w: 0} + value: {x: 1, y: 0.6101358, z: 0.61013615, w: 0} gain: - overrideState: 1 + overrideState: 0 value: {x: 1, y: 1, z: 1, w: 0} masterCurve: overrideState: 1 diff --git a/FlufflParty/UserSettings/Layouts/default-2021.dwlt b/FlufflParty/UserSettings/Layouts/default-2021.dwlt index e51697e..54dfc8c 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: Hierarchy + m_Title: Inspector m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -118,7 +118,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 78 + controlID: 17 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -143,7 +143,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 79 + controlID: 18 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -168,7 +168,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 80 + controlID: 19 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -193,7 +193,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 23 + controlID: 20 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -213,8 +213,8 @@ MonoBehaviour: y: 0 width: 313 height: 755 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 14} m_Panes: - {fileID: 14} @@ -230,7 +230,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: @@ -241,13 +241,13 @@ MonoBehaviour: height: 755 m_MinSize: {x: 102, y: 121} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 16} + m_ActualView: {fileID: 20} m_Panes: - {fileID: 16} - {fileID: 15} - {fileID: 20} - m_Selected: 0 - m_LastSelected: 2 + m_Selected: 2 + m_LastSelected: 0 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -294,8 +294,8 @@ MonoBehaviour: y: 0 width: 369 height: 1067 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 18} m_Panes: - {fileID: 18} @@ -343,22 +343,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/BlenderFiles/Textures/Button + - Assets/Materials m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/BlenderFiles/Textures/Button + - Assets/Materials m_LastFoldersGridSize: -1 m_LastProjectPath: D:\Unity\flufflparty\FlufflParty m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 79} - m_SelectedIDs: b4690000 - m_LastClickedID: 27060 - m_ExpandedIDs: 00000000486900004a6900004e690000506900005269000000ca9a3b + scrollPos: {x: 0, y: 277} + m_SelectedIDs: d0610000 + m_LastClickedID: 25040 + m_ExpandedIDs: 000000005c6100005e61000060610000626100006461000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -386,7 +386,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000486900004a6900004c6900004e6900005069000052690000 + m_ExpandedIDs: 000000005c6100005e610000606100006261000064610000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -413,7 +413,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 0 + m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c6230000906400007e6d0000485d00002c610000fa0b020046650000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -473,25 +473,25 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: 828cffff0291ffff4eacffff44c1ffff94c1ffff3cc5ffff48c7ffff9cccffffecccffff94d0ffffa0d2ffff90e6ffffc8f6ffff04fbffff9c5f0000ba070100300801009c080100d0080100e6080100120901004e0901007809010098090100a2090100ac090100d8090100de090100e2090100fc0901003c0a0100 + m_SelectedIDs: 90660000 + m_LastClickedID: 26256 + m_ExpandedIDs: 8cf9ffff06fbffff4c630000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: Back - m_OriginalName: Back + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 67858 + m_UserData: 0 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 0 + m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 9} + m_ClientGUIView: {fileID: 10} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -884,14 +884,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: 663.28094, y: 371.9174, z: 6.018918} + m_Target: {x: 93.41888, y: 5.5334697, z: 123.85117} speed: 2 - m_Value: {x: 663.28094, y: 371.9174, z: 6.018918} + m_Value: {x: 93.41888, y: 5.5334697, z: 123.85117} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -938,17 +938,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.025187694, y: 0.94757295, z: -0.3090909, w: 0.07720698} speed: 2 - m_Value: {x: 0, y: 0, z: 0, w: 1} + m_Value: {x: 0.024723696, y: 0.94767493, z: -0.30912417, w: 0.07578451} m_Size: - m_Target: 439.48425 + m_Target: 1.6191624 speed: 2 - m_Value: 439.48425 + m_Value: 1.5494378 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 @@ -962,7 +962,7 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: 0.21745035, y: 0.7549491, z: -0.30545437, w: 0.53820926} + m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: @@ -1129,7 +1129,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