Skip to content

Commit 63ecd92

Browse files
fernando-cortezfernando-cortez
authored
Feature/player persistence prefab refactor (#349)
* foundational scripts for player persistence (Player/PlayerCharacter, runtime lists & associated assets) * better naming & commenting * removing playercharacter, renaming, creating servercharacter runtime collection * removed event * name on spawn rectified * character SO, character registry SO, graphics prefabs created per player type (boy & girl), sending character SO guids over network * persistentplayer reference to networkbehaviours, gamenetportal race condition fix * character SO & matching references renamed to Avatar, Guid validation fix, handling avatar guid through its own component * fixing duplicate graphics spawn bug * playeravatar class with local client creation event, onnetworkspawned parity, hierarchy names cleanup * clientavatarguidhandler inheriting from monobehaviour
1 parent f45373e commit 63ecd92

File tree

105 files changed

+16174
-11729
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+16174
-11729
lines changed

‎Assets/BossRoom/GameData/Avatars.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/BossRoom/GameData/Avatars/ArcherBoy.asset

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:6763868564603ecc5829d4ff61ab742307c7e342589e46aeef8e7d6838d2608a
3+
size 657

‎Assets/BossRoom/GameData/Avatars/ArcherBoy.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/BossRoom/GameData/Avatars/ArcherGirl.asset

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:cf6a23b741d25a32089d10d06778343fa4357597704a694cab655cd60a3e5357
3+
size 658

‎Assets/BossRoom/GameData/Avatars/ArcherGirl.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/BossRoom/GameData/Avatars/MageBoy.asset

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:4ac1343961a62bf59258b9428cc4ec34738617a05b1be80378c3381691767bb4
3+
size 655

‎Assets/BossRoom/GameData/Avatars/MageBoy.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/BossRoom/GameData/Avatars/MageGirl.asset

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:8e93e83f712da2d1d05e100d39db5933793ea50f373ad70a902e49d16d85e71a
3+
size 656

‎Assets/BossRoom/GameData/Avatars/MageGirl.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/BossRoom/GameData/Avatars/RogueBoy.asset

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:b3c4c758ee30f237539c7fddbabcf3e5717fe474fdedea27c994deaed4b7d4b8
3+
size 656

‎Assets/BossRoom/GameData/Avatars/RogueBoy.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/BossRoom/GameData/Avatars/RogueGirl.asset

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:0a7b71c4093578abf7571ccdd6b8bafc6000e8634857794ebf116cec02c1e0a5
3+
size 657

‎Assets/BossRoom/GameData/Avatars/RogueGirl.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/BossRoom/GameData/Avatars/TankBoy.asset

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:f5891b7d9aac8826258b06734981eca5372570cedfdb7e1e7f961c32c329168c
3+
size 655

‎Assets/BossRoom/GameData/Avatars/TankBoy.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/BossRoom/GameData/Avatars/TankGirl.asset

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:c4395149b94496b78eebe604a5e477093665eeb5beb21bac1ca30968c0bcd090
3+
size 656

‎Assets/BossRoom/GameData/Avatars/TankGirl.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/BossRoom/GameData/Character/Archer.asset renamed to ‎Assets/BossRoom/GameData/Character/Archer/Archer.asset

File renamed without changes.

‎Assets/BossRoom/GameData/Character/Archer.asset.meta renamed to ‎Assets/BossRoom/GameData/Character/Archer/Archer.asset.meta

File renamed without changes.

‎Assets/BossRoom/GameData/Character/Imp.asset renamed to ‎Assets/BossRoom/GameData/Character/Imp/Imp.asset

File renamed without changes.

‎Assets/BossRoom/GameData/Character/Imp.asset.meta renamed to ‎Assets/BossRoom/GameData/Character/Imp/Imp.asset.meta

File renamed without changes.

‎Assets/BossRoom/GameData/Character/ImpBoss.asset renamed to ‎Assets/BossRoom/GameData/Character/ImpBoss/ImpBoss.asset

File renamed without changes.

‎Assets/BossRoom/GameData/Character/ImpBoss.asset.meta renamed to ‎Assets/BossRoom/GameData/Character/ImpBoss/ImpBoss.asset.meta

File renamed without changes.

‎Assets/BossRoom/GameData/Character/Mage.asset renamed to ‎Assets/BossRoom/GameData/Character/Mage/Mage.asset

File renamed without changes.

‎Assets/BossRoom/GameData/Character/Mage.asset.meta renamed to ‎Assets/BossRoom/GameData/Character/Mage/Mage.asset.meta

File renamed without changes.

‎Assets/BossRoom/GameData/Character/Rogue.asset renamed to ‎Assets/BossRoom/GameData/Character/Rogue/Rogue.asset

File renamed without changes.

‎Assets/BossRoom/GameData/Character/Rogue.asset.meta renamed to ‎Assets/BossRoom/GameData/Character/Rogue/Rogue.asset.meta

File renamed without changes.

‎Assets/BossRoom/GameData/Character/Tank.asset renamed to ‎Assets/BossRoom/GameData/Character/Tank/Tank.asset

File renamed without changes.

‎Assets/BossRoom/GameData/Character/Tank.asset.meta renamed to ‎Assets/BossRoom/GameData/Character/Tank/Tank.asset.meta

File renamed without changes.

‎Assets/BossRoom/GameData/Systems.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/BossRoom/GameData/Systems/AvatarRegistry.asset

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:1b58f33f08023a72371ecf98234cec1a8f3c4b54ab0a36a2e5e6f5116a2e4966
3+
size 992

‎Assets/BossRoom/GameData/Systems/AvatarRegistry.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/BossRoom/Material/Dungeon/lava.mat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Material:
4242
- _MainTex:
4343
m_Texture: {fileID: 2800000, guid: 71f14d5f7422f9346af23185b106a77b, type: 3}
4444
m_Scale: {x: 1, y: 1}
45-
m_Offset: {x: 0, y: 0}
45+
m_Offset: {x: 0.2626989, y: 0.2626989}
4646
- _MetallicGlossMap:
4747
m_Texture: {fileID: 0}
4848
m_Scale: {x: 1, y: 1}

‎Assets/BossRoom/Prefabs/CharGFX/BossGraphics.prefab

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2002,6 +2002,7 @@ MonoBehaviour:
20022002
m_CharacterSwapper: {fileID: 0}
20032003
m_VisualizationConfiguration: {fileID: 11400000, guid: 9504973cdecd65749889771972fa0117, type: 2}
20042004
m_RuntimeObjectsParent: {fileID: 11400000, guid: deda38c596e7fbd4386b9d8f9b7bb4b5, type: 2}
2005+
m_CharacterClass: {fileID: 11400000, guid: 1fdbcd02edb11484a91de118f5ef44b3, type: 2}
20052006
--- !u!114 &4538447335436592133
20062007
MonoBehaviour:
20072008
m_ObjectHideFlags: 0

‎Assets/BossRoom/Prefabs/CharGFX/CharacterGraphics.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)