From d12cc396661c6f98bbd46a7a11165ad77b705221 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krist=C3=BDna=20Janovsk=C3=A1?= <janovkri@fit.cvut.cz>
Date: Tue, 15 Nov 2022 15:43:21 +0100
Subject: [PATCH] colliders
---
Assets/SZZ/Art/Models/blend/blood-1.blend | 3 -
.../SZZ/Art/Models/blend/blood-1.blend.meta | 106 ------------------
Assets/SZZ/Art/Models/blend/blood-2.blend | 3 -
.../SZZ/Art/Models/blend/blood-2.blend.meta | 106 ------------------
Assets/SZZ/Art/Models/blend/flowerpot.blend | 4 +-
Assets/SZZ/Art/Models/flowerpot.fbx | 2 +-
Assets/SZZ/Level/Scenes/building a.unity | 6 +-
Assets/SZZ/Prefabs/DoubleDoor.prefab | 28 +++++
Assets/SZZ/Prefabs/DoubleDoorOpen.prefab | 28 +++++
Assets/SZZ/Prefabs/ElevatorDoor.prefab | 28 +++++
Assets/SZZ/Prefabs/FileDrawer.prefab | 18 ++-
Assets/SZZ/Prefabs/Flowerpot.prefab | 14 +++
Assets/SZZ/Prefabs/GlassDoorHalfOpen.prefab | 28 +++++
Assets/SZZ/Prefabs/Poof1Blue.prefab | 14 +++
Assets/SZZ/Prefabs/Poof1Red.prefab | 14 +++
Assets/SZZ/Prefabs/Poof1Yellow.prefab | 14 +++
Assets/SZZ/Prefabs/SingleDoorClosed.prefab | 14 +++
Assets/SZZ/Prefabs/SingleDoorOpen.prefab | 14 +++
Assets/SZZ/Prefabs/SingleDoorOpenWide.prefab | 14 +++
Assets/SZZ/Prefabs/SingleDoorWide.prefab | 14 +++
Assets/SZZ/Prefabs/Table.prefab | 13 +--
.../SZZ/Prefabs/WindowSingleClassroom.prefab | 14 +++
Assets/SZZ/Prefabs/WindowSingleHall.prefab | 14 +++
.../SZZ/Prefabs/WindowSingleStairway.prefab | 14 +++
.../SZZ/Settings/Lighting Settings.lighting | 2 +-
ProjectSettings/ProjectSettings.asset | 3 +-
26 files changed, 297 insertions(+), 235 deletions(-)
delete mode 100644 Assets/SZZ/Art/Models/blend/blood-1.blend
delete mode 100644 Assets/SZZ/Art/Models/blend/blood-1.blend.meta
delete mode 100644 Assets/SZZ/Art/Models/blend/blood-2.blend
delete mode 100644 Assets/SZZ/Art/Models/blend/blood-2.blend.meta
diff --git a/Assets/SZZ/Art/Models/blend/blood-1.blend b/Assets/SZZ/Art/Models/blend/blood-1.blend
deleted file mode 100644
index 0c035e6..0000000
--- a/Assets/SZZ/Art/Models/blend/blood-1.blend
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d5d08192b1057ad763ea08585c57cf2132cae18dec8256fdab799c9aef533f69
-size 868136
diff --git a/Assets/SZZ/Art/Models/blend/blood-1.blend.meta b/Assets/SZZ/Art/Models/blend/blood-1.blend.meta
deleted file mode 100644
index fdabc9e..0000000
--- a/Assets/SZZ/Art/Models/blend/blood-1.blend.meta
+++ /dev/null
@@ -1,106 +0,0 @@
-fileFormatVersion: 2
-guid: c80a5f3e08ba34b4fb0c703b6e1b024f
-ModelImporter:
- serializedVersion: 21300
- internalIDToNameTable: []
- externalObjects: {}
- materials:
- materialImportMode: 2
- materialName: 0
- materialSearch: 1
- materialLocation: 1
- animations:
- legacyGenerateAnimations: 4
- bakeSimulation: 0
- resampleCurves: 1
- optimizeGameObjects: 0
- removeConstantScaleCurves: 1
- motionNodeName:
- rigImportErrors:
- rigImportWarnings:
- animationImportErrors:
- animationImportWarnings:
- animationRetargetingWarnings:
- animationDoRetargetingWarnings: 0
- importAnimatedCustomProperties: 0
- importConstraints: 0
- animationCompression: 1
- animationRotationError: 0.5
- animationPositionError: 0.5
- animationScaleError: 0.5
- animationWrapMode: 0
- extraExposedTransformPaths: []
- extraUserProperties: []
- clipAnimations: []
- isReadable: 0
- meshes:
- lODScreenPercentages: []
- globalScale: 1
- meshCompression: 0
- addColliders: 0
- useSRGBMaterialColor: 1
- sortHierarchyByName: 1
- importVisibility: 1
- importBlendShapes: 1
- importCameras: 1
- importLights: 1
- nodeNameCollisionStrategy: 1
- fileIdsGeneration: 2
- swapUVChannels: 0
- generateSecondaryUV: 0
- useFileUnits: 1
- keepQuads: 0
- weldVertices: 1
- bakeAxisConversion: 0
- preserveHierarchy: 0
- skinWeightsMode: 0
- maxBonesPerVertex: 4
- minBoneWeight: 0.001
- optimizeBones: 1
- meshOptimizationFlags: -1
- indexFormat: 0
- secondaryUVAngleDistortion: 8
- secondaryUVAreaDistortion: 15.000001
- secondaryUVHardAngle: 88
- secondaryUVMarginMethod: 1
- secondaryUVMinLightmapResolution: 40
- secondaryUVMinObjectScale: 1
- secondaryUVPackMargin: 4
- useFileScale: 1
- tangentSpace:
- normalSmoothAngle: 60
- normalImportMode: 0
- tangentImportMode: 3
- normalCalculationMode: 4
- legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
- blendShapeNormalImportMode: 1
- normalSmoothingSource: 0
- referencedClips: []
- importAnimation: 1
- humanDescription:
- serializedVersion: 3
- human: []
- skeleton: []
- armTwist: 0.5
- foreArmTwist: 0.5
- upperLegTwist: 0.5
- legTwist: 0.5
- armStretch: 0.05
- legStretch: 0.05
- feetSpacing: 0
- globalScale: 1
- rootMotionBoneName:
- hasTranslationDoF: 0
- hasExtraRoot: 0
- skeletonHasParents: 1
- lastHumanDescriptionAvatarSource: {instanceID: 0}
- autoGenerateAvatarMappingIfUnspecified: 1
- animationType: 2
- humanoidOversampling: 1
- avatarSetup: 0
- addHumanoidExtraRootOnlyWhenUsingAvatar: 1
- remapMaterialsIfMaterialImportModeIsNone: 0
- additionalBone: 0
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/SZZ/Art/Models/blend/blood-2.blend b/Assets/SZZ/Art/Models/blend/blood-2.blend
deleted file mode 100644
index 15f31e3..0000000
--- a/Assets/SZZ/Art/Models/blend/blood-2.blend
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7d8c13c9f39f7db66b258188d1691f54e509f7015e4b6aeb2a01d7b528659f8c
-size 868880
diff --git a/Assets/SZZ/Art/Models/blend/blood-2.blend.meta b/Assets/SZZ/Art/Models/blend/blood-2.blend.meta
deleted file mode 100644
index fb99517..0000000
--- a/Assets/SZZ/Art/Models/blend/blood-2.blend.meta
+++ /dev/null
@@ -1,106 +0,0 @@
-fileFormatVersion: 2
-guid: 9f53b91b85f4b1948bf9c03286648e83
-ModelImporter:
- serializedVersion: 21300
- internalIDToNameTable: []
- externalObjects: {}
- materials:
- materialImportMode: 2
- materialName: 0
- materialSearch: 1
- materialLocation: 1
- animations:
- legacyGenerateAnimations: 4
- bakeSimulation: 0
- resampleCurves: 1
- optimizeGameObjects: 0
- removeConstantScaleCurves: 1
- motionNodeName:
- rigImportErrors:
- rigImportWarnings:
- animationImportErrors:
- animationImportWarnings:
- animationRetargetingWarnings:
- animationDoRetargetingWarnings: 0
- importAnimatedCustomProperties: 0
- importConstraints: 0
- animationCompression: 1
- animationRotationError: 0.5
- animationPositionError: 0.5
- animationScaleError: 0.5
- animationWrapMode: 0
- extraExposedTransformPaths: []
- extraUserProperties: []
- clipAnimations: []
- isReadable: 0
- meshes:
- lODScreenPercentages: []
- globalScale: 1
- meshCompression: 0
- addColliders: 0
- useSRGBMaterialColor: 1
- sortHierarchyByName: 1
- importVisibility: 1
- importBlendShapes: 1
- importCameras: 1
- importLights: 1
- nodeNameCollisionStrategy: 1
- fileIdsGeneration: 2
- swapUVChannels: 0
- generateSecondaryUV: 0
- useFileUnits: 1
- keepQuads: 0
- weldVertices: 1
- bakeAxisConversion: 0
- preserveHierarchy: 0
- skinWeightsMode: 0
- maxBonesPerVertex: 4
- minBoneWeight: 0.001
- optimizeBones: 1
- meshOptimizationFlags: -1
- indexFormat: 0
- secondaryUVAngleDistortion: 8
- secondaryUVAreaDistortion: 15.000001
- secondaryUVHardAngle: 88
- secondaryUVMarginMethod: 1
- secondaryUVMinLightmapResolution: 40
- secondaryUVMinObjectScale: 1
- secondaryUVPackMargin: 4
- useFileScale: 1
- tangentSpace:
- normalSmoothAngle: 60
- normalImportMode: 0
- tangentImportMode: 3
- normalCalculationMode: 4
- legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
- blendShapeNormalImportMode: 1
- normalSmoothingSource: 0
- referencedClips: []
- importAnimation: 1
- humanDescription:
- serializedVersion: 3
- human: []
- skeleton: []
- armTwist: 0.5
- foreArmTwist: 0.5
- upperLegTwist: 0.5
- legTwist: 0.5
- armStretch: 0.05
- legStretch: 0.05
- feetSpacing: 0
- globalScale: 1
- rootMotionBoneName:
- hasTranslationDoF: 0
- hasExtraRoot: 0
- skeletonHasParents: 1
- lastHumanDescriptionAvatarSource: {instanceID: 0}
- autoGenerateAvatarMappingIfUnspecified: 1
- animationType: 2
- humanoidOversampling: 1
- avatarSetup: 0
- addHumanoidExtraRootOnlyWhenUsingAvatar: 1
- remapMaterialsIfMaterialImportModeIsNone: 0
- additionalBone: 0
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/SZZ/Art/Models/blend/flowerpot.blend b/Assets/SZZ/Art/Models/blend/flowerpot.blend
index a036f48..93d0211 100644
--- a/Assets/SZZ/Art/Models/blend/flowerpot.blend
+++ b/Assets/SZZ/Art/Models/blend/flowerpot.blend
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:9d2fcc02832f506effd7df06d1eb63a49b4d2101824875657a53e146468537f3
-size 4409500
+oid sha256:8c84bc224bf6d554711ef61820c5fd8b6ed51d6f405efd853cf9634a3db60f60
+size 4380580
diff --git a/Assets/SZZ/Art/Models/flowerpot.fbx b/Assets/SZZ/Art/Models/flowerpot.fbx
index 174d459..c3f64e0 100644
--- a/Assets/SZZ/Art/Models/flowerpot.fbx
+++ b/Assets/SZZ/Art/Models/flowerpot.fbx
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:48fa418c206a0ead9d8884c5919afd476728038d3f18a3649218cffdd5448c8a
+oid sha256:d26d8d88a35049425e64a56d8af1245fe2fcd9ab5851f7fc0af056c699667ac0
size 1295340
diff --git a/Assets/SZZ/Level/Scenes/building a.unity b/Assets/SZZ/Level/Scenes/building a.unity
index 6e0fe04..42dccf6 100644
--- a/Assets/SZZ/Level/Scenes/building a.unity
+++ b/Assets/SZZ/Level/Scenes/building a.unity
@@ -2889,7 +2889,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 228514487}
m_LocalRotation: {x: 0, y: 0.7071068, z: -0, w: -0.7071068}
- m_LocalPosition: {x: -21.155, y: 14.702, z: -2.316}
+ m_LocalPosition: {x: -21.475, y: 14.702, z: -2.316}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -2916,8 +2916,8 @@ MonoBehaviour:
m_UVScale: {x: 1, y: 1}
m_UVBias: {x: 0, y: 0}
m_ScaleMode: 0
- m_Offset: {x: 0, y: 0, z: 0.5}
- m_Size: {x: 0.7, y: 1.5, z: 1}
+ m_Offset: {x: 0, y: 0, z: 0.005}
+ m_Size: {x: 0.7, y: 1.5, z: 0.01}
m_FadeFactor: 1
--- !u!4 &236366607 stripped
Transform:
diff --git a/Assets/SZZ/Prefabs/DoubleDoor.prefab b/Assets/SZZ/Prefabs/DoubleDoor.prefab
index 0f19ec5..6aba56a 100644
--- a/Assets/SZZ/Prefabs/DoubleDoor.prefab
+++ b/Assets/SZZ/Prefabs/DoubleDoor.prefab
@@ -11,6 +11,7 @@ GameObject:
- component: {fileID: 6867354290265714302}
- component: {fileID: 1157496520569524813}
- component: {fileID: 172432964815014588}
+ - component: {fileID: 1048141437874048462}
m_Layer: 0
m_Name: Cube.005
m_TagString: Untagged
@@ -85,6 +86,19 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
+--- !u!65 &1048141437874048462
+BoxCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 956378666904465392}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Size: {x: 35.933823, y: 2.0078433, z: 2}
+ m_Center: {x: -16.922493, y: 0.003921687, z: -0.0000076293945}
--- !u!1 &1172450719481561834
GameObject:
m_ObjectHideFlags: 0
@@ -343,6 +357,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 7134618828506801380}
+ - component: {fileID: 6365219791076986834}
m_Layer: 0
m_Name: DoubleDoor
m_TagString: Untagged
@@ -371,6 +386,19 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &6365219791076986834
+BoxCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7514417239429643870}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Size: {x: 2.07, y: 2, z: 0.1}
+ m_Center: {x: -0.57, y: 1, z: 0}
--- !u!1 &8178171208426410861
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/SZZ/Prefabs/DoubleDoorOpen.prefab b/Assets/SZZ/Prefabs/DoubleDoorOpen.prefab
index 3dbfbde..d7e6a3e 100644
--- a/Assets/SZZ/Prefabs/DoubleDoorOpen.prefab
+++ b/Assets/SZZ/Prefabs/DoubleDoorOpen.prefab
@@ -297,6 +297,7 @@ GameObject:
- component: {fileID: 6049072270912512538}
- component: {fileID: 5364835955197193945}
- component: {fileID: 7827206970517902868}
+ - component: {fileID: 5396257346148969454}
m_Layer: 0
m_Name: Cube.006
m_TagString: Untagged
@@ -369,6 +370,19 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
+--- !u!65 &5396257346148969454
+BoxCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5225495141936575167}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Size: {x: 1.9999999, y: 2, z: 2}
+ m_Center: {x: -0.0000076293945, y: 0, z: 0}
--- !u!1 &5320299369286816203
GameObject:
m_ObjectHideFlags: 0
@@ -380,6 +394,7 @@ GameObject:
- component: {fileID: 695930632326105206}
- component: {fileID: 2036747373983148635}
- component: {fileID: 6537983428657820618}
+ - component: {fileID: 3958600450221973405}
m_Layer: 0
m_Name: Cube.001
m_TagString: Untagged
@@ -452,6 +467,19 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
+--- !u!65 &3958600450221973405
+BoxCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5320299369286816203}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Size: {x: 2, y: 1.9999999, z: 2}
+ m_Center: {x: 0, y: 0.00000011920929, z: 0.00012207031}
--- !u!1 &6399533430066216228
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/SZZ/Prefabs/ElevatorDoor.prefab b/Assets/SZZ/Prefabs/ElevatorDoor.prefab
index 97bb070..a02a9d6 100644
--- a/Assets/SZZ/Prefabs/ElevatorDoor.prefab
+++ b/Assets/SZZ/Prefabs/ElevatorDoor.prefab
@@ -177,6 +177,7 @@ GameObject:
- component: {fileID: 9203430039342980527}
- component: {fileID: 7661376204524978050}
- component: {fileID: 3218598923784742419}
+ - component: {fileID: 5610987843455021517}
m_Layer: 0
m_Name: Cube.001
m_TagString: Untagged
@@ -249,6 +250,19 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
+--- !u!65 &5610987843455021517
+BoxCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4595034964528825362}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Size: {x: 2, y: 1.9999999, z: 2}
+ m_Center: {x: 0, y: 0, z: -0.00000047683716}
--- !u!1 &5463936874851072339
GameObject:
m_ObjectHideFlags: 0
@@ -297,6 +311,7 @@ GameObject:
- component: {fileID: 8424470864747739276}
- component: {fileID: 942635565004082706}
- component: {fileID: 8652232812112089805}
+ - component: {fileID: 6492626155245768812}
m_Layer: 0
m_Name: Cube
m_TagString: Untagged
@@ -369,6 +384,19 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
+--- !u!65 &6492626155245768812
+BoxCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5521070089440917094}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Size: {x: 2, y: 1.9999999, z: 2}
+ m_Center: {x: -0.000030517578, y: 0, z: 0}
--- !u!1 &5973440427774497888
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/SZZ/Prefabs/FileDrawer.prefab b/Assets/SZZ/Prefabs/FileDrawer.prefab
index fc8026e..0a6da21 100644
--- a/Assets/SZZ/Prefabs/FileDrawer.prefab
+++ b/Assets/SZZ/Prefabs/FileDrawer.prefab
@@ -853,7 +853,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5853904565370456136}
- m_LocalRotation: {x: 0.41303834, y: 0.57393324, z: -0.41303834, w: 0.57393324}
+ m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
m_LocalPosition: {x: 34.736, y: 7.149, z: -1.757}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@@ -873,7 +873,7 @@ Transform:
- {fileID: 5586346921845568345}
m_Father: {fileID: 0}
m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 71.482, y: 90, z: 0}
+ m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
--- !u!1 &6228537049310201725
GameObject:
m_ObjectHideFlags: 0
@@ -885,6 +885,7 @@ GameObject:
- component: {fileID: 7928386007491987863}
- component: {fileID: 1727720353538621193}
- component: {fileID: 7132599455072510934}
+ - component: {fileID: 1634599430045070862}
m_Layer: 0
m_Name: Cube
m_TagString: Untagged
@@ -957,6 +958,19 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
+--- !u!65 &1634599430045070862
+BoxCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6228537049310201725}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Size: {x: 2.0000002, y: 2, z: 2.0000005}
+ m_Center: {x: -0.00000047683716, y: 0, z: 0}
--- !u!1 &6779338858411602382
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/SZZ/Prefabs/Flowerpot.prefab b/Assets/SZZ/Prefabs/Flowerpot.prefab
index 034691b..2515d9a 100644
--- a/Assets/SZZ/Prefabs/Flowerpot.prefab
+++ b/Assets/SZZ/Prefabs/Flowerpot.prefab
@@ -1256,6 +1256,7 @@ GameObject:
- component: {fileID: 8825660008071408152}
- component: {fileID: 7798496352187107436}
- component: {fileID: 5022117442966587126}
+ - component: {fileID: 7756127364558588344}
m_Layer: 0
m_Name: Cylinder
m_TagString: Untagged
@@ -1328,6 +1329,19 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
+--- !u!65 &7756127364558588344
+BoxCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1511121601544568361}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Size: {x: 0.6020148, y: 0.30202472, z: 0.6000001}
+ m_Center: {x: -0.0010073632, y: 0.0010123029, z: -0.00000047683716}
--- !u!1 &1540280060300756053
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/SZZ/Prefabs/GlassDoorHalfOpen.prefab b/Assets/SZZ/Prefabs/GlassDoorHalfOpen.prefab
index fbbe10f..6ebff72 100644
--- a/Assets/SZZ/Prefabs/GlassDoorHalfOpen.prefab
+++ b/Assets/SZZ/Prefabs/GlassDoorHalfOpen.prefab
@@ -426,6 +426,7 @@ GameObject:
- component: {fileID: 7741163550965505235}
- component: {fileID: 6107517059887533420}
- component: {fileID: 4872572801309033150}
+ - component: {fileID: 9022011564873560165}
m_Layer: 0
m_Name: Cube.009
m_TagString: Untagged
@@ -498,6 +499,19 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
+--- !u!65 &9022011564873560165
+BoxCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3864785718552347835}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Size: {x: 2.0000043, y: 2, z: 2.0000005}
+ m_Center: {x: -0.00012207031, y: 0, z: 0}
--- !u!1 &4113618519569840985
GameObject:
m_ObjectHideFlags: 0
@@ -968,6 +982,7 @@ GameObject:
- component: {fileID: 7333176360968058141}
- component: {fileID: 2033934456155767683}
- component: {fileID: 7584045792676798300}
+ - component: {fileID: 8519427101401762454}
m_Layer: 0
m_Name: Cube
m_TagString: Untagged
@@ -1040,6 +1055,19 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
+--- !u!65 &8519427101401762454
+BoxCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6751970542406384631}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Size: {x: 2.0000005, y: 2, z: 2.0000007}
+ m_Center: {x: 0.000061035156, y: 0, z: 0.0000038146973}
--- !u!1 &8367195818658824567
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/SZZ/Prefabs/Poof1Blue.prefab b/Assets/SZZ/Prefabs/Poof1Blue.prefab
index 45f0ac1..d1c98eb 100644
--- a/Assets/SZZ/Prefabs/Poof1Blue.prefab
+++ b/Assets/SZZ/Prefabs/Poof1Blue.prefab
@@ -11,6 +11,7 @@ GameObject:
- component: {fileID: 4012635663398735587}
- component: {fileID: 111553319600454}
- component: {fileID: 2874583252556707212}
+ - component: {fileID: 4183249653861154358}
m_Layer: 0
m_Name: Poof1Blue
m_TagString: Untagged
@@ -83,3 +84,16 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
+--- !u!65 &4183249653861154358
+BoxCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4387753213340832857}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Size: {x: 2, y: 2, z: 2}
+ m_Center: {x: 0, y: 0, z: 0}
diff --git a/Assets/SZZ/Prefabs/Poof1Red.prefab b/Assets/SZZ/Prefabs/Poof1Red.prefab
index ca972cf..ebfadda 100644
--- a/Assets/SZZ/Prefabs/Poof1Red.prefab
+++ b/Assets/SZZ/Prefabs/Poof1Red.prefab
@@ -11,6 +11,7 @@ GameObject:
- component: {fileID: 7779701430396224831}
- component: {fileID: 6654304493314935450}
- component: {fileID: 8916038641885806160}
+ - component: {fileID: 8672055846398488435}
m_Layer: 0
m_Name: Poof1Red
m_TagString: Untagged
@@ -83,3 +84,16 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
+--- !u!65 &8672055846398488435
+BoxCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6970689967696502661}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Size: {x: 2, y: 2, z: 2}
+ m_Center: {x: 0, y: 0, z: 0}
diff --git a/Assets/SZZ/Prefabs/Poof1Yellow.prefab b/Assets/SZZ/Prefabs/Poof1Yellow.prefab
index bca0a87..6689da5 100644
--- a/Assets/SZZ/Prefabs/Poof1Yellow.prefab
+++ b/Assets/SZZ/Prefabs/Poof1Yellow.prefab
@@ -11,6 +11,7 @@ GameObject:
- component: {fileID: 3897113598890534221}
- component: {fileID: 124569989557119720}
- component: {fileID: 2764780224362651170}
+ - component: {fileID: -2722606887132866204}
m_Layer: 0
m_Name: Poof1Yellow
m_TagString: Untagged
@@ -83,3 +84,16 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
+--- !u!65 &-2722606887132866204
+BoxCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4422117599572574199}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Size: {x: 2, y: 2, z: 2}
+ m_Center: {x: 0, y: 0, z: 0}
diff --git a/Assets/SZZ/Prefabs/SingleDoorClosed.prefab b/Assets/SZZ/Prefabs/SingleDoorClosed.prefab
index 7f27f37..3b61500 100644
--- a/Assets/SZZ/Prefabs/SingleDoorClosed.prefab
+++ b/Assets/SZZ/Prefabs/SingleDoorClosed.prefab
@@ -11,6 +11,7 @@ GameObject:
- component: {fileID: 9057179778203456209}
- component: {fileID: 3669430533712899810}
- component: {fileID: 2348826821928957459}
+ - component: {fileID: 1263730176349911845}
m_Layer: 0
m_Name: Cube.005
m_TagString: Untagged
@@ -85,6 +86,19 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
+--- !u!65 &1263730176349911845
+BoxCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3438940347076170591}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Size: {x: 35.933823, y: 2.0078433, z: 2}
+ m_Center: {x: -16.922546, y: 0.0039218063, z: 0}
--- !u!1 &3655039319182704197
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/SZZ/Prefabs/SingleDoorOpen.prefab b/Assets/SZZ/Prefabs/SingleDoorOpen.prefab
index 3459121..476d4e3 100644
--- a/Assets/SZZ/Prefabs/SingleDoorOpen.prefab
+++ b/Assets/SZZ/Prefabs/SingleDoorOpen.prefab
@@ -212,6 +212,7 @@ GameObject:
- component: {fileID: 867080491502298114}
- component: {fileID: 1865606078047159855}
- component: {fileID: 6853239947566784446}
+ - component: {fileID: 4812625139015583435}
m_Layer: 0
m_Name: Cube.001
m_TagString: Untagged
@@ -284,6 +285,19 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
+--- !u!65 &4812625139015583435
+BoxCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5509463871618121151}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Size: {x: 2.0000002, y: 1.9999999, z: 2}
+ m_Center: {x: 0.0000009536743, y: -0.00000011920929, z: 0.000030517578}
--- !u!1 &6732804040710902096
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/SZZ/Prefabs/SingleDoorOpenWide.prefab b/Assets/SZZ/Prefabs/SingleDoorOpenWide.prefab
index d28392f..42ef5f6 100644
--- a/Assets/SZZ/Prefabs/SingleDoorOpenWide.prefab
+++ b/Assets/SZZ/Prefabs/SingleDoorOpenWide.prefab
@@ -212,6 +212,7 @@ GameObject:
- component: {fileID: 3155070436171080011}
- component: {fileID: 4477286198682157926}
- component: {fileID: 8708531938841205495}
+ - component: {fileID: 3483962596202778681}
m_Layer: 0
m_Name: Cube.001
m_TagString: Untagged
@@ -284,6 +285,19 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
+--- !u!65 &3483962596202778681
+BoxCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7761108398575155446}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Size: {x: 2.0000002, y: 1.9999999, z: 2.000002}
+ m_Center: {x: 0, y: 0, z: -0.00024414062}
--- !u!1 &8840226727022646297
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/SZZ/Prefabs/SingleDoorWide.prefab b/Assets/SZZ/Prefabs/SingleDoorWide.prefab
index 7849d3b..befdc46 100644
--- a/Assets/SZZ/Prefabs/SingleDoorWide.prefab
+++ b/Assets/SZZ/Prefabs/SingleDoorWide.prefab
@@ -295,6 +295,7 @@ GameObject:
- component: {fileID: 270504155163293316}
- component: {fileID: 5520560733839985335}
- component: {fileID: 6838754041327080006}
+ - component: {fileID: 5753811798510817508}
m_Layer: 0
m_Name: Cube.005
m_TagString: Untagged
@@ -369,3 +370,16 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
+--- !u!65 &5753811798510817508
+BoxCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5893247203116758794}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Size: {x: 35.93382, y: 2.0078433, z: 2}
+ m_Center: {x: -16.922552, y: 0.0039216275, z: -0.0000038146973}
diff --git a/Assets/SZZ/Prefabs/Table.prefab b/Assets/SZZ/Prefabs/Table.prefab
index 28ed4eb..d0bc65b 100644
--- a/Assets/SZZ/Prefabs/Table.prefab
+++ b/Assets/SZZ/Prefabs/Table.prefab
@@ -425,7 +425,7 @@ GameObject:
m_Component:
- component: {fileID: 8182742340936260200}
- component: {fileID: -3917086517343353833}
- - component: {fileID: 5820903482703622916}
+ - component: {fileID: 3143037316876003268}
m_Layer: 0
m_Name: Table
m_TagString: Untagged
@@ -496,8 +496,8 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
---- !u!64 &5820903482703622916
-MeshCollider:
+--- !u!65 &3143037316876003268
+BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@@ -506,10 +506,9 @@ MeshCollider:
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
- serializedVersion: 4
- m_Convex: 0
- m_CookingOptions: 30
- m_Mesh: {fileID: 0}
+ serializedVersion: 2
+ m_Size: {x: 2.1, y: 0.9, z: 1}
+ m_Center: {x: -0.2, y: 0.4, z: 0}
--- !u!1 &9045526303309205479
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/SZZ/Prefabs/WindowSingleClassroom.prefab b/Assets/SZZ/Prefabs/WindowSingleClassroom.prefab
index b4fe910..107adb5 100644
--- a/Assets/SZZ/Prefabs/WindowSingleClassroom.prefab
+++ b/Assets/SZZ/Prefabs/WindowSingleClassroom.prefab
@@ -11,6 +11,7 @@ GameObject:
- component: {fileID: 8285856495067362141}
- component: {fileID: 7627143796207169430}
- component: {fileID: 7546752099009454531}
+ - component: {fileID: 7777153521084600355}
m_Layer: 0
m_Name: Cube.003
m_TagString: Untagged
@@ -92,6 +93,19 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
+--- !u!65 &7777153521084600355
+BoxCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 52921091683607756}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Size: {x: 17.198227, y: 105.59315, z: 12.568597}
+ m_Center: {x: 0.7210962, y: -18.37071, z: -5.2842984}
--- !u!1 &1202212641935324652
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/SZZ/Prefabs/WindowSingleHall.prefab b/Assets/SZZ/Prefabs/WindowSingleHall.prefab
index 86d37bb..82e9560 100644
--- a/Assets/SZZ/Prefabs/WindowSingleHall.prefab
+++ b/Assets/SZZ/Prefabs/WindowSingleHall.prefab
@@ -94,6 +94,7 @@ GameObject:
- component: {fileID: 1157656368756979525}
- component: {fileID: 807439690069224334}
- component: {fileID: 745037657012463067}
+ - component: {fileID: 7715336442974407913}
m_Layer: 0
m_Name: Cube.003
m_TagString: Untagged
@@ -175,6 +176,19 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
+--- !u!65 &7715336442974407913
+BoxCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7084610481084522708}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Size: {x: 17.198233, y: 105.59315, z: 12.5686}
+ m_Center: {x: 0.72109646, y: -18.370695, z: -5.2840557}
--- !u!1 &8233295654830076404
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/SZZ/Prefabs/WindowSingleStairway.prefab b/Assets/SZZ/Prefabs/WindowSingleStairway.prefab
index 78324d4..179b0f3 100644
--- a/Assets/SZZ/Prefabs/WindowSingleStairway.prefab
+++ b/Assets/SZZ/Prefabs/WindowSingleStairway.prefab
@@ -11,6 +11,7 @@ GameObject:
- component: {fileID: 8632796593696572837}
- component: {fileID: 7847964941819992430}
- component: {fileID: 7893665947028985659}
+ - component: {fileID: 8898495425905149925}
m_Layer: 0
m_Name: Cube.003
m_TagString: Untagged
@@ -92,6 +93,19 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
+--- !u!65 &8898495425905149925
+BoxCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 399869445503947316}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Size: {x: 17.19823, y: 105.59315, z: 12.5686}
+ m_Center: {x: 0.7213405, y: -18.370703, z: -5.2840557}
--- !u!1 &1558107279191900948
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/SZZ/Settings/Lighting Settings.lighting b/Assets/SZZ/Settings/Lighting Settings.lighting
index 1337b96..58f9fcc 100644
--- a/Assets/SZZ/Settings/Lighting Settings.lighting
+++ b/Assets/SZZ/Settings/Lighting Settings.lighting
@@ -16,7 +16,7 @@ LightingSettings:
m_AlbedoBoost: 1
m_IndirectOutputScale: 1
m_UsingShadowmask: 1
- m_BakeBackend: 2
+ m_BakeBackend: 1
m_LightmapMaxSize: 2048
m_BakeResolution: 20
m_Padding: 4
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index 0bd24a9..6cd8acb 100644
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -135,7 +135,8 @@ PlayerSettings:
16:9: 1
Others: 1
bundleVersion: 0.1
- preloadedAssets: []
+ preloadedAssets:
+ - {fileID: 11400000, guid: 9e7be553448fa2546aea5752021cbcf7, type: 2}
metroInputSource: 0
wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1
--
GitLab