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

@@ -26486,7 +26486,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!4 &236828983
Transform:
m_ObjectHideFlags: 0
@@ -26617,7 +26617,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 01554ac8a98d75b47b443ab9a7d5f0a5, type: 3}
m_Name:
m_EditorClassIdentifier:
streamingVolume: []
streamingVolume:
- {fileID: 738387422}
forceCloseVolume: []
--- !u!114 &236828985
MonoBehaviour:
@@ -58377,6 +58378,95 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b6b427d6336c57942859bb577b0f2cb2, type: 3}
--- !u!1 &538006195
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 538006196}
- component: {fileID: 538006199}
- component: {fileID: 538006198}
- component: {fileID: 538006197}
m_Layer: 11
m_Name: 'SWAMP_MAZErigger '
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &538006196
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 538006195}
serializedVersion: 2
m_LocalRotation: {x: -0, y: 0.9525568, z: -0, w: -0.30436108}
m_LocalPosition: {x: -195.1, y: 13.787, z: -14.9}
m_LocalScale: {x: 116.17064, y: 41.10603, z: 67.0781}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1444526674}
m_LocalEulerAnglesHint: {x: 0, y: 215.439, z: 0}
--- !u!114 &538006197
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 538006195}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d8c26023d2cb9264aa65a4c7d6cd66bd, type: 3}
m_Name:
m_EditorClassIdentifier:
collisionLayer:
serializedVersion: 2
m_Bits: 256
tagMask:
m_tags:
- Player
startVolumeState: 0
deactivateDelay: 0
draw: 1
drawWire: 0
drawColor: {r: 0.514151, g: 1, b: 0.5941512, a: 0.4}
drawWireColor: {r: 1, g: 1, b: 1, a: 1}
activeVolumeColor: {r: 0.0023497343, g: 1, b: 0, a: 0.4}
activeVolumeWireColor: {r: 1, g: 0, b: 1, a: 1}
--- !u!65 &538006198
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 538006195}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 1
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!33 &538006199
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 538006195}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!4 &538616110 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4514217290287882027, guid: 943e9fc65625b7f4a8a34cfe75a890d9,
@@ -66567,11 +66657,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: -30.619
objectReference: {fileID: 0}
- target: {fileID: 198000011337858710, guid: 5ca4c580b3888314581688fa46fb142d,
type: 3}
propertyPath: moveWithTransform
value: 1
objectReference: {fileID: 0}
- target: {fileID: 198000011337858710, guid: 5ca4c580b3888314581688fa46fb142d,
type: 3}
propertyPath: ShapeModule.m_Scale.x
@@ -66610,11 +66695,7 @@ PrefabInstance:
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 1000012882023006, guid: 5ca4c580b3888314581688fa46fb142d,
type: 3}
insertIndex: -1
addedObject: {fileID: 1234965693}
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5ca4c580b3888314581688fa46fb142d, type: 3}
--- !u!4 &603642907 stripped
Transform:
@@ -75530,10 +75611,6 @@ PrefabInstance:
propertyPath: m_Name
value: DustMotesEffect (5)
objectReference: {fileID: 0}
- target: {fileID: 1000012882023006, guid: 5ca4c580b3888314581688fa46fb142d, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4000010002477438, guid: 5ca4c580b3888314581688fa46fb142d, type: 3}
propertyPath: m_RootOrder
value: 0
@@ -81171,6 +81248,95 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 738077740}
m_PrefabAsset: {fileID: 0}
--- !u!1 &738387420
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 738387421}
- component: {fileID: 738387424}
- component: {fileID: 738387423}
- component: {fileID: 738387422}
m_Layer: 11
m_Name: GIANTS_CAMP_Trigger
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &738387421
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 738387420}
serializedVersion: 2
m_LocalRotation: {x: -0, y: 0.78814864, z: -0, w: -0.615485}
m_LocalPosition: {x: -58.8, y: 13.787, z: -113.7}
m_LocalScale: {x: 107.89351, y: 26.806421, z: 92.513245}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1444526674}
m_LocalEulerAnglesHint: {x: 0, y: 255.974, z: 0}
--- !u!114 &738387422
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 738387420}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d8c26023d2cb9264aa65a4c7d6cd66bd, type: 3}
m_Name:
m_EditorClassIdentifier:
collisionLayer:
serializedVersion: 2
m_Bits: 256
tagMask:
m_tags:
- Player
startVolumeState: 0
deactivateDelay: 0
draw: 1
drawWire: 0
drawColor: {r: 0.514151, g: 1, b: 0.5941512, a: 0.4}
drawWireColor: {r: 1, g: 1, b: 1, a: 1}
activeVolumeColor: {r: 0.0023497343, g: 1, b: 0, a: 0.4}
activeVolumeWireColor: {r: 1, g: 0, b: 1, a: 1}
--- !u!65 &738387423
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 738387420}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 1
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!33 &738387424
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 738387420}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1 &738421096
GameObject:
m_ObjectHideFlags: 0
@@ -104218,6 +104384,95 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 955905723}
m_PrefabAsset: {fileID: 0}
--- !u!1 &956183036
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 956183037}
- component: {fileID: 956183040}
- component: {fileID: 956183039}
- component: {fileID: 956183038}
m_Layer: 11
m_Name: 'GOODSOILTrigger '
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &956183037
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 956183036}
serializedVersion: 2
m_LocalRotation: {x: -0, y: 0.5959078, z: -0, w: 0.80305284}
m_LocalPosition: {x: -113.5, y: 13.787, z: -2.1}
m_LocalScale: {x: 74.3712, y: 18.290989, z: 59.859173}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1444526674}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &956183038
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 956183036}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d8c26023d2cb9264aa65a4c7d6cd66bd, type: 3}
m_Name:
m_EditorClassIdentifier:
collisionLayer:
serializedVersion: 2
m_Bits: 256
tagMask:
m_tags:
- Player
startVolumeState: 0
deactivateDelay: 0
draw: 1
drawWire: 0
drawColor: {r: 0.514151, g: 1, b: 0.5941512, a: 0.4}
drawWireColor: {r: 1, g: 1, b: 1, a: 1}
activeVolumeColor: {r: 0.0023497343, g: 1, b: 0, a: 0.4}
activeVolumeWireColor: {r: 1, g: 0, b: 1, a: 1}
--- !u!65 &956183039
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 956183036}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 1
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!33 &956183040
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 956183036}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!4 &956707853 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4455337937660413453, guid: 9add92619d51d3f40ae4c39ab66871a6,
@@ -108218,7 +108473,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!4 &985343415
Transform:
m_ObjectHideFlags: 0
@@ -108324,7 +108579,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 01554ac8a98d75b47b443ab9a7d5f0a5, type: 3}
m_Name:
m_EditorClassIdentifier:
streamingVolume: []
streamingVolume:
- {fileID: 956183038}
forceCloseVolume: []
--- !u!114 &985343417
MonoBehaviour:
@@ -122475,6 +122731,95 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e2c55e0b6196faf45a37f623364af185, type: 3}
--- !u!1 &1068367601
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1068367602}
- component: {fileID: 1068367605}
- component: {fileID: 1068367604}
- component: {fileID: 1068367603}
m_Layer: 11
m_Name: 'ZORA''S CAMPTrigger '
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1068367602
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1068367601}
serializedVersion: 2
m_LocalRotation: {x: -0, y: 0.9525568, z: -0, w: -0.30436108}
m_LocalPosition: {x: -195.1, y: 13.787, z: -14.9}
m_LocalScale: {x: 116.17064, y: 41.10603, z: 67.0781}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1444526674}
m_LocalEulerAnglesHint: {x: 0, y: 215.439, z: 0}
--- !u!114 &1068367603
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1068367601}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d8c26023d2cb9264aa65a4c7d6cd66bd, type: 3}
m_Name:
m_EditorClassIdentifier:
collisionLayer:
serializedVersion: 2
m_Bits: 256
tagMask:
m_tags:
- Player
startVolumeState: 0
deactivateDelay: 0
draw: 1
drawWire: 0
drawColor: {r: 0.514151, g: 1, b: 0.5941512, a: 0.4}
drawWireColor: {r: 1, g: 1, b: 1, a: 1}
activeVolumeColor: {r: 0.0023497343, g: 1, b: 0, a: 0.4}
activeVolumeWireColor: {r: 1, g: 0, b: 1, a: 1}
--- !u!65 &1068367604
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1068367601}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 1
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!33 &1068367605
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1068367601}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!4 &1069844622 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4079643640427470942, guid: aad277c12f1f9ac459fb72e04873de26,
@@ -139231,27 +139576,6 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 74891e27ac9a73e4b87d0b0647f45f49, type: 3}
--- !u!1 &1234965690 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1000012882023006, guid: 5ca4c580b3888314581688fa46fb142d,
type: 3}
m_PrefabInstance: {fileID: 602981892}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1234965693
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1234965690}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0e008257ca9c7464d8f9b914b5b218b6, type: 3}
m_Name:
m_EditorClassIdentifier:
heightOffset: 6
useSmoothing: 0
smoothSpeed: 10
--- !u!4 &1235333389 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1250713121180268479, guid: 927f89aaaa69590449d08aa5447f6cc2,
@@ -140793,6 +141117,95 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c95dfd3cf8772004c8b920dfb24fe382, type: 3}
--- !u!1 &1252331881
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1252331882}
- component: {fileID: 1252331885}
- component: {fileID: 1252331884}
- component: {fileID: 1252331883}
m_Layer: 11
m_Name: 'TAINTED_TREETrigger '
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1252331882
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1252331881}
serializedVersion: 2
m_LocalRotation: {x: -0, y: 0.9525568, z: -0, w: -0.30436108}
m_LocalPosition: {x: -199.2, y: 13.787, z: 27.7}
m_LocalScale: {x: 87.277054, y: 34.41275, z: 62.03895}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1444526674}
m_LocalEulerAnglesHint: {x: 0, y: 215.439, z: 0}
--- !u!114 &1252331883
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1252331881}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d8c26023d2cb9264aa65a4c7d6cd66bd, type: 3}
m_Name:
m_EditorClassIdentifier:
collisionLayer:
serializedVersion: 2
m_Bits: 256
tagMask:
m_tags:
- Player
startVolumeState: 0
deactivateDelay: 0
draw: 1
drawWire: 0
drawColor: {r: 0.514151, g: 1, b: 0.5941512, a: 0.4}
drawWireColor: {r: 1, g: 1, b: 1, a: 1}
activeVolumeColor: {r: 0.0023497343, g: 1, b: 0, a: 0.4}
activeVolumeWireColor: {r: 1, g: 0, b: 1, a: 1}
--- !u!65 &1252331884
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1252331881}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 1
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!33 &1252331885
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1252331881}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1001 &1255222972
PrefabInstance:
m_ObjectHideFlags: 0
@@ -151041,7 +151454,7 @@ PrefabInstance:
- target: {fileID: 3749252306457878305, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchoredPosition.x
value: -26
value: -26.00003
objectReference: {fileID: 0}
- target: {fileID: 3806889720075550842, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
@@ -151641,12 +152054,12 @@ PrefabInstance:
- target: {fileID: 5234664790783380194, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 3146014.8
value: 2082359.2
objectReference: {fileID: 0}
- target: {fileID: 5234664790783380194, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -503362.94
value: -333177.12
objectReference: {fileID: 0}
- target: {fileID: 5552483164784459722, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
@@ -155754,7 +156167,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!4 &1383216878
Transform:
m_ObjectHideFlags: 0
@@ -155931,7 +156344,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 01554ac8a98d75b47b443ab9a7d5f0a5, type: 3}
m_Name:
m_EditorClassIdentifier:
streamingVolume: []
streamingVolume:
- {fileID: 1068367603}
forceCloseVolume: []
--- !u!114 &1383216880
MonoBehaviour:
@@ -163340,18 +163754,25 @@ Transform:
- {fileID: 2006355181}
- {fileID: 290637970}
- {fileID: 985343415}
- {fileID: 956183037}
- {fileID: 489417850}
- {fileID: 1854932497}
- {fileID: 1763956640}
- {fileID: 432864470}
- {fileID: 1793013648}
- {fileID: 1899110885}
- {fileID: 1505791785}
- {fileID: 1680785740}
- {fileID: 1252331882}
- {fileID: 1549527266}
- {fileID: 1383216878}
- {fileID: 1068367602}
- {fileID: 1038882087}
- {fileID: 1554866860}
- {fileID: 538006196}
- {fileID: 2125503775}
- {fileID: 236828983}
- {fileID: 738387421}
- {fileID: 899745476}
- {fileID: 1111883630}
- {fileID: 241399758}
@@ -164371,7 +164792,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1000012882023006, guid: 5ca4c580b3888314581688fa46fb142d, type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4000010002477438, guid: 5ca4c580b3888314581688fa46fb142d, type: 3}
propertyPath: m_RootOrder
@@ -175566,7 +175987,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!4 &1554866860
Transform:
m_ObjectHideFlags: 0
@@ -176100,7 +176521,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 01554ac8a98d75b47b443ab9a7d5f0a5, type: 3}
m_Name:
m_EditorClassIdentifier:
streamingVolume: []
streamingVolume:
- {fileID: 538006197}
forceCloseVolume: []
--- !u!114 &1554866862
MonoBehaviour:
@@ -189138,7 +189560,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!4 &1680785740
Transform:
m_ObjectHideFlags: 0
@@ -189360,7 +189782,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 01554ac8a98d75b47b443ab9a7d5f0a5, type: 3}
m_Name:
m_EditorClassIdentifier:
streamingVolume: []
streamingVolume:
- {fileID: 1252331883}
forceCloseVolume: []
--- !u!114 &1680785742
MonoBehaviour:
@@ -197755,6 +198178,95 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 583726261}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1763956639
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1763956640}
- component: {fileID: 1763956643}
- component: {fileID: 1763956642}
- component: {fileID: 1763956641}
m_Layer: 11
m_Name: 'GOODSOILTrigger '
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1763956640
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1763956639}
serializedVersion: 2
m_LocalRotation: {x: -0, y: 0.8302053, z: -0, w: 0.5574578}
m_LocalPosition: {x: -134, y: 13.787, z: -67.1}
m_LocalScale: {x: 96.117874, y: 20.877335, z: 68.32326}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1444526674}
m_LocalEulerAnglesHint: {x: 0, y: 112.24, z: 0}
--- !u!114 &1763956641
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1763956639}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d8c26023d2cb9264aa65a4c7d6cd66bd, type: 3}
m_Name:
m_EditorClassIdentifier:
collisionLayer:
serializedVersion: 2
m_Bits: 256
tagMask:
m_tags:
- Player
startVolumeState: 0
deactivateDelay: 0
draw: 1
drawWire: 0
drawColor: {r: 0.514151, g: 1, b: 0.5941512, a: 0.4}
drawWireColor: {r: 1, g: 1, b: 1, a: 1}
activeVolumeColor: {r: 0.0023497343, g: 1, b: 0, a: 0.4}
activeVolumeWireColor: {r: 1, g: 0, b: 1, a: 1}
--- !u!65 &1763956642
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1763956639}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 1
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!33 &1763956643
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1763956639}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1001 &1764089837
PrefabInstance:
m_ObjectHideFlags: 0
@@ -200407,7 +200919,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!4 &1793013648
Transform:
m_ObjectHideFlags: 0
@@ -200554,7 +201066,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 01554ac8a98d75b47b443ab9a7d5f0a5, type: 3}
m_Name:
m_EditorClassIdentifier:
streamingVolume: []
streamingVolume:
- {fileID: 1899110886}
forceCloseVolume: []
--- !u!114 &1793013650
MonoBehaviour:
@@ -206096,7 +206609,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!4 &1854932497
Transform:
m_ObjectHideFlags: 0
@@ -206138,7 +206651,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 01554ac8a98d75b47b443ab9a7d5f0a5, type: 3}
m_Name:
m_EditorClassIdentifier:
streamingVolume: []
streamingVolume:
- {fileID: 1763956641}
forceCloseVolume: []
--- !u!114 &1854932499
MonoBehaviour:
@@ -206641,10 +207155,6 @@ PrefabInstance:
propertyPath: m_Name
value: DustMotesEffect (7)
objectReference: {fileID: 0}
- target: {fileID: 1000012882023006, guid: 5ca4c580b3888314581688fa46fb142d, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4000010002477438, guid: 5ca4c580b3888314581688fa46fb142d, type: 3}
propertyPath: m_RootOrder
value: 0
@@ -210404,6 +210914,95 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 157512936}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1899110884
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1899110885}
- component: {fileID: 1899110888}
- component: {fileID: 1899110887}
- component: {fileID: 1899110886}
m_Layer: 11
m_Name: 'CHASMTrigger '
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1899110885
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1899110884}
serializedVersion: 2
m_LocalRotation: {x: -0, y: 0.98272187, z: -0, w: 0.18508847}
m_LocalPosition: {x: -135.3, y: 13.787, z: 53}
m_LocalScale: {x: 71.47998, y: 15.525847, z: 50.809956}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1444526674}
m_LocalEulerAnglesHint: {x: 0, y: 158.667, z: 0}
--- !u!114 &1899110886
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1899110884}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d8c26023d2cb9264aa65a4c7d6cd66bd, type: 3}
m_Name:
m_EditorClassIdentifier:
collisionLayer:
serializedVersion: 2
m_Bits: 256
tagMask:
m_tags:
- Player
startVolumeState: 0
deactivateDelay: 0
draw: 1
drawWire: 0
drawColor: {r: 0.514151, g: 1, b: 0.5941512, a: 0.4}
drawWireColor: {r: 1, g: 1, b: 1, a: 1}
activeVolumeColor: {r: 0.0023497343, g: 1, b: 0, a: 0.4}
activeVolumeWireColor: {r: 1, g: 0, b: 1, a: 1}
--- !u!65 &1899110887
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1899110884}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 1
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!33 &1899110888
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1899110884}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1001 &1899408415
PrefabInstance:
m_ObjectHideFlags: 0
@@ -227420,7 +228019,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1000012882023006, guid: 5ca4c580b3888314581688fa46fb142d, type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4000010002477438, guid: 5ca4c580b3888314581688fa46fb142d, type: 3}
propertyPath: m_RootOrder

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

View File

@@ -26,6 +26,9 @@ EditorBuildSettings:
- enabled: 1
path: Assets/Scenes/Old_Levels!/Portal/Portal.unity
guid: cf1147d8227221747a9f5884efeaeab3
- enabled: 1
path: Assets/Scenes/01_Wasteland/Wasteland_Arenas.unity
guid: c4c18449baafe5d459c11608c40b2904
m_configObjects:
com.unity.addressableassets: {fileID: 11400000, guid: 272caeb75b6504dcb987edb253f851b7,
type: 2}