Skip to content
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

Jump to bottom

Feature/player persistence visuals #356

Merged
merged 8 commits into from
Sep 9, 2021
Merged

Feature/player persistence visuals #356

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d69654a
character select screen displays character, health and name in-game d…
fernando-cortez Jul 15, 2021
761d77c
refactored player SO collection, cleanup for PartyHud & graphics game…
fernando-cortez Jul 19, 2021
67a851c
removing todo and fix
fernando-cortez Jul 23, 2021
40dc8c6
re-enabling return to main menu from char select, deregistering callb…
fernando-cortez Jul 23, 2021
3144f8e
proper runtime element removal & removal of unused asset & script
fernando-cortez Aug 5, 2021
5cea5b8
removal of old char select prefab
fernando-cortez Aug 5, 2021
ad09694
fixed some asserts blocking non-debug builds
fernando-cortez Aug 18, 2021
0fbd17c
character movement is performed on a child NetworkTransform object, r…
fernando-cortez Aug 30, 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
4 changes: 2 additions & 2 deletions Assets/BossRoom/GameData/Avatars/ArcherBoy.asset
View file
Open in desktop
Git LFS file not shown
4 changes: 2 additions & 2 deletions Assets/BossRoom/GameData/Avatars/ArcherGirl.asset
View file
Open in desktop
Git LFS file not shown
4 changes: 2 additions & 2 deletions Assets/BossRoom/GameData/Avatars/MageBoy.asset
View file
Open in desktop
Git LFS file not shown
4 changes: 2 additions & 2 deletions Assets/BossRoom/GameData/Avatars/MageGirl.asset
View file
Open in desktop
Git LFS file not shown
4 changes: 2 additions & 2 deletions Assets/BossRoom/GameData/Avatars/RogueBoy.asset
View file
Open in desktop
Git LFS file not shown
4 changes: 2 additions & 2 deletions Assets/BossRoom/GameData/Avatars/RogueGirl.asset
View file
Open in desktop
Git LFS file not shown
4 changes: 2 additions & 2 deletions Assets/BossRoom/GameData/Avatars/TankBoy.asset
View file
Open in desktop
Git LFS file not shown
4 changes: 2 additions & 2 deletions Assets/BossRoom/GameData/Avatars/TankGirl.asset
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions Assets/BossRoom/GameData/Collections/ClientPlayerAvatars.asset
View file
Open in desktop
Git LFS file not shown
2 changes: 1 addition & 1 deletion ...ections/PlayerServerCharacters.asset.meta → ...ollections/ClientPlayerAvatars.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: 0 additions & 3 deletions Assets/BossRoom/GameData/Collections/PlayerServerCharacters.asset
View file
Open in desktop

This file was deleted.

8 changes: 8 additions & 0 deletions Assets/BossRoom/GameData/Transforms.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/Transforms/NetworkGameState.asset
View file
Open in desktop
Git LFS file not shown
8 changes: 8 additions & 0 deletions Assets/BossRoom/GameData/Transforms/NetworkGameState.asset.meta
View file
Open in desktop

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

0 ...ameData/RuntimeNetworkObjectsParent.asset → ...nsforms/RuntimeNetworkObjectsParent.asset
View file
Open in desktop
File renamed without changes.
0 ...ta/RuntimeNetworkObjectsParent.asset.meta → ...ms/RuntimeNetworkObjectsParent.asset.meta
View file
Open in desktop
File renamed without changes.
0 ...sRoom/GameData/RuntimeObjectsParent.asset → ...ata/Transforms/RuntimeObjectsParent.asset
View file
Open in desktop
File renamed without changes.
0 .../GameData/RuntimeObjectsParent.asset.meta → ...ransforms/RuntimeObjectsParent.asset.meta
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion Assets/BossRoom/Material/Dungeon/lava.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Material:
- _MainTex:
m_Texture: {fileID: 2800000, guid: 71f14d5f7422f9346af23185b106a77b, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0.2626989, y: 0.2626989}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
Expand Down
8 changes: 8 additions & 0 deletions Assets/BossRoom/Prefabs/CharGFX/CharacterGraphics/CharacterSelect.meta
View file
Open in desktop

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

