Skip to content

Commit 0f68104

Browse files
jilfranco-unityjilfranco-unity
committed
Merge branch 'develop' into fix/gpu-perf-issues
# Conflicts: # ProjectSettings/QualitySettings.asset--merged with rider
2 parents bab0a93 + 3fa21a9 commit 0f68104

12 files changed

+83
-39
lines changed

‎Assets/Prefabs/UI/PlayerSeatTemplate.prefab

Lines changed: 36 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,15 @@ RectTransform:
2828
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
2929
m_LocalPosition: {x: 0, y: 0, z: 0}
3030
m_LocalScale: {x: 1, y: 1, z: 1}
31+
m_ConstrainProportionsScale: 0
3132
m_Children: []
32-
m_Father: {fileID: 2768642224677944325}
33-
m_RootOrder: 2
33+
m_Father: {fileID: 628160980191873562}
34+
m_RootOrder: 0
3435
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3536
m_AnchorMin: {x: 0.5, y: 0.5}
3637
m_AnchorMax: {x: 0.5, y: 0.5}
3738
m_AnchoredPosition: {x: 0, y: 0}
38-
m_SizeDelta: {x: 150, y: 150}
39+
m_SizeDelta: {x: 111.4719, y: 150}
3940
m_Pivot: {x: 0.5, y: 0.5}
4041
--- !u!222 &371197909
4142
CanvasRenderer:
@@ -67,7 +68,7 @@ MonoBehaviour:
6768
m_Calls: []
6869
m_Sprite: {fileID: 21300000, guid: 96ba0f0aaeac03e40be64f748a4f2d1e, type: 3}
6970
m_Type: 0
70-
m_PreserveAspect: 1
71+
m_PreserveAspect: 0
7172
m_FillCenter: 1
7273
m_FillMethod: 4
7374
m_FillAmount: 1
@@ -103,9 +104,10 @@ RectTransform:
103104
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
104105
m_LocalPosition: {x: 0, y: 0, z: 0}
105106
m_LocalScale: {x: 1, y: 1, z: 1}
107+
m_ConstrainProportionsScale: 0
106108
m_Children: []
107109
m_Father: {fileID: 628160980191873562}
108-
m_RootOrder: 1
110+
m_RootOrder: 2
109111
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
110112
m_AnchorMin: {x: 0.5, y: 0.5}
111113
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -178,11 +180,12 @@ RectTransform:
178180
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
179181
m_LocalPosition: {x: 0, y: 0, z: 0}
180182
m_LocalScale: {x: 1, y: 1, z: 1}
183+
m_ConstrainProportionsScale: 0
181184
m_Children:
182185
- {fileID: 7227755882419628908}
183186
- {fileID: 2849120150865561455}
184187
m_Father: {fileID: 628160980191873562}
185-
m_RootOrder: 0
188+
m_RootOrder: 1
186189
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
187190
m_AnchorMin: {x: 0.5, y: 0.5}
188191
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -255,14 +258,15 @@ RectTransform:
255258
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
256259
m_LocalPosition: {x: 0, y: 0, z: 0}
257260
m_LocalScale: {x: 1, y: 1, z: 1}
261+
m_ConstrainProportionsScale: 0
258262
m_Children: []
259263
m_Father: {fileID: 2768642224677944325}
260264
m_RootOrder: 0
261265
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
262-
m_AnchorMin: {x: 0, y: 0}
263-
m_AnchorMax: {x: 1, y: 1}
266+
m_AnchorMin: {x: 0.5, y: 0.5}
267+
m_AnchorMax: {x: 0.5, y: 0.5}
264268
m_AnchoredPosition: {x: 0, y: 0}
265-
m_SizeDelta: {x: -2, y: -2}
269+
m_SizeDelta: {x: 103.75, y: 144.5844}
266270
m_Pivot: {x: 0.5, y: 0.5}
267271
--- !u!222 &1916582725
268272
CanvasRenderer:
@@ -294,7 +298,7 @@ MonoBehaviour:
294298
m_Calls: []
295299
m_Sprite: {fileID: 21300000, guid: bfc58bd585100d642846bfe41495a631, type: 3}
296300
m_Type: 0
297-
m_PreserveAspect: 1
301+
m_PreserveAspect: 0
298302
m_FillCenter: 1
299303
m_FillMethod: 4
300304
m_FillAmount: 1
@@ -329,7 +333,9 @@ RectTransform:
329333
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
330334
m_LocalPosition: {x: 0, y: 0, z: 0}
331335
m_LocalScale: {x: 1, y: 1, z: 1}
336+
m_ConstrainProportionsScale: 0
332337
m_Children:
338+
- {fileID: 371197907}
333339
- {fileID: 1447857258}
334340
- {fileID: 763871755}
335341
- {fileID: 2768642224677944325}
@@ -346,7 +352,7 @@ RectTransform:
346352
m_Pivot: {x: 0.5, y: 0.5}
347353
--- !u!95 &6724969306933167588
348354
Animator:
349-
serializedVersion: 3
355+
serializedVersion: 4
350356
m_ObjectHideFlags: 0
351357
m_CorrespondingSourceObject: {fileID: 0}
352358
m_PrefabInstance: {fileID: 0}
@@ -359,6 +365,7 @@ Animator:
359365
m_UpdateMode: 0
360366
m_ApplyRootMotion: 0
361367
m_LinearVelocityBlending: 0
368+
m_StabilizeFeet: 0
362369
m_WarningMessage:
363370
m_HasTransformHierarchy: 1
364371
m_AllowConstantClipSamplingOptimization: 1
@@ -391,6 +398,7 @@ RectTransform:
391398
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
392399
m_LocalPosition: {x: 0, y: 0, z: 0}
393400
m_LocalScale: {x: 1, y: 1, z: 1}
401+
m_ConstrainProportionsScale: 0
394402
m_Children: []
395403
m_Father: {fileID: 1447857258}
396404
m_RootOrder: 1
@@ -466,9 +474,10 @@ RectTransform:
466474
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
467475
m_LocalPosition: {x: 0, y: 0, z: 0}
468476
m_LocalScale: {x: 1, y: 1, z: 1}
477+
m_ConstrainProportionsScale: 0
469478
m_Children: []
470479
m_Father: {fileID: 2768642224677944325}
471-
m_RootOrder: 3
480+
m_RootOrder: 2
472481
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
473482
m_AnchorMin: {x: 0.5, y: 1}
474483
m_AnchorMax: {x: 0.5, y: 1}
@@ -541,6 +550,7 @@ RectTransform:
541550
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
542551
m_LocalPosition: {x: 0, y: 0, z: 0}
543552
m_LocalScale: {x: 1, y: 1, z: 1}
553+
m_ConstrainProportionsScale: 0
544554
m_Children: []
545555
m_Father: {fileID: 1447857258}
546556
m_RootOrder: 0
@@ -617,9 +627,10 @@ RectTransform:
617627
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
618628
m_LocalPosition: {x: 0, y: 0, z: 0}
619629
m_LocalScale: {x: 1, y: 1, z: 1}
630+
m_ConstrainProportionsScale: 0
620631
m_Children: []
621632
m_Father: {fileID: 628160980191873562}
622-
m_RootOrder: 3
633+
m_RootOrder: 4
623634
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
624635
m_AnchorMin: {x: 0, y: 0}
625636
m_AnchorMax: {x: 1, y: 1}
@@ -748,9 +759,10 @@ RectTransform:
748759
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
749760
m_LocalPosition: {x: 0, y: 0, z: 0}
750761
m_LocalScale: {x: 1, y: 1, z: 1}
762+
m_ConstrainProportionsScale: 0
751763
m_Children: []
752764
m_Father: {fileID: 2768642224677944325}
753-
m_RootOrder: 4
765+
m_RootOrder: 3
754766
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
755767
m_AnchorMin: {x: 0.5, y: 0}
756768
m_AnchorMax: {x: 0.5, y: 0}
@@ -823,15 +835,15 @@ RectTransform:
823835
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
824836
m_LocalPosition: {x: 0, y: 0, z: 0}
825837
m_LocalScale: {x: 1, y: 1, z: 1}
838+
m_ConstrainProportionsScale: 0
826839
m_Children:
827840
- {fileID: 1916582723}
828841
- {fileID: 4288405572601731449}
829-
- {fileID: 371197907}
830842
- {fileID: 7697377224375302682}
831843
- {fileID: 8171136458736705924}
832844
- {fileID: 3079994904646502685}
833845
m_Father: {fileID: 628160980191873562}
834-
m_RootOrder: 2
846+
m_RootOrder: 3
835847
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
836848
m_AnchorMin: {x: 0.5, y: 0.5}
837849
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -904,9 +916,10 @@ RectTransform:
904916
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
905917
m_LocalPosition: {x: 0, y: 0, z: 0}
906918
m_LocalScale: {x: 1, y: 1, z: 1}
919+
m_ConstrainProportionsScale: 0
907920
m_Children: []
908921
m_Father: {fileID: 628160980191873562}
909-
m_RootOrder: 5
922+
m_RootOrder: 6
910923
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
911924
m_AnchorMin: {x: 0.5, y: 0.5}
912925
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1038,9 +1051,10 @@ RectTransform:
10381051
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
10391052
m_LocalPosition: {x: 0, y: 0, z: 0}
10401053
m_LocalScale: {x: 1, y: 1, z: 1}
1054+
m_ConstrainProportionsScale: 0
10411055
m_Children: []
10421056
m_Father: {fileID: 2768642224677944325}
1043-
m_RootOrder: 5
1057+
m_RootOrder: 4
10441058
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
10451059
m_AnchorMin: {x: 0.5, y: 0}
10461060
m_AnchorMax: {x: 0.5, y: 0}
@@ -1113,6 +1127,7 @@ RectTransform:
11131127
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
11141128
m_LocalPosition: {x: 0, y: 0, z: 0}
11151129
m_LocalScale: {x: 1, y: 1, z: 1}
1130+
m_ConstrainProportionsScale: 0
11161131
m_Children:
11171132
- {fileID: 628160980191873562}
11181133
m_Father: {fileID: 0}
@@ -1182,9 +1197,10 @@ RectTransform:
11821197
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
11831198
m_LocalPosition: {x: 0, y: 0, z: 0}
11841199
m_LocalScale: {x: 1, y: 1, z: 1}
1200+
m_ConstrainProportionsScale: 0
11851201
m_Children: []
11861202
m_Father: {fileID: 628160980191873562}
1187-
m_RootOrder: 4
1203+
m_RootOrder: 5
11881204
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
11891205
m_AnchorMin: {x: 0.5, y: 0.5}
11901206
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1257,6 +1273,7 @@ RectTransform:
12571273
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
12581274
m_LocalPosition: {x: 0, y: 0, z: 0}
12591275
m_LocalScale: {x: 1, y: 1, z: 1}
1276+
m_ConstrainProportionsScale: 0
12601277
m_Children: []
12611278
m_Father: {fileID: 2768642224677944325}
12621279
m_RootOrder: 1

