Skip to content

Feature/static scene network objects #292

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 6 commits into from
Apr 29, 2021
Merged

Feature/static scene network objects #292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c556319
Merge branch 'develop' into feature/static-scene-network-objects
fernando-cortez Apr 18, 2021
ffb0213
BossRoom scene spawners converted to prefab instances & using separat…
fernando-cortez Apr 19, 2021
2e38ff2
made IGameEventListenable interface, assert added, and duplicate chec…
fernando-cortez Apr 20, 2021
af13348
merge develop and fixing compiler errors
fernando-cortez Apr 28, 2021
422f6f3
boss room scene network objects hierarchy cleanup, networkingmanager …
fernando-cortez Apr 28, 2021
d7dbc82
made RuntimeObjects & RuntimeNetworkObjects into separate prefabs (re…
fernando-cortez Apr 29, 2021
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
5 changes: 3 additions & 2 deletions ...abs/Dungeon/AllPillarsDungeon.prefab.meta → Assets/BossRoom/GameData/GameEvents.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Assets/BossRoom/GameData/GameEvents/BossDefeated.asset
View file
Open in desktop
Git LFS file not shown
8 changes: 8 additions & 0 deletions Assets/BossRoom/GameData/GameEvents/BossDefeated.asset.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Assets/BossRoom/GameData/RuntimeNetworkObjectsParent.asset
View file
Open in desktop
Git LFS file not shown
8 changes: 8 additions & 0 deletions Assets/BossRoom/GameData/RuntimeNetworkObjectsParent.asset.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Assets/BossRoom/GameData/RuntimeObjectsParent.asset
View file
Open in desktop
Git LFS file not shown
8 changes: 8 additions & 0 deletions Assets/BossRoom/GameData/RuntimeObjectsParent.asset.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 7 additions & 3 deletions Assets/BossRoom/Prefabs/CharGFX/BossGraphics.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2000,9 +2000,7 @@ MonoBehaviour:
m_ClientVisualsAnimator: {fileID: 234724737205816310}
m_CharacterSwapper: {fileID: 0}
m_VisualizationConfiguration: {fileID: 11400000, guid: 9504973cdecd65749889771972fa0117, type: 2}
TargetReticule: {fileID: 0}
ReticuleFriendlyMat: {fileID: 0}
ReticuleHostileMat: {fileID: 0}
m_RuntimeObjectsParent: {fileID: 11400000, guid: deda38c596e7fbd4386b9d8f9b7bb4b5, type: 2}
--- !u!114 &4538447335436592133
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -2024,6 +2022,7 @@ MonoBehaviour:
m_PrefabCanBeAbortedUntilSecs: 0
m_PrefabParent: {fileID: 0}
m_PrefabParentOffset: {x: 0, y: 0, z: 0}
m_DeParentPrefab: 0
m_SoundEffect: {fileID: 8300000, guid: a3d48c8599f0d584abc8ea603587d496, type: 3}
m_SoundStartDelaySeconds: 0
m_VolumeMultiplier: 1
Expand All @@ -2035,6 +2034,7 @@ MonoBehaviour:
m_PrefabCanBeAbortedUntilSecs: 0
m_PrefabParent: {fileID: 0}
m_PrefabParentOffset: {x: 0, y: 0, z: 0}
m_DeParentPrefab: 0
m_SoundEffect: {fileID: 8300000, guid: 263888c6e986c944d80c59c3ac332ba1, type: 3}
m_SoundStartDelaySeconds: 0
m_VolumeMultiplier: 1
Expand All @@ -2046,6 +2046,7 @@ MonoBehaviour:
m_PrefabCanBeAbortedUntilSecs: 0
m_PrefabParent: {fileID: 0}
m_PrefabParentOffset: {x: 0, y: 0, z: 0}
m_DeParentPrefab: 0
m_SoundEffect: {fileID: 8300000, guid: 87cdf94f9ac5ef541b45ebaa3d8bf7aa, type: 3}
m_SoundStartDelaySeconds: 0
m_VolumeMultiplier: 1
Expand All @@ -2057,6 +2058,7 @@ MonoBehaviour:
m_PrefabCanBeAbortedUntilSecs: 0
m_PrefabParent: {fileID: 0}
m_PrefabParentOffset: {x: 0, y: 0, z: 0}
m_DeParentPrefab: 0
m_SoundEffect: {fileID: 8300000, guid: 3d6f2e33acb1e8f4b9d829e245c62e16, type: 3}
m_SoundStartDelaySeconds: 0
m_VolumeMultiplier: 1
Expand All @@ -2068,6 +2070,7 @@ MonoBehaviour:
m_PrefabCanBeAbortedUntilSecs: 0
m_PrefabParent: {fileID: 0}
m_PrefabParentOffset: {x: 0, y: 0, z: 0}
m_DeParentPrefab: 0
m_SoundEffect: {fileID: 8300000, guid: 5ef809d665d13b245b559cd6170f5794, type: 3}
m_SoundStartDelaySeconds: 0
m_VolumeMultiplier: 1
Expand All @@ -2079,6 +2082,7 @@ MonoBehaviour:
m_PrefabCanBeAbortedUntilSecs: 0
m_PrefabParent: {fileID: 0}
m_PrefabParentOffset: {x: 0, y: 0, z: 0}
m_DeParentPrefab: 0
m_SoundEffect: {fileID: 0}
m_SoundStartDelaySeconds: 0
m_VolumeMultiplier: 1
Expand Down
4 changes: 1 addition & 3 deletions Assets/BossRoom/Prefabs/CharGFX/ImpGraphics.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1134,9 +1134,7 @@ MonoBehaviour:
m_ClientVisualsAnimator: {fileID: 234724737205816310}
m_CharacterSwapper: {fileID: 0}
m_VisualizationConfiguration: {fileID: 11400000, guid: 9504973cdecd65749889771972fa0117, type: 2}
TargetReticule: {fileID: 0}
ReticuleFriendlyMat: {fileID: 0}
ReticuleHostileMat: {fileID: 0}
m_RuntimeObjectsParent: {fileID: 11400000, guid: deda38c596e7fbd4386b9d8f9b7bb4b5, type: 2}
--- !u!114 &8005647249789065143
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down
35 changes: 32 additions & 3 deletions Assets/BossRoom/Prefabs/CharGFX/PlayerGraphics.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1189,9 +1189,7 @@ MonoBehaviour:
m_ClientVisualsAnimator: {fileID: 4199396739699390757}
m_CharacterSwapper: {fileID: 579958722332811098}
m_VisualizationConfiguration: {fileID: 11400000, guid: 9504973cdecd65749889771972fa0117, type: 2}
TargetReticule: {fileID: 3697322597467218969, guid: 546d1949af792c245b0861507d25a349, type: 3}
ReticuleFriendlyMat: {fileID: 2100000, guid: 0bc9c70c830bca44dbddfbc5c49830f8, type: 2}
ReticuleHostileMat: {fileID: 2100000, guid: 06ea36c997b09a943b6f5ea691093c21, type: 2}
m_RuntimeObjectsParent: {fileID: 11400000, guid: deda38c596e7fbd4386b9d8f9b7bb4b5, type: 2}
--- !u!114 &579958722332811098
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -1342,6 +1340,7 @@ MonoBehaviour:
m_PrefabCanBeAbortedUntilSecs: 0
m_PrefabParent: {fileID: 0}
m_PrefabParentOffset: {x: 0, y: 0, z: 0}
m_DeParentPrefab: 0
m_SoundEffect: {fileID: 8300000, guid: cba8cb3c39a998149a882dbe30d5fa4b, type: 3}
m_SoundStartDelaySeconds: 0
m_VolumeMultiplier: 1
Expand All @@ -1353,6 +1352,7 @@ MonoBehaviour:
m_PrefabCanBeAbortedUntilSecs: 0
m_PrefabParent: {fileID: 0}
m_PrefabParentOffset: {x: 0, y: 0, z: 0}
m_DeParentPrefab: 0
m_SoundEffect: {fileID: 8300000, guid: fe3390994a24bd8409ace9b1711ee692, type: 3}
m_SoundStartDelaySeconds: 0
m_VolumeMultiplier: 1
Expand All @@ -1364,6 +1364,7 @@ MonoBehaviour:
m_PrefabCanBeAbortedUntilSecs: 0
m_PrefabParent: {fileID: 0}
m_PrefabParentOffset: {x: 0, y: 0, z: 0}
m_DeParentPrefab: 0
m_SoundEffect: {fileID: 8300000, guid: 146b93ddde84a144986e8886e0217677, type: 3}
m_SoundStartDelaySeconds: 0
m_VolumeMultiplier: 1
Expand All @@ -1375,6 +1376,7 @@ MonoBehaviour:
m_PrefabCanBeAbortedUntilSecs: 0
m_PrefabParent: {fileID: 0}
m_PrefabParentOffset: {x: 0, y: 0, z: 0}
m_DeParentPrefab: 0
m_SoundEffect: {fileID: 8300000, guid: d646d51b3d779ea4db41dabf61d750e0, type: 3}
m_SoundStartDelaySeconds: 0
m_VolumeMultiplier: 1
Expand All @@ -1386,6 +1388,7 @@ MonoBehaviour:
m_PrefabCanBeAbortedUntilSecs: 0
m_PrefabParent: {fileID: 0}
m_PrefabParentOffset: {x: 0, y: 0, z: 0}
m_DeParentPrefab: 0
m_SoundEffect: {fileID: 8300000, guid: 142f526f026d1c241b01ebb524d19903, type: 3}
m_SoundStartDelaySeconds: 0
m_VolumeMultiplier: 1
Expand All @@ -1397,6 +1400,7 @@ MonoBehaviour:
m_PrefabCanBeAbortedUntilSecs: 0
m_PrefabParent: {fileID: 0}
m_PrefabParentOffset: {x: 0, y: 0, z: 0}
m_DeParentPrefab: 0
m_SoundEffect: {fileID: 8300000, guid: 7fbc6b32425f98840b339a705b4a28cb, type: 3}
m_SoundStartDelaySeconds: 0
m_VolumeMultiplier: 1
Expand All @@ -1408,6 +1412,7 @@ MonoBehaviour:
m_PrefabCanBeAbortedUntilSecs: 0
m_PrefabParent: {fileID: 0}
m_PrefabParentOffset: {x: 0, y: 0, z: 0}
m_DeParentPrefab: 0
m_SoundEffect: {fileID: 0}
m_SoundStartDelaySeconds: 0
m_VolumeMultiplier: 1
Expand All @@ -1419,6 +1424,7 @@ MonoBehaviour:
m_PrefabCanBeAbortedUntilSecs: 0
m_PrefabParent: {fileID: 0}
m_PrefabParentOffset: {x: 0, y: 0, z: 0}
m_DeParentPrefab: 0
m_SoundEffect: {fileID: 8300000, guid: c6c3998cfe5b6b94ab3b60a57f1c1598, type: 3}
m_SoundStartDelaySeconds: 0
m_VolumeMultiplier: 1
Expand All @@ -1430,6 +1436,7 @@ MonoBehaviour:
m_PrefabCanBeAbortedUntilSecs: 0
m_PrefabParent: {fileID: 0}
m_PrefabParentOffset: {x: 0, y: 0, z: 0}
m_DeParentPrefab: 0
m_SoundEffect: {fileID: 8300000, guid: 3d6f2e33acb1e8f4b9d829e245c62e16, type: 3}
m_SoundStartDelaySeconds: 0
m_VolumeMultiplier: 1
Expand All @@ -1441,6 +1448,7 @@ MonoBehaviour:
m_PrefabCanBeAbortedUntilSecs: 0
m_PrefabParent: {fileID: 0}
m_PrefabParentOffset: {x: 0, y: 0, z: 0}
m_DeParentPrefab: 0
m_SoundEffect: {fileID: 8300000, guid: 5ef809d665d13b245b559cd6170f5794, type: 3}
m_SoundStartDelaySeconds: 0
m_VolumeMultiplier: 1
Expand Down Expand Up @@ -1470,6 +1478,7 @@ MonoBehaviour:
m_PrefabCanBeAbortedUntilSecs: 0
m_PrefabParent: {fileID: 0}
m_PrefabParentOffset: {x: 0, y: 0, z: 0}
m_DeParentPrefab: 0
m_SoundEffect: {fileID: 8300000, guid: 62f4581e195a41c4eb9b5429dc33e34e, type: 3}
m_SoundStartDelaySeconds: 0
m_VolumeMultiplier: 1
Expand All @@ -1481,6 +1490,7 @@ MonoBehaviour:
m_PrefabCanBeAbortedUntilSecs: 0
m_PrefabParent: {fileID: 0}
m_PrefabParentOffset: {x: 0, y: 0, z: 0}
m_DeParentPrefab: 0
m_SoundEffect: {fileID: 8300000, guid: c6f935b3555f5454992dbcad445131c9, type: 3}
m_SoundStartDelaySeconds: 0
m_VolumeMultiplier: 1
Expand All @@ -1492,6 +1502,7 @@ MonoBehaviour:
m_PrefabCanBeAbortedUntilSecs: 0
m_PrefabParent: {fileID: 0}
m_PrefabParentOffset: {x: 0, y: 0, z: 0}
m_DeParentPrefab: 0
m_SoundEffect: {fileID: 8300000, guid: f954c95038a18f34e98b0ad4dd7307e1, type: 3}
m_SoundStartDelaySeconds: 0
m_VolumeMultiplier: 1
Expand All @@ -1503,6 +1514,7 @@ MonoBehaviour:
m_PrefabCanBeAbortedUntilSecs: 0
m_PrefabParent: {fileID: 0}
m_PrefabParentOffset: {x: 0, y: 0, z: 0}
m_DeParentPrefab: 0
m_SoundEffect: {fileID: 0}
m_SoundStartDelaySeconds: 0
m_VolumeMultiplier: 1
Expand All @@ -1514,6 +1526,7 @@ MonoBehaviour:
m_PrefabCanBeAbortedUntilSecs: 0
m_PrefabParent: {fileID: 0}
m_PrefabParentOffset: {x: 0, y: 0, z: 0}
m_DeParentPrefab: 0
m_SoundEffect: {fileID: 0}
m_SoundStartDelaySeconds: 0
m_VolumeMultiplier: 1
Expand All @@ -1525,6 +1538,7 @@ MonoBehaviour:
m_PrefabCanBeAbortedUntilSecs: 0
m_PrefabParent: {fileID: 0}
m_PrefabParentOffset: {x: 0, y: 0, z: 0}
m_DeParentPrefab: 0
m_SoundEffect: {fileID: 8300000, guid: c6c3998cfe5b6b94ab3b60a57f1c1598, type: 3}
m_SoundStartDelaySeconds: 0
m_VolumeMultiplier: 1
Expand All @@ -1536,6 +1550,7 @@ MonoBehaviour:
m_PrefabCanBeAbortedUntilSecs: 0
m_PrefabParent: {fileID: 0}
m_PrefabParentOffset: {x: 0, y: 0, z: 0}
m_DeParentPrefab: 0
m_SoundEffect: {fileID: 8300000, guid: 3d6f2e33acb1e8f4b9d829e245c62e16, type: 3}
m_SoundStartDelaySeconds: 0
m_VolumeMultiplier: 1
Expand All @@ -1547,6 +1562,7 @@ MonoBehaviour:
m_PrefabCanBeAbortedUntilSecs: 0
m_PrefabParent: {fileID: 0}
m_PrefabParentOffset: {x: 0, y: 0, z: 0}
m_DeParentPrefab: 0
m_SoundEffect: {fileID: 8300000, guid: 5ef809d665d13b245b559cd6170f5794, type: 3}
m_SoundStartDelaySeconds: 0
m_VolumeMultiplier: 1
Expand Down Expand Up @@ -1576,6 +1592,7 @@ MonoBehaviour:
m_PrefabCanBeAbortedUntilSecs: 0
m_PrefabParent: {fileID: 0}
m_PrefabParentOffset: {x: 0, y: 0, z: 0}
m_DeParentPrefab: 0
m_SoundEffect: {fileID: 8300000, guid: aafc6fae94f920546bf019c2d9cec45c, type: 3}
m_SoundStartDelaySeconds: 0
m_VolumeMultiplier: 1
Expand All @@ -1587,6 +1604,7 @@ MonoBehaviour:
m_PrefabCanBeAbortedUntilSecs: 0
m_PrefabParent: {fileID: 0}
m_PrefabParentOffset: {x: 0, y: 0, z: 0}
m_DeParentPrefab: 0
m_SoundEffect: {fileID: 8300000, guid: 7fbc6b32425f98840b339a705b4a28cb, type: 3}
m_SoundStartDelaySeconds: 0
m_VolumeMultiplier: 1
Expand All @@ -1598,6 +1616,7 @@ MonoBehaviour:
m_PrefabCanBeAbortedUntilSecs: 0
m_PrefabParent: {fileID: 0}
m_PrefabParentOffset: {x: 0, y: 0, z: 0}
m_DeParentPrefab: 0
m_SoundEffect: {fileID: 0}
m_SoundStartDelaySeconds: 0
m_VolumeMultiplier: 1
Expand All @@ -1609,6 +1628,7 @@ MonoBehaviour:
m_PrefabCanBeAbortedUntilSecs: 0
m_PrefabParent: {fileID: 0}
m_PrefabParentOffset: {x: 0, y: 0, z: 0}
m_DeParentPrefab: 0
m_SoundEffect: {fileID: 8300000, guid: c6c3998cfe5b6b94ab3b60a57f1c1598, type: 3}
m_SoundStartDelaySeconds: 0
m_VolumeMultiplier: 1
Expand All @@ -1620,6 +1640,7 @@ MonoBehaviour:
m_PrefabCanBeAbortedUntilSecs: 0
m_PrefabParent: {fileID: 0}
m_PrefabParentOffset: {x: 0, y: 0, z: 0}
m_DeParentPrefab: 0
m_SoundEffect: {fileID: 8300000, guid: 3d6f2e33acb1e8f4b9d829e245c62e16, type: 3}
m_SoundStartDelaySeconds: 0
m_VolumeMultiplier: 1
Expand All @@ -1631,6 +1652,7 @@ MonoBehaviour:
m_PrefabCanBeAbortedUntilSecs: 0
m_PrefabParent: {fileID: 0}
m_PrefabParentOffset: {x: 0, y: 0, z: 0}
m_DeParentPrefab: 0
m_SoundEffect: {fileID: 8300000, guid: 5ef809d665d13b245b559cd6170f5794, type: 3}
m_SoundStartDelaySeconds: 0
m_VolumeMultiplier: 1
Expand Down Expand Up @@ -1660,6 +1682,7 @@ MonoBehaviour:
m_PrefabCanBeAbortedUntilSecs: 0
m_PrefabParent: {fileID: 0}
m_PrefabParentOffset: {x: 0, y: 0, z: 0}
m_DeParentPrefab: 0
m_SoundEffect: {fileID: 8300000, guid: 8d2a35c9550c27e4eb96ffa1d2c7e37b, type: 3}
m_SoundStartDelaySeconds: 0
m_VolumeMultiplier: 1
Expand All @@ -1671,6 +1694,7 @@ MonoBehaviour:
m_PrefabCanBeAbortedUntilSecs: 0
m_PrefabParent: {fileID: 0}
m_PrefabParentOffset: {x: 0, y: 0, z: 0}
m_DeParentPrefab: 0
m_SoundEffect: {fileID: 8300000, guid: 97c406be535d27e4fb6e1e8b64113e34, type: 3}
m_SoundStartDelaySeconds: 0
m_VolumeMultiplier: 1
Expand All @@ -1682,6 +1706,7 @@ MonoBehaviour:
m_PrefabCanBeAbortedUntilSecs: 0
m_PrefabParent: {fileID: 0}
m_PrefabParentOffset: {x: 0, y: 0, z: 0}
m_DeParentPrefab: 0
m_SoundEffect: {fileID: 8300000, guid: 7fbc6b32425f98840b339a705b4a28cb, type: 3}
m_SoundStartDelaySeconds: 0
m_VolumeMultiplier: 1
Expand All @@ -1693,6 +1718,7 @@ MonoBehaviour:
m_PrefabCanBeAbortedUntilSecs: 0
m_PrefabParent: {fileID: 0}
m_PrefabParentOffset: {x: 0, y: 0, z: 0}
m_DeParentPrefab: 0
m_SoundEffect: {fileID: 0}
m_SoundStartDelaySeconds: 0
m_VolumeMultiplier: 1
Expand All @@ -1704,6 +1730,7 @@ MonoBehaviour:
m_PrefabCanBeAbortedUntilSecs: 0
m_PrefabParent: {fileID: 0}
m_PrefabParentOffset: {x: 0, y: 0, z: 0}
m_DeParentPrefab: 0
m_SoundEffect: {fileID: 8300000, guid: c6c3998cfe5b6b94ab3b60a57f1c1598, type: 3}
m_SoundStartDelaySeconds: 0
m_VolumeMultiplier: 1
Expand All @@ -1715,6 +1742,7 @@ MonoBehaviour:
m_PrefabCanBeAbortedUntilSecs: 0
m_PrefabParent: {fileID: 0}
m_PrefabParentOffset: {x: 0, y: 0, z: 0}
m_DeParentPrefab: 0
m_SoundEffect: {fileID: 8300000, guid: 3d6f2e33acb1e8f4b9d829e245c62e16, type: 3}
m_SoundStartDelaySeconds: 0
m_VolumeMultiplier: 1
Expand All @@ -1726,6 +1754,7 @@ MonoBehaviour:
m_PrefabCanBeAbortedUntilSecs: 0
m_PrefabParent: {fileID: 0}
m_PrefabParentOffset: {x: 0, y: 0, z: 0}
m_DeParentPrefab: 0
m_SoundEffect: {fileID: 8300000, guid: 5ef809d665d13b245b559cd6170f5794, type: 3}
m_SoundStartDelaySeconds: 0
m_VolumeMultiplier: 1
Expand Down
Loading