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

feat: Bridge classes removal, Namespace cleanup [MTT-4014] #732

Merged
merged 43 commits into from
Sep 26, 2022
Merged

feat: Bridge classes removal, Namespace cleanup [MTT-4014] #732

Show file tree
Hide file tree
Changes from 35 commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
007a382
wip namespaces, locations and unused code
pdeschain Sep 7, 2022
c998f20
Door code has been refactored into one class
pdeschain Sep 8, 2022
4b845d6
Removed NetworkFloorSwitchState and renamed switch class to FloorSwit…
pdeschain Sep 8, 2022
fde81e8
renamed projectile to PhysicsProjectile to better describe the intent…
pdeschain Sep 8, 2022
3d3d851
Renamed projectiles to missiles and other merges
pdeschain Sep 8, 2022
aa2a6d2
wip ServerCharacter, NetworkCharacterState and ClientCharacterVisuali…
pdeschain Sep 8, 2022
64f9e34
Further removals of bridge classes and general cleanup
pdeschain Sep 20, 2022
bf243f1
Renamed FXProjectileTargetedAction to FXMissileAction
pdeschain Sep 20, 2022
c62e4f7
Undid projectile to missile renaming
pdeschain Sep 20, 2022
97b9d66
Removed GlobalSatticNetworkObjects prefab in BossRoom scene
pdeschain Sep 20, 2022
36071ff
Reset BossRoom subscene lifetimescope references
pdeschain Sep 20, 2022
ef38902
#
pdeschain Sep 20, 2022
1d338bc
Merge branch 'develop' into pdeschain/project-cleanup
pdeschain Sep 20, 2022
42c8ba5
Resetting prefab inspector values where major changes were done
pdeschain Sep 20, 2022
a39c42c
Enemy portal is now a subclass of Breakable
pdeschain Sep 20, 2022
43ac63d
Merged TossedItem client and server classes into one
pdeschain Sep 20, 2022
8dc10db
Restored NetworkingManager.prefab
pdeschain Sep 20, 2022
d8ce832
Enemy spawner now has a Breakable component on it, alongside with ENe…
pdeschain Sep 20, 2022
e42c972
EnemySpawner crystals reset
pdeschain Sep 21, 2022
124b39b
Fixed more prefab errors
pdeschain Sep 21, 2022
29284f5
formatting
pdeschain Sep 21, 2022
9522f6c
Build errors cleanup
pdeschain Sep 21, 2022
6047a2d
Update Assets/Scripts/Gameplay/GameplayObjects/Character/ServerCharac…
pdeschain Sep 21, 2022
22934cf
ClientCharacterVisuzliation renamed to ClientCharacter
pdeschain Sep 22, 2022
1fdae13
PhysicsProjectile tweaks
pdeschain Sep 22, 2022
df031b6
Removed unnecessary collider that was causing issues with projectiles
pdeschain Sep 22, 2022
3ace5c4
Floor switch fix
pdeschain Sep 23, 2022
faca09e
more namespace changes, renamed asmdef
pdeschain Sep 23, 2022
2d86e63
more namespace adjustments
pdeschain Sep 23, 2022
180cfb1
restored broken references between LifetimeScopes (namespace changes …
pdeschain Sep 23, 2022
9077616
removed duplicate subscription
pdeschain Sep 24, 2022
8fa3262
addressing github comments
pdeschain Sep 26, 2022
395b452
field renames to match the new type name
pdeschain Sep 26, 2022
7343b13
Merge branch 'develop' into pdeschain/project-cleanup
pdeschain Sep 26, 2022
6f40f03
removing unused methods
SamuelBellomo Sep 26, 2022
7e2f242
removing unused methods
SamuelBellomo Sep 26, 2022
83e7ee4
Merge branch 'pdeschain/project-cleanup' of github.com:Unity-Technolo…
pdeschain Sep 26, 2022
c15936a
fixed injection issue due to broken ref to parent lifetimescope
pdeschain Sep 26, 2022
1863179
comments feedback
pdeschain Sep 26, 2022
9ae96d9
Merge branch 'develop' into pdeschain/project-cleanup
pdeschain Sep 26, 2022
6cd680f
changed tests namespace in yamato
pdeschain Sep 26, 2022
eabfe15
changelog
pdeschain Sep 26, 2022
8dfc286
Update CHANGELOG.md
SamuelBellomo Sep 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
66 changes: 17 additions & 49 deletions Assets/Prefabs/Character/Character.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,8 @@ GameObject:
m_Component:
- component: {fileID: 4600110157238723791}
- component: {fileID: 4600110157238723790}
- component: {fileID: 4600110157238723777}
- component: {fileID: -909640835356089789}
- component: {fileID: 514105321093282895}
- component: {fileID: -5107732197415868221}
- component: {fileID: -6618539813679097072}
- component: {fileID: 7420593339233078707}
- component: {fileID: 4058497248645145345}
- component: {fileID: 350177175035117514}
Expand All @@ -24,6 +21,7 @@ GameObject:
- component: {fileID: 4309865414312164521}
- component: {fileID: 753347877357705413}
- component: {fileID: -2014321709067566591}
- component: {fileID: 3884788294438199994}
m_Layer: 3
m_Name: Character
m_TagString: Player
Expand Down Expand Up @@ -62,36 +60,6 @@ MonoBehaviour:
AlwaysReplicateAsRoot: 0
DontDestroyWithOwner: 0
AutoObjectParentSync: 1
--- !u!114 &4600110157238723777
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4600110157238723781}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: edb78c1621dad5149bb47b96120d3fbf, type: 3}
m_Name:
m_EditorClassIdentifier:
heldNetworkObject:
m_InternalValue: 0
m_NetworkHealthState: {fileID: 514105321093282895}
m_NetworkLifeState: {fileID: -5107732197415868221}
m_CharacterClassContainer: {fileID: -6618539813679097072}
--- !u!114 &-909640835356089789
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4600110157238723781}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ae9a06a3585027044ababe9f9cb7b8e6, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ClientCharacterVisualization: {fileID: 0}
--- !u!114 &514105321093282895
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -120,19 +88,6 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_LifeState:
m_InternalValue: 0
--- !u!114 &-6618539813679097072
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4600110157238723781}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4a3a07abfb44d50469112a0db6a202b2, type: 3}
m_Name:
m_EditorClassIdentifier:
m_CharacterClass: {fileID: 0}
--- !u!114 &7420593339233078707
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -145,10 +100,11 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 920a440eb254ba348915767fd046027a, type: 3}
m_Name:
m_EditorClassIdentifier:
m_NetworkCharacterState: {fileID: 4600110157238723777}
m_ClientVisualization: {fileID: 0}
m_CharacterClass: {fileID: 0}
m_BrainEnabled: 1
m_KilledDestroyDelaySeconds: 3
m_StartingAction: 0
m_StartingAction: {fileID: 0}
m_DamageReceiver: {fileID: 753347877357705413}
m_Movement: {fileID: 4309865414312164521}
m_PhysicsWrapper: {fileID: 4058497248645145345}
Expand Down Expand Up @@ -248,7 +204,6 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_NavMeshAgent: {fileID: 745390554272530562}
m_Rigidbody: {fileID: 3375535791397456380}
m_NetworkCharacterState: {fileID: 4600110157238723777}
m_CharLogic: {fileID: 7420593339233078707}
--- !u!114 &753347877357705413
MonoBehaviour:
Expand Down Expand Up @@ -289,3 +244,16 @@ MonoBehaviour:
ScaleThreshold: 0.01
InLocalSpace: 0
Interpolate: 1
--- !u!114 &3884788294438199994
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4600110157238723781}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ebe9bfd21e47445488dfd84b4e0c9884, type: 3}
m_Name:
m_EditorClassIdentifier:
m_AvatarRegistry: {fileID: 11400000, guid: 48d17d764bff6c643a3dc035fb71c979, type: 2}
79 changes: 38 additions & 41 deletions Assets/Prefabs/Character/Imp.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,16 +69,6 @@ PrefabInstance:
objectReference: {fileID: 3121817358174221070}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3}
--- !u!1 &5858966600248860054 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 6839301660383890230, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3}
m_PrefabInstance: {fileID: 1127359556114831008}
m_PrefabAsset: {fileID: 0}
--- !u!4 &6486568539699693356 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 6170428688339538316, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3}
m_PrefabInstance: {fileID: 1127359556114831008}
m_PrefabAsset: {fileID: 0}
--- !u!95 &929086692793228630 stripped
Animator:
m_CorrespondingSourceObject: {fileID: 234724737205816310, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3}
Expand All @@ -95,6 +85,11 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9520a47fc61d5ab4ca99cdac2d574909, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &5858966600248860054 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 6839301660383890230, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3}
m_PrefabInstance: {fileID: 1127359556114831008}
m_PrefabAsset: {fileID: 0}
--- !u!114 &5401475423617019972
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -108,6 +103,11 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Animator: {fileID: 929086692793228630}
--- !u!4 &6486568539699693356 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 6170428688339538316, guid: 1ffde884792e9a44a9fbe049ebb79c9f, type: 3}
m_PrefabInstance: {fileID: 1127359556114831008}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &2173896227866280545
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -247,6 +247,14 @@ PrefabInstance:
propertyPath: animator
value:
objectReference: {fileID: 929086692793228630}
- target: {fileID: 8398944656959553575, guid: 64cfd098f62285f42918875fef849e88, type: 3}
propertyPath: m_CharacterClass
value:
objectReference: {fileID: 11400000, guid: fa81aca63f2fce545a3b9e046b6e42e7, type: 2}
- target: {fileID: 8398944656959553575, guid: 64cfd098f62285f42918875fef849e88, type: 3}
propertyPath: m_ClientVisualization
value:
objectReference: {fileID: 3121817358174221070}
- target: {fileID: 8398944656959553575, guid: 64cfd098f62285f42918875fef849e88, type: 3}
propertyPath: m_KilledDestroyDelaySeconds
value: 2
Expand All @@ -265,27 +273,6 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 64cfd098f62285f42918875fef849e88, type: 3}
--- !u!1 &3713729372785093424 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 3288448142974003537, guid: 64cfd098f62285f42918875fef849e88, type: 3}
m_PrefabInstance: {fileID: 2173896227866280545}
m_PrefabAsset: {fileID: 0}
--- !u!4 &3713729372785093434 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 3288448142974003547, guid: 64cfd098f62285f42918875fef849e88, type: 3}
m_PrefabInstance: {fileID: 2173896227866280545}
m_PrefabAsset: {fileID: 0}
--- !u!114 &9169118397563301302 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 6995351927119310807, guid: 64cfd098f62285f42918875fef849e88, type: 3}
m_PrefabInstance: {fileID: 2173896227866280545}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3713729372785093424}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ae9a06a3585027044ababe9f9cb7b8e6, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &827948680237315002 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1537501989561463259, guid: 64cfd098f62285f42918875fef849e88, type: 3}
Expand All @@ -297,17 +284,11 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6733907396f36c44891916e5c62f25a0, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &3837839015300097846 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3128178037050369367, guid: 64cfd098f62285f42918875fef849e88, type: 3}
--- !u!1 &3713729372785093424 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 3288448142974003537, guid: 64cfd098f62285f42918875fef849e88, type: 3}
m_PrefabInstance: {fileID: 2173896227866280545}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3713729372785093424}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 818290ebb0ac23541921b4dfc6842778, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &-4570750241117365215
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -325,8 +306,24 @@ MonoBehaviour:
m_UIStatePrefab: {fileID: -1943162842029199943, guid: 2b07482491a17964380023240087ce16, type: 3}
m_NetworkNameState: {fileID: 0}
m_NetworkHealthState: {fileID: 827948680237315002}
m_ClientCharacter: {fileID: 9169118397563301302}
m_ServerCharacter: {fileID: 0}
m_BaseHP: {fileID: 11400000, guid: 95633dc134a4e654f863831b22b5681a, type: 2}
m_TransformToTrack: {fileID: 6486568539699693356}
m_VerticalWorldOffset: 2.2
m_VerticalScreenOffset: 20
--- !u!4 &3713729372785093434 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 3288448142974003547, guid: 64cfd098f62285f42918875fef849e88, type: 3}
m_PrefabInstance: {fileID: 2173896227866280545}
m_PrefabAsset: {fileID: 0}
--- !u!114 &3837839015300097846 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3128178037050369367, guid: 64cfd098f62285f42918875fef849e88, type: 3}
m_PrefabInstance: {fileID: 2173896227866280545}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3713729372785093424}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 818290ebb0ac23541921b4dfc6842778, type: 3}
m_Name:
m_EditorClassIdentifier:
Loading