iwnc2020/CapersProject
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Nam Tae Gun 2025-01-03 16:17:23 +09:00
parent a6dc25b915
commit f9595ec0ef
7 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/04.Materials/Characters/TycoonPlayer.mat
View File

@ -16,7 +16,7 @@ Material:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 2000
m_CustomRenderQueue: 3000
stringTagMap: {}
disabledShaderPasses:
- MOTIONVECTORS

2
Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Serialization.dll.meta
View File

@ -54,7 +54,7 @@ PluginImporter:
enabled: 1
settings: {}
Win64:
enabled: 1
enabled: 0
settings: {}
WindowsStoreApps:
enabled: 1

2
Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Utilities.dll.meta
View File

@ -54,7 +54,7 @@ PluginImporter:
enabled: 1
settings: {}
Win64:
enabled: 1
enabled: 0
settings: {}
WindowsStoreApps:
enabled: 1

2
Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Serialization.dll.meta
View File

@ -63,7 +63,7 @@ PluginImporter:
settings:
CPU:
Win64:
enabled: 0
enabled: 1
settings:
CPU:
WindowsStoreApps:

2
Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Utilities.dll.meta
View File

@ -63,7 +63,7 @@ PluginImporter:
settings:
CPU:
Win64:
enabled: 0
enabled: 1
settings:
CPU:
WindowsStoreApps:

2
Assets/StreamingAssets/google-services-desktop.json.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 083ccbece78c4b849b208ac39b1f23aa
guid: 71c3ad3ad9a7251489dd7254740f6079
DefaultImporter:
externalObjects: {}
userData:

40
Assets/UniversalRenderPipelineGlobalSettings.asset
View File

@ -36,24 +36,24 @@ MonoBehaviour:
- rid: 5032277253446697243
- rid: 5032277253446697244
- rid: 5032277253446697245
- rid: 2144060238552367253
- rid: 845977496734662805
- rid: 5032277253446697247
- rid: 5032277253446697248
- rid: 2144060238552367254
- rid: 2144060238552367255
- rid: 845977496734662806
- rid: 845977496734662807
- rid: 5032277253446697251
- rid: 2144060238552367256
- rid: 845977496734662808
- rid: 5032277253446697253
- rid: 2144060238552367257
- rid: 845977496734662809
- rid: 5032277253446697255
- rid: 2144060238552367258
- rid: 2144060238552367259
- rid: 845977496734662810
- rid: 845977496734662811
- rid: 5032277253446697258
- rid: 5032277253446697259
- rid: 2144060238552367260
- rid: 2144060238552367261
- rid: 845977496734662812
- rid: 845977496734662813
- rid: 5032277253446697262
- rid: 2144060238552367262
- rid: 845977496734662814
m_RuntimeSettings:
m_List:
- rid: 5032277253446697243
@ -90,7 +90,7 @@ MonoBehaviour:
references:
version: 2
RefIds:
- rid: 2144060238552367253
- rid: 845977496734662805
type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_Version: 0
@ -105,14 +105,14 @@ 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: 2144060238552367254
- rid: 845977496734662806
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: 2144060238552367255
- rid: 845977496734662807
type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
@ -120,7 +120,7 @@ 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: 2144060238552367256
- rid: 845977496734662808
type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3}
@ -132,7 +132,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: 2144060238552367257
- rid: 845977496734662809
type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime}
data:
m_Version: 0
@ -145,7 +145,7 @@ 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: 2144060238552367258
- rid: 845977496734662810
type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
@ -155,7 +155,7 @@ MonoBehaviour:
probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3}
probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3}
numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3}
- rid: 2144060238552367259
- rid: 845977496734662811
type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
@ -168,19 +168,19 @@ MonoBehaviour:
skyOcclusionRT: {fileID: 4807578003741378534, guid: dfaf42b38dd001f49a72d8102b709f29, type: 3}
renderingLayerCS: {fileID: 7200000, guid: a63c9cf933e3d8f41ae680a372784ebf, type: 3}
renderingLayerRT: {fileID: 4807578003741378534, guid: c2be09c936362eb49a58f08aeb30627a, type: 3}
- rid: 2144060238552367260
- rid: 845977496734662812
type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
m_ProbeVolumeDisableStreamingAssets: 0
- rid: 2144060238552367261
- rid: 845977496734662813
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: 2144060238552367262
- rid: 845977496734662814
type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_version: 0