Skip to content

Commit 0703d22

Browse files
authored
Merge branch 'develop' into pdeschain/actions-merge
2 parents 57df669 + 16963d6 commit 0703d22

File tree

8 files changed

+98
-83
lines changed

8 files changed

+98
-83
lines changed

Assets/Prefabs/Character/Character.prefab

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ GameObject:
2323
- component: {fileID: 7679526581544062779}
2424
- component: {fileID: 4309865414312164521}
2525
- component: {fileID: 753347877357705413}
26-
- component: {fileID: 7495268952650712827}
26+
- component: {fileID: -2014321709067566591}
2727
m_Layer: 3
2828
m_Name: Character
2929
m_TagString: Player
@@ -41,6 +41,7 @@ Transform:
4141
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
4242
m_LocalPosition: {x: 0, y: 0, z: 0}
4343
m_LocalScale: {x: 1, y: 1, z: 1}
44+
m_ConstrainProportionsScale: 0
4445
m_Children: []
4546
m_Father: {fileID: 0}
4647
m_RootOrder: 0
@@ -73,6 +74,8 @@ MonoBehaviour:
7374
m_Script: {fileID: 11500000, guid: edb78c1621dad5149bb47b96120d3fbf, type: 3}
7475
m_Name:
7576
m_EditorClassIdentifier:
77+
heldNetworkObject:
78+
m_InternalValue: 0
7679
m_NetworkHealthState: {fileID: 514105321093282895}
7780
m_NetworkLifeState: {fileID: -5107732197415868221}
7881
m_CharacterClassContainer: {fileID: -6618539813679097072}
@@ -260,7 +263,7 @@ MonoBehaviour:
260263
m_Name:
261264
m_EditorClassIdentifier:
262265
m_NetworkLifeState: {fileID: -5107732197415868221}
263-
--- !u!114 &7495268952650712827
266+
--- !u!114 &-2014321709067566591
264267
MonoBehaviour:
265268
m_ObjectHideFlags: 0
266269
m_CorrespondingSourceObject: {fileID: 0}
@@ -275,15 +278,14 @@ MonoBehaviour:
275278
SyncPositionX: 1
276279
SyncPositionY: 1
277280
SyncPositionZ: 1
278-
SyncRotAngleX: 1
281+
SyncRotAngleX: 0
279282
SyncRotAngleY: 1
280-
SyncRotAngleZ: 1
281-
SyncScaleX: 1
282-
SyncScaleY: 1
283-
SyncScaleZ: 1
284-
PositionThreshold: 0
285-
RotAngleThreshold: 0
286-
ScaleThreshold: 0
283+
SyncRotAngleZ: 0
284+
SyncScaleX: 0
285+
SyncScaleY: 0
286+
SyncScaleZ: 0
287+
PositionThreshold: 0.001
288+
RotAngleThreshold: 0.01
289+
ScaleThreshold: 0.01
287290
InLocalSpace: 0
288291
Interpolate: 1
289-
CanCommitToTransform: 0

Assets/Prefabs/Game/Arrow.prefab

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,14 @@ MonoBehaviour:
7979
m_Name:
8080
m_EditorClassIdentifier:
8181
SyncPositionX: 1
82-
SyncPositionY: 1
82+
SyncPositionY: 0
8383
SyncPositionZ: 1
84-
SyncRotAngleX: 1
84+
SyncRotAngleX: 0
8585
SyncRotAngleY: 1
86-
SyncRotAngleZ: 1
87-
SyncScaleX: 1
88-
SyncScaleY: 1
89-
SyncScaleZ: 1
86+
SyncRotAngleZ: 0
87+
SyncScaleX: 0
88+
SyncScaleY: 0
89+
SyncScaleZ: 0
9090
PositionThreshold: 0.001
9191
RotAngleThreshold: 0.01
9292
ScaleThreshold: 0.01

Assets/Prefabs/Game/ChargedArrow1.prefab

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ Transform:
3131
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
3232
m_LocalPosition: {x: 0, y: 1, z: 1}
3333
m_LocalScale: {x: 1, y: 1, z: 1}
34+
m_ConstrainProportionsScale: 0
3435
m_Children:
3536
- {fileID: 761584903563702131}
3637
m_Father: {fileID: 0}
@@ -77,17 +78,20 @@ MonoBehaviour:
7778
m_Script: {fileID: 11500000, guid: e96cb6065543e43c4a752faaa1468eb1, type: 3}
7879
m_Name:
7980
m_EditorClassIdentifier:
80-
TransformAuthority: 0
81-
FixedSendsPerSecond: 50
82-
InterpolatePosition: 1
83-
SnapDistance: 10
84-
InterpolateServer: 1
85-
MinMeters: 0.15
86-
MinDegrees: 1.5
87-
MinSize: 0.15
88-
Channel: 6
89-
m_UseLocal:
90-
m_InternalValue: 0
81+
SyncPositionX: 1
82+
SyncPositionY: 0
83+
SyncPositionZ: 1
84+
SyncRotAngleX: 0
85+
SyncRotAngleY: 1
86+
SyncRotAngleZ: 0
87+
SyncScaleX: 0
88+
SyncScaleY: 0
89+
SyncScaleZ: 0
90+
PositionThreshold: 0.001
91+
RotAngleThreshold: 0.01
92+
ScaleThreshold: 0.01
93+
InLocalSpace: 0
94+
Interpolate: 1
9195
--- !u!114 &144087972406990258
9296
MonoBehaviour:
9397
m_ObjectHideFlags: 0