78 changes: 78 additions & 0 deletions ...harGFX/CharacterGraphics/CharacterSelect/PlayerGraphics_Archer_Boy_CharacterSelect.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &8777683624683320601
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2408587852517914968, guid: 29d0c8c1a1c40274d97718c37b8b1426, type: 3}
propertyPath: m_Name
value: PlayerGraphics_Archer_Boy_CharacterSelect
objectReference: {fileID: 0}
- target: {fileID: 3037349535683109858, guid: 29d0c8c1a1c40274d97718c37b8b1426, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3037349535683109858, guid: 29d0c8c1a1c40274d97718c37b8b1426, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3037349535683109858, guid: 29d0c8c1a1c40274d97718c37b8b1426, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3037349535683109858, guid: 29d0c8c1a1c40274d97718c37b8b1426, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3037349535683109858, guid: 29d0c8c1a1c40274d97718c37b8b1426, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3037349535683109858, guid: 29d0c8c1a1c40274d97718c37b8b1426, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3037349535683109858, guid: 29d0c8c1a1c40274d97718c37b8b1426, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3037349535683109858, guid: 29d0c8c1a1c40274d97718c37b8b1426, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3037349535683109858, guid: 29d0c8c1a1c40274d97718c37b8b1426, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3037349535683109858, guid: 29d0c8c1a1c40274d97718c37b8b1426, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3037349535683109858, guid: 29d0c8c1a1c40274d97718c37b8b1426, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8839929010072219690, guid: 29d0c8c1a1c40274d97718c37b8b1426, type: 3}
propertyPath: m_AudioSources.Array.data[0]
value:
objectReference: {fileID: 0}
- target: {fileID: 8839929010072219690, guid: 29d0c8c1a1c40274d97718c37b8b1426, type: 3}
propertyPath: m_AudioSources.Array.data[1]
value:
objectReference: {fileID: 0}
- target: {fileID: 8974659347401553557, guid: 29d0c8c1a1c40274d97718c37b8b1426, type: 3}
propertyPath: m_CharacterSwapper
value:
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 1926289423182741662, guid: 29d0c8c1a1c40274d97718c37b8b1426, type: 3}
- {fileID: 7211668411825366569, guid: 29d0c8c1a1c40274d97718c37b8b1426, type: 3}
- {fileID: 7137336644708754433, guid: 29d0c8c1a1c40274d97718c37b8b1426, type: 3}
- {fileID: 6915374236898689727, guid: 29d0c8c1a1c40274d97718c37b8b1426, type: 3}
- {fileID: 4460020700640811699, guid: 29d0c8c1a1c40274d97718c37b8b1426, type: 3}
- {fileID: 8839929010072219690, guid: 29d0c8c1a1c40274d97718c37b8b1426, type: 3}
- {fileID: 8974659347401553557, guid: 29d0c8c1a1c40274d97718c37b8b1426, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: 29d0c8c1a1c40274d97718c37b8b1426, type: 3}
2 changes: 1 addition & 1 deletion ...hics for CharSelect (Variant).prefab.meta → ...cs_Archer_Boy_CharacterSelect.prefab.meta
View file
Open in desktop

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

78 changes: 78 additions & 0 deletions ...arGFX/CharacterGraphics/CharacterSelect/PlayerGraphics_Archer_Girl_CharacterSelect.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &4285338174576980640
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2408587852517914968, guid: c606ea8a9b63df640a18e10c81bbe28c, type: 3}
propertyPath: m_Name
value: PlayerGraphics_Archer_Girl_CharacterSelect
objectReference: {fileID: 0}
- target: {fileID: 3037349535683109858, guid: c606ea8a9b63df640a18e10c81bbe28c, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3037349535683109858, guid: c606ea8a9b63df640a18e10c81bbe28c, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3037349535683109858, guid: c606ea8a9b63df640a18e10c81bbe28c, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3037349535683109858, guid: c606ea8a9b63df640a18e10c81bbe28c, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3037349535683109858, guid: c606ea8a9b63df640a18e10c81bbe28c, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3037349535683109858, guid: c606ea8a9b63df640a18e10c81bbe28c, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3037349535683109858, guid: c606ea8a9b63df640a18e10c81bbe28c, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3037349535683109858, guid: c606ea8a9b63df640a18e10c81bbe28c, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3037349535683109858, guid: c606ea8a9b63df640a18e10c81bbe28c, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3037349535683109858, guid: c606ea8a9b63df640a18e10c81bbe28c, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3037349535683109858, guid: c606ea8a9b63df640a18e10c81bbe28c, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8839929010072219690, guid: c606ea8a9b63df640a18e10c81bbe28c, type: 3}
propertyPath: m_AudioSources.Array.data[0]
value:
objectReference: {fileID: 0}
- target: {fileID: 8839929010072219690, guid: c606ea8a9b63df640a18e10c81bbe28c, type: 3}
propertyPath: m_AudioSources.Array.data[1]
value:
objectReference: {fileID: 0}
- target: {fileID: 8974659347401553557, guid: c606ea8a9b63df640a18e10c81bbe28c, type: 3}
propertyPath: m_CharacterSwapper
value:
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 1926289423182741662, guid: c606ea8a9b63df640a18e10c81bbe28c, type: 3}
- {fileID: 7211668411825366569, guid: c606ea8a9b63df640a18e10c81bbe28c, type: 3}
- {fileID: 7137336644708754433, guid: c606ea8a9b63df640a18e10c81bbe28c, type: 3}
- {fileID: 6915374236898689727, guid: c606ea8a9b63df640a18e10c81bbe28c, type: 3}
- {fileID: 4460020700640811699, guid: c606ea8a9b63df640a18e10c81bbe28c, type: 3}
- {fileID: 8839929010072219690, guid: c606ea8a9b63df640a18e10c81bbe28c, type: 3}
- {fileID: 8974659347401553557, guid: c606ea8a9b63df640a18e10c81bbe28c, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: c606ea8a9b63df640a18e10c81bbe28c, type: 3}
7 changes: 7 additions & 0 deletions .../CharacterGraphics/CharacterSelect/PlayerGraphics_Archer_Girl_CharacterSelect.prefab.meta
View file
Open in desktop

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

