Skip to content

Commit 4cef420

Browse files
fernando-cortezfernando-cortez
authored
Merge pull request #140 from Unity-Technologies/develop
release: Bitesize samples v1.4.0
2 parents f675409 + a661fe5 commit 4cef420

36 files changed

+508
-204
lines changed

‎.github/CODEOWNERS‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
2+
# Lines starting with '#' are comments.
3+
# Each line is a file pattern followed by one or more owners.
4+
5+
# More details are here: https://help.github.com/articles/about-codeowners/
6+
7+
# The '*' pattern is global owners.
8+
9+
# Order is important. The last matching pattern has the most precedence.
10+
# The folders are ordered as follows:
11+
12+
# In each subsection folders are ordered first by depth, then alphabetically.
13+
# This should make it easy to add new rules without breaking existing ones.
14+
15+
# Global rule:
16+
* @Unity-Technologies/mtt-samples-dev

‎Basic/2DSpaceShooter/Assets/Scripts/Asteroid.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ void Awake()
2424
Assert.IsNotNull(m_ObjectPool, $"{nameof(NetworkObjectPool)} not found in scene. Did you apply the {s_ObjectPoolTag} to the GameObject?");
2525
}
2626

27-
// Use this for initialization
2827
void Start()
2928
{
3029
numAsteroids += 1;
@@ -61,7 +60,7 @@ public void Explode()
6160
var go = m_ObjectPool.GetNetworkObject(asteroidPrefab, transform.position + diff, Quaternion.identity);
6261

6362
var asteroid = go.GetComponent<Asteroid>();
64-
asteroid.Size.Value = newSize;
63+
asteroid.Size = new NetworkVariable<int>(newSize);
6564
asteroid.asteroidPrefab = asteroidPrefab;
6665
go.GetComponent<NetworkObject>().Spawn();
6766
go.GetComponent<Rigidbody2D>().AddForce(diff * 10, ForceMode2D.Impulse);

‎Basic/2DSpaceShooter/Assets/Scripts/RandomPositionPlayerSpawner.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System;
2-
using System.Collections;
32
using System.Collections.Generic;
43
using Unity.Netcode;
54
using UnityEngine;

‎Basic/2DSpaceShooter/Assets/Scripts/Spawner.cs‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,16 +80,19 @@ void SpawnAsteroids()
8080
go.transform.position = new Vector3(Random.Range(-40, 40), Random.Range(-40, 40));
8181

8282
go.transform.localScale = new Vector3(4, 4, 4);
83-
go.GetComponent<Asteroid>().Size.Value = 4;
83+
84+
var asteroid = go.GetComponent<Asteroid>();
85+
asteroid.Size = new NetworkVariable<int>(4);
8486

8587
float dx = Random.Range(-40, 40) / 10.0f;
8688
float dy = Random.Range(-40, 40) / 10.0f;
8789
float dir = Random.Range(-40, 40);
8890
go.transform.rotation = Quaternion.Euler(0, 0, dir);
89-
go.GetComponent<Rigidbody2D>().angularVelocity = dir;
90-
go.GetComponent<Rigidbody2D>().velocity = new Vector2(dx, dy);
91-
go.GetComponent<Asteroid>().asteroidPrefab = m_AsteroidPrefab;
92-
go.GetComponent<NetworkObject>().Spawn( true); // TODO
91+
var rigidbody2D = go.GetComponent<Rigidbody2D>();
92+
rigidbody2D.angularVelocity = dir;
93+
rigidbody2D.velocity = new Vector2(dx, dy);
94+
asteroid.asteroidPrefab = m_AsteroidPrefab;
95+
asteroid.NetworkObject.Spawn(true);
9396
}
9497
}
9598

‎Basic/2DSpaceShooter/Assets/URP/UniversalRenderPipelineAsset_Renderer.asset‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ MonoBehaviour:
3939
type: 3}
4040
objectMotionVector: {fileID: 4800000, guid: 7b3ede40266cd49a395def176e1bc486,
4141
type: 3}
42+
dataDrivenLensFlare: {fileID: 4800000, guid: 6cda457ac28612740adb23da5d39ea92,
43+
type: 3}
4244
m_AssetVersion: 2
4345
m_OpaqueLayerMask:
4446
serializedVersion: 2

