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

chore: update socialhub component editors #238

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
+420 −266
Open

chore: update socialhub component editors #238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3d15df3
update
NoelStephensUnity Oct 22, 2024
50f0361
update
NoelStephensUnity Oct 22, 2024
a2a6094
update
NoelStephensUnity Oct 22, 2024
fb5e7a7
update
NoelStephensUnity Oct 22, 2024
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
48 changes: 36 additions & 12 deletions Experimental/DistributedAuthoritySample/Assets/Prefabs/Characters/Avatar.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
m_Name:
m_EditorClassIdentifier:
GlobalObjectIdHash: 3001504883
GlobalObjectIdHash: 2473698027
InScenePlacedSourceGlobalObjectIdHash: 0
DeferredDespawnTick: 0
Ownership: 0
Expand All @@ -65,6 +65,8 @@ MonoBehaviour:
SpawnWithObservers: 1
DontDestroyWithOwner: 0
AutoObjectParentSync: 1
SyncOwnerTransformWhenParented: 1
AllowOwnerToParent: 0
--- !u!114 &5446307037829169848
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -77,7 +79,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5e253f865ab604b12a7f84e3d97704d8, type: 3}
m_Name:
m_EditorClassIdentifier:
ShowTopMostFoldoutHeaderGroup: 1
NetworkTransformExpanded: 0
AuthorityMode: 1
TickSyncChildren: 0
UseUnreliableDeltas: 0
SyncPositionX: 1
SyncPositionY: 1
Expand All @@ -95,20 +100,35 @@ MonoBehaviour:
UseQuaternionCompression: 0
UseHalfFloatPrecision: 0
InLocalSpace: 0
SwitchTransformSpaceWhenParented: 0
Interpolate: 1
SlerpPosition: 0
m_CollisionType: 1
m_CollisionDamage: 0
m_DebugCollisions: 0
m_DebugDamage: 0
m_Colliders:
BaseObjectMotionHandlerPropertiesVisible: 1
IsPooled: 1
CollisionType: 1
CollisionDamage: 0
DebugCollisions: 0
DebugDamage: 0
Colliders:
- {fileID: 36137897785899347}
m_MaxAngularVelocity: 10
m_MaxVelocity: 10
m_PlayerInput: {fileID: 4903152183366241606}
m_AvatarInputs: {fileID: 8197190117666738524}
m_AvatarInteractions: {fileID: 539700041658036575}
m_PhysicsPlayerController: {fileID: 4655812346339390596}
PhysicsObjectMotionPropertiesVisible: 1
MaxAngularVelocity: 10
MaxVelocity: 10
m_Mass:
m_InternalValue: 1
m_AngularVelocity:
m_InternalValue: {x: 0, y: 0, z: 0}
m_Velocity:
m_InternalValue: {x: 0, y: 0, z: 0}
m_Torque:
m_InternalValue: {x: 0, y: 0, z: 0}
m_Force:
m_InternalValue: {x: 0, y: 0, z: 0}
AvatarTransformPropertiesVisible: 1
PlayerInput: {fileID: 4903152183366241606}
AvatarInputs: {fileID: 8197190117666738524}
AvatarInteractions: {fileID: 539700041658036575}
PhysicsPlayerController: {fileID: 4655812346339390596}
--- !u!54 &4745766379562620470
Rigidbody:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -148,6 +168,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f6c0be61502bb534f922ebb746851216, type: 3}
m_Name:
m_EditorClassIdentifier:
ShowTopMostFoldoutHeaderGroup: 1
NetworkRigidbodyBaseExpanded: 0
UseRigidBodyForMotion: 1
AutoUpdateKinematicState: 1
AutoSetKinematicOnDespawn: 1
Expand Down Expand Up @@ -212,6 +234,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: b47efef44cef74d9ca00f4913607f988, type: 3}
m_Name:
m_EditorClassIdentifier:
ShowTopMostFoldoutHeaderGroup: 1
m_AvatarNetworkAnimator: {fileID: 7543523986693376117}
m_AnimationEventRelayer: {fileID: 3050276823525430539}
m_MainCollider: {fileID: 36137897785899347}
Expand Down Expand Up @@ -249,6 +272,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: df477f8da5cc5436fb68de2bde7515aa, type: 3}
m_Name:
m_EditorClassIdentifier:
ShowTopMostFoldoutHeaderGroup: 1
TransitionStateInfoList:
- IsCrossFadeExit: 0
Layer: 0
Expand Down
37 changes: 26 additions & 11 deletions Experimental/DistributedAuthoritySample/Assets/Prefabs/Props/CarryableObjectTemplate.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,18 +193,33 @@ MonoBehaviour:
SwitchTransformSpaceWhenParented: 0
Interpolate: 1
SlerpPosition: 0
m_CollisionType: 2
m_CollisionDamage: 5
m_DebugCollisions: 0
m_DebugDamage: 0
m_Colliders:
BaseObjectMotionHandlerPropertiesVisible: 1
IsPooled: 1
CollisionType: 2
CollisionDamage: 5
DebugCollisions: 0
DebugDamage: 0
Colliders:
- {fileID: 1070061854055180021}
m_MaxAngularVelocity: 10
m_MaxVelocity: 10
m_StartingHealth: 25
m_IntangibleDurationAfterDamage: 2
m_SecondsUntilRespawn: 0
m_TransferableObject: {fileID: 0}
PhysicsObjectMotionPropertiesVisible: 1
MaxAngularVelocity: 10
MaxVelocity: 10
m_Mass:
m_InternalValue: 1
m_AngularVelocity:
m_InternalValue: {x: 0, y: 0, z: 0}
m_Velocity:
m_InternalValue: {x: 0, y: 0, z: 0}
m_Torque:
m_InternalValue: {x: 0, y: 0, z: 0}
m_Force:
m_InternalValue: {x: 0, y: 0, z: 0}
DestructibleObjectPropertiesVisible: 1
StartingHealth: 25
IntangibleDurationAfterDamage: 2
SecondsUntilRespawn: 5
DeferredDespawnTicks: 4
TransferableObject: {fileID: 0}
m_DestructionFX: {fileID: 4911318353974513769, guid: 56f26e64c02337a47907a313b4d6399c, type: 3}
m_RubblePrefab: {fileID: 0}
destructionVFXType:
Expand Down
91 changes: 35 additions & 56 deletions Experimental/DistributedAuthoritySample/Assets/Prefabs/Props/Chest_CarryableObject.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,14 +84,26 @@ PrefabInstance:
propertyPath: m_ProvidesContacts
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2004954010814667909, guid: b35b44635b9b3ec43b189ea3a1400750, type: 3}
propertyPath: RubblePrefab
value:
objectReference: {fileID: 8387396247047937556, guid: 7edc42645c2fba04892f066a0f38e825, type: 3}
- target: {fileID: 2004954010814667909, guid: b35b44635b9b3ec43b189ea3a1400750, type: 3}
propertyPath: rubblePrefab
value:
objectReference: {fileID: 4548375771530481534, guid: 7edc42645c2fba04892f066a0f38e825, type: 3}
- target: {fileID: 2004954010814667909, guid: b35b44635b9b3ec43b189ea3a1400750, type: 3}
propertyPath: DestructionFX
value:
objectReference: {fileID: 4911318353974513769, guid: 56f26e64c02337a47907a313b4d6399c, type: 3}
- target: {fileID: 2004954010814667909, guid: b35b44635b9b3ec43b189ea3a1400750, type: 3}
propertyPath: m_DebugDamage
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2004954010814667909, guid: b35b44635b9b3ec43b189ea3a1400750, type: 3}
propertyPath: StartingHealth
value: 10
objectReference: {fileID: 0}
- target: {fileID: 2004954010814667909, guid: b35b44635b9b3ec43b189ea3a1400750, type: 3}
propertyPath: m_RubblePrefab
value:
Expand All @@ -100,18 +112,38 @@ PrefabInstance:
propertyPath: m_StartingHealth
value: 10
objectReference: {fileID: 0}
- target: {fileID: 2004954010814667909, guid: b35b44635b9b3ec43b189ea3a1400750, type: 3}
propertyPath: DestructionVFXType
value: Crate
objectReference: {fileID: 0}
- target: {fileID: 2004954010814667909, guid: b35b44635b9b3ec43b189ea3a1400750, type: 3}
propertyPath: TransferableObject
value:
objectReference: {fileID: 4975332333728566176}
- target: {fileID: 2004954010814667909, guid: b35b44635b9b3ec43b189ea3a1400750, type: 3}
propertyPath: destructionVFXType
value: Crate
objectReference: {fileID: 0}
- target: {fileID: 2004954010814667909, guid: b35b44635b9b3ec43b189ea3a1400750, type: 3}
propertyPath: SecondsUntilRespawn
value: 5
objectReference: {fileID: 0}
- target: {fileID: 2004954010814667909, guid: b35b44635b9b3ec43b189ea3a1400750, type: 3}
propertyPath: m_TransferableObject
value:
objectReference: {fileID: 4975332333728566176}
objectReference: {fileID: 0}
- target: {fileID: 2004954010814667909, guid: b35b44635b9b3ec43b189ea3a1400750, type: 3}
propertyPath: m_SecondsUntilRespawn
value: 5
objectReference: {fileID: 0}
- target: {fileID: 2004954010814667909, guid: b35b44635b9b3ec43b189ea3a1400750, type: 3}
propertyPath: DestructibleObjectPropertiesVisible
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2093548513578380327, guid: b35b44635b9b3ec43b189ea3a1400750, type: 3}
propertyPath: GlobalObjectIdHash
value: 1523686939
objectReference: {fileID: 0}
- target: {fileID: 5622352566631732085, guid: b35b44635b9b3ec43b189ea3a1400750, type: 3}
propertyPath: m_Name
value: Chest_CarryableObject
Expand Down Expand Up @@ -200,73 +232,20 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: -4.520996
objectReference: {fileID: 0}
- target: {fileID: 8778270557094879703, guid: b35b44635b9b3ec43b189ea3a1400750, type: 3}
propertyPath: m_Mass
value: 5
objectReference: {fileID: 0}
- target: {fileID: 8778270557094879703, guid: b35b44635b9b3ec43b189ea3a1400750, type: 3}
propertyPath: m_IsKinematic
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8860140056957201948, guid: b35b44635b9b3ec43b189ea3a1400750, type: 3}
propertyPath: rubblePrefab
value:
objectReference: {fileID: 4548375771530481534, guid: 7edc42645c2fba04892f066a0f38e825, type: 3}
- target: {fileID: 8860140056957201948, guid: b35b44635b9b3ec43b189ea3a1400750, type: 3}
propertyPath: destructionVFX
value:
objectReference: {fileID: 4911318353974513769, guid: 56f26e64c02337a47907a313b4d6399c, type: 3}
- target: {fileID: 8860140056957201948, guid: b35b44635b9b3ec43b189ea3a1400750, type: 3}
propertyPath: destructionVFXType
value: Crate
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 79685342591573548, guid: b35b44635b9b3ec43b189ea3a1400750, type: 3}
insertIndex: -1
addedObject: {fileID: 3877267113667028722}
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 5622352566631732085, guid: b35b44635b9b3ec43b189ea3a1400750, type: 3}
insertIndex: 1
addedObject: {fileID: 5832966791020054508}
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b35b44635b9b3ec43b189ea3a1400750, type: 3}
--- !u!1 &291901203331741842 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 5622352566631732085, guid: b35b44635b9b3ec43b189ea3a1400750, type: 3}
m_PrefabInstance: {fileID: 5335517921941646311}
m_PrefabAsset: {fileID: 0}
--- !u!114 &5832966791020054508
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 291901203331741842}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
m_Name:
m_EditorClassIdentifier:
GlobalObjectIdHash: 3630027201
InScenePlacedSourceGlobalObjectIdHash: 3034623722
DeferredDespawnTick: 0
Ownership: 3
AlwaysReplicateAsRoot: 0
SynchronizeTransform: 1
ActiveSceneSynchronization: 0
SceneMigrationSynchronization: 1
SpawnWithObservers: 1
DontDestroyWithOwner: 1
AutoObjectParentSync: 1
SyncOwnerTransformWhenParented: 1
AllowOwnerToParent: 0
--- !u!114 &4975332333728566176 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1081003696074514503, guid: b35b44635b9b3ec43b189ea3a1400750, type: 3}
m_PrefabInstance: {fileID: 5335517921941646311}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 291901203331741842}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 54937e94f00ab46c8ae43b81027f342c, type: 3}
Expand Down
46 changes: 41 additions & 5 deletions Experimental/DistributedAuthoritySample/Assets/Prefabs/Props/Pottery_CarryableObject.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,14 +151,30 @@ PrefabInstance:
propertyPath: m_ProvidesContacts
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2004954010814667909, guid: b35b44635b9b3ec43b189ea3a1400750, type: 3}
propertyPath: RubblePrefab
value:
objectReference: {fileID: -3113171657165918681, guid: 403fa0c0f66425a4cb7b0f50869d1dc2, type: 3}
- target: {fileID: 2004954010814667909, guid: b35b44635b9b3ec43b189ea3a1400750, type: 3}
propertyPath: rubblePrefab
value:
objectReference: {fileID: 2426574549031202649, guid: 403fa0c0f66425a4cb7b0f50869d1dc2, type: 3}
- target: {fileID: 2004954010814667909, guid: b35b44635b9b3ec43b189ea3a1400750, type: 3}
propertyPath: CollisionType
value: 2
objectReference: {fileID: 0}
- target: {fileID: 2004954010814667909, guid: b35b44635b9b3ec43b189ea3a1400750, type: 3}
propertyPath: DestructionFX
value:
objectReference: {fileID: 787550606690037956, guid: 9b46f8e0c3f5c3440892c2663f9ef3ff, type: 3}
- target: {fileID: 2004954010814667909, guid: b35b44635b9b3ec43b189ea3a1400750, type: 3}
propertyPath: m_DebugDamage
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2004954010814667909, guid: b35b44635b9b3ec43b189ea3a1400750, type: 3}
propertyPath: StartingHealth
value: 10
objectReference: {fileID: 0}
- target: {fileID: 2004954010814667909, guid: b35b44635b9b3ec43b189ea3a1400750, type: 3}
propertyPath: m_RubblePrefab
value:
Expand All @@ -171,18 +187,42 @@ PrefabInstance:
propertyPath: m_StartingHealth
value: 10
objectReference: {fileID: 0}
- target: {fileID: 2004954010814667909, guid: b35b44635b9b3ec43b189ea3a1400750, type: 3}
propertyPath: DestructionVFXType
value: Pot
objectReference: {fileID: 0}
- target: {fileID: 2004954010814667909, guid: b35b44635b9b3ec43b189ea3a1400750, type: 3}
propertyPath: TransferableObject
value:
objectReference: {fileID: 4795437905408949846}
- target: {fileID: 2004954010814667909, guid: b35b44635b9b3ec43b189ea3a1400750, type: 3}
propertyPath: destructionVFXType
value: Pot
objectReference: {fileID: 0}
- target: {fileID: 2004954010814667909, guid: b35b44635b9b3ec43b189ea3a1400750, type: 3}
propertyPath: SecondsUntilRespawn
value: 5
objectReference: {fileID: 0}
- target: {fileID: 2004954010814667909, guid: b35b44635b9b3ec43b189ea3a1400750, type: 3}
propertyPath: m_TransferableObject
value:
objectReference: {fileID: 4795437905408949846}
objectReference: {fileID: 0}
- target: {fileID: 2004954010814667909, guid: b35b44635b9b3ec43b189ea3a1400750, type: 3}
propertyPath: m_SecondsUntilRespawn
value: 5
objectReference: {fileID: 0}
- target: {fileID: 2004954010814667909, guid: b35b44635b9b3ec43b189ea3a1400750, type: 3}
propertyPath: DestructibleObjectPropertiesVisible
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2004954010814667909, guid: b35b44635b9b3ec43b189ea3a1400750, type: 3}
propertyPath: PhysicsObjectMotionPropertiesVisible
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2004954010814667909, guid: b35b44635b9b3ec43b189ea3a1400750, type: 3}
propertyPath: BaseObjectMotionHandlerPropertiesVisible
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2093548513578380327, guid: b35b44635b9b3ec43b189ea3a1400750, type: 3}
propertyPath: GlobalObjectIdHash
value: 1926722854
Expand Down Expand Up @@ -275,10 +315,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: -48.802002
objectReference: {fileID: 0}
- target: {fileID: 8778270557094879703, guid: b35b44635b9b3ec43b189ea3a1400750, type: 3}
propertyPath: m_Mass
value: 5
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
Expand Down
Loading