From ecdbef5640ee4fd8c650cd42cbc9494fa55a7b95 Mon Sep 17 00:00:00 2001 From: logzinga <65839350+logzinga@users.noreply.github.com> Date: Fri, 24 Feb 2023 11:17:01 +1100 Subject: [PATCH] changed player color --- Assets/PlayerMat.mat | 80 +++++++++++++++++++++++ Assets/PlayerMat.mat.meta | 8 +++ Assets/Prefabs/Player.prefab | 89 +------------------------- Assets/Scenes/Level01.unity | 2 +- UserSettings/Layouts/default-2021.dwlt | 50 +++++++-------- 5 files changed, 116 insertions(+), 113 deletions(-) create mode 100644 Assets/PlayerMat.mat create mode 100644 Assets/PlayerMat.mat.meta diff --git a/Assets/PlayerMat.mat b/Assets/PlayerMat.mat new file mode 100644 index 0000000..928bbcb --- /dev/null +++ b/Assets/PlayerMat.mat @@ -0,0 +1,80 @@ +%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: PlayerMat + 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} + 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, b: 0.83183813, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/PlayerMat.mat.meta b/Assets/PlayerMat.mat.meta new file mode 100644 index 0000000..e5b7964 --- /dev/null +++ b/Assets/PlayerMat.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: aa53088ab9dc2927d9e84ab6c7f45db6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index 83bd81f..a8455b9 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -34,8 +34,7 @@ Transform: m_LocalPosition: {x: -15.88, y: 1, z: -16.65} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 5037713273956633303} + m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -67,7 +66,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: aa53088ab9dc2927d9e84ab6c7f45db6, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -174,87 +173,3 @@ MonoBehaviour: ScaleThreshold: 0.01 InLocalSpace: 0 Interpolate: 1 ---- !u!1 &5037713273956633298 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5037713273956633303} - - component: {fileID: 5037713273956633296} - - component: {fileID: 5037713273956633297} - m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5037713273956633303 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5037713273956633298} - m_LocalRotation: {x: -0, y: 0.7071068, z: -0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0.5, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 5037713273676016674} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} ---- !u!20 &5037713273956633296 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5037713273956633298} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!81 &5037713273956633297 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5037713273956633298} - m_Enabled: 1 diff --git a/Assets/Scenes/Level01.unity b/Assets/Scenes/Level01.unity index 7948a3b..1cb03e1 100644 --- a/Assets/Scenes/Level01.unity +++ b/Assets/Scenes/Level01.unity @@ -1530,7 +1530,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2108671896} m_LocalRotation: {x: 0.75592655, y: -0, z: -0, w: 0.6546564} - m_LocalPosition: {x: -5.380368, y: 26.56, z: -10.14} + m_LocalPosition: {x: -5.380368, y: 36.85, z: -8.66} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 3bd256b..1806d6a 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1920 height: 978 m_ShowMode: 4 - m_Title: Project + 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: 41 + controlID: 72 --- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 @@ -223,7 +223,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 42 + 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: 17 + controlID: 74 --- !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: @@ -270,12 +270,12 @@ MonoBehaviour: height: 550 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 15} + 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/Prefabs + - Assets/Scenes m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Prefabs + - Assets/Scenes m_LastFoldersGridSize: -1 m_LastProjectPath: /home/logan/HatGunner m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 5c5e0000 - m_LastClickedID: 24156 - m_ExpandedIDs: 000000003a5e000000ca9a3b + m_SelectedIDs: c6660000 + m_LastClickedID: 26310 + m_ExpandedIDs: 000000006c66000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -360,7 +360,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000003a5e0000 + m_ExpandedIDs: 000000006c660000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -488,9 +488,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: ee5e0000 - m_LastClickedID: 0 - m_ExpandedIDs: a2b1fffff2b1ffff2cb3ffff32b3ffffd8b4ffff28b5ffff5eb5ffff62b5ffffb8bbffff74beffffc4beffff08c0ffff10c0ffffd6c0ffffcac2ffff12c3ffff0cccffff4ed4fffffed4ffff42d5ffff12dbfffffee1ffff4ce2ffff8ae3ffff92e3ffff44e5ffff32e6ffff06e7ffff50e8ffff72e9ffff4eeaffff2eefffffaef0ffff8af1ffff28f2ffffc2f2ffff2afbfffff4ffffffae5d00005e640000006800004468000096740000d8740000 + m_SelectedIDs: da670000 + m_LastClickedID: 26586 + m_ExpandedIDs: c8f6ffff08f8ffff38fbffff18670000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -772,9 +772,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 550.5, y: 254, z: 0} + m_Target: {x: 538.4778, y: 250.99454, z: 0} speed: 2 - m_Value: {x: 550.5, y: 254, z: 0} + m_Value: {x: 538.4769, y: 250.99419, z: -0.000012519593} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -805,7 +805,7 @@ MonoBehaviour: m_Fade: m_Target: 0 speed: 2 - m_Value: 0 + m_Value: 1 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} m_Size: {x: 1, y: 1} @@ -823,11 +823,11 @@ MonoBehaviour: m_Rotation: m_Target: {x: 0, y: 0, z: 0, w: 1} speed: 2 - m_Value: {x: 0, y: 0, z: 0, w: 1} + m_Value: {x: -0.00000023107182, y: 0.0000015522646, z: -0.0000005901495, w: -1} m_Size: - m_Target: 606.2724 + m_Target: 674.65393 speed: 2 - m_Value: 606.2724 + m_Value: 674.65283 m_Ortho: m_Target: 1 speed: 2 @@ -845,7 +845,7 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: -0.16148843, y: 0.78426635, z: -0.2287575, w: -0.5536422} + m_LastSceneViewRotation: {x: -0.12956645, y: 0.87038475, z: -0.33090827, w: -0.34079745} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: @@ -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