summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchai <215380520@qq.com>2024-04-18 00:55:34 +0800
committerchai <215380520@qq.com>2024-04-18 00:55:34 +0800
commitcc0c9d088b661c27fd70818f39465fdbab7294cd (patch)
treee68258efda5b35bbc203264e5c99918fd314fbbc
parent9195d35e9aaab77b315d5c689fd86bce599ab42c (diff)
*unity 2022
-rw-r--r--ActiveRagdoll/Assets/Bundle/Materials/mat_gray.mat9
-rw-r--r--ActiveRagdoll/Assets/Settings/URP-Balanced.asset53
-rw-r--r--ActiveRagdoll/Assets/Settings/URP-HighFidelity-Renderer.asset26
-rw-r--r--ActiveRagdoll/Assets/Settings/URP-HighFidelity.asset53
-rw-r--r--ActiveRagdoll/Assets/Settings/URP-Performant.asset53
-rw-r--r--ActiveRagdoll/Assets/TABG/Materials/default_material.mat11
-rw-r--r--ActiveRagdoll/Assets/TABG/Models/New Material.mat9
-rw-r--r--ActiveRagdoll/Assets/TABG/Scripts/Debug/DebugFps.cs21
-rw-r--r--ActiveRagdoll/Assets/TABG/Scripts/Debug/DebugFps.cs.meta11
-rw-r--r--ActiveRagdoll/Assets/TABG/Test.unity217
-rw-r--r--ActiveRagdoll/Assets/UniversalRenderPipelineGlobalSettings.asset16
-rw-r--r--ActiveRagdoll/Packages/packages-lock.json99
-rw-r--r--ActiveRagdoll/ProjectSettings/ProjectVersion.txt4
-rw-r--r--ActiveRagdoll/ProjectSettings/ShaderGraphSettings.asset1
-rw-r--r--ActiveRagdoll/ProjectSettings/URPProjectSettings.asset2
-rw-r--r--ActiveRagdoll/ProjectSettings/boot.config0
16 files changed, 493 insertions, 92 deletions
diff --git a/ActiveRagdoll/Assets/Bundle/Materials/mat_gray.mat b/ActiveRagdoll/Assets/Bundle/Materials/mat_gray.mat
index 065f440..d780172 100644
--- a/ActiveRagdoll/Assets/Bundle/Materials/mat_gray.mat
+++ b/ActiveRagdoll/Assets/Bundle/Materials/mat_gray.mat
@@ -9,6 +9,8 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: mat_gray
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+ m_Parent: {fileID: 0}
+ m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
@@ -18,6 +20,7 @@ Material:
stringTagMap:
RenderType: Opaque
disabledShaderPasses: []
+ m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
@@ -80,7 +83,9 @@ Material:
m_Ints: []
m_Floats:
- _AlphaClip: 0
+ - _AlphaToMask: 0
- _Blend: 0
+ - _BlendModePreserveSpecular: 1
- _BumpScale: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
@@ -89,6 +94,7 @@ Material:
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
+ - _DstBlendAlpha: 0
- _EnvironmentReflections: 1
- _GlossMapScale: 0
- _Glossiness: 0
@@ -102,6 +108,7 @@ Material:
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
+ - _SrcBlendAlpha: 1
- _Surface: 0
- _WorkflowMode: 1
- _ZWrite: 1
@@ -123,4 +130,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
- version: 5
+ version: 7
diff --git a/ActiveRagdoll/Assets/Settings/URP-Balanced.asset b/ActiveRagdoll/Assets/Settings/URP-Balanced.asset
index 83ee844..65bbfc8 100644
--- a/ActiveRagdoll/Assets/Settings/URP-Balanced.asset
+++ b/ActiveRagdoll/Assets/Settings/URP-Balanced.asset
@@ -12,8 +12,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3}
m_Name: URP-Balanced
m_EditorClassIdentifier:
- k_AssetVersion: 9
- k_AssetPreviousVersion: 9
+ k_AssetVersion: 11
+ k_AssetPreviousVersion: 11
m_RendererType: 1
m_RendererData: {fileID: 0}
m_RendererDataList:
@@ -23,10 +23,16 @@ MonoBehaviour:
m_RequireOpaqueTexture: 0
m_OpaqueDownsampling: 1
m_SupportsTerrainHoles: 1
- m_StoreActionsOptimization: 0
m_SupportsHDR: 1
+ m_HDRColorBufferPrecision: 0
m_MSAA: 1
m_RenderScale: 1
+ m_UpscalingFilter: 0
+ m_FsrOverrideSharpness: 0
+ m_FsrSharpness: 0.92
+ m_EnableLODCrossFade: 1
+ m_LODCrossFadeDitheringType: 1
+ m_ShEvalMode: 0
m_MainLightRenderingMode: 1
m_MainLightShadowsSupported: 1
m_MainLightShadowmapResolution: 1024
@@ -47,23 +53,62 @@ MonoBehaviour:
m_CascadeBorder: 0.1
m_ShadowDepthBias: 1
m_ShadowNormalBias: 1
+ m_AnyShadowsSupported: 1
m_SoftShadowsSupported: 1
+ m_ConservativeEnclosingSphere: 0
+ m_NumIterationsEnclosingSphere: 64
+ m_SoftShadowQuality: 2
m_AdditionalLightsCookieResolution: 512
m_AdditionalLightsCookieFormat: 1
m_UseSRPBatcher: 1
m_SupportsDynamicBatching: 0
m_MixedLightingSupported: 1
+ m_SupportsLightCookies: 1
m_SupportsLightLayers: 0
m_DebugLevel: 0
+ m_StoreActionsOptimization: 0
+ m_EnableRenderGraph: 0
m_UseAdaptivePerformance: 1
m_ColorGradingMode: 0
m_ColorGradingLutSize: 32
m_UseFastSRGBLinearConversion: 0
+ m_SupportDataDrivenLensFlare: 1
m_ShadowType: 1
m_LocalShadowsSupported: 0
m_LocalShadowsAtlasResolution: 256
m_MaxPixelLights: 0
m_ShadowAtlasResolution: 256
- m_ShaderVariantLogLevel: 0
m_VolumeFrameworkUpdateMode: 0
+ m_Textures:
+ blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3}
+ bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3}
+ m_PrefilteringModeMainLightShadows: 1
+ m_PrefilteringModeAdditionalLight: 4
+ m_PrefilteringModeAdditionalLightShadows: 1
+ m_PrefilterXRKeywords: 0
+ m_PrefilteringModeForwardPlus: 1
+ m_PrefilteringModeDeferredRendering: 1
+ m_PrefilteringModeScreenSpaceOcclusion: 1
+ m_PrefilterDebugKeywords: 0
+ m_PrefilterWriteRenderingLayers: 0
+ m_PrefilterHDROutput: 0
+ m_PrefilterSSAODepthNormals: 0
+ m_PrefilterSSAOSourceDepthLow: 0
+ m_PrefilterSSAOSourceDepthMedium: 0
+ m_PrefilterSSAOSourceDepthHigh: 0
+ m_PrefilterSSAOInterleaved: 0
+ m_PrefilterSSAOBlueNoise: 0
+ m_PrefilterSSAOSampleCountLow: 0
+ m_PrefilterSSAOSampleCountMedium: 0
+ m_PrefilterSSAOSampleCountHigh: 0
+ m_PrefilterDBufferMRT1: 0
+ m_PrefilterDBufferMRT2: 0
+ m_PrefilterDBufferMRT3: 0
+ m_PrefilterSoftShadowsQualityLow: 0
+ m_PrefilterSoftShadowsQualityMedium: 0
+ m_PrefilterSoftShadowsQualityHigh: 0
+ m_PrefilterSoftShadows: 0
+ m_PrefilterScreenCoord: 0
+ m_PrefilterNativeRenderPass: 0
+ m_ShaderVariantLogLevel: 0
m_ShadowCascades: 0
diff --git a/ActiveRagdoll/Assets/Settings/URP-HighFidelity-Renderer.asset b/ActiveRagdoll/Assets/Settings/URP-HighFidelity-Renderer.asset
index 90883f9..d9cfc00 100644
--- a/ActiveRagdoll/Assets/Settings/URP-HighFidelity-Renderer.asset
+++ b/ActiveRagdoll/Assets/Settings/URP-HighFidelity-Renderer.asset
@@ -13,8 +13,8 @@ MonoBehaviour:
m_Name: SSAO
m_EditorClassIdentifier:
m_Active: 1
- m_Shader: {fileID: 4800000, guid: 0849e84e3d62649e8882e9d6f056a017, type: 3}
m_Settings:
+ AOMethod: 1
Downsample: 0
AfterOpaque: 0
Source: 1
@@ -22,7 +22,19 @@ MonoBehaviour:
Intensity: 0.5
DirectLightingStrength: 0.25
Radius: 0.25
- SampleCount: 12
+ Samples: 0
+ BlurQuality: 0
+ Falloff: 100
+ SampleCount: -1
+ m_BlueNoise256Textures:
+ - {fileID: 2800000, guid: 36f118343fc974119bee3d09e2111500, type: 3}
+ - {fileID: 2800000, guid: 4b7b083e6b6734e8bb2838b0b50a0bc8, type: 3}
+ - {fileID: 2800000, guid: c06cc21c692f94f5fb5206247191eeee, type: 3}
+ - {fileID: 2800000, guid: cb76dd40fa7654f9587f6a344f125c9a, type: 3}
+ - {fileID: 2800000, guid: e32226222ff144b24bf3a5a451de54bc, type: 3}
+ - {fileID: 2800000, guid: 3302065f671a8450b82c9ddf07426f3a, type: 3}
+ - {fileID: 2800000, guid: 56a77a3e8d64f47b6afe9e3c95cb57d5, type: 3}
+ m_Shader: {fileID: 4800000, guid: 0849e84e3d62649e8882e9d6f056a017, type: 3}
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -38,6 +50,7 @@ MonoBehaviour:
debugShaders:
debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7,
type: 3}
+ hdrDebugViewPS: {fileID: 4800000, guid: 573620ae32aec764abd4d728906d2587, type: 3}
m_RendererFeatures:
- {fileID: -1878332245247344467}
m_RendererFeatureMap: adc0de57c6d2eee5
@@ -51,15 +64,19 @@ MonoBehaviour:
samplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3}
stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3}
fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3}
+ fallbackLoadingPS: {fileID: 4800000, guid: 7f888aff2ac86494babad1c2c5daeee2, type: 3}
materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3}
coreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3}
coreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b,
type: 3}
+ blitHDROverlay: {fileID: 4800000, guid: a89bee29cffa951418fc1e2da94d1959, type: 3}
cameraMotionVector: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf,
type: 3}
objectMotionVector: {fileID: 4800000, guid: 7b3ede40266cd49a395def176e1bc486,
type: 3}
- m_AssetVersion: 1
+ dataDrivenLensFlare: {fileID: 4800000, guid: 6cda457ac28612740adb23da5d39ea92,
+ type: 3}
+ m_AssetVersion: 2
m_OpaqueLayerMask:
serializedVersion: 2
m_Bits: 4294967295
@@ -76,7 +93,6 @@ MonoBehaviour:
m_ShadowTransparentReceive: 1
m_RenderingMode: 0
m_DepthPrimingMode: 0
+ m_CopyDepthMode: 0
m_AccurateGbufferNormals: 0
- m_ClusteredRendering: 0
- m_TileSize: 32
m_IntermediateTextureMode: 1
diff --git a/ActiveRagdoll/Assets/Settings/URP-HighFidelity.asset b/ActiveRagdoll/Assets/Settings/URP-HighFidelity.asset
index 6248100..d526597 100644
--- a/ActiveRagdoll/Assets/Settings/URP-HighFidelity.asset
+++ b/ActiveRagdoll/Assets/Settings/URP-HighFidelity.asset
@@ -12,8 +12,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3}
m_Name: URP-HighFidelity
m_EditorClassIdentifier:
- k_AssetVersion: 9
- k_AssetPreviousVersion: 9
+ k_AssetVersion: 11
+ k_AssetPreviousVersion: 11
m_RendererType: 1
m_RendererData: {fileID: 0}
m_RendererDataList:
@@ -23,10 +23,16 @@ MonoBehaviour:
m_RequireOpaqueTexture: 0
m_OpaqueDownsampling: 1
m_SupportsTerrainHoles: 1
- m_StoreActionsOptimization: 0
m_SupportsHDR: 1
+ m_HDRColorBufferPrecision: 0
m_MSAA: 4
m_RenderScale: 1
+ m_UpscalingFilter: 0
+ m_FsrOverrideSharpness: 0
+ m_FsrSharpness: 0.92
+ m_EnableLODCrossFade: 1
+ m_LODCrossFadeDitheringType: 1
+ m_ShEvalMode: 0
m_MainLightRenderingMode: 1
m_MainLightShadowsSupported: 1
m_MainLightShadowmapResolution: 4096
@@ -47,23 +53,62 @@ MonoBehaviour:
m_CascadeBorder: 0.1
m_ShadowDepthBias: 1
m_ShadowNormalBias: 1
+ m_AnyShadowsSupported: 1
m_SoftShadowsSupported: 1
+ m_ConservativeEnclosingSphere: 0
+ m_NumIterationsEnclosingSphere: 64
+ m_SoftShadowQuality: 2
m_AdditionalLightsCookieResolution: 4096
m_AdditionalLightsCookieFormat: 4
m_UseSRPBatcher: 1
m_SupportsDynamicBatching: 0
m_MixedLightingSupported: 1
+ m_SupportsLightCookies: 1
m_SupportsLightLayers: 0
m_DebugLevel: 0
+ m_StoreActionsOptimization: 0
+ m_EnableRenderGraph: 0
m_UseAdaptivePerformance: 1
m_ColorGradingMode: 0
m_ColorGradingLutSize: 32
m_UseFastSRGBLinearConversion: 0
+ m_SupportDataDrivenLensFlare: 1
m_ShadowType: 1
m_LocalShadowsSupported: 0
m_LocalShadowsAtlasResolution: 256
m_MaxPixelLights: 0
m_ShadowAtlasResolution: 256
- m_ShaderVariantLogLevel: 0
m_VolumeFrameworkUpdateMode: 0
+ m_Textures:
+ blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3}
+ bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3}
+ m_PrefilteringModeMainLightShadows: 1
+ m_PrefilteringModeAdditionalLight: 4
+ m_PrefilteringModeAdditionalLightShadows: 1
+ m_PrefilterXRKeywords: 0
+ m_PrefilteringModeForwardPlus: 1
+ m_PrefilteringModeDeferredRendering: 1
+ m_PrefilteringModeScreenSpaceOcclusion: 1
+ m_PrefilterDebugKeywords: 0
+ m_PrefilterWriteRenderingLayers: 0
+ m_PrefilterHDROutput: 0
+ m_PrefilterSSAODepthNormals: 0
+ m_PrefilterSSAOSourceDepthLow: 0
+ m_PrefilterSSAOSourceDepthMedium: 0
+ m_PrefilterSSAOSourceDepthHigh: 0
+ m_PrefilterSSAOInterleaved: 0
+ m_PrefilterSSAOBlueNoise: 0
+ m_PrefilterSSAOSampleCountLow: 0
+ m_PrefilterSSAOSampleCountMedium: 0
+ m_PrefilterSSAOSampleCountHigh: 0
+ m_PrefilterDBufferMRT1: 0
+ m_PrefilterDBufferMRT2: 0
+ m_PrefilterDBufferMRT3: 0
+ m_PrefilterSoftShadowsQualityLow: 0
+ m_PrefilterSoftShadowsQualityMedium: 0
+ m_PrefilterSoftShadowsQualityHigh: 0
+ m_PrefilterSoftShadows: 0
+ m_PrefilterScreenCoord: 0
+ m_PrefilterNativeRenderPass: 0
+ m_ShaderVariantLogLevel: 0
m_ShadowCascades: 1
diff --git a/ActiveRagdoll/Assets/Settings/URP-Performant.asset b/ActiveRagdoll/Assets/Settings/URP-Performant.asset
index 5e53341..8650b69 100644
--- a/ActiveRagdoll/Assets/Settings/URP-Performant.asset
+++ b/ActiveRagdoll/Assets/Settings/URP-Performant.asset
@@ -12,8 +12,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3}
m_Name: URP-Performant
m_EditorClassIdentifier:
- k_AssetVersion: 9
- k_AssetPreviousVersion: 9
+ k_AssetVersion: 11
+ k_AssetPreviousVersion: 11
m_RendererType: 1
m_RendererData: {fileID: 0}
m_RendererDataList:
@@ -23,10 +23,16 @@ MonoBehaviour:
m_RequireOpaqueTexture: 0
m_OpaqueDownsampling: 1
m_SupportsTerrainHoles: 1
- m_StoreActionsOptimization: 0
m_SupportsHDR: 0
+ m_HDRColorBufferPrecision: 0
m_MSAA: 1
m_RenderScale: 1
+ m_UpscalingFilter: 0
+ m_FsrOverrideSharpness: 0
+ m_FsrSharpness: 0.92
+ m_EnableLODCrossFade: 1
+ m_LODCrossFadeDitheringType: 1
+ m_ShEvalMode: 0
m_MainLightRenderingMode: 1
m_MainLightShadowsSupported: 0
m_MainLightShadowmapResolution: 1024
@@ -47,23 +53,62 @@ MonoBehaviour:
m_CascadeBorder: 0.1
m_ShadowDepthBias: 1
m_ShadowNormalBias: 1
+ m_AnyShadowsSupported: 1
m_SoftShadowsSupported: 0
+ m_ConservativeEnclosingSphere: 0
+ m_NumIterationsEnclosingSphere: 64
+ m_SoftShadowQuality: 2
m_AdditionalLightsCookieResolution: 2048
m_AdditionalLightsCookieFormat: 3
m_UseSRPBatcher: 1
m_SupportsDynamicBatching: 0
m_MixedLightingSupported: 1
+ m_SupportsLightCookies: 1
m_SupportsLightLayers: 0
m_DebugLevel: 0
+ m_StoreActionsOptimization: 0
+ m_EnableRenderGraph: 0
m_UseAdaptivePerformance: 1
m_ColorGradingMode: 0
m_ColorGradingLutSize: 16
m_UseFastSRGBLinearConversion: 0
+ m_SupportDataDrivenLensFlare: 1
m_ShadowType: 1
m_LocalShadowsSupported: 0
m_LocalShadowsAtlasResolution: 256
m_MaxPixelLights: 0
m_ShadowAtlasResolution: 256
- m_ShaderVariantLogLevel: 0
m_VolumeFrameworkUpdateMode: 0
+ m_Textures:
+ blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3}
+ bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3}
+ m_PrefilteringModeMainLightShadows: 1
+ m_PrefilteringModeAdditionalLight: 4
+ m_PrefilteringModeAdditionalLightShadows: 1
+ m_PrefilterXRKeywords: 0
+ m_PrefilteringModeForwardPlus: 1
+ m_PrefilteringModeDeferredRendering: 1
+ m_PrefilteringModeScreenSpaceOcclusion: 1
+ m_PrefilterDebugKeywords: 0
+ m_PrefilterWriteRenderingLayers: 0
+ m_PrefilterHDROutput: 0
+ m_PrefilterSSAODepthNormals: 0
+ m_PrefilterSSAOSourceDepthLow: 0
+ m_PrefilterSSAOSourceDepthMedium: 0
+ m_PrefilterSSAOSourceDepthHigh: 0
+ m_PrefilterSSAOInterleaved: 0
+ m_PrefilterSSAOBlueNoise: 0
+ m_PrefilterSSAOSampleCountLow: 0
+ m_PrefilterSSAOSampleCountMedium: 0
+ m_PrefilterSSAOSampleCountHigh: 0
+ m_PrefilterDBufferMRT1: 0
+ m_PrefilterDBufferMRT2: 0
+ m_PrefilterDBufferMRT3: 0
+ m_PrefilterSoftShadowsQualityLow: 0
+ m_PrefilterSoftShadowsQualityMedium: 0
+ m_PrefilterSoftShadowsQualityHigh: 0
+ m_PrefilterSoftShadows: 0
+ m_PrefilterScreenCoord: 0
+ m_PrefilterNativeRenderPass: 0
+ m_ShaderVariantLogLevel: 0
m_ShadowCascades: 0
diff --git a/ActiveRagdoll/Assets/TABG/Materials/default_material.mat b/ActiveRagdoll/Assets/TABG/Materials/default_material.mat
index 9a3fc4d..3fa491b 100644
--- a/ActiveRagdoll/Assets/TABG/Materials/default_material.mat
+++ b/ActiveRagdoll/Assets/TABG/Materials/default_material.mat
@@ -9,6 +9,8 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: default_material
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+ m_Parent: {fileID: 0}
+ m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _ALPHAPREMULTIPLY_ON
- _RECEIVE_SHADOWS_OFF
@@ -23,6 +25,7 @@ Material:
disabledShaderPasses:
- DepthOnly
- SHADOWCASTER
+ m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
@@ -85,7 +88,9 @@ Material:
m_Ints: []
m_Floats:
- _AlphaClip: 0
- - _Blend: 1
+ - _AlphaToMask: 0
+ - _Blend: 0
+ - _BlendModePreserveSpecular: 1
- _BumpScale: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
@@ -94,6 +99,7 @@ Material:
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 10
+ - _DstBlendAlpha: 10
- _EnvironmentReflections: 1
- _GlossMapScale: 0
- _Glossiness: 0
@@ -107,6 +113,7 @@ Material:
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
+ - _SrcBlendAlpha: 1
- _Surface: 1
- _WorkflowMode: 1
- _ZWrite: 0
@@ -128,4 +135,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
- version: 5
+ version: 7
diff --git a/ActiveRagdoll/Assets/TABG/Models/New Material.mat b/ActiveRagdoll/Assets/TABG/Models/New Material.mat
index d96e8e3..645d635 100644
--- a/ActiveRagdoll/Assets/TABG/Models/New Material.mat
+++ b/ActiveRagdoll/Assets/TABG/Models/New Material.mat
@@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
- version: 5
+ version: 7
--- !u!21 &2100000
Material:
serializedVersion: 8
@@ -22,6 +22,8 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: New Material
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+ m_Parent: {fileID: 0}
+ m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
@@ -31,6 +33,7 @@ Material:
stringTagMap:
RenderType: Opaque
disabledShaderPasses: []
+ m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
@@ -93,7 +96,9 @@ Material:
m_Ints: []
m_Floats:
- _AlphaClip: 0
+ - _AlphaToMask: 0
- _Blend: 0
+ - _BlendModePreserveSpecular: 1
- _BumpScale: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
@@ -102,6 +107,7 @@ Material:
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
+ - _DstBlendAlpha: 0
- _EnvironmentReflections: 1
- _GlossMapScale: 0
- _Glossiness: 0
@@ -115,6 +121,7 @@ Material:
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
+ - _SrcBlendAlpha: 1
- _Surface: 0
- _WorkflowMode: 1
- _ZWrite: 1
diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Debug/DebugFps.cs b/ActiveRagdoll/Assets/TABG/Scripts/Debug/DebugFps.cs
new file mode 100644
index 0000000..75f68fa
--- /dev/null
+++ b/ActiveRagdoll/Assets/TABG/Scripts/Debug/DebugFps.cs
@@ -0,0 +1,21 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class DebugFps : MonoBehaviour
+{
+ // Start is called before the first frame update
+ void Start()
+ {
+
+ }
+
+ // Update is called once per frame
+ void Update()
+ {
+ if (Time.deltaTime > 0.1f)
+ {
+ Debug.Log("lag");
+ }
+ }
+}
diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Debug/DebugFps.cs.meta b/ActiveRagdoll/Assets/TABG/Scripts/Debug/DebugFps.cs.meta
new file mode 100644
index 0000000..09ec6a4
--- /dev/null
+++ b/ActiveRagdoll/Assets/TABG/Scripts/Debug/DebugFps.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 0c434c840bdccd44eb3b468eda3d8de8
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/ActiveRagdoll/Assets/TABG/Test.unity b/ActiveRagdoll/Assets/TABG/Test.unity
index 85d3570..e8b8307 100644
--- a/ActiveRagdoll/Assets/TABG/Test.unity
+++ b/ActiveRagdoll/Assets/TABG/Test.unity
@@ -104,7 +104,7 @@ NavMeshSettings:
serializedVersion: 2
m_ObjectHideFlags: 0
m_BuildSettings:
- serializedVersion: 2
+ serializedVersion: 3
agentTypeID: 0
agentRadius: 0.5
agentHeight: 2
@@ -117,7 +117,7 @@ NavMeshSettings:
cellSize: 0.16666667
manualTileSize: 0
tileSize: 256
- accuratePlacement: 0
+ buildHeightMesh: 0
maxJobWorkers: 0
preserveTilesOutsideBounds: 0
debug:
@@ -160,13 +160,57 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 23701354}
+ serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -1.6151596, y: 0.62225217, z: 0.94675076}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 3
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &388376335
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 388376337}
+ - component: {fileID: 388376336}
+ m_Layer: 0
+ m_Name: GameObject
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &388376336
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 388376335}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 0c434c840bdccd44eb3b468eda3d8de8, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+--- !u!4 &388376337
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 388376335}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 5.659071, y: 0.13835071, z: 2.78826}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!850595691 &403353010
LightingSettings:
@@ -175,7 +219,7 @@ LightingSettings:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
- serializedVersion: 4
+ serializedVersion: 6
m_GIWorkflowMode: 1
m_EnableBakedLightmaps: 1
m_EnableRealtimeLightmaps: 0
@@ -214,8 +258,8 @@ LightingSettings:
m_PVREnvironmentReferencePointCount: 2048
m_LightProbeSampleCountMultiplier: 4
m_PVRBounces: 2
- m_PVRMinBounces: 1
- m_PVREnvironmentMIS: 1
+ m_PVRMinBounces: 2
+ m_PVREnvironmentImportanceSampling: 1
m_PVRFilteringMode: 1
m_PVRDenoiserTypeDirect: 1
m_PVRDenoiserTypeIndirect: 1
@@ -230,6 +274,8 @@ LightingSettings:
m_PVRFilteringAtrousPositionSigmaIndirect: 2
m_PVRFilteringAtrousPositionSigmaAO: 1
m_PVRTiledBaking: 0
+ m_NumRaysToShootPerTexel: -1
+ m_RespectSceneVisibilityWhenBakingGI: 0
--- !u!1 &705426289
GameObject:
m_ObjectHideFlags: 0
@@ -257,9 +303,17 @@ BoxCollider:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 705426289}
m_Material: {fileID: 0}
+ m_IncludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_ExcludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_LayerOverridePriority: 0
m_IsTrigger: 0
+ m_ProvidesContacts: 0
m_Enabled: 1
- serializedVersion: 2
+ serializedVersion: 3
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!23 &705426291
@@ -319,13 +373,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 705426289}
+ serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 1.168, y: -0.08, z: 0.14327973}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1061905091}
- m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &705806567
GameObject:
@@ -354,9 +408,17 @@ MeshCollider:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 705806567}
m_Material: {fileID: 0}
+ m_IncludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_ExcludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_LayerOverridePriority: 0
m_IsTrigger: 0
+ m_ProvidesContacts: 0
m_Enabled: 1
- serializedVersion: 4
+ serializedVersion: 5
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
@@ -417,13 +479,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 705806567}
+ serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 100, y: 1, z: 100}
+ m_LocalPosition: {x: 0, y: 0, z: 47.01}
+ m_LocalScale: {x: 1000, y: 1, z: 1000}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1061905091}
- m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &814323549
GameObject:
@@ -452,9 +514,17 @@ BoxCollider:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 814323549}
m_Material: {fileID: 0}
+ m_IncludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_ExcludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_LayerOverridePriority: 0
m_IsTrigger: 0
+ m_ProvidesContacts: 0
m_Enabled: 1
- serializedVersion: 2
+ serializedVersion: 3
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!23 &814323551
@@ -514,13 +584,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 814323549}
+ serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 1.727, y: 0.295, z: 0.49133635}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1061905091}
- m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &981251352
GameObject:
@@ -609,13 +679,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 981251352}
+ serializedVersion: 2
m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
m_LocalPosition: {x: 0, y: 3, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1061905091}
- m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!114 &981251355
MonoBehaviour:
@@ -629,14 +699,17 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_Version: 1
+ m_Version: 3
m_UsePipelineSettings: 1
m_AdditionalLightsShadowResolutionTier: 2
m_LightLayerMask: 1
+ m_RenderingLayers: 1
m_CustomShadowLayers: 0
m_ShadowLayerMask: 1
+ m_ShadowRenderingLayers: 1
m_LightCookieSize: {x: 1, y: 1}
m_LightCookieOffset: {x: 0, y: 0}
+ m_SoftShadowQuality: 1
--- !u!1 &1061905090
GameObject:
m_ObjectHideFlags: 0
@@ -660,6 +733,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1061905090}
+ serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
@@ -671,7 +745,6 @@ Transform:
- {fileID: 814323553}
- {fileID: 981251354}
m_Father: {fileID: 0}
- m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1871198445
GameObject:
@@ -700,9 +773,17 @@ BoxCollider:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1871198445}
m_Material: {fileID: 0}
+ m_IncludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_ExcludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_LayerOverridePriority: 0
m_IsTrigger: 0
+ m_ProvidesContacts: 0
m_Enabled: 1
- serializedVersion: 2
+ serializedVersion: 3
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!23 &1871198447
@@ -762,13 +843,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1871198445}
+ serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 3.68, y: 0.291, z: 0.709}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1061905091}
- m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &543450652995596035
Transform:
@@ -777,6 +858,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 919132148792948153}
+ serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
@@ -784,7 +866,6 @@ Transform:
m_Children:
- {fileID: 3078023919892016089}
m_Father: {fileID: 0}
- m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &919132148792948153
GameObject:
@@ -838,13 +919,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 951011102821778674}
+ serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 543450652995596035}
- m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &3526346404085441773 stripped
Transform:
@@ -974,8 +1055,25 @@ PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
+ serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
+ - target: {fileID: 1848931108, guid: fce18bbf37be1384eb1a089a94aac81d, type: 3}
+ propertyPath: m_BackGroundColor.a
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1848931108, guid: fce18bbf37be1384eb1a089a94aac81d, type: 3}
+ propertyPath: m_BackGroundColor.b
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1848931108, guid: fce18bbf37be1384eb1a089a94aac81d, type: 3}
+ propertyPath: m_BackGroundColor.g
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1848931108, guid: fce18bbf37be1384eb1a089a94aac81d, type: 3}
+ propertyPath: m_BackGroundColor.r
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 1666344766112317020, guid: fce18bbf37be1384eb1a089a94aac81d,
type: 3}
propertyPath: m_RootOrder
@@ -1031,12 +1129,75 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 2037636450122013953, guid: fce18bbf37be1384eb1a089a94aac81d,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 2047971321291531494, guid: fce18bbf37be1384eb1a089a94aac81d,
type: 3}
propertyPath: m_Name
value: human_rigging
objectReference: {fileID: 0}
+ - target: {fileID: 2047971321291531494, guid: fce18bbf37be1384eb1a089a94aac81d,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2783424386060882347, guid: fce18bbf37be1384eb1a089a94aac81d,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 3526346404085441778, guid: fce18bbf37be1384eb1a089a94aac81d,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4321150989774212269, guid: fce18bbf37be1384eb1a089a94aac81d,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4878685260469331854, guid: fce18bbf37be1384eb1a089a94aac81d,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5216378010582810227, guid: fce18bbf37be1384eb1a089a94aac81d,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 6122181118401514979, guid: fce18bbf37be1384eb1a089a94aac81d,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7057859769783231887, guid: fce18bbf37be1384eb1a089a94aac81d,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8659986707249222525, guid: fce18bbf37be1384eb1a089a94aac81d,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8750515621544498667, guid: fce18bbf37be1384eb1a089a94aac81d,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 9027679549219952251, guid: fce18bbf37be1384eb1a089a94aac81d,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
m_RemovedComponents: []
+ m_RemovedGameObjects: []
+ m_AddedGameObjects: []
+ m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: fce18bbf37be1384eb1a089a94aac81d, type: 3}
--- !u!4 &8128778564773403801 stripped
Transform:
@@ -1049,6 +1210,7 @@ PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
+ serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 8454544435054491251, guid: c21b1754a609d0b409dd8c8e90321803,
@@ -1117,6 +1279,9 @@ PrefabInstance:
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
+ m_RemovedGameObjects: []
+ m_AddedGameObjects: []
+ m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c21b1754a609d0b409dd8c8e90321803, type: 3}
--- !u!4 &8659986707249222520 stripped
Transform:
@@ -1130,3 +1295,13 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 8128778564773403800}
m_PrefabAsset: {fileID: 0}
+--- !u!1660057539 &9223372036854775807
+SceneRoots:
+ m_ObjectHideFlags: 0
+ m_Roots:
+ - {fileID: 8277099497161960097}
+ - {fileID: 543450652995596035}
+ - {fileID: 8128778564773403800}
+ - {fileID: 23701356}
+ - {fileID: 1061905091}
+ - {fileID: 388376337}
diff --git a/ActiveRagdoll/Assets/UniversalRenderPipelineGlobalSettings.asset b/ActiveRagdoll/Assets/UniversalRenderPipelineGlobalSettings.asset
index f84421d..0c0350e 100644
--- a/ActiveRagdoll/Assets/UniversalRenderPipelineGlobalSettings.asset
+++ b/ActiveRagdoll/Assets/UniversalRenderPipelineGlobalSettings.asset
@@ -12,7 +12,17 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2ec995e51a6e251468d2a3fd8a686257, type: 3}
m_Name: UniversalRenderPipelineGlobalSettings
m_EditorClassIdentifier:
- k_AssetVersion: 2
+ k_AssetVersion: 3
+ m_RenderingLayerNames:
+ - Light Layer default
+ - Light Layer 1
+ - Light Layer 2
+ - Light Layer 3
+ - Light Layer 4
+ - Light Layer 5
+ - Light Layer 6
+ - Light Layer 7
+ m_ValidRenderingLayers: 255
lightLayerName0: Light Layer default
lightLayerName1: Light Layer 1
lightLayerName2: Light Layer 2
@@ -24,4 +34,8 @@ MonoBehaviour:
m_StripDebugVariants: 1
m_StripUnusedPostProcessingVariants: 1
m_StripUnusedVariants: 1
+ m_StripUnusedLODCrossFadeVariants: 1
+ m_StripScreenCoordOverrideVariants: 1
supportRuntimeDebugDisplay: 0
+ m_ShaderVariantLogLevel: 0
+ m_ExportShaderVariants: 1
diff --git a/ActiveRagdoll/Packages/packages-lock.json b/ActiveRagdoll/Packages/packages-lock.json
index 256b97e..69817bf 100644
--- a/ActiveRagdoll/Packages/packages-lock.json
+++ b/ActiveRagdoll/Packages/packages-lock.json
@@ -1,19 +1,20 @@
{
"dependencies": {
"com.unity.2d.animation": {
- "version": "7.0.11",
+ "version": "9.1.0",
"depth": 1,
"source": "registry",
"dependencies": {
- "com.unity.2d.common": "6.0.6",
+ "com.unity.2d.common": "8.0.2",
"com.unity.2d.sprite": "1.0.0",
+ "com.unity.collections": "1.1.0",
"com.unity.modules.animation": "1.0.0",
"com.unity.modules.uielements": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.2d.aseprite": {
- "version": "1.0.0",
+ "version": "1.1.2",
"depth": 1,
"source": "registry",
"dependencies": {
@@ -25,24 +26,18 @@
"url": "https://packages.unity.com"
},
"com.unity.2d.common": {
- "version": "6.0.6",
+ "version": "8.0.2",
"depth": 2,
"source": "registry",
"dependencies": {
"com.unity.2d.sprite": "1.0.0",
"com.unity.mathematics": "1.1.0",
"com.unity.modules.uielements": "1.0.0",
- "com.unity.burst": "1.5.1"
+ "com.unity.modules.animation": "1.0.0",
+ "com.unity.burst": "1.7.3"
},
"url": "https://packages.unity.com"
},
- "com.unity.2d.path": {
- "version": "5.0.2",
- "depth": 2,
- "source": "registry",
- "dependencies": {},
- "url": "https://packages.unity.com"
- },
"com.unity.2d.pixel-perfect": {
"version": "5.0.3",
"depth": 1,
@@ -51,12 +46,12 @@
"url": "https://packages.unity.com"
},
"com.unity.2d.psdimporter": {
- "version": "6.0.7",
+ "version": "8.0.4",
"depth": 1,
"source": "registry",
"dependencies": {
- "com.unity.2d.animation": "7.0.9",
- "com.unity.2d.common": "6.0.6",
+ "com.unity.2d.animation": "9.1.0",
+ "com.unity.2d.common": "8.0.2",
"com.unity.2d.sprite": "1.0.0"
},
"url": "https://packages.unity.com"
@@ -68,13 +63,12 @@
"dependencies": {}
},
"com.unity.2d.spriteshape": {
- "version": "7.0.7",
+ "version": "9.0.2",
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.mathematics": "1.1.0",
- "com.unity.2d.common": "6.0.6",
- "com.unity.2d.path": "5.0.2",
+ "com.unity.2d.common": "8.0.1",
"com.unity.modules.physics2d": "1.0.0"
},
"url": "https://packages.unity.com"
@@ -83,10 +77,13 @@
"version": "1.0.0",
"depth": 1,
"source": "builtin",
- "dependencies": {}
+ "dependencies": {
+ "com.unity.modules.tilemap": "1.0.0",
+ "com.unity.modules.uielements": "1.0.0"
+ }
},
"com.unity.2d.tilemap.extras": {
- "version": "2.2.6",
+ "version": "3.1.2",
"depth": 1,
"source": "registry",
"dependencies": {
@@ -98,11 +95,12 @@
"url": "https://packages.unity.com"
},
"com.unity.burst": {
- "version": "1.8.4",
+ "version": "1.8.13",
"depth": 1,
"source": "registry",
"dependencies": {
- "com.unity.mathematics": "1.2.1"
+ "com.unity.mathematics": "1.2.1",
+ "com.unity.modules.jsonserialize": "1.0.0"
},
"url": "https://packages.unity.com"
},
@@ -113,6 +111,16 @@
"dependencies": {},
"url": "https://packages.unity.com"
},
+ "com.unity.collections": {
+ "version": "1.2.4",
+ "depth": 2,
+ "source": "registry",
+ "dependencies": {
+ "com.unity.burst": "1.6.6",
+ "com.unity.test-framework": "1.1.31"
+ },
+ "url": "https://packages.unity.com"
+ },
"com.unity.ext.nunit": {
"version": "1.0.6",
"depth": 1,
@@ -125,14 +133,14 @@
"depth": 0,
"source": "builtin",
"dependencies": {
- "com.unity.2d.animation": "7.0.11",
+ "com.unity.2d.animation": "9.1.0",
"com.unity.2d.pixel-perfect": "5.0.3",
- "com.unity.2d.psdimporter": "6.0.7",
+ "com.unity.2d.psdimporter": "8.0.4",
"com.unity.2d.sprite": "1.0.0",
- "com.unity.2d.spriteshape": "7.0.7",
+ "com.unity.2d.spriteshape": "9.0.2",
"com.unity.2d.tilemap": "1.0.0",
- "com.unity.2d.tilemap.extras": "2.2.6",
- "com.unity.2d.aseprite": "1.0.0"
+ "com.unity.2d.tilemap.extras": "3.1.2",
+ "com.unity.2d.aseprite": "1.1.2"
}
},
"com.unity.ide.rider": {
@@ -188,12 +196,13 @@
"url": "https://packages.unity.com"
},
"com.unity.render-pipelines.core": {
- "version": "12.1.12",
+ "version": "14.0.10",
"depth": 1,
"source": "builtin",
"dependencies": {
"com.unity.ugui": "1.0.0",
"com.unity.modules.physics": "1.0.0",
+ "com.unity.modules.terrain": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0"
}
},
@@ -203,13 +212,22 @@
"source": "builtin",
"dependencies": {
"com.unity.mathematics": "1.2.1",
- "com.unity.burst": "1.8.4",
- "com.unity.render-pipelines.core": "12.1.12",
- "com.unity.shadergraph": "12.1.12"
+ "com.unity.burst": "1.8.9",
+ "com.unity.render-pipelines.core": "14.0.10",
+ "com.unity.shadergraph": "14.0.10",
+ "com.unity.render-pipelines.universal-config": "14.0.9"
+ }
+ },
+ "com.unity.render-pipelines.universal-config": {
+ "version": "14.0.9",
+ "depth": 1,
+ "source": "builtin",
+ "dependencies": {
+ "com.unity.render-pipelines.core": "14.0.9"
}
},
"com.unity.searcher": {
- "version": "4.9.1",
+ "version": "4.9.2",
"depth": 2,
"source": "registry",
"dependencies": {},
@@ -223,12 +241,12 @@
"url": "https://packages.unity.com"
},
"com.unity.shadergraph": {
- "version": "12.1.12",
+ "version": "14.0.10",
"depth": 1,
"source": "builtin",
"dependencies": {
- "com.unity.render-pipelines.core": "12.1.12",
- "com.unity.searcher": "4.9.1"
+ "com.unity.render-pipelines.core": "14.0.10",
+ "com.unity.searcher": "4.9.2"
}
},
"com.unity.test-framework": {
@@ -417,17 +435,6 @@
"dependencies": {
"com.unity.modules.ui": "1.0.0",
"com.unity.modules.imgui": "1.0.0",
- "com.unity.modules.jsonserialize": "1.0.0",
- "com.unity.modules.uielementsnative": "1.0.0"
- }
- },
- "com.unity.modules.uielementsnative": {
- "version": "1.0.0",
- "depth": 1,
- "source": "builtin",
- "dependencies": {
- "com.unity.modules.ui": "1.0.0",
- "com.unity.modules.imgui": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0"
}
},
diff --git a/ActiveRagdoll/ProjectSettings/ProjectVersion.txt b/ActiveRagdoll/ProjectSettings/ProjectVersion.txt
index cd32c29..bc915f1 100644
--- a/ActiveRagdoll/ProjectSettings/ProjectVersion.txt
+++ b/ActiveRagdoll/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2021.3.30f1
-m_EditorVersionWithRevision: 2021.3.30f1 (b4360d7cdac4)
+m_EditorVersion: 2022.3.24f1
+m_EditorVersionWithRevision: 2022.3.24f1 (334eb2a0b267)
diff --git a/ActiveRagdoll/ProjectSettings/ShaderGraphSettings.asset b/ActiveRagdoll/ProjectSettings/ShaderGraphSettings.asset
index 9b28428..3250b06 100644
--- a/ActiveRagdoll/ProjectSettings/ShaderGraphSettings.asset
+++ b/ActiveRagdoll/ProjectSettings/ShaderGraphSettings.asset
@@ -12,5 +12,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: de02f9e1d18f588468e474319d09a723, type: 3}
m_Name:
m_EditorClassIdentifier:
+ shaderVariantLimit: 128
customInterpolatorErrorThreshold: 32
customInterpolatorWarningThreshold: 16
diff --git a/ActiveRagdoll/ProjectSettings/URPProjectSettings.asset b/ActiveRagdoll/ProjectSettings/URPProjectSettings.asset
index c1f118a..cd7fd8c 100644
--- a/ActiveRagdoll/ProjectSettings/URPProjectSettings.asset
+++ b/ActiveRagdoll/ProjectSettings/URPProjectSettings.asset
@@ -12,4 +12,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 247994e1f5a72c2419c26a37e9334c01, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_LastMaterialVersion: 5
+ m_LastMaterialVersion: 7
diff --git a/ActiveRagdoll/ProjectSettings/boot.config b/ActiveRagdoll/ProjectSettings/boot.config
deleted file mode 100644
index e69de29..0000000
--- a/ActiveRagdoll/ProjectSettings/boot.config
+++ /dev/null