diff --git a/Basic/2DSpaceShooter/Assets/Scripts/Powerup.cs b/Basic/2DSpaceShooter/Assets/Scripts/Powerup.cs index 5a1e5a577..ecb84e322 100644 --- a/Basic/2DSpaceShooter/Assets/Scripts/Powerup.cs +++ b/Basic/2DSpaceShooter/Assets/Scripts/Powerup.cs @@ -61,21 +61,14 @@ public override void OnNetworkSpawn() { OnStartServer(); } - Color buffColor = Buff.buffColors[(int)buffType.Value]; - GetComponent().material.color = buffColor; - m_PowerUpGlow.material.SetColor("_Color", buffColor); - m_PowerUpGlow.material.SetColor("_EmissiveColor", buffColor); - m_PowerUpGlow2.material.SetColor("_Color", buffColor); - m_PowerUpGlow2.material.SetColor("_EmissiveColor", buffColor); - - m_PowerUpLabel.text = buffType.Value.ToString().ToUpper(); - - if (buffType.Value == Buff.BuffType.QuadDamage) - { - m_PowerUpLabel.text = "Quad Damage"; - } - m_PowerUpLabel.style.color = buffColor; + UpdateVisuals(buffType.Value); + buffType.OnValueChanged += OnBuffTypeChanged; + } + + public override void OnNetworkDespawn() + { + buffType.OnValueChanged -= OnBuffTypeChanged; } void OnStartClient() @@ -94,6 +87,30 @@ void OnStartServer() { numPowerUps += 1; } + + void OnBuffTypeChanged(Buff.BuffType previousValue, Buff.BuffType newValue) + { + UpdateVisuals(newValue); + } + + void UpdateVisuals(Buff.BuffType buffType) + { + var buffColor = Buff.buffColors[(int)buffType]; + GetComponent().material.color = buffColor; + m_PowerUpGlow.material.SetColor("_Color", buffColor); + m_PowerUpGlow.material.SetColor("_EmissiveColor", buffColor); + m_PowerUpGlow2.material.SetColor("_Color", buffColor); + m_PowerUpGlow2.material.SetColor("_EmissiveColor", buffColor); + + m_PowerUpLabel.text = buffType.ToString().ToUpper(); + + if (buffType == Buff.BuffType.QuadDamage) + { + m_PowerUpLabel.text = "Quad Damage"; + } + + m_PowerUpLabel.style.color = buffColor; + } void LateUpdate() { diff --git a/Basic/2DSpaceShooter/Packages/manifest.json b/Basic/2DSpaceShooter/Packages/manifest.json index 2e82c1a55..75095271d 100644 --- a/Basic/2DSpaceShooter/Packages/manifest.json +++ b/Basic/2DSpaceShooter/Packages/manifest.json @@ -1,18 +1,19 @@ { "dependencies": { "com.unity.2d.sprite": "1.0.0", - "com.unity.collab-proxy": "1.17.7", - "com.unity.ide.rider": "3.0.16", - "com.unity.ide.visualstudio": "2.0.16", + "com.unity.collab-proxy": "2.0.0", + "com.unity.ide.rider": "3.0.18", + "com.unity.ide.visualstudio": "2.0.17", "com.unity.ide.vscode": "1.2.5", "com.unity.multiplayer.samples.coop": "https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop.git?path=/Packages/com.unity.multiplayer.samples.coop", "com.unity.netcode.gameobjects": "1.2.0", "com.unity.postprocessing": "3.2.2", - "com.unity.render-pipelines.universal": "12.1.8", + "com.unity.render-pipelines.universal": "12.1.10", "com.unity.test-framework": "1.1.31", "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.6.4", "com.unity.ugui": "1.0.0", + "com.veriorpies.parrelsync": "https://github.com/VeriorPies/ParrelSync.git?path=/ParrelSync#bb3d5067e49e403d8b8ba15c036d313b4dd2c696", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/Basic/2DSpaceShooter/Packages/packages-lock.json b/Basic/2DSpaceShooter/Packages/packages-lock.json index 48bfe9353..ba77b0e5c 100644 --- a/Basic/2DSpaceShooter/Packages/packages-lock.json +++ b/Basic/2DSpaceShooter/Packages/packages-lock.json @@ -7,7 +7,7 @@ "dependencies": {} }, "com.unity.burst": { - "version": "1.7.3", + "version": "1.8.2", "depth": 1, "source": "registry", "dependencies": { @@ -16,12 +16,10 @@ "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "1.17.7", + "version": "2.0.0", "depth": 0, "source": "registry", - "dependencies": { - "com.unity.services.core": "1.0.1" - }, + "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.collections": { @@ -49,7 +47,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.16", + "version": "3.0.18", "depth": 0, "source": "registry", "dependencies": { @@ -58,7 +56,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.16", + "version": "2.0.17", "depth": 0, "source": "registry", "dependencies": { @@ -74,7 +72,7 @@ "url": "https://packages.unity.com" }, "com.unity.learn.iet-framework": { - "version": "2.2.2", + "version": "3.1.1", "depth": 1, "source": "registry", "dependencies": { @@ -156,7 +154,7 @@ "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "12.1.8", + "version": "12.1.10", "depth": 1, "source": "builtin", "dependencies": { @@ -166,14 +164,14 @@ } }, "com.unity.render-pipelines.universal": { - "version": "12.1.8", + "version": "12.1.10", "depth": 0, "source": "builtin", "dependencies": { "com.unity.mathematics": "1.2.1", - "com.unity.burst": "1.7.3", - "com.unity.render-pipelines.core": "12.1.8", - "com.unity.shadergraph": "12.1.8" + "com.unity.burst": "1.8.2", + "com.unity.render-pipelines.core": "12.1.10", + "com.unity.shadergraph": "12.1.10" } }, "com.unity.searcher": { @@ -184,20 +182,20 @@ "url": "https://packages.unity.com" }, "com.unity.services.authentication": { - "version": "2.3.1", + "version": "2.4.0", "depth": 2, "source": "registry", "dependencies": { "com.unity.nuget.newtonsoft-json": "3.0.2", - "com.unity.services.core": "1.4.3", + "com.unity.services.core": "1.7.0", "com.unity.modules.unitywebrequest": "1.0.0", "com.unity.ugui": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.services.core": { - "version": "1.6.0", - "depth": 1, + "version": "1.7.0", + "depth": 2, "source": "registry", "dependencies": { "com.unity.modules.unitywebrequest": "1.0.0", @@ -207,7 +205,7 @@ "url": "https://packages.unity.com" }, "com.unity.services.qos": { - "version": "1.0.1", + "version": "1.1.0", "depth": 2, "source": "registry", "dependencies": { @@ -215,25 +213,25 @@ "com.unity.modules.unitywebrequest": "1.0.0", "com.unity.nuget.newtonsoft-json": "3.0.2", "com.unity.services.authentication": "2.0.0", - "com.unity.collections": "1.2.3" + "com.unity.collections": "1.2.4" }, "url": "https://packages.unity.com" }, "com.unity.services.relay": { - "version": "1.0.3", + "version": "1.0.5", "depth": 1, "source": "registry", "dependencies": { "com.unity.services.core": "1.4.0", "com.unity.services.authentication": "2.0.0", - "com.unity.services.qos": "1.0.1", + "com.unity.services.qos": "1.1.0", "com.unity.modules.unitywebrequest": "1.0.0", "com.unity.modules.unitywebrequestassetbundle": "1.0.0", "com.unity.modules.unitywebrequestaudio": "1.0.0", "com.unity.modules.unitywebrequesttexture": "1.0.0", "com.unity.modules.unitywebrequestwww": "1.0.0", "com.unity.nuget.newtonsoft-json": "3.0.2", - "com.unity.transport": "1.0.0" + "com.unity.transport": "1.3.0" }, "url": "https://packages.unity.com" }, @@ -245,11 +243,11 @@ "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "12.1.8", + "version": "12.1.10", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "12.1.8", + "com.unity.render-pipelines.core": "12.1.10", "com.unity.searcher": "4.9.1" } }, @@ -286,7 +284,7 @@ "url": "https://packages.unity.com" }, "com.unity.transport": { - "version": "1.3.0", + "version": "1.3.1", "depth": 1, "source": "registry", "dependencies": { @@ -305,6 +303,13 @@ "com.unity.modules.imgui": "1.0.0" } }, + "com.veriorpies.parrelsync": { + "version": "https://github.com/VeriorPies/ParrelSync.git?path=/ParrelSync#bb3d5067e49e403d8b8ba15c036d313b4dd2c696", + "depth": 0, + "source": "git", + "dependencies": {}, + "hash": "bb3d5067e49e403d8b8ba15c036d313b4dd2c696" + }, "com.unity.modules.ai": { "version": "1.0.0", "depth": 0, diff --git a/Basic/2DSpaceShooter/ProjectSettings/ProjectVersion.txt b/Basic/2DSpaceShooter/ProjectSettings/ProjectVersion.txt index eabd63377..61bfe8aab 100644 --- a/Basic/2DSpaceShooter/ProjectSettings/ProjectVersion.txt +++ b/Basic/2DSpaceShooter/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.15f1 -m_EditorVersionWithRevision: 2021.3.15f1 (e8e88683f834) +m_EditorVersion: 2021.3.18f1 +m_EditorVersionWithRevision: 2021.3.18f1 (3129e69bc0c7) diff --git a/Basic/ClientDriven/Assets/StarterAssets/TutorialInfo.meta b/Basic/ClientDriven/Assets/StarterAssets/TutorialInfo.meta deleted file mode 100644 index 32cf2dbc4..000000000 --- a/Basic/ClientDriven/Assets/StarterAssets/TutorialInfo.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d9b1ba53f81715d4a8405a40b0a1e2c1 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Basic/ClientDriven/Assets/StarterAssets/TutorialInfo/Icons.meta b/Basic/ClientDriven/Assets/StarterAssets/TutorialInfo/Icons.meta deleted file mode 100644 index 1cf0f7df1..000000000 --- a/Basic/ClientDriven/Assets/StarterAssets/TutorialInfo/Icons.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: bf2b09552ecf8f04294975e07f8da67e -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Basic/ClientDriven/Assets/StarterAssets/TutorialInfo/Icons/ReadMeImg.PNG b/Basic/ClientDriven/Assets/StarterAssets/TutorialInfo/Icons/ReadMeImg.PNG deleted file mode 100644 index 3e36294e6..000000000 Binary files a/Basic/ClientDriven/Assets/StarterAssets/TutorialInfo/Icons/ReadMeImg.PNG and /dev/null differ diff --git a/Basic/ClientDriven/Assets/StarterAssets/TutorialInfo/Icons/ReadMeImg.PNG.meta b/Basic/ClientDriven/Assets/StarterAssets/TutorialInfo/Icons/ReadMeImg.PNG.meta deleted file mode 100644 index bdf1d4230..000000000 --- a/Basic/ClientDriven/Assets/StarterAssets/TutorialInfo/Icons/ReadMeImg.PNG.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: 44a17a5b205fcd349a24700e6f5615bd -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Basic/ClientDriven/Assets/StarterAssets/TutorialInfo/Scripts.meta b/Basic/ClientDriven/Assets/StarterAssets/TutorialInfo/Scripts.meta deleted file mode 100644 index 30786fad7..000000000 --- a/Basic/ClientDriven/Assets/StarterAssets/TutorialInfo/Scripts.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 00e1a3ea601874740b954664a078e551 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Basic/ClientDriven/Assets/StarterAssets/TutorialInfo/Scripts/Editor.meta b/Basic/ClientDriven/Assets/StarterAssets/TutorialInfo/Scripts/Editor.meta deleted file mode 100644 index 2b590d91a..000000000 --- a/Basic/ClientDriven/Assets/StarterAssets/TutorialInfo/Scripts/Editor.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 254f8f69c2bb6464cbd208f418928aab -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Basic/ClientDriven/Packages/manifest.json b/Basic/ClientDriven/Packages/manifest.json index 10aceeacf..b4ea9b4c2 100644 --- a/Basic/ClientDriven/Packages/manifest.json +++ b/Basic/ClientDriven/Packages/manifest.json @@ -1,14 +1,14 @@ { "dependencies": { "com.unity.cinemachine": "2.8.9", - "com.unity.collab-proxy": "1.17.7", - "com.unity.ide.rider": "3.0.16", - "com.unity.ide.visualstudio": "2.0.16", + "com.unity.collab-proxy": "2.0.0", + "com.unity.ide.rider": "3.0.18", + "com.unity.ide.visualstudio": "2.0.17", "com.unity.ide.vscode": "1.2.5", "com.unity.inputsystem": "1.4.4", "com.unity.multiplayer.samples.coop": "https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop.git?path=/Packages/com.unity.multiplayer.samples.coop", "com.unity.netcode.gameobjects": "1.2.0", - "com.unity.render-pipelines.universal": "12.1.8", + "com.unity.render-pipelines.universal": "12.1.10", "com.unity.test-framework": "1.1.31", "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.6.4", diff --git a/Basic/ClientDriven/Packages/packages-lock.json b/Basic/ClientDriven/Packages/packages-lock.json index d7b1ef16b..3527b012a 100644 --- a/Basic/ClientDriven/Packages/packages-lock.json +++ b/Basic/ClientDriven/Packages/packages-lock.json @@ -1,7 +1,7 @@ { "dependencies": { "com.unity.burst": { - "version": "1.7.3", + "version": "1.8.2", "depth": 1, "source": "registry", "dependencies": { @@ -19,12 +19,10 @@ "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "1.17.7", + "version": "2.0.0", "depth": 0, "source": "registry", - "dependencies": { - "com.unity.services.core": "1.0.1" - }, + "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.collections": { @@ -52,7 +50,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.16", + "version": "3.0.18", "depth": 0, "source": "registry", "dependencies": { @@ -61,7 +59,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.16", + "version": "2.0.17", "depth": 0, "source": "registry", "dependencies": { @@ -86,7 +84,7 @@ "url": "https://packages.unity.com" }, "com.unity.learn.iet-framework": { - "version": "2.2.2", + "version": "3.1.1", "depth": 1, "source": "registry", "dependencies": { @@ -159,7 +157,7 @@ "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "12.1.8", + "version": "12.1.10", "depth": 1, "source": "builtin", "dependencies": { @@ -169,14 +167,14 @@ } }, "com.unity.render-pipelines.universal": { - "version": "12.1.8", + "version": "12.1.10", "depth": 0, "source": "builtin", "dependencies": { "com.unity.mathematics": "1.2.1", - "com.unity.burst": "1.7.3", - "com.unity.render-pipelines.core": "12.1.8", - "com.unity.shadergraph": "12.1.8" + "com.unity.burst": "1.8.2", + "com.unity.render-pipelines.core": "12.1.10", + "com.unity.shadergraph": "12.1.10" } }, "com.unity.searcher": { @@ -187,20 +185,20 @@ "url": "https://packages.unity.com" }, "com.unity.services.authentication": { - "version": "2.3.1", + "version": "2.4.0", "depth": 2, "source": "registry", "dependencies": { "com.unity.nuget.newtonsoft-json": "3.0.2", - "com.unity.services.core": "1.4.3", + "com.unity.services.core": "1.7.0", "com.unity.modules.unitywebrequest": "1.0.0", "com.unity.ugui": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.services.core": { - "version": "1.6.0", - "depth": 1, + "version": "1.7.0", + "depth": 2, "source": "registry", "dependencies": { "com.unity.modules.unitywebrequest": "1.0.0", @@ -210,7 +208,7 @@ "url": "https://packages.unity.com" }, "com.unity.services.qos": { - "version": "1.0.1", + "version": "1.1.0", "depth": 2, "source": "registry", "dependencies": { @@ -218,25 +216,25 @@ "com.unity.modules.unitywebrequest": "1.0.0", "com.unity.nuget.newtonsoft-json": "3.0.2", "com.unity.services.authentication": "2.0.0", - "com.unity.collections": "1.2.3" + "com.unity.collections": "1.2.4" }, "url": "https://packages.unity.com" }, "com.unity.services.relay": { - "version": "1.0.3", + "version": "1.0.5", "depth": 1, "source": "registry", "dependencies": { "com.unity.services.core": "1.4.0", "com.unity.services.authentication": "2.0.0", - "com.unity.services.qos": "1.0.1", + "com.unity.services.qos": "1.1.0", "com.unity.modules.unitywebrequest": "1.0.0", "com.unity.modules.unitywebrequestassetbundle": "1.0.0", "com.unity.modules.unitywebrequestaudio": "1.0.0", "com.unity.modules.unitywebrequesttexture": "1.0.0", "com.unity.modules.unitywebrequestwww": "1.0.0", "com.unity.nuget.newtonsoft-json": "3.0.2", - "com.unity.transport": "1.0.0" + "com.unity.transport": "1.3.0" }, "url": "https://packages.unity.com" }, @@ -248,11 +246,11 @@ "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "12.1.8", + "version": "12.1.10", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "12.1.8", + "com.unity.render-pipelines.core": "12.1.10", "com.unity.searcher": "4.9.1" } }, @@ -289,7 +287,7 @@ "url": "https://packages.unity.com" }, "com.unity.transport": { - "version": "1.3.0", + "version": "1.3.1", "depth": 1, "source": "registry", "dependencies": { diff --git a/Basic/ClientDriven/ProjectSettings/ProjectVersion.txt b/Basic/ClientDriven/ProjectSettings/ProjectVersion.txt index eabd63377..61bfe8aab 100644 --- a/Basic/ClientDriven/ProjectSettings/ProjectVersion.txt +++ b/Basic/ClientDriven/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.15f1 -m_EditorVersionWithRevision: 2021.3.15f1 (e8e88683f834) +m_EditorVersion: 2021.3.18f1 +m_EditorVersionWithRevision: 2021.3.18f1 (3129e69bc0c7) diff --git a/Basic/Invaders/Packages/manifest.json b/Basic/Invaders/Packages/manifest.json index d869b42aa..7da9f3478 100644 --- a/Basic/Invaders/Packages/manifest.json +++ b/Basic/Invaders/Packages/manifest.json @@ -1,16 +1,17 @@ { "dependencies": { "com.unity.2d.sprite": "1.0.0", - "com.unity.ide.rider": "3.0.16", - "com.unity.ide.visualstudio": "2.0.16", + "com.unity.ide.rider": "3.0.18", + "com.unity.ide.visualstudio": "2.0.17", "com.unity.ide.vscode": "1.2.5", "com.unity.multiplayer.samples.coop": "https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop.git?path=/Packages/com.unity.multiplayer.samples.coop", "com.unity.multiplayer.tools": "1.0.0", "com.unity.netcode.gameobjects": "1.2.0", - "com.unity.render-pipelines.universal": "12.1.8", + "com.unity.render-pipelines.universal": "12.1.10", "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.6.4", "com.unity.ugui": "1.0.0", + "com.veriorpies.parrelsync": "https://github.com/VeriorPies/ParrelSync.git?path=/ParrelSync#bb3d5067e49e403d8b8ba15c036d313b4dd2c696", "com.unity.modules.ai": "1.0.0", "com.unity.modules.animation": "1.0.0", "com.unity.modules.audio": "1.0.0", diff --git a/Basic/Invaders/Packages/packages-lock.json b/Basic/Invaders/Packages/packages-lock.json index 8b9e029fa..14c48be87 100644 --- a/Basic/Invaders/Packages/packages-lock.json +++ b/Basic/Invaders/Packages/packages-lock.json @@ -7,7 +7,7 @@ "dependencies": {} }, "com.unity.burst": { - "version": "1.7.3", + "version": "1.8.2", "depth": 1, "source": "registry", "dependencies": { @@ -40,7 +40,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.16", + "version": "3.0.18", "depth": 0, "source": "registry", "dependencies": { @@ -49,7 +49,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.16", + "version": "2.0.17", "depth": 0, "source": "registry", "dependencies": { @@ -65,7 +65,7 @@ "url": "https://packages.unity.com" }, "com.unity.learn.iet-framework": { - "version": "2.2.2", + "version": "3.1.1", "depth": 1, "source": "registry", "dependencies": { @@ -138,7 +138,7 @@ "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "12.1.8", + "version": "12.1.10", "depth": 1, "source": "builtin", "dependencies": { @@ -148,14 +148,14 @@ } }, "com.unity.render-pipelines.universal": { - "version": "12.1.8", + "version": "12.1.10", "depth": 0, "source": "builtin", "dependencies": { "com.unity.mathematics": "1.2.1", - "com.unity.burst": "1.7.3", - "com.unity.render-pipelines.core": "12.1.8", - "com.unity.shadergraph": "12.1.8" + "com.unity.burst": "1.8.2", + "com.unity.render-pipelines.core": "12.1.10", + "com.unity.shadergraph": "12.1.10" } }, "com.unity.searcher": { @@ -166,19 +166,19 @@ "url": "https://packages.unity.com" }, "com.unity.services.authentication": { - "version": "2.3.1", + "version": "2.4.0", "depth": 2, "source": "registry", "dependencies": { "com.unity.nuget.newtonsoft-json": "3.0.2", - "com.unity.services.core": "1.4.3", + "com.unity.services.core": "1.7.0", "com.unity.modules.unitywebrequest": "1.0.0", "com.unity.ugui": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.services.core": { - "version": "1.6.0", + "version": "1.7.0", "depth": 2, "source": "registry", "dependencies": { @@ -189,7 +189,7 @@ "url": "https://packages.unity.com" }, "com.unity.services.qos": { - "version": "1.0.1", + "version": "1.1.0", "depth": 2, "source": "registry", "dependencies": { @@ -197,25 +197,25 @@ "com.unity.modules.unitywebrequest": "1.0.0", "com.unity.nuget.newtonsoft-json": "3.0.2", "com.unity.services.authentication": "2.0.0", - "com.unity.collections": "1.2.3" + "com.unity.collections": "1.2.4" }, "url": "https://packages.unity.com" }, "com.unity.services.relay": { - "version": "1.0.3", + "version": "1.0.5", "depth": 1, "source": "registry", "dependencies": { "com.unity.services.core": "1.4.0", "com.unity.services.authentication": "2.0.0", - "com.unity.services.qos": "1.0.1", + "com.unity.services.qos": "1.1.0", "com.unity.modules.unitywebrequest": "1.0.0", "com.unity.modules.unitywebrequestassetbundle": "1.0.0", "com.unity.modules.unitywebrequestaudio": "1.0.0", "com.unity.modules.unitywebrequesttexture": "1.0.0", "com.unity.modules.unitywebrequestwww": "1.0.0", "com.unity.nuget.newtonsoft-json": "3.0.2", - "com.unity.transport": "1.0.0" + "com.unity.transport": "1.3.0" }, "url": "https://packages.unity.com" }, @@ -227,11 +227,11 @@ "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "12.1.8", + "version": "12.1.10", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "12.1.8", + "com.unity.render-pipelines.core": "12.1.10", "com.unity.searcher": "4.9.1" } }, @@ -268,7 +268,7 @@ "url": "https://packages.unity.com" }, "com.unity.transport": { - "version": "1.3.0", + "version": "1.3.1", "depth": 1, "source": "registry", "dependencies": { @@ -287,6 +287,13 @@ "com.unity.modules.imgui": "1.0.0" } }, + "com.veriorpies.parrelsync": { + "version": "https://github.com/VeriorPies/ParrelSync.git?path=/ParrelSync#bb3d5067e49e403d8b8ba15c036d313b4dd2c696", + "depth": 0, + "source": "git", + "dependencies": {}, + "hash": "bb3d5067e49e403d8b8ba15c036d313b4dd2c696" + }, "com.unity.modules.ai": { "version": "1.0.0", "depth": 0, diff --git a/Basic/Invaders/ProjectSettings/ProjectVersion.txt b/Basic/Invaders/ProjectSettings/ProjectVersion.txt index eabd63377..61bfe8aab 100644 --- a/Basic/Invaders/ProjectSettings/ProjectVersion.txt +++ b/Basic/Invaders/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.15f1 -m_EditorVersionWithRevision: 2021.3.15f1 (e8e88683f834) +m_EditorVersion: 2021.3.18f1 +m_EditorVersionWithRevision: 2021.3.18f1 (3129e69bc0c7) diff --git a/CHANGELOG.md b/CHANGELOG.md index 49cb8c17e..5e74b8e2b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,26 @@ ### 2DSpaceShooter -### Fixed +#### Fixed +- Resolved issue where the colour of powerups was not displayed correctly (#91) + +#### Changed +- Upgraded sample to 2021.3.18f1 LTS (#91) + +### Client Driven + +#### Changed +- Upgraded sample to 2021.3.18f1 LTS (#91) + +### Invaders + +#### Changed +- Upgraded sample to 2021.3.18f1 LTS (#91) + + +### 2DSpaceShooter + +#### Fixed - Removing warning when spawning powerups (#90). Fixed the order in which powerups were spawned and when their NetworkVariable value was initialized. Now they are spawned beforehand. - Fixing bullet explosion desync (#89). Bullet explosion vfx were happening too early on clients because of NetworkTransform's interpolation. Bullets are now no longer synchronised by NetworkTransforms and instead only have their velocity set through client rpcs when they are spawned. Since they are no longer interpolated, they are not lagging behind the server and are at the correct position when they receive the despawn message from the server. @@ -41,7 +60,7 @@ ### Invaders -### Fixed +#### Fixed - Fixing NotServerException [MTT-4029] (#59) - Despawning enemies instead of destroying them (#74)