Merge branch 'NewStory' of http://185.56.209.148/beyond/beyond into NewStory

# Conflicts:
#	Assets/Scenes/03_DarkWoods/DarkForest.unity
This commit is contained in:
2025-12-19 11:42:11 +01:00
3 changed files with 675 additions and 59 deletions

View File

@@ -140,7 +140,8 @@ MonoBehaviour:
- {fileID: -8401544187620710908}
- {fileID: 8705260567137607853}
- {fileID: -8542654664514485498}
m_RendererFeatureMap: da69d7b3bdd6aeb26de13b70aa75ef177f447f3a64df181a0386cf88a7053a04e16c5c3b3c1da21a04a61e1c13b8678bade073055d4ccf7806c3c7f2d7647289
- {fileID: 565310806681130197}
m_RendererFeatureMap: da69d7b3bdd6aeb26de13b70aa75ef177f447f3a64df181a0386cf88a7053a04e16c5c3b3c1da21a04a61e1c13b8678bade073055d4ccf7806c3c7f2d7647289d514ebfb2e63d807
m_UseNativeRenderPass: 1
xrSystemData: {fileID: 0}
postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2}
@@ -208,6 +209,19 @@ MonoBehaviour:
restoreCamera: 1
offset: {x: 0, y: 0, z: 0, w: 0}
cameraFieldOfView: 60
--- !u!114 &565310806681130197
MonoBehaviour:
m_ObjectHideFlags: 0
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: 5d111dc2a0b22b142804f4d59508b893, type: 3}
m_Name: URPOutlineFeature
m_EditorClassIdentifier:
m_Active: 1
--- !u!114 &1724726557194051949
MonoBehaviour:
m_ObjectHideFlags: 0