diff --git a/Assets/OldCharacter/TGBR/Material_1 1.mat b/Assets/OldCharacter/TGBR/Material_1 1.mat index b084a29..cbd664b 100644 --- a/Assets/OldCharacter/TGBR/Material_1 1.mat +++ b/Assets/OldCharacter/TGBR/Material_1 1.mat @@ -11,10 +11,9 @@ Material: m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _EMISSION + m_ValidKeywords: [] m_InvalidKeywords: [] - m_LightmapFlags: 1 + m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 @@ -27,7 +26,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _BaseMap: - m_Texture: {fileID: 2800000, guid: fc33ef2f62490e94e8516121765e6c1f, type: 3} + m_Texture: {fileID: 2800000, guid: 9c79b691e7dc4b7478878417cb6ad010, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BumpMap: @@ -47,11 +46,11 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _EmissionMap: - m_Texture: {fileID: 2800000, guid: fc33ef2f62490e94e8516121765e6c1f, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: fc33ef2f62490e94e8516121765e6c1f, type: 3} + m_Texture: {fileID: 2800000, guid: 9c79b691e7dc4b7478878417cb6ad010, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/OldCharacter/TGBR/Material_1.mat b/Assets/OldCharacter/TGBR/Material_1.mat index b323690..fcc44bd 100644 --- a/Assets/OldCharacter/TGBR/Material_1.mat +++ b/Assets/OldCharacter/TGBR/Material_1.mat @@ -11,10 +11,9 @@ Material: m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _EMISSION + m_ValidKeywords: [] m_InvalidKeywords: [] - m_LightmapFlags: 5 + m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 @@ -82,3 +81,4 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/TPSBR/Animations/Agents/MenuAgentController.controller b/Assets/TPSBR/Animations/Agents/MenuAgentController.controller index d6174f0..6be8361 100644 --- a/Assets/TPSBR/Animations/Agents/MenuAgentController.controller +++ b/Assets/TPSBR/Animations/Agents/MenuAgentController.controller @@ -20,7 +20,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: -203655887218126122, guid: 039975b96c5ffed48b1f6641a64c109c, type: 3} + m_Motion: {fileID: -203655887218126122, guid: dcb42bc06cb479947a8259f5ecfef672, type: 3} m_Tag: m_SpeedParameter: m_MirrorParameter: diff --git a/Assets/TPSBR/Resources/Settings/URP/UniversalRenderPipelineGlobalSettings.asset b/Assets/TPSBR/Resources/Settings/URP/UniversalRenderPipelineGlobalSettings.asset index 155b956..3264c06 100644 --- a/Assets/TPSBR/Resources/Settings/URP/UniversalRenderPipelineGlobalSettings.asset +++ b/Assets/TPSBR/Resources/Settings/URP/UniversalRenderPipelineGlobalSettings.asset @@ -33,26 +33,26 @@ MonoBehaviour: m_Settings: m_SettingsList: m_List: - - rid: 1051813791241076828 + - rid: 1051813860904534127 - rid: 3067256451524460819 - - rid: 1051813791241076829 + - rid: 1051813860904534128 - rid: 3067256451524460821 - - rid: 1051813791241076830 + - rid: 1051813860904534129 - rid: 3067256451524460823 - rid: 3067256451524460824 - - rid: 1051813791241076831 + - rid: 1051813860904534130 - rid: 3067256451524460826 - rid: 3067256451524460827 - rid: 3067256451524460828 - - rid: 1051813791241076832 + - rid: 1051813860904534131 - rid: 3067256451524460830 - - rid: 1051813791241076833 - - rid: 1051813791241076834 - - rid: 1051813791241076835 - - rid: 1051813791241076836 + - rid: 1051813860904534132 + - rid: 1051813860904534133 + - rid: 1051813860904534134 + - rid: 1051813860904534135 - rid: 3067256451524460835 - - rid: 1051813791241076837 - - rid: 1051813791241076838 + - rid: 1051813860904534136 + - rid: 1051813860904534137 - rid: 3067256451524460838 m_RuntimeSettings: m_List: @@ -96,7 +96,7 @@ MonoBehaviour: references: version: 2 RefIds: - - rid: 1051813791241076828 + - rid: 1051813860904534127 type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3} @@ -108,7 +108,7 @@ MonoBehaviour: m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3} m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3} m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3} - - rid: 1051813791241076829 + - rid: 1051813860904534128 type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_Version: 0 @@ -123,7 +123,7 @@ MonoBehaviour: m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} m_DefaultMaskMaterial: {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2} - - rid: 1051813791241076830 + - rid: 1051813860904534129 type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} @@ -131,14 +131,14 @@ MonoBehaviour: m_DefaultLineMaterial: {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d, type: 2} m_DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2} m_DefaultDecalMaterial: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862, type: 2} - - rid: 1051813791241076831 + - rid: 1051813860904534130 type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_Version: 0 m_StripUnusedPostProcessingVariants: 0 m_StripUnusedVariants: 1 m_StripScreenCoordOverrideVariants: 1 - - rid: 1051813791241076832 + - rid: 1051813860904534131 type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime} data: m_Version: 0 @@ -151,21 +151,21 @@ MonoBehaviour: m_OcclusionCullingDebugKernels: {fileID: 7200000, guid: b23e766bcf50ca4438ef186b174557df, type: 3} m_DebugOcclusionTestPS: {fileID: 4800000, guid: d3f0849180c2d0944bc71060693df100, type: 3} m_DebugOccluderPS: {fileID: 4800000, guid: b3c92426a88625841ab15ca6a7917248, type: 3} - - rid: 1051813791241076833 + - rid: 1051813860904534132 type: {class: ProbeVolumeRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 probeVolumeBlendStatesCS: {fileID: 7200000, guid: a3f7b8c99de28a94684cb1daebeccf5d, type: 3} probeVolumeUploadDataCS: {fileID: 7200000, guid: 0951de5992461754fa73650732c4954c, type: 3} probeVolumeUploadDataL2CS: {fileID: 7200000, guid: 6196f34ed825db14b81fb3eb0ea8d931, type: 3} - - rid: 1051813791241076834 + - rid: 1051813860904534133 type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_version: 0 m_IncludeReferencedInScenes: 0 m_IncludeAssetsByLabel: 0 m_LabelToInclude: - - rid: 1051813791241076835 + - rid: 1051813860904534134 type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 @@ -178,13 +178,13 @@ MonoBehaviour: skyOcclusionRT: {fileID: -5126288278712620388, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3} renderingLayerCS: {fileID: -6772857160820960102, guid: 94a070d33e408384bafc1dea4a565df9, type: 3} renderingLayerRT: {fileID: -5126288278712620388, guid: 94a070d33e408384bafc1dea4a565df9, type: 3} - - rid: 1051813791241076836 + - rid: 1051813860904534135 type: {class: STP/RuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_setupCS: {fileID: 7200000, guid: 33be2e9a5506b2843bdb2bdff9cad5e1, type: 3} m_preTaaCS: {fileID: 7200000, guid: a679dba8ec4d9ce45884a270b0e22dda, type: 3} m_taaCS: {fileID: 7200000, guid: 3923900e2b41b5e47bc25bfdcbcdc9e6, type: 3} - - rid: 1051813791241076837 + - rid: 1051813860904534136 type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 @@ -194,7 +194,7 @@ MonoBehaviour: probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3} probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3} numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3} - - rid: 1051813791241076838 + - rid: 1051813860904534137 type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1