diff --git a/secret_rooms_cc/.gitignore b/secret_rooms_cc/.gitignore index b955697..4fdb949 100644 --- a/secret_rooms_cc/.gitignore +++ b/secret_rooms_cc/.gitignore @@ -1,3 +1,7 @@ +*.blend1 +*.blend1.meta + + # This .gitignore file should be placed at the root of your Unity project directory # # Get latest from https://github.com/github/gitignore/blob/main/Unity.gitignore diff --git a/secret_rooms_cc/Assets/de6/cab/de6_secret_room_prefab.prefab b/secret_rooms_cc/Assets/de6/cab/de6_secret_room_prefab.prefab index d186e9e..97155fd 100644 --- a/secret_rooms_cc/Assets/de6/cab/de6_secret_room_prefab.prefab +++ b/secret_rooms_cc/Assets/de6/cab/de6_secret_room_prefab.prefab @@ -43,7 +43,6 @@ GameObject: - component: {fileID: 2244970944203012666} - component: {fileID: 6470723835525977331} - component: {fileID: 3080987772344777606} - - component: {fileID: 2564383862465124164} m_Layer: 0 m_Name: top m_TagString: Untagged @@ -112,20 +111,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!64 &2564383862465124164 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 510688569375860255} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &896777797134429986 GameObject: m_ObjectHideFlags: 0 @@ -206,7 +191,6 @@ GameObject: - component: {fileID: 475084258952817977} - component: {fileID: 5894590355284793704} - component: {fileID: 5164092948447779844} - - component: {fileID: 3203075860931979961} m_Layer: 0 m_Name: right m_TagString: Untagged @@ -275,20 +259,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!64 &3203075860931979961 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2031145764709587960} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &2269874009582069491 GameObject: m_ObjectHideFlags: 0 @@ -344,7 +314,6 @@ GameObject: - component: {fileID: 3619509750521597006} - component: {fileID: 845305605988465256} - component: {fileID: 4134507313210934880} - - component: {fileID: 4602405995761414071} m_Layer: 0 m_Name: front m_TagString: Untagged @@ -413,20 +382,21 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!64 &4602405995761414071 -MeshCollider: +--- !u!114 &310354954093147550 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3993015155750450841} - m_Material: {fileID: 0} - m_IsTrigger: 0 + m_GameObject: {fileID: 3791100745548111733} m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} + m_EditorHideFlags: 0 + m_Script: {fileID: -805236176, guid: b6e5ff4f80d0a724dbfb41cb3875a6bf, type: 3} + m_Name: + m_EditorClassIdentifier: + TransformPaths: + - '[walkable]/MeshCollider' + - '[items]/MeshCollider' --- !u!114 &4246013516370830205 MonoBehaviour: m_ObjectHideFlags: 0 @@ -443,6 +413,9 @@ MonoBehaviour: MaterialObjectPath: FromInterior: 0 GenerateExplodedMaterialProcedurally: 1 + UseForPaint: 0 + Area: 0 + Paints: [] --- !u!114 &9173173929487258546 MonoBehaviour: m_ObjectHideFlags: 0 @@ -459,6 +432,9 @@ MonoBehaviour: MaterialObjectPath: FromInterior: 0 GenerateExplodedMaterialProcedurally: 1 + UseForPaint: 0 + Area: 0 + Paints: [] --- !u!114 &8069388613562590392 MonoBehaviour: m_ObjectHideFlags: 0 @@ -475,6 +451,9 @@ MonoBehaviour: MaterialObjectPath: FromInterior: 0 GenerateExplodedMaterialProcedurally: 1 + UseForPaint: 0 + Area: 0 + Paints: [] --- !u!1 &4382410325613486750 GameObject: m_ObjectHideFlags: 0 @@ -530,7 +509,6 @@ GameObject: - component: {fileID: 6805794407336091078} - component: {fileID: 3695541401586655775} - component: {fileID: 7541544243495319542} - - component: {fileID: 2397960519072385230} m_Layer: 0 m_Name: left m_TagString: Untagged @@ -599,20 +577,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!64 &2397960519072385230 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6602547309484564964} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &4061644174113382948 PrefabInstance: m_ObjectHideFlags: 0 @@ -786,6 +750,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 4061644174113382948} m_PrefabAsset: {fileID: 0} +--- !u!4 &4600254010101679567 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 05eff27f31a3df04d82b327cbceac210, + type: 3} + m_PrefabInstance: {fileID: 4061644174113382948} + m_PrefabAsset: {fileID: 0} --- !u!4 &2081474799469645608 stripped Transform: m_CorrespondingSourceObject: {fileID: 2647898422681595148, guid: 05eff27f31a3df04d82b327cbceac210, @@ -798,9 +768,9 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 4061644174113382948} m_PrefabAsset: {fileID: 0} ---- !u!4 &4600254010101679567 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 05eff27f31a3df04d82b327cbceac210, +--- !u!1 &3791100745548111733 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 05eff27f31a3df04d82b327cbceac210, type: 3} m_PrefabInstance: {fileID: 4061644174113382948} m_PrefabAsset: {fileID: 0} diff --git a/secret_rooms_cc/Assets/de6/custom colliders/camera dampening/cab_LOD2.obj b/secret_rooms_cc/Assets/de6/custom colliders/camera dampening/cab_LOD2.obj index a52dd18..fd7ad14 100644 --- a/secret_rooms_cc/Assets/de6/custom colliders/camera dampening/cab_LOD2.obj +++ b/secret_rooms_cc/Assets/de6/custom colliders/camera dampening/cab_LOD2.obj @@ -535,6 +535,40 @@ v 1.313998 2.437518 4.860585 v 1.411942 2.535462 4.860585 v 1.313998 3.113824 4.860585 v 1.411943 3.015879 4.860585 +v -0.855035 1.192125 8.174202 +v -0.855035 1.192125 6.904574 +v 0.855035 1.192125 8.174202 +v 0.855035 1.192125 6.904574 +v -0.855035 1.192125 7.327783 +v -0.855035 1.192125 7.750992 +v 0.285012 1.192125 6.904574 +v -0.285012 1.192125 6.904574 +v 0.855035 1.192125 7.750992 +v 0.855035 1.192125 7.327783 +v -0.285012 1.192125 8.174202 +v 0.285012 1.192125 8.174202 +v -0.285012 1.192125 7.327783 +v -0.285012 1.192125 7.750992 +v 0.285012 1.192125 7.327783 +v 0.285012 1.192125 7.750992 +v -0.855035 1.192125 8.174202 +v -0.855035 2.812024 8.174202 +v -0.855035 1.192125 6.904574 +v -0.855035 2.812024 6.904574 +v 0.855035 1.192125 8.174202 +v 0.855035 2.812024 8.174202 +v 0.855035 1.192125 6.904574 +v 0.855035 2.812024 6.904574 +v -0.295806 1.192157 6.904574 +v -0.295806 2.822547 6.904574 +v -0.855035 1.192125 7.327783 +v -0.855035 1.192125 7.750992 +v 0.855035 1.192125 7.750992 +v 0.855035 1.192125 7.327783 +v -0.285012 1.192125 8.174202 +v 0.285012 1.192125 8.174202 +v 0.300497 1.192125 6.904574 +v 0.300497 2.822547 6.904574 vn -0.0000 1.0000 -0.0000 vn -0.0000 -0.0000 1.0000 vn -0.5718 -0.8204 -0.0000 @@ -1020,6 +1054,52 @@ vt 0.733398 0.169189 vt 0.722168 0.157593 vt 0.733398 0.089478 vt 0.722168 0.101013 +vt 0.449918 0.007872 +vt 0.449918 0.091206 +vt 0.366625 0.091206 +vt 0.366625 0.007872 +vt 0.283251 0.007872 +vt 0.283251 0.091206 +vt 0.366585 0.091206 +vt 0.366585 0.007872 +vt 0.287158 0.007953 +vt 0.287158 0.091673 +vt 0.370491 0.091673 +vt 0.370491 0.007953 +vt 0.278857 0.344603 +vt 0.278857 0.261290 +vt 0.362190 0.261290 +vt 0.362190 0.344603 +vt 0.453824 0.091673 +vt 0.453824 0.007953 +vt 0.445524 0.261290 +vt 0.445524 0.344603 +vt 0.370532 0.091673 +vt 0.370532 0.007953 +vt 0.362231 0.261290 +vt 0.362231 0.344603 +vt 0.375000 0.250000 +vt 0.458333 0.250000 +vt 0.375000 0.000000 +vt 0.014231 0.299941 +vt 0.086257 0.299941 +vt 0.014231 0.083864 +vt 0.000000 1.000346 +vt 0.333333 1.000346 +vt 0.000000 0.000346 +vt 0.625000 0.500000 +vt 0.625000 0.750000 +vt 0.875000 0.750000 +vt 0.875000 0.500000 +vt 0.625000 0.250000 +vt 0.666667 1.000346 +vt 1.000000 1.000346 +vt 1.000000 0.000346 +vt 0.158283 0.299941 +vt 0.230309 0.299941 +vt 0.230309 0.083863 +vt 0.541667 0.250000 +vt 0.625000 0.000000 s 1 f 3/1/1 2/2/1 1/3/1 f 4/4/1 2/2/1 3/1/1 @@ -1408,3 +1488,25 @@ f 530/426/2 529/425/2 532/428/2 f 533/429/2 529/425/2 524/418/2 f 529/425/2 534/430/2 532/428/2 f 534/430/2 529/425/2 533/429/2 +s 0 +f 550/431/1 546/432/1 537/433/1 543/434/1 +f 540/435/1 535/436/1 545/437/1 548/438/1 +f 548/438/1 545/437/1 546/432/1 550/431/1 +f 536/439/1 539/440/1 547/441/1 542/442/1 +f 539/443/1 540/444/1 548/445/1 547/446/1 +f 542/442/1 547/441/1 549/447/1 541/448/1 +f 547/446/1 548/445/1 550/449/1 549/450/1 +f 541/448/1 549/447/1 544/451/1 538/452/1 +f 549/450/1 550/449/1 543/453/1 544/454/1 +f 551/455/8 562/456/8 552/457/8 +f 557/458/9 564/459/9 558/460/9 +f 555/461/32 566/462/32 556/463/32 +f 558/464/5 556/465/5 552/466/5 554/467/5 +f 553/455/2 559/455/2 560/468/2 554/468/2 +f 565/469/32 551/470/32 552/471/32 +f 556/463/32 566/462/32 565/469/32 552/471/32 +f 563/472/9 555/473/9 556/474/9 +f 558/460/9 564/459/9 563/472/9 556/474/9 +f 561/475/8 553/468/8 554/476/8 +f 552/457/8 562/456/8 561/475/8 554/476/8 +f 557/458/2 558/460/2 568/460/2 567/458/2 diff --git a/secret_rooms_cc/Assets/de6/custom colliders/custom colliders blend.blend b/secret_rooms_cc/Assets/de6/custom colliders/custom colliders blend.blend index b94bf74..510055e 100644 Binary files a/secret_rooms_cc/Assets/de6/custom colliders/custom colliders blend.blend and b/secret_rooms_cc/Assets/de6/custom colliders/custom colliders blend.blend differ diff --git a/secret_rooms_cc/Assets/de6/custom colliders/items/de6_body_item_collider Variant.prefab b/secret_rooms_cc/Assets/de6/custom colliders/items/de6_body_item_collider Variant.prefab new file mode 100644 index 0000000..df6e5c5 --- /dev/null +++ b/secret_rooms_cc/Assets/de6/custom colliders/items/de6_body_item_collider Variant.prefab @@ -0,0 +1,92 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!64 &8157069737076652758 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1747817086468911704} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -2432090755550338912, guid: f2a3f2d1e098acc4d953ed154e0f02dd, type: 3} +--- !u!1001 &7569948787363821520 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: f2a3f2d1e098acc4d953ed154e0f02dd, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f2a3f2d1e098acc4d953ed154e0f02dd, + type: 3} + propertyPath: m_LocalPosition.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f2a3f2d1e098acc4d953ed154e0f02dd, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f2a3f2d1e098acc4d953ed154e0f02dd, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f2a3f2d1e098acc4d953ed154e0f02dd, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f2a3f2d1e098acc4d953ed154e0f02dd, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f2a3f2d1e098acc4d953ed154e0f02dd, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f2a3f2d1e098acc4d953ed154e0f02dd, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f2a3f2d1e098acc4d953ed154e0f02dd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f2a3f2d1e098acc4d953ed154e0f02dd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f2a3f2d1e098acc4d953ed154e0f02dd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: f2a3f2d1e098acc4d953ed154e0f02dd, + type: 3} + propertyPath: m_Name + value: de6_body_item_collider Variant + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: -7635826562936255635, guid: f2a3f2d1e098acc4d953ed154e0f02dd, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: f2a3f2d1e098acc4d953ed154e0f02dd, type: 3} +--- !u!1 &1747817086468911704 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8164078558771037576, guid: f2a3f2d1e098acc4d953ed154e0f02dd, + type: 3} + m_PrefabInstance: {fileID: 7569948787363821520} + m_PrefabAsset: {fileID: 0} diff --git a/secret_rooms_cc/Assets/de6/custom colliders/items/de6_body_item_collider Variant.prefab.meta b/secret_rooms_cc/Assets/de6/custom colliders/items/de6_body_item_collider Variant.prefab.meta new file mode 100644 index 0000000..635d178 --- /dev/null +++ b/secret_rooms_cc/Assets/de6/custom colliders/items/de6_body_item_collider Variant.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ce9e44553ad84f3438c96a885e0d5295 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/secret_rooms_cc/Assets/de6/custom colliders/items/de6_body_item_collider.obj b/secret_rooms_cc/Assets/de6/custom colliders/items/de6_body_item_collider.obj index 6729796..9db40c6 100644 --- a/secret_rooms_cc/Assets/de6/custom colliders/items/de6_body_item_collider.obj +++ b/secret_rooms_cc/Assets/de6/custom colliders/items/de6_body_item_collider.obj @@ -33131,6 +33131,40 @@ v -0.119690 2.601063 1.184025 v 0.131394 2.637276 1.143058 v 0.000001 2.655638 1.143058 v 0.000001 2.617854 1.184025 +v -0.855035 1.192125 8.174202 +v -0.855035 1.192125 6.904574 +v 0.855035 1.192125 8.174202 +v 0.855035 1.192125 6.904574 +v -0.855035 1.192125 7.327783 +v -0.855035 1.192125 7.750992 +v 0.285012 1.192125 6.904574 +v -0.285012 1.192125 6.904574 +v 0.855035 1.192125 7.750992 +v 0.855035 1.192125 7.327783 +v -0.285012 1.192125 8.174202 +v 0.285012 1.192125 8.174202 +v -0.285012 1.192125 7.327783 +v -0.285012 1.192125 7.750992 +v 0.285012 1.192125 7.327783 +v 0.285012 1.192125 7.750992 +v -0.855035 1.192125 8.174202 +v -0.855035 2.812024 8.174202 +v -0.855035 1.192125 6.904574 +v -0.855035 2.812024 6.904574 +v 0.855035 1.192125 8.174202 +v 0.855035 2.812024 8.174202 +v 0.855035 1.192125 6.904574 +v 0.855035 2.812024 6.904574 +v -0.295806 1.192157 6.904574 +v -0.295806 2.822547 6.904574 +v -0.855035 1.192125 7.327783 +v -0.855035 1.192125 7.750992 +v 0.855035 1.192125 7.750992 +v 0.855035 1.192125 7.327783 +v -0.285012 1.192125 8.174202 +v 0.285012 1.192125 8.174202 +v 0.300497 1.192125 6.904574 +v 0.300497 2.822547 6.904574 vn 1.0000 -0.0000 -0.0000 vn -0.0375 0.0840 0.9958 vn 1.0000 0.0001 -0.0000 @@ -49553,6 +49587,52 @@ vt 0.492432 0.439209 vt 0.418701 0.454590 vt 0.466797 0.454590 vt 0.442627 0.458740 +vt 0.449918 0.007872 +vt 0.449918 0.091206 +vt 0.366625 0.091206 +vt 0.366625 0.007872 +vt 0.283251 0.007872 +vt 0.283251 0.091206 +vt 0.366585 0.091206 +vt 0.366585 0.007872 +vt 0.287158 0.007953 +vt 0.287158 0.091673 +vt 0.370491 0.091673 +vt 0.370491 0.007953 +vt 0.278857 0.344603 +vt 0.278857 0.261290 +vt 0.362190 0.261290 +vt 0.362190 0.344603 +vt 0.453824 0.091673 +vt 0.453824 0.007953 +vt 0.445524 0.261290 +vt 0.445524 0.344603 +vt 0.370532 0.091673 +vt 0.370532 0.007953 +vt 0.362231 0.261290 +vt 0.362231 0.344603 +vt 0.375000 0.250000 +vt 0.458333 0.250000 +vt 0.375000 0.000000 +vt 0.014231 0.299941 +vt 0.086257 0.299941 +vt 0.014231 0.083864 +vt 0.000000 1.000346 +vt 0.333333 1.000346 +vt 0.000000 0.000346 +vt 0.625000 0.500000 +vt 0.625000 0.750000 +vt 0.875000 0.750000 +vt 0.875000 0.500000 +vt 0.625000 0.250000 +vt 0.666667 1.000346 +vt 1.000000 1.000346 +vt 1.000000 0.000346 +vt 0.158283 0.299941 +vt 0.230309 0.299941 +vt 0.230309 0.083863 +vt 0.541667 0.250000 +vt 0.625000 0.000000 s 1 f 3/1/1 2/2/1 1/3/1 f 6/4/2 5/5/2 4/6/2 @@ -72880,3 +72960,25 @@ f 33129/7394/9027 33125/7392/9023 33127/7105/9025 f 33126/7101/9024 33128/7393/9026 33130/7103/9028 f 33130/7103/9028 33129/7394/9027 33127/7105/9025 f 33128/7393/9026 33129/7394/9027 33130/7103/9028 +s 0 +f 33146/7395/143 33142/7396/143 33133/7397/143 33139/7398/143 +f 33136/7399/143 33131/7400/143 33141/7401/143 33144/7402/143 +f 33144/7402/143 33141/7401/143 33142/7396/143 33146/7395/143 +f 33132/7403/143 33135/7404/143 33143/7405/143 33138/7406/143 +f 33135/7407/143 33136/7408/143 33144/7409/143 33143/7410/143 +f 33138/7406/143 33143/7405/143 33145/7411/143 33137/7412/143 +f 33143/7410/143 33144/7409/143 33146/7413/143 33145/7414/143 +f 33137/7412/143 33145/7411/143 33140/7415/143 33134/7416/143 +f 33145/7414/143 33146/7413/143 33139/7417/143 33140/7418/143 +f 33147/7419/1 33158/7420/1 33148/7421/1 +f 33153/7422/8 33160/7423/8 33154/7424/8 +f 33151/7425/142 33162/7426/142 33152/7427/142 +f 33154/7428/144 33152/7429/144 33148/7430/144 33150/7431/144 +f 33149/7419/27 33155/7419/27 33156/7432/27 33150/7432/27 +f 33161/7433/142 33147/7434/142 33148/7435/142 +f 33152/7427/142 33162/7426/142 33161/7433/142 33148/7435/142 +f 33159/7436/8 33151/7437/8 33152/7438/8 +f 33154/7424/8 33160/7423/8 33159/7436/8 33152/7438/8 +f 33157/7439/1 33149/7432/1 33150/7440/1 +f 33148/7421/1 33158/7420/1 33157/7439/1 33150/7440/1 +f 33153/7422/27 33154/7424/27 33164/7424/27 33163/7422/27 diff --git a/secret_rooms_cc/Assets/de6/custom colliders/walkable/de6_body_player_collider Variant.prefab b/secret_rooms_cc/Assets/de6/custom colliders/walkable/de6_body_player_collider Variant.prefab new file mode 100644 index 0000000..5ddfce9 --- /dev/null +++ b/secret_rooms_cc/Assets/de6/custom colliders/walkable/de6_body_player_collider Variant.prefab @@ -0,0 +1,92 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!64 &4089379503015645971 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3782455465940419742} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -2432090755550338912, guid: 7f8d47716d34fa449869ccb3eaacc454, type: 3} +--- !u!1001 &4985864140887376150 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 7f8d47716d34fa449869ccb3eaacc454, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7f8d47716d34fa449869ccb3eaacc454, + type: 3} + propertyPath: m_LocalPosition.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7f8d47716d34fa449869ccb3eaacc454, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7f8d47716d34fa449869ccb3eaacc454, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7f8d47716d34fa449869ccb3eaacc454, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7f8d47716d34fa449869ccb3eaacc454, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7f8d47716d34fa449869ccb3eaacc454, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7f8d47716d34fa449869ccb3eaacc454, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7f8d47716d34fa449869ccb3eaacc454, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7f8d47716d34fa449869ccb3eaacc454, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7f8d47716d34fa449869ccb3eaacc454, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 7f8d47716d34fa449869ccb3eaacc454, + type: 3} + propertyPath: m_Name + value: de6_body_player_collider Variant + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: -7635826562936255635, guid: 7f8d47716d34fa449869ccb3eaacc454, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: 7f8d47716d34fa449869ccb3eaacc454, type: 3} +--- !u!1 &3782455465940419742 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8164078558771037576, guid: 7f8d47716d34fa449869ccb3eaacc454, + type: 3} + m_PrefabInstance: {fileID: 4985864140887376150} + m_PrefabAsset: {fileID: 0} diff --git a/secret_rooms_cc/Assets/de6/custom colliders/walkable/de6_body_player_collider Variant.prefab.meta b/secret_rooms_cc/Assets/de6/custom colliders/walkable/de6_body_player_collider Variant.prefab.meta new file mode 100644 index 0000000..92f1153 --- /dev/null +++ b/secret_rooms_cc/Assets/de6/custom colliders/walkable/de6_body_player_collider Variant.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c99e2165e8a1f134c9f6b7d543bb494c +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/secret_rooms_cc/Assets/de6/custom colliders/walkable/de6_body_player_collider.obj b/secret_rooms_cc/Assets/de6/custom colliders/walkable/de6_body_player_collider.obj index 5bac1b3..8b92ed7 100644 --- a/secret_rooms_cc/Assets/de6/custom colliders/walkable/de6_body_player_collider.obj +++ b/secret_rooms_cc/Assets/de6/custom colliders/walkable/de6_body_player_collider.obj @@ -11662,6 +11662,40 @@ v 0.900000 2.706981 3.840930 v 0.900000 1.758357 4.193640 v 0.900000 1.603995 4.358910 v 0.900000 2.706981 4.193640 +v -0.855035 1.192125 8.174202 +v -0.855035 1.192125 6.904574 +v 0.855035 1.192125 8.174202 +v 0.855035 1.192125 6.904574 +v -0.855035 1.192125 7.327783 +v -0.855035 1.192125 7.750992 +v 0.285012 1.192125 6.904574 +v -0.285012 1.192125 6.904574 +v 0.855035 1.192125 7.750992 +v 0.855035 1.192125 7.327783 +v -0.285012 1.192125 8.174202 +v 0.285012 1.192125 8.174202 +v -0.285012 1.192125 7.327783 +v -0.285012 1.192125 7.750992 +v 0.285012 1.192125 7.327783 +v 0.285012 1.192125 7.750992 +v -0.855035 1.192125 8.174202 +v -0.855035 2.710120 8.174202 +v -0.855035 1.192125 6.904574 +v -0.855035 2.710120 6.904574 +v 0.855035 1.192125 8.174202 +v 0.855035 2.710120 8.174202 +v 0.855035 1.192125 6.904574 +v 0.855035 2.710120 6.904574 +v -0.295806 1.192157 6.904574 +v -0.295806 2.822547 6.904574 +v -0.855035 1.192125 7.327783 +v -0.855035 1.192125 7.750992 +v 0.855035 1.192125 7.750992 +v 0.855035 1.192125 7.327783 +v -0.285012 1.192125 8.174202 +v 0.285012 1.192125 8.174202 +v 0.300497 1.192125 6.904574 +v 0.300497 2.822547 6.904574 vn -0.5987 0.5599 0.5728 vn -0.4127 0.6367 0.6514 vn -0.4205 0.6342 0.6489 @@ -17563,6 +17597,52 @@ vt 0.063538 0.255859 vt 0.063538 0.314697 vt 0.041656 0.255859 vt 0.041656 0.314697 +vt 0.449918 0.007872 +vt 0.449918 0.091206 +vt 0.366625 0.091206 +vt 0.366625 0.007872 +vt 0.283251 0.007872 +vt 0.283251 0.091206 +vt 0.366585 0.091206 +vt 0.366585 0.007872 +vt 0.287158 0.007953 +vt 0.287158 0.091673 +vt 0.370491 0.091673 +vt 0.370491 0.007953 +vt 0.278857 0.344603 +vt 0.278857 0.261290 +vt 0.362190 0.261290 +vt 0.362190 0.344603 +vt 0.453824 0.091673 +vt 0.453824 0.007953 +vt 0.445524 0.261290 +vt 0.445524 0.344603 +vt 0.370532 0.091673 +vt 0.370532 0.007953 +vt 0.362231 0.261290 +vt 0.362231 0.344603 +vt 0.375000 0.250000 +vt 0.458333 0.250000 +vt 0.375000 0.000000 +vt 0.014231 0.299941 +vt 0.086257 0.299941 +vt 0.014231 0.083864 +vt 0.000000 1.000346 +vt 0.333333 1.000346 +vt 0.000000 0.000346 +vt 0.625000 0.500000 +vt 0.625000 0.750000 +vt 0.875000 0.750000 +vt 0.875000 0.500000 +vt 0.625000 0.250000 +vt 0.666667 1.000346 +vt 1.000000 1.000346 +vt 1.000000 0.000346 +vt 0.158283 0.299941 +vt 0.230309 0.299941 +vt 0.230309 0.083863 +vt 0.541667 0.250000 +vt 0.625000 0.000000 s 1 f 3/1/1 2/2/2 1/3/3 f 6/4/4 5/5/5 4/6/6 @@ -25925,3 +26005,25 @@ f 11660/1268/30 11655/3024/30 11659/3028/30 f 4053/1265/30 11661/3029/30 11658/3027/30 f 11660/1268/30 11659/3028/30 11661/3029/30 f 4053/1265/30 11660/1268/30 11661/3029/30 +s 0 +f 11677/3030/46 11673/3031/46 11664/3032/46 11670/3033/46 +f 11667/3034/46 11662/3035/46 11672/3036/46 11675/3037/46 +f 11675/3037/46 11672/3036/46 11673/3031/46 11677/3030/46 +f 11663/3038/46 11666/3039/46 11674/3040/46 11669/3041/46 +f 11666/3042/46 11667/3043/46 11675/3044/46 11674/3045/46 +f 11669/3041/46 11674/3040/46 11676/3046/46 11668/3047/46 +f 11674/3045/46 11675/3044/46 11677/3048/46 11676/3049/46 +f 11668/3047/46 11676/3046/46 11671/3050/46 11665/3051/46 +f 11676/3049/46 11677/3048/46 11670/3052/46 11671/3053/46 +f 11678/3054/30 11689/3055/30 11679/3056/30 +f 11684/3057/34 11691/3058/34 11685/3059/34 +f 11682/3060/42 11693/3061/42 11683/3062/42 +f 11685/3063/31 11683/3064/31 11679/3065/31 11681/3066/31 +f 11680/3054/37 11686/3054/37 11687/3067/37 11681/3067/37 +f 11692/3068/42 11678/3069/42 11679/3070/42 +f 11683/3062/42 11693/3061/42 11692/3068/42 11679/3070/42 +f 11690/3071/34 11682/3072/34 11683/3073/34 +f 11685/3059/34 11691/3058/34 11690/3071/34 11683/3073/34 +f 11688/3074/30 11680/3067/30 11681/3075/30 +f 11679/3056/30 11689/3055/30 11688/3074/30 11681/3075/30 +f 11684/3057/37 11685/3059/37 11695/3059/37 11694/3057/37 diff --git a/secret_rooms_cc/Assets/de6/de6_config.asset b/secret_rooms_cc/Assets/de6/de6_config.asset index 785c21c..f4581da 100644 --- a/secret_rooms_cc/Assets/de6/de6_config.asset +++ b/secret_rooms_cc/Assets/de6/de6_config.asset @@ -28,9 +28,9 @@ MonoBehaviour: CustomBuffer: {fileID: 0} CustomBufferMaterial: {fileID: 0} CollisionCollider: {fileID: 0} - WalkableCollider: {fileID: 919132149155446097, guid: 7f8d47716d34fa449869ccb3eaacc454, + WalkableCollider: {fileID: 5327812050364038215, guid: c99e2165e8a1f134c9f6b7d543bb494c, type: 3} - ItemsCollider: {fileID: 919132149155446097, guid: f2a3f2d1e098acc4d953ed154e0f02dd, + ItemsCollider: {fileID: 7335437460659571329, guid: ce9e44553ad84f3438c96a885e0d5295, type: 3} InteriorPrefab: {fileID: 3791100745548111733, guid: 8b5813820aeb68548bff9c0b51f5fcbd, type: 3} diff --git a/secret_rooms_code/src/PlayerManager_Patch.cs b/secret_rooms_code/src/PlayerManager_Patch.cs index b3cabf8..8ca494e 100644 --- a/secret_rooms_code/src/PlayerManager_Patch.cs +++ b/secret_rooms_code/src/PlayerManager_Patch.cs @@ -34,18 +34,8 @@ public class PlayerManager_SetCar_Patch secret.gameObject.AddComponent(); Main.Log($"added {nameof(CaramellManager)} to {secret.gameObject.name}"); } - - private static void Yeet(Transform aTransform, string searchPath) - { - var foundTransform = aTransform.Find(searchPath); - if (!foundTransform) - { - Main.Error($"{nameof(PlayerManager_SetCar_Patch)} Could not find '{aTransform.name}/{searchPath}'"); - return; - } - foundTransform.gameObject.SetActive(false); - } + //TODO door collider doesn't work anymore; you walk straight through private static void DoorSetup(Transform secret, Transform interiorTransform) { var doorTransform = secret.Find("door"); @@ -67,6 +57,5 @@ public class PlayerManager_SetCar_Patch lever.CopyValues(existingDoorLever); lever.colliderGameObjects = door.GetComponentsInChildren().Select(collider => collider.gameObject).ToArray(); - //TODO collider layers } } \ No newline at end of file