‎Assets/Textures/UI/ui_archer_symbol_inactive.png

Lines changed: 2 additions & 2 deletions
Loading

‎Assets/Textures/UI/ui_archer_symbol_inactive.png.meta

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

‎Assets/Textures/UI/ui_mage_symbol_inactive.png

Lines changed: 2 additions & 2 deletions
Loading

‎Assets/Textures/UI/ui_rogue_symbol_inactive.png

Lines changed: 2 additions & 2 deletions
Loading

‎Assets/Textures/UI/ui_tank_symbol_inactive.png

Lines changed: 2 additions & 2 deletions
Loading

‎CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ Additional documentation and release notes are available at [Multiplayer Documen
1717
* Introduced a mechanism for identifying actions by their runtime-generated ActionID, instead of relying on a fragile ActionType enumeration (#705)
1818
* NetworkObjectSpawner handles dynamically spawning in-scene placed NetworkObjects (#717) - You can't place a NetworkObject in scene directly and destroy it at runtime. This PR showcases proper handling of NetworkObjects that you'd wish to place inside of scenes, but would still want to destroy at game-time. Examples of these are: Imps, VandalImps, ImpBoss. NetworkObjects such as doors, crystals, door switch, etc. remain the same, statically-placed in scene.
1919
* Quality levels settings set up for Desktop [MTT-4450] (#713)
20+
* Added custom RNSM config with graph for RTT instead of single value (#747)
2021

2122
### Changed
2223
* Updated tools, authentication and relay packages (#690)

‎Packages/com.unity.multiplayer.samples.coop/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
## [Unreleased] - yyyy-mm-dd
44

55
### Added
6-
*
6+
* Added custom RNSM config with graph for RTT instead of single value (#747)
77
### Changed
88
*
99
### Removed

‎Packages/com.unity.multiplayer.samples.coop/Utilities/Net/RNSM/CustomNetStatsMonitorConfiguration.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:5080a9b907bac3cbc409cf77779de83470afe1262c4c76f661e1453f39ac2a93
3+
size 5873

‎Packages/com.unity.multiplayer.samples.coop/Utilities/Net/RNSM/CustomNetStatsMonitorConfiguration.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.

‎Packages/com.unity.multiplayer.samples.coop/Utilities/Net/RNSM/NetStatsMonitorPrefab.prefab

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,14 @@ MonoBehaviour:
4848
m_Name:
4949
m_EditorClassIdentifier:
5050
m_Visible: 1
51-
<MaxRefreshRate>k__BackingField: 30
51+
m_MaxRefreshRate: 30
5252
<CustomStyleSheet>k__BackingField: {fileID: 0}
5353
<PanelSettingsOverride>k__BackingField: {fileID: 0}
5454
<Position>k__BackingField:
5555
<OverridePosition>k__BackingField: 1
56-
<PositionLeftToRight>k__BackingField: 0
57-
<PositionTopToBottom>k__BackingField: 0
58-
<Configuration>k__BackingField: {fileID: 11400000, guid: 8f1b4e3792d8446399527749cfb591a2, type: 2}
56+
m_PositionLeftToRight: 0
57+
m_PositionTopToBottom: 0
58+
<Configuration>k__BackingField: {fileID: 11400000, guid: e778574068db1456fa54fbbade3bd995, type: 2}
5959
--- !u!114 &2974514019541307266
6060
MonoBehaviour:
6161
m_ObjectHideFlags: 0
@@ -174,7 +174,7 @@ MonoBehaviour:
174174
m_faceColor:
175175
serializedVersion: 2
176176
rgba: 4294967295
177-
m_fontSize: 70.5
177+
m_fontSize: 32.05
178178
m_fontSizeBase: 21
179179
m_fontWeight: 400
180180
m_enableAutoSizing: 1

‎ProjectSettings/QualitySettings.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:c2066c036bfb90d628a4a151f2d8c5b2d80bd33f18f8cdce9b21fddf2c101cdc
2+
oid sha256:a6e88db416c8c4bd6e8dc3cf49115a3ecc2a384338961159ead30302f2cef37f
33
size 8255

0 commit comments

Comments
 (0)