Skip to content

Cherrypick: Fill in Floor Holes #533

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 9, 2022
Merged

Cherrypick: Fill in Floor Holes #533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
111 changes: 87 additions & 24 deletions Assets/BossRoom/Prefabs/Dungeon/BossRoom.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,6 +432,7 @@ Transform:
- {fileID: 7867852344355884709}
- {fileID: 4138240087403568044}
- {fileID: 8887438673195068678}
- {fileID: 8289508416153001268}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Expand All @@ -454,10 +455,6 @@ PrefabInstance:
propertyPath: m_LocalPosition.y
value: -0.0000047645412
objectReference: {fileID: 0}
- target: {fileID: 3325143161705299546, guid: 25ef8f3b7c676ec4994e31f9806fb988, type: 3}
propertyPath: m_LocalPosition.z
value: 108.99998
objectReference: {fileID: 0}
- target: {fileID: 3325143161705299546, guid: 25ef8f3b7c676ec4994e31f9806fb988, type: 3}
propertyPath: m_LocalRotation.w
value: 1
Expand Down Expand Up @@ -6748,31 +6745,31 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e66ef62da289e58448bb8a515f9782b0, type: 3}
--- !u!108 &630916705848015862 stripped
Light:
m_CorrespondingSourceObject: {fileID: 1616884588323289830, guid: e66ef62da289e58448bb8a515f9782b0, type: 3}
--- !u!4 &8074448873891158056 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 7980115660496427320, guid: e66ef62da289e58448bb8a515f9782b0, type: 3}
m_PrefabInstance: {fileID: 2211589100949864720}
m_PrefabAsset: {fileID: 0}
--- !u!108 &1247694266230675825 stripped
--- !u!108 &630916705848015862 stripped
Light:
m_CorrespondingSourceObject: {fileID: 1144362643193501793, guid: e66ef62da289e58448bb8a515f9782b0, type: 3}
m_CorrespondingSourceObject: {fileID: 1616884588323289830, guid: e66ef62da289e58448bb8a515f9782b0, type: 3}
m_PrefabInstance: {fileID: 2211589100949864720}
m_PrefabAsset: {fileID: 0}
--- !u!1 &602357202979843451 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1652016489583930475, guid: e66ef62da289e58448bb8a515f9782b0, type: 3}
m_PrefabInstance: {fileID: 2211589100949864720}
m_PrefabAsset: {fileID: 0}
--- !u!4 &8074448873891158056 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 7980115660496427320, guid: e66ef62da289e58448bb8a515f9782b0, type: 3}
m_PrefabInstance: {fileID: 2211589100949864720}
m_PrefabAsset: {fileID: 0}
--- !u!1 &8632535556475219616 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7601453607532916656, guid: e66ef62da289e58448bb8a515f9782b0, type: 3}
m_PrefabInstance: {fileID: 2211589100949864720}
m_PrefabAsset: {fileID: 0}
--- !u!108 &1247694266230675825 stripped
Light:
m_CorrespondingSourceObject: {fileID: 1144362643193501793, guid: e66ef62da289e58448bb8a515f9782b0, type: 3}
m_PrefabInstance: {fileID: 2211589100949864720}
m_PrefabAsset: {fileID: 0}
--- !u!114 &5119945755969724262
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -11349,6 +11346,72 @@ Transform:
m_CorrespondingSourceObject: {fileID: 4756247935159238973, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
m_PrefabInstance: {fileID: 3512188034804301127}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &3534104906077248521
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 7243886634180294756}
m_Modifications:
- target: {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4756247935159238973, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
propertyPath: m_RootOrder
value: 405
objectReference: {fileID: 0}
- target: {fileID: 4756247935159238973, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
propertyPath: m_LocalPosition.x
value: 76
objectReference: {fileID: 0}
- target: {fileID: 4756247935159238973, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
propertyPath: m_LocalPosition.y
value: 0.000007693204
objectReference: {fileID: 0}
- target: {fileID: 4756247935159238973, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
propertyPath: m_LocalPosition.z
value: 15.99998
objectReference: {fileID: 0}
- target: {fileID: 4756247935159238973, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4756247935159238973, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
propertyPath: m_LocalRotation.x
value: 0.000000043711378
objectReference: {fileID: 0}
- target: {fileID: 4756247935159238973, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
propertyPath: m_LocalRotation.y
value: 0.00000011920929
objectReference: {fileID: 0}
- target: {fileID: 4756247935159238973, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
propertyPath: m_LocalRotation.z
value: -0.00000008742278
objectReference: {fileID: 0}
- target: {fileID: 4756247935159238973, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4756247935159238973, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4756247935159238973, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6858229082375244730, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
propertyPath: m_Name
value: env_floor1 (10)
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
--- !u!4 &8289508416153001268 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4756247935159238973, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
m_PrefabInstance: {fileID: 3534104906077248521}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &3562497777173869688
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -15542,21 +15605,11 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e66ef62da289e58448bb8a515f9782b0, type: 3}
--- !u!1 &6158980800265356021 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1652016489583930475, guid: e66ef62da289e58448bb8a515f9782b0, type: 3}
m_PrefabInstance: {fileID: 4869583451704553118}
m_PrefabAsset: {fileID: 0}
--- !u!1 &3092272623483355438 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7601453607532916656, guid: e66ef62da289e58448bb8a515f9782b0, type: 3}
m_PrefabInstance: {fileID: 4869583451704553118}
m_PrefabAsset: {fileID: 0}
--- !u!4 &3254744293496305574 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 7980115660496427320, guid: e66ef62da289e58448bb8a515f9782b0, type: 3}
m_PrefabInstance: {fileID: 4869583451704553118}
m_PrefabAsset: {fileID: 0}
--- !u!108 &6189194581216089208 stripped
Light:
m_CorrespondingSourceObject: {fileID: 1616884588323289830, guid: e66ef62da289e58448bb8a515f9782b0, type: 3}
Expand All @@ -15567,6 +15620,16 @@ Light:
m_CorrespondingSourceObject: {fileID: 1144362643193501793, guid: e66ef62da289e58448bb8a515f9782b0, type: 3}
m_PrefabInstance: {fileID: 4869583451704553118}
m_PrefabAsset: {fileID: 0}
--- !u!1 &6158980800265356021 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1652016489583930475, guid: e66ef62da289e58448bb8a515f9782b0, type: 3}
m_PrefabInstance: {fileID: 4869583451704553118}
m_PrefabAsset: {fileID: 0}
--- !u!4 &3254744293496305574 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 7980115660496427320, guid: e66ef62da289e58448bb8a515f9782b0, type: 3}
m_PrefabInstance: {fileID: 4869583451704553118}
m_PrefabAsset: {fileID: 0}
--- !u!114 &3127095706194231339
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down
2 changes: 1 addition & 1 deletion Assets/BossRoom/Prefabs/Dungeon/Dungeon Pieces/env_floor6.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4371491365999748502}
m_LocalRotation: {x: 0.000000021855694, y: 0.00000011920929, z: -2.6054018e-15, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 0, y: 0, z: 107.99998}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
Expand Down
89 changes: 78 additions & 11 deletions Assets/BossRoom/Prefabs/Dungeon/Entrance.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,7 @@ Transform:
- {fileID: 738705630915668208}
- {fileID: 8998074154055278213}
- {fileID: 8843797310243302815}
- {fileID: 5044464642502902394}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Expand Down Expand Up @@ -623,6 +624,72 @@ Transform:
m_CorrespondingSourceObject: {fileID: 6923725348669878280, guid: 2e8b2f19951d26e45920350db546ec1b, type: 3}
m_PrefabInstance: {fileID: 212319315871566379}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &288265086009426759
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1143081499798261330}
m_Modifications:
- target: {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4756247935159238973, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
propertyPath: m_RootOrder
value: 221
objectReference: {fileID: 0}
- target: {fileID: 4756247935159238973, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
propertyPath: m_LocalPosition.x
value: 12
objectReference: {fileID: 0}
- target: {fileID: 4756247935159238973, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4756247935159238973, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
propertyPath: m_LocalPosition.z
value: -8
objectReference: {fileID: 0}
- target: {fileID: 4756247935159238973, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4756247935159238973, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
propertyPath: m_LocalRotation.x
value: 0.000000043711378
objectReference: {fileID: 0}
- target: {fileID: 4756247935159238973, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
propertyPath: m_LocalRotation.y
value: 0.00000011920929
objectReference: {fileID: 0}
- target: {fileID: 4756247935159238973, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
propertyPath: m_LocalRotation.z
value: -0.00000008742278
objectReference: {fileID: 0}
- target: {fileID: 4756247935159238973, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4756247935159238973, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4756247935159238973, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6858229082375244730, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
propertyPath: m_Name
value: env_floor1 (5)
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
--- !u!4 &5044464642502902394 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4756247935159238973, guid: 4e8bd4962790c8142ac06150a37418de, type: 3}
m_PrefabInstance: {fileID: 288265086009426759}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &330771298698531092
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -1438,31 +1505,31 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e66ef62da289e58448bb8a515f9782b0, type: 3}
--- !u!108 &304716794938965296 stripped
Light:
m_CorrespondingSourceObject: {fileID: 1144362643193501793, guid: e66ef62da289e58448bb8a515f9782b0, type: 3}
--- !u!1 &7108593661045394145 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7601453607532916656, guid: e66ef62da289e58448bb8a515f9782b0, type: 3}
m_PrefabInstance: {fileID: 854282660529841489}
m_PrefabAsset: {fileID: 0}
--- !u!1 &2104906929298262330 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1652016489583930475, guid: e66ef62da289e58448bb8a515f9782b0, type: 3}
m_PrefabInstance: {fileID: 854282660529841489}
m_PrefabAsset: {fileID: 0}
--- !u!108 &2137897533852622775 stripped
Light:
m_CorrespondingSourceObject: {fileID: 1616884588323289830, guid: e66ef62da289e58448bb8a515f9782b0, type: 3}
m_PrefabInstance: {fileID: 854282660529841489}
m_PrefabAsset: {fileID: 0}
--- !u!1 &7108593661045394145 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7601453607532916656, guid: e66ef62da289e58448bb8a515f9782b0, type: 3}
--- !u!108 &304716794938965296 stripped
Light:
m_CorrespondingSourceObject: {fileID: 1144362643193501793, guid: e66ef62da289e58448bb8a515f9782b0, type: 3}
m_PrefabInstance: {fileID: 854282660529841489}
m_PrefabAsset: {fileID: 0}
--- !u!4 &7305988015225306217 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 7980115660496427320, guid: e66ef62da289e58448bb8a515f9782b0, type: 3}
m_PrefabInstance: {fileID: 854282660529841489}
m_PrefabAsset: {fileID: 0}
--- !u!1 &2104906929298262330 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1652016489583930475, guid: e66ef62da289e58448bb8a515f9782b0, type: 3}
m_PrefabInstance: {fileID: 854282660529841489}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1977884657892176400
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down
4 changes: 2 additions & 2 deletions Assets/BossRoom/Scenes/BossRoom/LightingData.asset
View file
Open in desktop
Git LFS file not shown
4 changes: 2 additions & 2 deletions Assets/BossRoom/Scenes/BossRoom/Lightmap-0_comp_light.exr
View file
Open in desktop
Git LFS file not shown
4 changes: 2 additions & 2 deletions Assets/BossRoom/Scenes/BossRoom/Lightmap-1_comp_light.exr
View file
Open in desktop
Git LFS file not shown
4 changes: 2 additions & 2 deletions Assets/BossRoom/Scenes/BossRoom/Lightmap-2_comp_light.exr
View file
Open in desktop
Git LFS file not shown
4 changes: 2 additions & 2 deletions Assets/BossRoom/Scenes/BossRoom/Lightmap-3_comp_light.exr
View file
Open in desktop
Git LFS file not shown
4 changes: 2 additions & 2 deletions Assets/BossRoom/Scenes/BossRoom/Lightmap-4_comp_light.exr
View file
Open in desktop
Git LFS file not shown
4 changes: 2 additions & 2 deletions Assets/BossRoom/Scenes/BossRoom/Lightmap-5_comp_light.exr
View file
Open in desktop
Git LFS file not shown
4 changes: 2 additions & 2 deletions Assets/BossRoom/Scenes/BossRoom/ReflectionProbe-0.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions Assets/BossRoom/Scenes/BossRoom/ReflectionProbe-1.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions Assets/BossRoom/Scenes/BossRoom/ReflectionProbe-2.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.