‎Basic/2DSpaceShooter/Packages/manifest.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
{
22
"dependencies": {
33
"com.unity.2d.sprite": "1.0.0",
4-
"com.unity.ai.navigation": "1.1.3",
5-
"com.unity.collab-proxy": "2.0.4",
6-
"com.unity.ide.rider": "3.0.21",
4+
"com.unity.ai.navigation": "1.1.4",
5+
"com.unity.collab-proxy": "2.0.7",
6+
"com.unity.ide.rider": "3.0.24",
77
"com.unity.ide.visualstudio": "2.0.18",
88
"com.unity.ide.vscode": "1.2.5",
9-
"com.unity.multiplayer.samples.coop": "https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop.git?path=/Packages/com.unity.multiplayer.samples.coop#v2.2.0",
10-
"com.unity.netcode.gameobjects": "1.4.0",
9+
"com.unity.multiplayer.samples.coop": "https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop.git?path=/Packages/com.unity.multiplayer.samples.coop#v2.3.0",
10+
"com.unity.netcode.gameobjects": "1.6.0",
1111
"com.unity.postprocessing": "3.2.2",
12-
"com.unity.render-pipelines.universal": "14.0.7",
12+
"com.unity.render-pipelines.universal": "14.0.8",
1313
"com.unity.test-framework": "1.1.33",
1414
"com.unity.textmeshpro": "3.0.6",
15-
"com.unity.timeline": "1.7.4",
15+
"com.unity.timeline": "1.7.5",
1616
"com.unity.ugui": "1.0.0",
1717
"com.veriorpies.parrelsync": "https://github.com/VeriorPies/ParrelSync.git?path=/ParrelSync#bb3d5067e49e403d8b8ba15c036d313b4dd2c696",
1818
"com.unity.modules.ai": "1.0.0",

‎Basic/2DSpaceShooter/Packages/packages-lock.json‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"dependencies": {}
88
},
99
"com.unity.ai.navigation": {
10-
"version": "1.1.3",
10+
"version": "1.1.4",
1111
"depth": 0,
1212
"source": "registry",
1313
"dependencies": {
@@ -16,7 +16,7 @@
1616
"url": "https://packages.unity.com"
1717
},
1818
"com.unity.burst": {
19-
"version": "1.8.4",
19+
"version": "1.8.8",
2020
"depth": 1,
2121
"source": "registry",
2222
"dependencies": {
@@ -25,7 +25,7 @@
2525
"url": "https://packages.unity.com"
2626
},
2727
"com.unity.collab-proxy": {
28-
"version": "2.0.4",
28+
"version": "2.0.7",
2929
"depth": 0,
3030
"source": "registry",
3131
"dependencies": {},
@@ -56,7 +56,7 @@
5656
"url": "https://packages.unity.com"
5757
},
5858
"com.unity.ide.rider": {
59-
"version": "3.0.21",
59+
"version": "3.0.24",
6060
"depth": 0,
6161
"source": "registry",
6262
"dependencies": {
@@ -98,16 +98,16 @@
9898
"url": "https://packages.unity.com"
9999
},
100100
"com.unity.multiplayer.samples.coop": {
101-
"version": "https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop.git?path=/Packages/com.unity.multiplayer.samples.coop#v2.2.0",
101+
"version": "https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop.git?path=/Packages/com.unity.multiplayer.samples.coop#v2.3.0",
102102
"depth": 0,
103103
"source": "git",
104104
"dependencies": {
105-
"com.unity.learn.iet-framework": "1.2.1",
105+
"com.unity.learn.iet-framework": "3.1.3",
106106
"com.unity.multiplayer.tools": "1.1.0",
107-
"com.unity.netcode.gameobjects": "1.4.0",
108-
"com.unity.services.relay": "1.0.3"
107+
"com.unity.netcode.gameobjects": "1.6.0",
108+
"com.unity.services.relay": "1.0.5"
109109
},
110-
"hash": "0cd402eaea1969d4e9f894a5bc6c90432e12ab02"
110+
"hash": "a93b8cee21c60b890838405bb629d245cfae30e6"
111111
},
112112
"com.unity.multiplayer.tools": {
113113
"version": "1.1.0",
@@ -123,12 +123,12 @@
123123
"url": "https://packages.unity.com"
124124
},
125125
"com.unity.netcode.gameobjects": {
126-
"version": "1.4.0",
126+
"version": "1.6.0",
127127
"depth": 0,
128128
"source": "registry",
129129
"dependencies": {
130130
"com.unity.nuget.mono-cecil": "1.10.1",
131-
"com.unity.transport": "1.3.3"
131+
"com.unity.transport": "1.3.4"
132132
},
133133
"url": "https://packages.unity.com"
134134
},
@@ -163,7 +163,7 @@
163163
"url": "https://packages.unity.com"
164164
},
165165
"com.unity.render-pipelines.core": {
166-
"version": "14.0.7",
166+
"version": "14.0.8",
167167
"depth": 1,
168168
"source": "builtin",
169169
"dependencies": {
@@ -174,14 +174,14 @@
174174
}
175175
},
176176
"com.unity.render-pipelines.universal": {
177-
"version": "14.0.7",
177+
"version": "14.0.8",
178178
"depth": 0,
179179
"source": "builtin",
180180
"dependencies": {
181181
"com.unity.mathematics": "1.2.1",
182182
"com.unity.burst": "1.8.4",
183-
"com.unity.render-pipelines.core": "14.0.7",
184-
"com.unity.shadergraph": "14.0.7"
183+
"com.unity.render-pipelines.core": "14.0.8",
184+
"com.unity.shadergraph": "14.0.8"
185185
}
186186
},
187187
"com.unity.searcher": {
@@ -192,19 +192,19 @@
192192
"url": "https://packages.unity.com"
193193
},
194194
"com.unity.services.authentication": {
195-
"version": "2.5.0",
195+
"version": "2.7.2",
196196
"depth": 2,
197197
"source": "registry",
198198
"dependencies": {
199199
"com.unity.nuget.newtonsoft-json": "3.2.1",
200-
"com.unity.services.core": "1.9.0",
200+
"com.unity.services.core": "1.10.1",
201201
"com.unity.modules.unitywebrequest": "1.0.0",
202202
"com.unity.ugui": "1.0.0"
203203
},
204204
"url": "https://packages.unity.com"
205205
},
206206
"com.unity.services.core": {
207-
"version": "1.9.0",
207+
"version": "1.11.0",
208208
"depth": 2,
209209
"source": "registry",
210210
"dependencies": {
@@ -215,7 +215,7 @@
215215
"url": "https://packages.unity.com"
216216
},
217217
"com.unity.services.qos": {
218-
"version": "1.2.0",
218+
"version": "1.2.1",
219219
"depth": 2,
220220
"source": "registry",
221221
"dependencies": {
@@ -253,11 +253,11 @@
253253
"url": "https://packages.unity.com"
254254
},
255255
"com.unity.shadergraph": {
256-
"version": "14.0.7",
256+
"version": "14.0.8",
257257
"depth": 1,
258258
"source": "builtin",
259259
"dependencies": {
260-
"com.unity.render-pipelines.core": "14.0.7",
260+
"com.unity.render-pipelines.core": "14.0.8",
261261
"com.unity.searcher": "4.9.2"
262262
}
263263
},
@@ -282,7 +282,7 @@
282282
"url": "https://packages.unity.com"
283283
},
284284
"com.unity.timeline": {
285-
"version": "1.7.4",
285+
"version": "1.7.5",
286286
"depth": 0,
287287
"source": "registry",
288288
"dependencies": {

‎Basic/2DSpaceShooter/ProjectSettings/NetcodeForGameObjects.asset‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &1
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 53
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: 2727d53a542a4c1aa312905c3a02d807, type: 3}
13+
m_Name:
14+
m_EditorClassIdentifier:
15+
NetworkPrefabsPath: Assets/DefaultNetworkPrefabs.asset
16+
TempNetworkPrefabsPath: Assets/DefaultNetworkPrefabs.asset
17+
GenerateDefaultNetworkPrefabs: 0

‎Basic/2DSpaceShooter/ProjectSettings/ProjectSettings.asset‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ PlayerSettings:
8686
hideHomeButton: 0
8787
submitAnalytics: 1
8888
usePlayerLog: 1
89+
dedicatedServerOptimizations: 0
8990
bakeCollisionMeshes: 0
9091
forceSingleInstance: 0
9192
useFlipModelSwapchain: 1
@@ -125,6 +126,7 @@ PlayerSettings:
125126
switchNVNMaxPublicTextureIDCount: 0
126127
switchNVNMaxPublicSamplerIDCount: 0
127128
switchNVNGraphicsFirmwareMemory: 32
129+
switchMaxWorkerMultiple: 8
128130
stadiaPresentMode: 0
129131
stadiaTargetFramerate: 0
130132
vulkanNumSwapchainBuffers: 3
@@ -133,7 +135,7 @@ PlayerSettings:
133135
vulkanEnableLateAcquireNextImage: 0
134136
vulkanEnableCommandBufferRecycling: 1
135137
loadStoreDebugModeEnabled: 0
136-
bundleVersion: 1.2.1
138+
bundleVersion: 1.4.0
137139
preloadedAssets: []
138140
metroInputSource: 1
139141
wsaTransparentSwapchain: 0
@@ -160,6 +162,7 @@ PlayerSettings:
160162
tvOS: com.Company.ProductName
161163
buildNumber:
162164
Standalone: 0
165+
VisionOS: 0
163166
iPhone: 0
164167
tvOS: 0
165168
overrideDefaultApplicationIdentifier: 0
@@ -184,6 +187,8 @@ PlayerSettings:
184187
tvOSSdkVersion: 0
185188
tvOSRequireExtendedGameController: 0
186189
tvOSTargetOSVersionString: 12.0
190+
VisionOSSdkVersion: 0
191+
VisionOSTargetOSVersionString: 1.0
187192
uIPrerenderedIcon: 0
188193
uIRequiresPersistentWiFi: 0
189194
uIRequiresFullScreen: 1
@@ -231,8 +236,10 @@ PlayerSettings:
231236
appleDeveloperTeamID:
232237
iOSManualSigningProvisioningProfileID:
233238
tvOSManualSigningProvisioningProfileID:
239+
VisionOSManualSigningProvisioningProfileID:
234240
iOSManualSigningProvisioningProfileType: 0
235241
tvOSManualSigningProvisioningProfileType: 0
242+
VisionOSManualSigningProvisioningProfileType: 0
236243
appleEnableAutomaticSigning: 0
237244
iOSRequireARKit: 0
238245
iOSAutomaticallyDetectAndAddCapabilities: 1
@@ -817,6 +824,7 @@ PlayerSettings:
817824
QNX: UNITY_POST_PROCESSING_STACK_V2
818825
Stadia: UNITY_POST_PROCESSING_STACK_V2
819826
Standalone: UNITY_POST_PROCESSING_STACK_V2
827+
VisionOS: UNITY_POST_PROCESSING_STACK_V2
820828
WebGL: UNITY_POST_PROCESSING_STACK_V2
821829
Windows Store Apps: UNITY_POST_PROCESSING_STACK_V2
822830
XboxOne: UNITY_POST_PROCESSING_STACK_V2
@@ -845,7 +853,6 @@ PlayerSettings:
845853
suppressCommonWarnings: 1
846854
allowUnsafeCode: 0
847855
useDeterministicCompilation: 1
848-
selectedPlatform: 0
849856
additionalIl2CppArgs:
850857
scriptingRuntimeVersion: 1
851858
gcIncremental: 1

‎Basic/2DSpaceShooter/ProjectSettings/ProjectVersion.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 2022.3.0f1
2-
m_EditorVersionWithRevision: 2022.3.0f1 (fb119bb0b476)
1+
m_EditorVersion: 2022.3.9f1
2+
m_EditorVersionWithRevision: 2022.3.9f1 (ea401c316338)

0 commit comments

Comments
 (0)