78 changes: 78 additions & 0 deletions .../CharGFX/CharacterGraphics/CharacterSelect/PlayerGraphics_Mage_Boy_CharacterSelect.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &2285026968648169134
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2760169324013038984, guid: 5198848937b62074586fad6bc95e0f3d, type: 3}
propertyPath: m_Name
value: PlayerGraphics_Mage_Boy_CharacterSelect
objectReference: {fileID: 0}
- target: {fileID: 3244218789185353522, guid: 5198848937b62074586fad6bc95e0f3d, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3244218789185353522, guid: 5198848937b62074586fad6bc95e0f3d, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3244218789185353522, guid: 5198848937b62074586fad6bc95e0f3d, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3244218789185353522, guid: 5198848937b62074586fad6bc95e0f3d, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3244218789185353522, guid: 5198848937b62074586fad6bc95e0f3d, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3244218789185353522, guid: 5198848937b62074586fad6bc95e0f3d, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3244218789185353522, guid: 5198848937b62074586fad6bc95e0f3d, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3244218789185353522, guid: 5198848937b62074586fad6bc95e0f3d, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3244218789185353522, guid: 5198848937b62074586fad6bc95e0f3d, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3244218789185353522, guid: 5198848937b62074586fad6bc95e0f3d, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3244218789185353522, guid: 5198848937b62074586fad6bc95e0f3d, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6437196459416029142, guid: 5198848937b62074586fad6bc95e0f3d, type: 3}
propertyPath: m_AudioSources.Array.data[0]
value:
objectReference: {fileID: 0}
- target: {fileID: 6437196459416029142, guid: 5198848937b62074586fad6bc95e0f3d, type: 3}
propertyPath: m_AudioSources.Array.data[1]
value:
objectReference: {fileID: 0}
- target: {fileID: 8912473733245870661, guid: 5198848937b62074586fad6bc95e0f3d, type: 3}
propertyPath: m_CharacterSwapper
value:
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 2132626522655872078, guid: 5198848937b62074586fad6bc95e0f3d, type: 3}
- {fileID: 7149443198138266361, guid: 5198848937b62074586fad6bc95e0f3d, type: 3}
- {fileID: 7219265114281799889, guid: 5198848937b62074586fad6bc95e0f3d, type: 3}
- {fileID: 6402793454155372143, guid: 5198848937b62074586fad6bc95e0f3d, type: 3}
- {fileID: 4235142532294053475, guid: 5198848937b62074586fad6bc95e0f3d, type: 3}
- {fileID: 6437196459416029142, guid: 5198848937b62074586fad6bc95e0f3d, type: 3}
- {fileID: 8912473733245870661, guid: 5198848937b62074586fad6bc95e0f3d, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: 5198848937b62074586fad6bc95e0f3d, type: 3}
7 changes: 7 additions & 0 deletions ...GFX/CharacterGraphics/CharacterSelect/PlayerGraphics_Mage_Boy_CharacterSelect.prefab.meta
View file
Open in desktop

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

Loading