Assets/Prefabs/Game/ChargedArrow2.prefab

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ Transform:
3131
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
3232
m_LocalPosition: {x: 0, y: 1, z: 1}
3333
m_LocalScale: {x: 1, y: 1, z: 1}
34+
m_ConstrainProportionsScale: 0
3435
m_Children:
3536
- {fileID: 6052162863261286440}
3637
m_Father: {fileID: 0}
@@ -77,17 +78,20 @@ MonoBehaviour:
7778
m_Script: {fileID: 11500000, guid: e96cb6065543e43c4a752faaa1468eb1, type: 3}
7879
m_Name:
7980
m_EditorClassIdentifier:
80-
TransformAuthority: 0
81-
FixedSendsPerSecond: 50
82-
InterpolatePosition: 1
83-
SnapDistance: 10
84-
InterpolateServer: 1
85-
MinMeters: 0.15
86-
MinDegrees: 1.5
87-
MinSize: 0.15
88-
Channel: 6
89-
m_UseLocal:
90-
m_InternalValue: 0
81+
SyncPositionX: 1
82+
SyncPositionY: 0
83+
SyncPositionZ: 1
84+
SyncRotAngleX: 0
85+
SyncRotAngleY: 1
86+
SyncRotAngleZ: 0
87+
SyncScaleX: 0
88+
SyncScaleY: 0
89+
SyncScaleZ: 0
90+
PositionThreshold: 0.001
91+
RotAngleThreshold: 0.01
92+
ScaleThreshold: 0.01
93+
InLocalSpace: 0
94+
Interpolate: 1
9195
--- !u!114 &144087972406990258
9296
MonoBehaviour:
9397
m_ObjectHideFlags: 0

Assets/Prefabs/Game/ChargedArrow3.prefab

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ Transform:
3131
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
3232
m_LocalPosition: {x: 0, y: 1, z: 1}
3333
m_LocalScale: {x: 1, y: 1, z: 1}
34+
m_ConstrainProportionsScale: 0
3435
m_Children:
3536
- {fileID: 7856784432745151475}
3637
m_Father: {fileID: 0}
@@ -77,17 +78,20 @@ MonoBehaviour:
7778
m_Script: {fileID: 11500000, guid: e96cb6065543e43c4a752faaa1468eb1, type: 3}
7879
m_Name:
7980
m_EditorClassIdentifier:
80-
TransformAuthority: 0
81-
FixedSendsPerSecond: 50
82-
InterpolatePosition: 1
83-
SnapDistance: 10
84-
InterpolateServer: 1
85-
MinMeters: 0.15
86-
MinDegrees: 1.5
87-
MinSize: 0.15
88-
Channel: 6
89-
m_UseLocal:
90-
m_InternalValue: 0
81+
SyncPositionX: 1
82+
SyncPositionY: 0
83+
SyncPositionZ: 1
84+
SyncRotAngleX: 0
85+
SyncRotAngleY: 1
86+
SyncRotAngleZ: 0
87+
SyncScaleX: 0
88+
SyncScaleY: 0
89+
SyncScaleZ: 0
90+
PositionThreshold: 0.001
91+
RotAngleThreshold: 0.01
92+
ScaleThreshold: 0.01
93+
InLocalSpace: 0
94+
Interpolate: 1
9195
--- !u!114 &144087972406990258
9296
MonoBehaviour:
9397
m_ObjectHideFlags: 0

Assets/Prefabs/Game/ImpTossedItem.prefab

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,9 @@ MonoBehaviour:
124124
SyncRotAngleX: 1
125125
SyncRotAngleY: 1
126126
SyncRotAngleZ: 1
127-
SyncScaleX: 1
128-
SyncScaleY: 1
129-
SyncScaleZ: 1
127+
SyncScaleX: 0
128+
SyncScaleY: 0
129+
SyncScaleZ: 0
130130
PositionThreshold: 0.001
131131
RotAngleThreshold: 0.01
132132
ScaleThreshold: 0.01
@@ -163,8 +163,8 @@ MonoBehaviour:
163163
m_LayerMask:
164164
serializedVersion: 2
165165
m_Bits: 72
166-
detonateAfterSeconds: 5
167-
destroyAfterSeconds: 6
166+
m_DetonateAfterSeconds: 5
167+
m_DestroyAfterSeconds: 6
168168
detonatedCallback:
169169
m_PersistentCalls:
170170
m_Calls:

