Skip to content

Commit

Permalink
Merge pull request #153 from 2024FALL-SWPP/bugfix/ClassroomColliders
Browse files Browse the repository at this point in the history
교단 잘 올라가지도록 높이 낮춤 + 왼쪽 벽 뚫려 보임 방지용 Collider 조정
  • Loading branch information
seozzi authored Nov 25, 2024
2 parents 58570c2 + 62efdec commit 26c08a3
Showing 1 changed file with 25 additions and 16 deletions.
41 changes: 25 additions & 16 deletions 302/Assets/Scenes/DefaultGameScene.unity
Original file line number Diff line number Diff line change
Expand Up @@ -7808,7 +7808,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 344747220}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
Expand Down Expand Up @@ -21410,8 +21410,8 @@ BoxCollider:
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 47.01239, y: 13.635007, z: 2.0497208}
m_Center: {x: -3.854248, y: 5.622643, z: 17.766048}
m_Size: {x: 47.01239, y: 13.635007, z: 2.242014}
m_Center: {x: -3.854248, y: 5.622643, z: 17.669903}
--- !u!1001 &958799144
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -26135,7 +26135,7 @@ CapsuleCollider:
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
m_Radius: 0.5
m_Radius: 0.15
m_Height: 1
m_Direction: 1
m_Center: {x: 0, y: 0, z: 0}
Expand Down Expand Up @@ -26558,6 +26558,10 @@ PrefabInstance:
propertyPath: m_RootOrder
value: 3
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 215dc3fb20ea4439b884ba0120103021, type: 3}
propertyPath: m_LocalScale.x
value: 70
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 215dc3fb20ea4439b884ba0120103021, type: 3}
propertyPath: m_LocalScale.z
value: 60
Expand All @@ -26572,7 +26576,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 215dc3fb20ea4439b884ba0120103021, type: 3}
propertyPath: m_LocalPosition.z
value: 17
value: 17.091002
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 215dc3fb20ea4439b884ba0120103021, type: 3}
propertyPath: m_LocalRotation.w
Expand Down Expand Up @@ -31240,6 +31244,10 @@ PrefabInstance:
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: fd767fe10a8c14c998f585458f438e70, type: 3}
propertyPath: m_LocalScale.x
value: 70
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: fd767fe10a8c14c998f585458f438e70, type: 3}
propertyPath: m_LocalScale.z
value: 60
Expand All @@ -31254,7 +31262,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: fd767fe10a8c14c998f585458f438e70, type: 3}
propertyPath: m_LocalPosition.z
value: 17
value: 17.03
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: fd767fe10a8c14c998f585458f438e70, type: 3}
propertyPath: m_LocalRotation.w
Expand Down Expand Up @@ -33969,8 +33977,8 @@ BoxCollider:
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 0.033585053, y: 0.024665697, z: 0.12539476}
m_Center: {x: 0.00081452366, y: 0.00081416254, z: 0}
m_Size: {x: 0.038248833, y: 0.02646038, z: 0.12539476}
m_Center: {x: 0.0031464135, y: 0.0005672741, z: 0}
--- !u!1001 &1561725255
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -35615,8 +35623,8 @@ BoxCollider:
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 0.033529375, y: 0.028243784, z: 0.12539476}
m_Center: {x: 0.00078670616, y: 0.0014458442, z: 0}
m_Size: {x: 0.038680155, y: 0.029429445, z: 0.12539476}
m_Center: {x: 0.0033620987, y: 0.000853014, z: 0}
--- !u!1 &1675446298
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -42434,39 +42442,39 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 8ef138eb9a84140bda031012eaf91116, type: 3}
propertyPath: m_LocalPosition.y
value: -0.07999999
value: -0.2
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 8ef138eb9a84140bda031012eaf91116, type: 3}
propertyPath: m_LocalPosition.z
value: 0.28
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 8ef138eb9a84140bda031012eaf91116, type: 3}
propertyPath: m_LocalRotation.w
value: 0.000000053385072
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 8ef138eb9a84140bda031012eaf91116, type: 3}
propertyPath: m_LocalRotation.x
value: -0.00000005338508
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 8ef138eb9a84140bda031012eaf91116, type: 3}
propertyPath: m_LocalRotation.y
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 8ef138eb9a84140bda031012eaf91116, type: 3}
propertyPath: m_LocalRotation.z
value: -0.7071067
value: -0.7071068
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 8ef138eb9a84140bda031012eaf91116, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
value: 90
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 8ef138eb9a84140bda031012eaf91116, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 8ef138eb9a84140bda031012eaf91116, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
value: -180
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 8ef138eb9a84140bda031012eaf91116, type: 3}
propertyPath: m_Name
Expand Down Expand Up @@ -43059,6 +43067,7 @@ MonoBehaviour:
- {fileID: 3233071982878084982, guid: 5156428cd2b781d4dabf6a30befa7685, type: 3}
- {fileID: 5605359256125054964, guid: 48c8f10abe45bef4098efae902701f34, type: 3}
checkSpecificAnomaly: 0
checkIntersect: 0
SpecificAnomalyNum: 0
currentAnomalyInstance: {fileID: 8678062959089499939, guid: 6aadfcd777444a24180cf51012c6e89c, type: 3}
--- !u!4 &1964216256
Expand Down

0 comments on commit 26c08a3

Please sign in to comment.