diff --git a/Assets/Materials/Player.mat b/Assets/Materials/Player.mat index eaf8f5b..d578c0b 100644 --- a/Assets/Materials/Player.mat +++ b/Assets/Materials/Player.mat @@ -1,5 +1,18 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-444352929537514057 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -8,19 +21,19 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Player - m_Shader: {fileID: 4800000, guid: 7b3dd5720b6152047b45788060d64904, type: 3} + m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] - m_InvalidKeywords: - - _FORMSOFTNESSMODE_UNIFORM - m_LightmapFlags: 4 + m_InvalidKeywords: [] + m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -49,6 +62,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _Illum: + 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} @@ -88,6 +105,7 @@ Material: - _AlphaToMask: 0 - _Blend: 0 - _BlendModePreserveSpecular: 1 + - _BlendOp: 0 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -97,6 +115,7 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _DstBlendAlpha: 0 + - _Emission: 1 - _EnvironmentReflections: 1 - _FormSoftness: 0.5 - _FormSoftnessUniform: 1 @@ -113,9 +132,11 @@ Material: - _Parallax: 0.005 - _QueueOffset: 0 - _ReceiveShadows: 1 + - _SampleGI: 0 - _Saturation: 0 - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 + - _Softness: 1 - _SpecularDampen: 0.1 - _SpecularHighlights: 1 - _SrcBlend: 1 @@ -130,7 +151,7 @@ Material: m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _XRayColor: {r: 18.379171, g: 0.18941379, b: 0, a: 0} m_BuildTextureStacks: [] diff --git a/Assets/Models/Paintman-UMotionProject.asset b/Assets/Models/Paintman-UMotionProject.asset index 12c50de..9984ae1 100644 --- a/Assets/Models/Paintman-UMotionProject.asset +++ b/Assets/Models/Paintman-UMotionProject.asset @@ -20,7 +20,7 @@ MonoBehaviour: PoseToolPivotMode: valueInternal: 0 PoseToolMode: - valueInternal: 2 + valueInternal: 1 PoseMirrorMode: valueInternal: 0 ConfigMode: @@ -32,7 +32,7 @@ MonoBehaviour: OpenedClipIndex: valueInternal: 6 SelectedFrame: - valueInternal: 1 + valueInternal: 0 TimelineViewMode: valueInternal: 0 FramesScrollPosition: diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 57f091e..fb4cb39 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -2515,7 +2515,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5033282336136931810, guid: 2f104ea08ab5c4141b58109d91dbe7df, type: 3} propertyPath: m_text - value: Taunt + value: Taunt (E) objectReference: {fileID: 0} - target: {fileID: 6262868416683193056, guid: 2f104ea08ab5c4141b58109d91dbe7df, type: 3} propertyPath: m_Sprite @@ -7204,7 +7204,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 5033282336136931810, guid: 2f104ea08ab5c4141b58109d91dbe7df, type: 3} propertyPath: m_text - value: Pose + value: Pose (C) objectReference: {fileID: 0} - target: {fileID: 6262868416683193056, guid: 2f104ea08ab5c4141b58109d91dbe7df, type: 3} propertyPath: m_Sprite @@ -9574,7 +9574,7 @@ MonoBehaviour: panelRoot: {fileID: 724536060} itemContainer: {fileID: 1582359526} itemPrefab: {fileID: 8162620711324250373, guid: 2f104ea08ab5c4141b58109d91dbe7df, type: 3} - radius: 220 + radius: 150 --- !u!1 &1237210244 GameObject: m_ObjectHideFlags: 0