Assets/Prefabs/Game/PickUpPot.prefab

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ GameObject:
1212
- component: {fileID: 1583543423304314435}
1313
- component: {fileID: 1583543423304314433}
1414
- component: {fileID: 557076851198928999}
15-
- component: {fileID: -6910049848596396308}
1615
- component: {fileID: 7749064398440206079}
1716
- component: {fileID: 172480899766740213}
17+
- component: {fileID: 3829689126279177341}
1818
m_Layer: 6
1919
m_Name: PickUpPot
2020
m_TagString: Heavy
@@ -79,32 +79,6 @@ BoxCollider:
7979
serializedVersion: 2
8080
m_Size: {x: 1.9166098, y: 2.0842423, z: 1.91661}
8181
m_Center: {x: 0.00000017881393, y: 1.0421212, z: 0.00000059604645}
82-
--- !u!114 &-6910049848596396308
83-
MonoBehaviour:
84-
m_ObjectHideFlags: 0
85-
m_CorrespondingSourceObject: {fileID: 0}
86-
m_PrefabInstance: {fileID: 0}
87-
m_PrefabAsset: {fileID: 0}
88-
m_GameObject: {fileID: 1583543423304314434}
89-
m_Enabled: 1
90-
m_EditorHideFlags: 0
91-
m_Script: {fileID: 11500000, guid: e96cb6065543e43c4a752faaa1468eb1, type: 3}
92-
m_Name:
93-
m_EditorClassIdentifier:
94-
SyncPositionX: 1
95-
SyncPositionY: 1
96-
SyncPositionZ: 1
97-
SyncRotAngleX: 1
98-
SyncRotAngleY: 1
99-
SyncRotAngleZ: 1
100-
SyncScaleX: 1
101-
SyncScaleY: 1
102-
SyncScaleZ: 1
103-
PositionThreshold: 0
104-
RotAngleThreshold: 0
105-
ScaleThreshold: 0
106-
InLocalSpace: 0
107-
Interpolate: 1
10882
--- !u!114 &7749064398440206079
10983
MonoBehaviour:
11084
m_ObjectHideFlags: 0
@@ -117,7 +91,7 @@ MonoBehaviour:
11791
m_Script: {fileID: 11500000, guid: 19d305a23aab66843ab49f61511c8662, type: 3}
11892
m_Name:
11993
m_EditorClassIdentifier:
120-
m_NetworkTransform: {fileID: -6910049848596396308}
94+
m_NetworkTransform: {fileID: 0}
12195
m_PositionConstraint: {fileID: 172480899766740213}
12296
--- !u!1818360608 &172480899766740213
12397
PositionConstraint:
@@ -136,6 +110,32 @@ PositionConstraint:
136110
m_IsContraintActive: 0
137111
m_IsLocked: 0
138112
m_Sources: []
113+
--- !u!114 &3829689126279177341
114+
MonoBehaviour:
115+
m_ObjectHideFlags: 0
116+
m_CorrespondingSourceObject: {fileID: 0}
117+
m_PrefabInstance: {fileID: 0}
118+
m_PrefabAsset: {fileID: 0}
119+
m_GameObject: {fileID: 1583543423304314434}
120+
m_Enabled: 1
121+
m_EditorHideFlags: 0
122+
m_Script: {fileID: 11500000, guid: e96cb6065543e43c4a752faaa1468eb1, type: 3}
123+
m_Name:
124+
m_EditorClassIdentifier:
125+
SyncPositionX: 1
126+
SyncPositionY: 1
127+
SyncPositionZ: 1
128+
SyncRotAngleX: 0
129+
SyncRotAngleY: 1
130+
SyncRotAngleZ: 0
131+
SyncScaleX: 0
132+
SyncScaleY: 0
133+
SyncScaleZ: 0
134+
PositionThreshold: 0.001
135+
RotAngleThreshold: 0.01
136+
ScaleThreshold: 0.01
137+
InLocalSpace: 0
138+
Interpolate: 1
139139
--- !u!1001 &1583543425366239673
140140
PrefabInstance:
141141
m_ObjectHideFlags: 0

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ Additional documentation and release notes are available at [Multiplayer Documen
2323
* Rearranged the Action system by adding more folders that separate different pieces more clearly (#701)
2424
* Action and ActionFX classes have been merged into a single Scriptable Object-based Action class; all the existing actions have been refactored to follow this new design (#705)
2525
* Refactored the Action system so that the action objects themselves are pooled Scriptable Objects (#705)
26+
* Configured the NetworkTransform components of every NetworkObject to reduce the bandwidth usage (#716). This prevents the unnecessary synchronization of data that clients do not need, i.e. a character's scale or y position. In the case of a character, it reduced the size of each update from 47B to 23B.
2627
*
2728
### Removed
2829
*

0 commit comments

Comments
 (0)