Skip to content

Commit

Permalink
bugfix: make escape zone collider smaller (#162)
Browse files Browse the repository at this point in the history
  • Loading branch information
kkilme authored May 31, 2024
1 parent 9fc079e commit 7523d5e
Show file tree
Hide file tree
Showing 6 changed files with 65 additions and 80 deletions.
10 changes: 7 additions & 3 deletions Client/Assets/Resources/Prefabs/Map/Components/Elevator.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -438,15 +438,19 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7162998184046019369, guid: 266368f46b75ec548857dc0163a9f3bd, type: 3}
propertyPath: m_Size.x
value: 2
value: 0.92007446
objectReference: {fileID: 0}
- target: {fileID: 7162998184046019369, guid: 266368f46b75ec548857dc0163a9f3bd, type: 3}
propertyPath: m_Size.z
value: 3
value: 1.0659885
objectReference: {fileID: 0}
- target: {fileID: 7162998184046019369, guid: 266368f46b75ec548857dc0163a9f3bd, type: 3}
propertyPath: m_Center.x
value: 0.5
value: 0.26650238
objectReference: {fileID: 0}
- target: {fileID: 7162998184046019369, guid: 266368f46b75ec548857dc0163a9f3bd, type: 3}
propertyPath: m_Center.z
value: -0.088721275
objectReference: {fileID: 0}
- target: {fileID: 7970807483730846797, guid: 266368f46b75ec548857dc0163a9f3bd, type: 3}
propertyPath: m_LocalPosition.x
Expand Down
28 changes: 28 additions & 0 deletions Client/Assets/Resources/Prefabs/Map/Map.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -3779,6 +3779,10 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 6491473544176005436}
m_Modifications:
- target: {fileID: 1737461934078090274, guid: 1772b9601cec99f4b9ced76f070ea5c2, type: 3}
propertyPath: Flags
value: 262145
objectReference: {fileID: 0}
- target: {fileID: 1737461934078090274, guid: 1772b9601cec99f4b9ced76f070ea5c2, type: 3}
propertyPath: SortKey
value: 376258823
Expand Down Expand Up @@ -4849,6 +4853,10 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 2558770651188516899}
m_Modifications:
- target: {fileID: -1894697666103748573, guid: 025466fda43d46442882ff7fd95e507a, type: 3}
propertyPath: Flags
value: 262145
objectReference: {fileID: 0}
- target: {fileID: -1894697666103748573, guid: 025466fda43d46442882ff7fd95e507a, type: 3}
propertyPath: SortKey
value: 2378540302
Expand Down Expand Up @@ -7415,6 +7423,10 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 6491473544176005436}
m_Modifications:
- target: {fileID: -7971593262542106541, guid: cfe83c28dea63f64fbab4e73cf4f8cbd, type: 3}
propertyPath: Flags
value: 262145
objectReference: {fileID: 0}
- target: {fileID: -7971593262542106541, guid: cfe83c28dea63f64fbab4e73cf4f8cbd, type: 3}
propertyPath: SortKey
value: 172332644
Expand Down Expand Up @@ -8875,6 +8887,10 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 2558770651188516899}
m_Modifications:
- target: {fileID: 1938526588529392681, guid: 6d00ec4ae1633b247b0cec238d34e5fd, type: 3}
propertyPath: Flags
value: 262145
objectReference: {fileID: 0}
- target: {fileID: 1938526588529392681, guid: 6d00ec4ae1633b247b0cec238d34e5fd, type: 3}
propertyPath: SortKey
value: 968538693
Expand Down Expand Up @@ -14003,6 +14019,10 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 6491473544176005436}
m_Modifications:
- target: {fileID: -4515694652883106185, guid: 69373d5892aceae4db2a86857fb64102, type: 3}
propertyPath: Flags
value: 262145
objectReference: {fileID: 0}
- target: {fileID: -4515694652883106185, guid: 69373d5892aceae4db2a86857fb64102, type: 3}
propertyPath: SortKey
value: 1821121041
Expand Down Expand Up @@ -19004,6 +19024,10 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 6491473544176005436}
m_Modifications:
- target: {fileID: 6901989839342170547, guid: 7af164c1c014b8741bf1a43551047893, type: 3}
propertyPath: TriggerHashes.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7236642029868985097, guid: 7af164c1c014b8741bf1a43551047893, type: 3}
propertyPath: m_Name
value: CargoPassageGate
Expand Down Expand Up @@ -30741,6 +30765,10 @@ PrefabInstance:
propertyPath: m_Name
value: 1F_Corridor_D
objectReference: {fileID: 0}
- target: {fileID: 8035556663697573054, guid: 461f52e41f9a4834bac19ae9ea7c25ff, type: 3}
propertyPath: Flags
value: 262145
objectReference: {fileID: 0}
- target: {fileID: 8035556663697573054, guid: 461f52e41f9a4834bac19ae9ea7c25ff, type: 3}
propertyPath: SortKey
value: 3856034067
Expand Down
20 changes: 18 additions & 2 deletions Client/Assets/Resources/Prefabs/Map/PanicRoom.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -2297,17 +2297,33 @@ PrefabInstance:
propertyPath: m_Name
value: GameClearPoint
objectReference: {fileID: 0}
- target: {fileID: 7162998184046019369, guid: 266368f46b75ec548857dc0163a9f3bd, type: 3}
propertyPath: m_Size.x
value: 2.3539572
objectReference: {fileID: 0}
- target: {fileID: 7162998184046019369, guid: 266368f46b75ec548857dc0163a9f3bd, type: 3}
propertyPath: m_Size.z
value: 2.4914083
objectReference: {fileID: 0}
- target: {fileID: 7162998184046019369, guid: 266368f46b75ec548857dc0163a9f3bd, type: 3}
propertyPath: m_Center.x
value: 0.64446324
objectReference: {fileID: 0}
- target: {fileID: 7162998184046019369, guid: 266368f46b75ec548857dc0163a9f3bd, type: 3}
propertyPath: m_Center.z
value: 0.14818025
objectReference: {fileID: 0}
- target: {fileID: 7970807483730846797, guid: 266368f46b75ec548857dc0163a9f3bd, type: 3}
propertyPath: m_LocalPosition.x
value: 0.25
value: -0.168
objectReference: {fileID: 0}
- target: {fileID: 7970807483730846797, guid: 266368f46b75ec548857dc0163a9f3bd, type: 3}
propertyPath: m_LocalPosition.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 7970807483730846797, guid: 266368f46b75ec548857dc0163a9f3bd, type: 3}
propertyPath: m_LocalPosition.z
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 7970807483730846797, guid: 266368f46b75ec548857dc0163a9f3bd, type: 3}
propertyPath: m_LocalRotation.w
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -712,7 +712,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
SortKey: 3571714659
ObjectInterest: 1
Flags: 1
Flags: 262145
NestedObjects: []
NetworkedBehaviours:
- {fileID: 1197239026105620533}
Expand Down Expand Up @@ -6919,7 +6919,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7970807483730846797, guid: 266368f46b75ec548857dc0163a9f3bd, type: 3}
propertyPath: m_LocalPosition.z
value: -5.73
value: -6.29
objectReference: {fileID: 0}
- target: {fileID: 7970807483730846797, guid: 266368f46b75ec548857dc0163a9f3bd, type: 3}
propertyPath: m_LocalRotation.w
Expand Down
75 changes: 2 additions & 73 deletions Client/Assets/Resources/Prefabs/Map/Sector/2F_Corridor_A.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,6 @@ Transform:
- {fileID: 7543303181156465859}
- {fileID: 4097611048824632125}
- {fileID: 4906831248869416068}
- {fileID: 8659900026919616553}
- {fileID: 2715475118959062153}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Expand Down Expand Up @@ -588,7 +587,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
SortKey: 3220778207
ObjectInterest: 1
Flags: 1
Flags: 262145
NestedObjects:
- {fileID: 7513475763541150856}
NetworkedBehaviours:
Expand Down Expand Up @@ -2668,76 +2667,6 @@ Transform:
m_CorrespondingSourceObject: {fileID: 1632220669457409249, guid: ac49a1eb466a25b4885f3df135c5338a, type: 3}
m_PrefabInstance: {fileID: 1528705756543961482}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1635890911483126884
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 7030881829091506616}
m_Modifications:
- target: {fileID: 3113415038546076315, guid: 266368f46b75ec548857dc0163a9f3bd, type: 3}
propertyPath: m_Name
value: GameClearPoint
objectReference: {fileID: 0}
- target: {fileID: 7162998184046019369, guid: 266368f46b75ec548857dc0163a9f3bd, type: 3}
propertyPath: m_Size.x
value: 4
objectReference: {fileID: 0}
- target: {fileID: 7162998184046019369, guid: 266368f46b75ec548857dc0163a9f3bd, type: 3}
propertyPath: m_Size.z
value: 4
objectReference: {fileID: 0}
- target: {fileID: 7970807483730846797, guid: 266368f46b75ec548857dc0163a9f3bd, type: 3}
propertyPath: m_LocalPosition.x
value: -11
objectReference: {fileID: 0}
- target: {fileID: 7970807483730846797, guid: 266368f46b75ec548857dc0163a9f3bd, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7970807483730846797, guid: 266368f46b75ec548857dc0163a9f3bd, type: 3}
propertyPath: m_LocalPosition.z
value: -10
objectReference: {fileID: 0}
- target: {fileID: 7970807483730846797, guid: 266368f46b75ec548857dc0163a9f3bd, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7970807483730846797, guid: 266368f46b75ec548857dc0163a9f3bd, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7970807483730846797, guid: 266368f46b75ec548857dc0163a9f3bd, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7970807483730846797, guid: 266368f46b75ec548857dc0163a9f3bd, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7970807483730846797, guid: 266368f46b75ec548857dc0163a9f3bd, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7970807483730846797, guid: 266368f46b75ec548857dc0163a9f3bd, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7970807483730846797, guid: 266368f46b75ec548857dc0163a9f3bd, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 266368f46b75ec548857dc0163a9f3bd, type: 3}
--- !u!4 &8659900026919616553 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 7970807483730846797, guid: 266368f46b75ec548857dc0163a9f3bd, type: 3}
m_PrefabInstance: {fileID: 1635890911483126884}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1664552989005018818
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -8896,7 +8825,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7970807483730846797, guid: 266368f46b75ec548857dc0163a9f3bd, type: 3}
propertyPath: m_LocalPosition.x
value: -11
value: -11.73
objectReference: {fileID: 0}
- target: {fileID: 7970807483730846797, guid: 266368f46b75ec548857dc0163a9f3bd, type: 3}
propertyPath: m_LocalPosition.y
Expand Down
8 changes: 8 additions & 0 deletions Client/Assets/Scenes/GameScene.unity
Original file line number Diff line number Diff line change
Expand Up @@ -2014,6 +2014,10 @@ PrefabInstance:
propertyPath: SortKey
value: 3331123564
objectReference: {fileID: 0}
- target: {fileID: 1601716150351087918, guid: 5231a4bab55a19a4b9326cb5ecc5b6c7, type: 3}
propertyPath: Flags
value: 262145
objectReference: {fileID: 0}
- target: {fileID: 1601716150351087918, guid: 5231a4bab55a19a4b9326cb5ecc5b6c7, type: 3}
propertyPath: SortKey
value: 2069903372
Expand All @@ -2026,6 +2030,10 @@ PrefabInstance:
propertyPath: SortKey
value: 3419889491
objectReference: {fileID: 0}
- target: {fileID: 1853621879442066785, guid: 5231a4bab55a19a4b9326cb5ecc5b6c7, type: 3}
propertyPath: Flags
value: 262145
objectReference: {fileID: 0}
- target: {fileID: 1853621879442066785, guid: 5231a4bab55a19a4b9326cb5ecc5b6c7, type: 3}
propertyPath: SortKey
value: 1254711320
Expand Down

0 comments on commit 7523d5e

Please sign in to comment.