From 60229bc8a08007e1f50d141ddd97ceadd08dbe75 Mon Sep 17 00:00:00 2001 From: Stedd Date: Mon, 25 Jul 2022 13:59:58 +0200 Subject: [PATCH] some material and prefab changes --- .../Enemies/scifi-drone/material/drone.mat | 5 +- .../Prototyping/Materials/YellowGrid.mat | 259 +++------ .../Prefabs/NestedParent_Unpack.prefab | 535 ------------------ .../Prefabs/PlayerCapsule.prefab | 49 +- 4 files changed, 141 insertions(+), 707 deletions(-) delete mode 100644 Assets/ImportedAssets/StarterAssets/FirstPersonController/Prefabs/NestedParent_Unpack.prefab diff --git a/Assets/ImportedAssets/Enemies/scifi-drone/material/drone.mat b/Assets/ImportedAssets/Enemies/scifi-drone/material/drone.mat index 2a5002f..c615ca5 100644 --- a/Assets/ImportedAssets/Enemies/scifi-drone/material/drone.mat +++ b/Assets/ImportedAssets/Enemies/scifi-drone/material/drone.mat @@ -10,11 +10,12 @@ Material: m_Name: drone m_Shader: {fileID: 47, guid: 0000000000000000f000000000000000, type: 0} m_ValidKeywords: + - _EMISSION - _METALLICGLOSSMAP - _NORMALMAP - _SPECGLOSSMAP m_InvalidKeywords: [] - m_LightmapFlags: 4 + m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 @@ -83,5 +84,5 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 1.0036937, g: 0.63498986, b: 0.3550481, a: 1} + - _EmissionColor: {r: 0.35733595, g: 0.9967227, b: 1.0036937, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/ImportedAssets/Standard Assets/Prototyping/Materials/YellowGrid.mat b/Assets/ImportedAssets/Standard Assets/Prototyping/Materials/YellowGrid.mat index ce5d4da..facee49 100644 --- a/Assets/ImportedAssets/Standard Assets/Prototyping/Materials/YellowGrid.mat +++ b/Assets/ImportedAssets/Standard Assets/Prototyping/Materials/YellowGrid.mat @@ -2,180 +2,101 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: YellowGrid m_Shader: {fileID: 45, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _EMISSION _EMISSIONMAP _LIGHTMAPPING_DYNAMIC_LIGHTMAPS _LIGHTMAPPING_REALTIME - _UVSEC_UV1 + m_ValidKeywords: + - _ALPHAPREMULTIPLY_ON + - _EMISSION + m_InvalidKeywords: + - _EMISSIONMAP + - _LIGHTMAPPING_DYNAMIC_LIGHTMAPS + - _LIGHTMAPPING_REALTIME + - _UVSEC_UV1 m_LightmapFlags: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: [] m_SavedProperties: - serializedVersion: 2 + serializedVersion: 3 m_TexEnvs: - data: - first: - name: _MainTex - second: - m_Texture: {fileID: 2800000, guid: b4646ae63b0bcca40b1bdde3b87e01bf, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - data: - first: - name: _BumpMap - second: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - data: - first: - name: _DetailNormalMap - second: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - data: - first: - name: _ParallaxMap - second: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - data: - first: - name: _OcclusionMap - second: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - data: - first: - name: _EmissionMap - second: - m_Texture: {fileID: 2800000, guid: a196fd6788131ec459bfb26012466fc1, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - data: - first: - name: _DetailMask - second: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - data: - first: - name: _DetailAlbedoMap - second: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - data: - first: - name: _Occlusion - second: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - data: - first: - name: _MetallicGlossMap - second: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - data: - first: - name: _SpecGlossMap - second: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} + - _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: 2800000, guid: a196fd6788131ec459bfb26012466fc1, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: b4646ae63b0bcca40b1bdde3b87e01bf, type: 3} + 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} + - _Occlusion: + 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} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - data: - first: - name: _SrcBlend - second: 1 - data: - first: - name: _DstBlend - second: 0 - data: - first: - name: _Cutoff - second: .5 - data: - first: - name: _AlphaTestRef - second: .5 - data: - first: - name: _Parallax - second: .0199999996 - data: - first: - name: _ZWrite - second: 1 - data: - first: - name: _Glossiness - second: .100000001 - data: - first: - name: _BumpScale - second: 1 - data: - first: - name: _OcclusionStrength - second: 1 - data: - first: - name: _DetailNormalMapScale - second: 1 - data: - first: - name: _UVSec - second: 0 - data: - first: - name: _Mode - second: 0 - data: - first: - name: _Metallic - second: .100000001 - data: - first: - name: _Lightmapping - second: 1 - data: - first: - name: _EmissionScaleUI - second: 2 + - _AlphaTestRef: 0.5 + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 10 + - _EmissionScaleUI: 2 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _Lightmapping: 1 + - _Metallic: 0.1 + - _Mode: 3 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 0 m_Colors: - data: - first: - name: _EmissionColor - second: {r: 1.33483374, g: 1.33483374, b: 1.33483374, a: 1.33483374} - data: - first: - name: _Color - second: {r: 1, g: 1, b: 1, a: 1} - data: - first: - name: _SpecColor - second: {r: .117647059, g: .117647059, b: .117647059, a: 1} - data: - first: - name: _SpecularColor - second: {r: .156862751, g: .156862751, b: .156862751, a: 1} - data: - first: - name: _EmissionColorUI - second: {r: 0, g: 0, b: 0, a: 1} - data: - first: - name: _EmissionColorWithMapUI - second: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 0.23529412} + - _EmissionColor: {r: 1.3348337, g: 1.3348337, b: 1.3348337, a: 1.3348337} + - _EmissionColorUI: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColorWithMapUI: {r: 1, g: 1, b: 1, a: 1} + - _SpecColor: {r: 0.11764706, g: 0.11764706, b: 0.11764706, a: 1} + - _SpecularColor: {r: 0.15686275, g: 0.15686275, b: 0.15686275, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/ImportedAssets/StarterAssets/FirstPersonController/Prefabs/NestedParent_Unpack.prefab b/Assets/ImportedAssets/StarterAssets/FirstPersonController/Prefabs/NestedParent_Unpack.prefab deleted file mode 100644 index c104f0c..0000000 --- a/Assets/ImportedAssets/StarterAssets/FirstPersonController/Prefabs/NestedParent_Unpack.prefab +++ /dev/null @@ -1,535 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &7094977340588366727 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6556307555316582679} - m_Layer: 0 - m_Name: NestedParent_Unpack - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6556307555316582679 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7094977340588366727} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 22.210217, y: -8.786317, z: 23.948788} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 5126527961139664760} - - {fileID: 2862278905927072855} - - {fileID: 937451010987979973} - - {fileID: 3697362953775235280} - - {fileID: 6116018315020930700} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &4253012990495331769 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 6556307555316582679} - m_Modifications: - - target: {fileID: 1992104595683069851, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} - propertyPath: m_Name - value: UI_EventSystem - objectReference: {fileID: 0} - - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} - propertyPath: m_LocalPosition.x - value: -22.210217 - objectReference: {fileID: 0} - - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} - propertyPath: m_LocalPosition.y - value: 8.786317 - objectReference: {fileID: 0} - - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} - propertyPath: m_LocalPosition.z - value: -23.948788 - objectReference: {fileID: 0} - - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: f0271df749728104eac22c3d897fd8ce, type: 3} ---- !u!4 &6116018315020930700 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 8063073397250431797, guid: f0271df749728104eac22c3d897fd8ce, - type: 3} - m_PrefabInstance: {fileID: 4253012990495331769} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &4253012991678481658 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 6556307555316582679} - m_Modifications: - - target: {fileID: 1663187150, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} - propertyPath: thirdPersonInputs - value: - objectReference: {fileID: 4244626405643678211} - - target: {fileID: 1663187150, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} - propertyPath: starterAssetsInputs - value: - objectReference: {fileID: 4244626405643678211} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} - propertyPath: m_Pivot.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} - propertyPath: m_Pivot.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6751388636123340836, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} - propertyPath: m_Name - value: UI_Canvas_StarterAssetsInputs_Joysticks - objectReference: {fileID: 0} - - target: {fileID: 8890774966862588244, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} - propertyPath: playerInput - value: - objectReference: {fileID: 453084650579209843} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 2f7f3dde7ae722a4aafffe20691ad702, type: 3} ---- !u!224 &3697362953775235280 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 597308369130767402, guid: 2f7f3dde7ae722a4aafffe20691ad702, - type: 3} - m_PrefabInstance: {fileID: 4253012991678481658} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &4313866245218740378 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 6556307555316582679} - m_Modifications: - - target: {fileID: 9005220659476430818, guid: 2d3a85ecde41a8246a79669975912b74, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9005220659476430818, guid: 2d3a85ecde41a8246a79669975912b74, - type: 3} - propertyPath: m_LocalPosition.x - value: -22.010216 - objectReference: {fileID: 0} - - target: {fileID: 9005220659476430818, guid: 2d3a85ecde41a8246a79669975912b74, - type: 3} - propertyPath: m_LocalPosition.y - value: 10.161317 - objectReference: {fileID: 0} - - target: {fileID: 9005220659476430818, guid: 2d3a85ecde41a8246a79669975912b74, - type: 3} - propertyPath: m_LocalPosition.z - value: -23.948788 - objectReference: {fileID: 0} - - target: {fileID: 9005220659476430818, guid: 2d3a85ecde41a8246a79669975912b74, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 9005220659476430818, guid: 2d3a85ecde41a8246a79669975912b74, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 9005220659476430818, guid: 2d3a85ecde41a8246a79669975912b74, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 9005220659476430818, guid: 2d3a85ecde41a8246a79669975912b74, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 9005220659476430818, guid: 2d3a85ecde41a8246a79669975912b74, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9005220659476430818, guid: 2d3a85ecde41a8246a79669975912b74, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9005220659476430818, guid: 2d3a85ecde41a8246a79669975912b74, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9005220659476430821, guid: 2d3a85ecde41a8246a79669975912b74, - type: 3} - propertyPath: far clip plane - value: 500 - objectReference: {fileID: 0} - - target: {fileID: 9005220659476430823, guid: 2d3a85ecde41a8246a79669975912b74, - type: 3} - propertyPath: m_Name - value: MainCamera - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 2d3a85ecde41a8246a79669975912b74, type: 3} ---- !u!4 &5126527961139664760 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 9005220659476430818, guid: 2d3a85ecde41a8246a79669975912b74, - type: 3} - m_PrefabInstance: {fileID: 4313866245218740378} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &6782772647021209901 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 6556307555316582679} - m_Modifications: - - target: {fileID: 8762286023885395077, guid: 9c489a8547f4d9e4387da15a4ff82c81, - type: 3} - propertyPath: m_Name - value: PlayerFollowCamera - objectReference: {fileID: 0} - - target: {fileID: 8762286023885395322, guid: 9c489a8547f4d9e4387da15a4ff82c81, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8762286023885395322, guid: 9c489a8547f4d9e4387da15a4ff82c81, - type: 3} - propertyPath: m_LocalPosition.x - value: -22.010216 - objectReference: {fileID: 0} - - target: {fileID: 8762286023885395322, guid: 9c489a8547f4d9e4387da15a4ff82c81, - type: 3} - propertyPath: m_LocalPosition.y - value: 10.161317 - objectReference: {fileID: 0} - - target: {fileID: 8762286023885395322, guid: 9c489a8547f4d9e4387da15a4ff82c81, - type: 3} - propertyPath: m_LocalPosition.z - value: -23.948788 - objectReference: {fileID: 0} - - target: {fileID: 8762286023885395322, guid: 9c489a8547f4d9e4387da15a4ff82c81, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8762286023885395322, guid: 9c489a8547f4d9e4387da15a4ff82c81, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8762286023885395322, guid: 9c489a8547f4d9e4387da15a4ff82c81, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8762286023885395322, guid: 9c489a8547f4d9e4387da15a4ff82c81, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8762286023885395322, guid: 9c489a8547f4d9e4387da15a4ff82c81, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8762286023885395322, guid: 9c489a8547f4d9e4387da15a4ff82c81, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8762286023885395322, guid: 9c489a8547f4d9e4387da15a4ff82c81, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8762286023885395323, guid: 9c489a8547f4d9e4387da15a4ff82c81, - type: 3} - propertyPath: m_Follow - value: - objectReference: {fileID: 5242107653240477475} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 9c489a8547f4d9e4387da15a4ff82c81, type: 3} ---- !u!4 &2862278905927072855 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 8762286023885395322, guid: 9c489a8547f4d9e4387da15a4ff82c81, - type: 3} - m_PrefabInstance: {fileID: 6782772647021209901} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &8204767106804910123 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 6556307555316582679} - m_Modifications: - - target: {fileID: 5393215578589016655, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 6b911390c5825014e8377183a7837d3f, type: 2} - - target: {fileID: 8616685848737228372, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, - type: 3} - propertyPath: m_Name - value: PlayerCapsule - objectReference: {fileID: 0} - - target: {fileID: 8997996947095583982, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, - type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8997996947095583982, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, - type: 3} - propertyPath: m_LocalPosition.x - value: -22.210217 - objectReference: {fileID: 0} - - target: {fileID: 8997996947095583982, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, - type: 3} - propertyPath: m_LocalPosition.y - value: 8.786317 - objectReference: {fileID: 0} - - target: {fileID: 8997996947095583982, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, - type: 3} - propertyPath: m_LocalPosition.z - value: -23.948788 - objectReference: {fileID: 0} - - target: {fileID: 8997996947095583982, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8997996947095583982, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8997996947095583982, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8997996947095583982, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8997996947095583982, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8997996947095583982, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8997996947095583982, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, type: 3} ---- !u!4 &937451010987979973 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 8997996947095583982, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, - type: 3} - m_PrefabInstance: {fileID: 8204767106804910123} - m_PrefabAsset: {fileID: 0} ---- !u!114 &4244626405643678211 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5420857361349278248, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, - type: 3} - m_PrefabInstance: {fileID: 8204767106804910123} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e087ecce43ebbff45a1b360637807d93, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &453084650579209843 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8616685848737228376, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, - type: 3} - m_PrefabInstance: {fileID: 8204767106804910123} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!4 &5242107653240477475 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4135013735270702856, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, - type: 3} - m_PrefabInstance: {fileID: 8204767106804910123} - m_PrefabAsset: {fileID: 0} diff --git a/Assets/ImportedAssets/StarterAssets/FirstPersonController/Prefabs/PlayerCapsule.prefab b/Assets/ImportedAssets/StarterAssets/FirstPersonController/Prefabs/PlayerCapsule.prefab index cb1880b..19df176 100644 --- a/Assets/ImportedAssets/StarterAssets/FirstPersonController/Prefabs/PlayerCapsule.prefab +++ b/Assets/ImportedAssets/StarterAssets/FirstPersonController/Prefabs/PlayerCapsule.prefab @@ -9,6 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2265701993784981172} + - component: {fileID: 9083568455291165773} m_Layer: 8 m_Name: Weapons m_TagString: Untagged @@ -35,6 +36,52 @@ Transform: m_Father: {fileID: 4135013735270702856} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &9083568455291165773 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 160269183453626702} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 01ef216392c8f33409f2efcd91f4e510, type: 3} + m_Name: + m_EditorClassIdentifier: + fireAction: + m_Name: Fire + m_Type: 0 + m_ExpectedControlType: + m_Id: 1ed57d50-dc55-4571-aecd-b32a46cca345 + m_Processors: + m_Interactions: + m_SingletonActionBindings: + - m_Name: + m_Id: 9820ce96-b93a-4117-a273-5fff0a8424d5 + m_Path: /leftButton + m_Interactions: + m_Processors: + m_Groups: + m_Action: Fire + m_Flags: 0 + m_Flags: 0 + reloadAction: + m_Name: Reload + m_Type: 0 + m_ExpectedControlType: + m_Id: b2fa540f-5a3f-4fb7-b40b-672ea6bc4308 + m_Processors: + m_Interactions: + m_SingletonActionBindings: + - m_Name: + m_Id: 58f8c3e7-8210-4dc2-8eae-d4494d6fdbcc + m_Path: /#(R) + m_Interactions: + m_Processors: + m_Groups: + m_Action: Reload + m_Flags: 0 + m_Flags: 0 --- !u!1 &4135013735270702863 GameObject: m_ObjectHideFlags: 0 @@ -511,7 +558,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 117070, guid: 38075ff1c3cff91428ade499a59bdc97, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 417070, guid: 38075ff1c3cff91428ade499a59bdc97, type: 3} propertyPath: m_RootOrder