From 2d85a08f0dba5d9141909bd16b96e5d4388f9b9b Mon Sep 17 00:00:00 2001 From: Kriszta Gombos Date: Mon, 16 Jan 2023 15:47:10 +0200 Subject: [PATCH 01/28] added yml --- RollABall/.github/workflows.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 RollABall/.github/workflows.yml diff --git a/RollABall/.github/workflows.yml b/RollABall/.github/workflows.yml new file mode 100644 index 0000000..bd5636f --- /dev/null +++ b/RollABall/.github/workflows.yml @@ -0,0 +1,22 @@ +name: Build Roll a Ball with NIS +on: + push: + workflow_dispatch: + +jobs: + build-macOS: + runs-on: [self-hosted, macOS] + steps: + - uses: actions/checkout@v3 + + - run: | + $UNITY_2021_3_HOME -batchmode -stackTraceLogType None -projectPath $CI_PROJECT_DIR -executeMethod Altom.AltTesterTools.BuildAltTester.MacBuildFromCommandLine -logFile buildMac.log -quit + + - run: ls + - uses: actions/upload-artifact@v3.1.0 + if: always() # run this step even if one of the previous step failed + with: + name: BuildMacArtifact + path: | + RollABall.app + buildMac.log \ No newline at end of file From 6921a18c5373d21a513ef7c3ba78aafa7c51a968 Mon Sep 17 00:00:00 2001 From: Kriszta Gombos Date: Fri, 20 Jan 2023 18:26:49 +0200 Subject: [PATCH 02/28] build roll a ball in pipeline --- RollABall/.github/workflows.yml | 37 ++++--- RollABall/Assets/Editor/build.meta | 8 ++ .../Assets/Editor/build/BuildRollABall.cs | 104 ++++++++++++++++++ .../Editor/build/BuildRollABall.cs.meta | 11 ++ 4 files changed, 147 insertions(+), 13 deletions(-) create mode 100644 RollABall/Assets/Editor/build.meta create mode 100644 RollABall/Assets/Editor/build/BuildRollABall.cs create mode 100644 RollABall/Assets/Editor/build/BuildRollABall.cs.meta diff --git a/RollABall/.github/workflows.yml b/RollABall/.github/workflows.yml index bd5636f..da4558e 100644 --- a/RollABall/.github/workflows.yml +++ b/RollABall/.github/workflows.yml @@ -4,19 +4,30 @@ on: workflow_dispatch: jobs: - build-macOS: - runs-on: [self-hosted, macOS] + build-windows: + runs-on: [macos-latest] steps: - - uses: actions/checkout@v3 + - name: Checkout repository + uses: actions/checkout@v2 + + - name: Init submodule + run: git submodule update --init --force - - run: | - $UNITY_2021_3_HOME -batchmode -stackTraceLogType None -projectPath $CI_PROJECT_DIR -executeMethod Altom.AltTesterTools.BuildAltTester.MacBuildFromCommandLine -logFile buildMac.log -quit - - - run: ls - - uses: actions/upload-artifact@v3.1.0 - if: always() # run this step even if one of the previous step failed + - uses: actions/cache@v2 + with: + path: Library + key: Library-${{ hashFiles('Assets/**', 'Packages/**', 'ProjectSettings/**') }} + restore-keys: | + Library- + - uses: game-ci/unity-builder@v2 + env: + UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }} + UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }} + UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }} + with: + projectPath: RollABall/ + buildMethod: BuildRollABall.WindowsBuildFromCommandLine + targetPlatform: StandaloneWindows + - uses: actions/upload-artifact@v2 with: - name: BuildMacArtifact - path: | - RollABall.app - buildMac.log \ No newline at end of file + path: RollABallWindows \ No newline at end of file diff --git a/RollABall/Assets/Editor/build.meta b/RollABall/Assets/Editor/build.meta new file mode 100644 index 0000000..90f7c3d --- /dev/null +++ b/RollABall/Assets/Editor/build.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8f3ba4e5ff8561c418945c8ef3898f1a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/RollABall/Assets/Editor/build/BuildRollABall.cs b/RollABall/Assets/Editor/build/BuildRollABall.cs new file mode 100644 index 0000000..5266c92 --- /dev/null +++ b/RollABall/Assets/Editor/build/BuildRollABall.cs @@ -0,0 +1,104 @@ +using System; +using Altom.AltTester; +using Altom.AltTesterEditor; +using UnityEditor; +using UnityEngine; + +class BuildRollABall +{ + static void WindowsBuildFromCommandLine(bool withAltunity, int proxyPort = 13000) + { + SetPlayerSettings(false); + + Debug.Log("Starting Windows build..." + PlayerSettings.productName + " : " + PlayerSettings.bundleVersion); + BuildPlayerOptions buildPlayerOptions = new BuildPlayerOptions(); + buildPlayerOptions.scenes = new string[] + { + "Assets/Scenes/MainGame.unity" + }; + if (withAltunity) + { + buildPlayerOptions.locationPathName = "RollABallWindowsTest/RollABall.exe"; + + } + else + { + buildPlayerOptions.locationPathName = "TrashCatWindows/RollABall.exe"; + + } + buildPlayerOptions.target = BuildTarget.StandaloneWindows; + buildPlayerOptions.targetGroup = BuildTargetGroup.Standalone; + if (withAltunity) + { + buildPlayerOptions.options = BuildOptions.Development; + } + BuildGame(buildPlayerOptions, withAltunity, proxyPort: proxyPort); + + } + + private static void SetPlayerSettings(bool customBuild) + { + PlayerSettings.companyName = "Altom"; + PlayerSettings.productName = "RollABall"; + PlayerSettings.bundleVersion = "1.0"; + PlayerSettings.resizableWindow = true; + PlayerSettings.defaultScreenHeight = 900; + PlayerSettings.defaultScreenWidth = 1200; + PlayerSettings.fullScreenMode = FullScreenMode.Windowed; + PlayerSettings.SetApiCompatibilityLevel(BuildTargetGroup.Standalone, ApiCompatibilityLevel.NET_4_6); + PlayerSettings.runInBackground = true; + } + + static void BuildGame(BuildPlayerOptions buildPlayerOptions, bool withAltUnity, string proxyHost = null, int proxyPort = 13000) + { + try + { + if (withAltUnity) + { + AddAltUnity(buildPlayerOptions.targetGroup, buildPlayerOptions.scenes[0], proxyHost, proxyPort); + } + var results = BuildPipeline.BuildPlayer(buildPlayerOptions); + + if (withAltUnity) + { + RemoveAltUnity(buildPlayerOptions.targetGroup); + } + + if (results.summary.totalErrors == 0 || results.summary.result == UnityEditor.Build.Reporting.BuildResult.Succeeded) + { + Debug.Log("Build succeeded!"); + + } + else + { + Debug.LogError("Build failed! " + results.steps + "\n Result: " + results.summary.result + "\n Stripping info: " + results.strippingInfo); + // EditorApplication.Exit(1); + } + + Debug.Log("Finished. " + PlayerSettings.productName + " : " + PlayerSettings.bundleVersion); + // EditorApplication.Exit(0); + } + catch (Exception exception) + { + + Debug.LogException(exception); + // EditorApplication.Exit(1); + } + } + + static void AddAltUnity(BuildTargetGroup buildTargetGroup, string firstSceneName, string proxyHost = null, int proxyPort = 13000) + { + AltBuilder.PreviousScenePath = firstSceneName; + var instrumentationSettings = new AltInstrumentationSettings(); + instrumentationSettings.ProxyPort = proxyPort; + if (!string.IsNullOrEmpty(proxyHost)) instrumentationSettings.ProxyHost = proxyHost; + AltBuilder.AddAltTesterInScriptingDefineSymbolsGroup(buildTargetGroup); + AltBuilder.InsertAltInScene(firstSceneName, instrumentationSettings); + Debug.Log("Instrumenting with proxyHost: " + proxyHost + ", proxyPort: " + proxyPort); + + } + static void RemoveAltUnity(BuildTargetGroup buildTargetGroup) + { + AltBuilder.RemoveAltTesterFromScriptingDefineSymbols(buildTargetGroup); + } +} \ No newline at end of file diff --git a/RollABall/Assets/Editor/build/BuildRollABall.cs.meta b/RollABall/Assets/Editor/build/BuildRollABall.cs.meta new file mode 100644 index 0000000..9d87fc2 --- /dev/null +++ b/RollABall/Assets/Editor/build/BuildRollABall.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 19b849cc0742d3e45b2b0a92bc41311d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From 6ccb8f59fa0af9f5e79e7aadbba4be7ad35fc932 Mon Sep 17 00:00:00 2001 From: Kriszta Gombos Date: Fri, 20 Jan 2023 20:25:16 +0200 Subject: [PATCH 03/28] actions --- RollABall/Assets/Editor/build/BuildRollABall.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/RollABall/Assets/Editor/build/BuildRollABall.cs b/RollABall/Assets/Editor/build/BuildRollABall.cs index 5266c92..44d266b 100644 --- a/RollABall/Assets/Editor/build/BuildRollABall.cs +++ b/RollABall/Assets/Editor/build/BuildRollABall.cs @@ -97,6 +97,7 @@ static void AddAltUnity(BuildTargetGroup buildTargetGroup, string firstSceneName Debug.Log("Instrumenting with proxyHost: " + proxyHost + ", proxyPort: " + proxyPort); } + static void RemoveAltUnity(BuildTargetGroup buildTargetGroup) { AltBuilder.RemoveAltTesterFromScriptingDefineSymbols(buildTargetGroup); From febd4a1be32f1d675de73fcc76f5864f0e8717ff Mon Sep 17 00:00:00 2001 From: Kriszta Gombos Date: Fri, 20 Jan 2023 20:28:47 +0200 Subject: [PATCH 04/28] created workflows folder --- RollABall/.github/{ => workflows}/workflows.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename RollABall/.github/{ => workflows}/workflows.yml (100%) diff --git a/RollABall/.github/workflows.yml b/RollABall/.github/workflows/workflows.yml similarity index 100% rename from RollABall/.github/workflows.yml rename to RollABall/.github/workflows/workflows.yml From 2d67f20c1cb61e5396142df8221d02b8e512845c Mon Sep 17 00:00:00 2001 From: Kriszta Gombos Date: Fri, 20 Jan 2023 20:31:25 +0200 Subject: [PATCH 05/28] moved yml --- {RollABall/.github => .github}/workflows/workflows.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {RollABall/.github => .github}/workflows/workflows.yml (100%) diff --git a/RollABall/.github/workflows/workflows.yml b/.github/workflows/workflows.yml similarity index 100% rename from RollABall/.github/workflows/workflows.yml rename to .github/workflows/workflows.yml From bcb2e75dffae928fc397338aa0aab81350abe577 Mon Sep 17 00:00:00 2001 From: Kriszta Gombos Date: Fri, 20 Jan 2023 20:34:26 +0200 Subject: [PATCH 06/28] deleted unnecessary file --- .github/workflows/main.yml | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml deleted file mode 100644 index 8b13789..0000000 --- a/.github/workflows/main.yml +++ /dev/null @@ -1 +0,0 @@ - From 158e5c29b4f092100e69f9c107ac8d2a42568559 Mon Sep 17 00:00:00 2001 From: Kriszta Gombos Date: Thu, 26 Jan 2023 10:38:47 +0200 Subject: [PATCH 07/28] updated yml --- .github/workflows/workflows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workflows.yml b/.github/workflows/workflows.yml index da4558e..6eefed1 100644 --- a/.github/workflows/workflows.yml +++ b/.github/workflows/workflows.yml @@ -1,7 +1,7 @@ name: Build Roll a Ball with NIS on: push: - workflow_dispatch: + workflow_dispatch: {} jobs: build-windows: From f694d4f0bb7a66a67ca2b95b53a48150e8340827 Mon Sep 17 00:00:00 2001 From: Kriszta Gombos Date: Thu, 26 Jan 2023 10:42:02 +0200 Subject: [PATCH 08/28] changed method --- .github/workflows/workflows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workflows.yml b/.github/workflows/workflows.yml index 6eefed1..4457aba 100644 --- a/.github/workflows/workflows.yml +++ b/.github/workflows/workflows.yml @@ -26,7 +26,7 @@ jobs: UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }} with: projectPath: RollABall/ - buildMethod: BuildRollABall.WindowsBuildFromCommandLine + buildMethod: BuildRollABall.WindowsBuildForRollABallFromCommandLine targetPlatform: StandaloneWindows - uses: actions/upload-artifact@v2 with: From 39e6a214e2091353e3f13d4a3a75cac296abe11a Mon Sep 17 00:00:00 2001 From: Kriszta Gombos Date: Thu, 26 Jan 2023 19:35:04 +0200 Subject: [PATCH 09/28] run ls --- .github/workflows/workflows.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/workflows.yml b/.github/workflows/workflows.yml index 4457aba..4934a56 100644 --- a/.github/workflows/workflows.yml +++ b/.github/workflows/workflows.yml @@ -28,6 +28,7 @@ jobs: projectPath: RollABall/ buildMethod: BuildRollABall.WindowsBuildForRollABallFromCommandLine targetPlatform: StandaloneWindows + - run: ls - uses: actions/upload-artifact@v2 with: path: RollABallWindows \ No newline at end of file From 1855713ba910732a37525df17e251bc745f4a8fd Mon Sep 17 00:00:00 2001 From: Kriszta Gombos Date: Thu, 26 Jan 2023 19:38:47 +0200 Subject: [PATCH 10/28] fixed path --- .github/workflows/workflows.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/workflows.yml b/.github/workflows/workflows.yml index 4934a56..c4a1eaa 100644 --- a/.github/workflows/workflows.yml +++ b/.github/workflows/workflows.yml @@ -28,7 +28,6 @@ jobs: projectPath: RollABall/ buildMethod: BuildRollABall.WindowsBuildForRollABallFromCommandLine targetPlatform: StandaloneWindows - - run: ls - uses: actions/upload-artifact@v2 with: - path: RollABallWindows \ No newline at end of file + path: RollABallWindowsTest \ No newline at end of file From 1e25188ec62f264af0f4b06bee085d903f69d55f Mon Sep 17 00:00:00 2001 From: Kriszta Gombos Date: Thu, 26 Jan 2023 19:53:54 +0200 Subject: [PATCH 11/28] changed path --- .github/workflows/workflows.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/workflows.yml b/.github/workflows/workflows.yml index c4a1eaa..f72f70b 100644 --- a/.github/workflows/workflows.yml +++ b/.github/workflows/workflows.yml @@ -28,6 +28,7 @@ jobs: projectPath: RollABall/ buildMethod: BuildRollABall.WindowsBuildForRollABallFromCommandLine targetPlatform: StandaloneWindows + - run: ls RollABall/ - uses: actions/upload-artifact@v2 with: - path: RollABallWindowsTest \ No newline at end of file + path: RollABall/RollABallWindowsTest \ No newline at end of file From 3fffc5fcfa980ad99071ee743ca03be138f59422 Mon Sep 17 00:00:00 2001 From: Kriszta Gombos Date: Fri, 27 Jan 2023 13:05:08 +0200 Subject: [PATCH 12/28] worth a try --- .github/workflows/workflows.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/workflows.yml b/.github/workflows/workflows.yml index f72f70b..f7da3fb 100644 --- a/.github/workflows/workflows.yml +++ b/.github/workflows/workflows.yml @@ -28,7 +28,9 @@ jobs: projectPath: RollABall/ buildMethod: BuildRollABall.WindowsBuildForRollABallFromCommandLine targetPlatform: StandaloneWindows + - run: ls - run: ls RollABall/ + - run: ls RollABall/Assets - uses: actions/upload-artifact@v2 with: path: RollABall/RollABallWindowsTest \ No newline at end of file From f9bd57eefcbea147d6878e5bb796ac5fe6bb82e3 Mon Sep 17 00:00:00 2001 From: Kriszta Gombos Date: Fri, 27 Jan 2023 13:57:11 +0200 Subject: [PATCH 13/28] changed environment variables --- .github/workflows/workflows.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/workflows.yml b/.github/workflows/workflows.yml index f7da3fb..50a0cb0 100644 --- a/.github/workflows/workflows.yml +++ b/.github/workflows/workflows.yml @@ -28,6 +28,7 @@ jobs: projectPath: RollABall/ buildMethod: BuildRollABall.WindowsBuildForRollABallFromCommandLine targetPlatform: StandaloneWindows + - run: ls - run: ls RollABall/ - run: ls RollABall/Assets From f919a7bbbc9e7eef8b5f5850a43534da3cfe0c46 Mon Sep 17 00:00:00 2001 From: gomboskriszta15 <112488760+gomboskriszta15@users.noreply.github.com> Date: Tue, 31 Jan 2023 15:25:36 +0200 Subject: [PATCH 14/28] Update workflows.yml --- .github/workflows/workflows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/workflows.yml b/.github/workflows/workflows.yml index 50a0cb0..7211f23 100644 --- a/.github/workflows/workflows.yml +++ b/.github/workflows/workflows.yml @@ -21,7 +21,7 @@ jobs: Library- - uses: game-ci/unity-builder@v2 env: - UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }} + UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }} UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }} UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }} with: @@ -34,4 +34,4 @@ jobs: - run: ls RollABall/Assets - uses: actions/upload-artifact@v2 with: - path: RollABall/RollABallWindowsTest \ No newline at end of file + path: RollABall/RollABallWindowsTest From dcf0af4dff0a762efeb4ac0d6300581dc7cb8db5 Mon Sep 17 00:00:00 2001 From: Kriszta Gombos Date: Tue, 31 Jan 2023 15:43:46 +0200 Subject: [PATCH 15/28] changed path --- .github/workflows/workflows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workflows.yml b/.github/workflows/workflows.yml index 7211f23..052ea83 100644 --- a/.github/workflows/workflows.yml +++ b/.github/workflows/workflows.yml @@ -34,4 +34,4 @@ jobs: - run: ls RollABall/Assets - uses: actions/upload-artifact@v2 with: - path: RollABall/RollABallWindowsTest + path: build From 54766b1201f555d3deb88de3a4ca934cdee54116 Mon Sep 17 00:00:00 2001 From: Kriszta Gombos Date: Tue, 31 Jan 2023 16:01:46 +0200 Subject: [PATCH 16/28] ls again --- .github/workflows/workflows.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/workflows.yml b/.github/workflows/workflows.yml index 052ea83..6545fb6 100644 --- a/.github/workflows/workflows.yml +++ b/.github/workflows/workflows.yml @@ -30,8 +30,7 @@ jobs: targetPlatform: StandaloneWindows - run: ls - - run: ls RollABall/ - - run: ls RollABall/Assets + - run: ls build/ - uses: actions/upload-artifact@v2 with: - path: build + path: build/ From c8be70abd75a40ce17abbe0b6ea18d7dbae3addf Mon Sep 17 00:00:00 2001 From: Kriszta Gombos Date: Tue, 31 Jan 2023 16:24:16 +0200 Subject: [PATCH 17/28] ls once more --- .github/workflows/workflows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/workflows.yml b/.github/workflows/workflows.yml index 6545fb6..4eb0b75 100644 --- a/.github/workflows/workflows.yml +++ b/.github/workflows/workflows.yml @@ -30,7 +30,7 @@ jobs: targetPlatform: StandaloneWindows - run: ls - - run: ls build/ + - run: ls build/StandaloneWindows/ - uses: actions/upload-artifact@v2 with: - path: build/ + path: build/StandaloneWindows From 6a56d198f3374ea85375df646d357e3b91b0dbbc Mon Sep 17 00:00:00 2001 From: Kriszta Gombos Date: Tue, 31 Jan 2023 16:35:15 +0200 Subject: [PATCH 18/28] use newer version of upload artifact --- .github/workflows/workflows.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/workflows.yml b/.github/workflows/workflows.yml index 4eb0b75..765893c 100644 --- a/.github/workflows/workflows.yml +++ b/.github/workflows/workflows.yml @@ -31,6 +31,7 @@ jobs: - run: ls - run: ls build/StandaloneWindows/ - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3.1.0 with: - path: build/StandaloneWindows + name: RollABall + path: build From 526e47006e331fd9f98956d9655c6e986b0af910 Mon Sep 17 00:00:00 2001 From: Kriszta Gombos Date: Tue, 31 Jan 2023 16:46:18 +0200 Subject: [PATCH 19/28] use development --- RollABall/Assets/AltTester-Unity-SDK | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RollABall/Assets/AltTester-Unity-SDK b/RollABall/Assets/AltTester-Unity-SDK index 3284150..0e8d2b5 160000 --- a/RollABall/Assets/AltTester-Unity-SDK +++ b/RollABall/Assets/AltTester-Unity-SDK @@ -1 +1 @@ -Subproject commit 3284150ea7ff22f49b2df0ab174332b4e9587f0b +Subproject commit 0e8d2b5259704518aee585f044b599f623e8558c From ed766d30ab621797d70e39993df5af0a46761167 Mon Sep 17 00:00:00 2001 From: Kriszta Gombos Date: Tue, 31 Jan 2023 16:59:22 +0200 Subject: [PATCH 20/28] build fixed --- RollABall/Assets/Editor/build/BuildRollABall.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/RollABall/Assets/Editor/build/BuildRollABall.cs b/RollABall/Assets/Editor/build/BuildRollABall.cs index 44d266b..b4c5b92 100644 --- a/RollABall/Assets/Editor/build/BuildRollABall.cs +++ b/RollABall/Assets/Editor/build/BuildRollABall.cs @@ -6,6 +6,10 @@ class BuildRollABall { + public static void WindowsBuildForRollABallFromCommandLine(){ + WindowsBuildFromCommandLine(true,13000); + } + static void WindowsBuildFromCommandLine(bool withAltunity, int proxyPort = 13000) { SetPlayerSettings(false); @@ -14,7 +18,7 @@ static void WindowsBuildFromCommandLine(bool withAltunity, int proxyPort = 13000 BuildPlayerOptions buildPlayerOptions = new BuildPlayerOptions(); buildPlayerOptions.scenes = new string[] { - "Assets/Scenes/MainGame.unity" + "Assets/Scenes/MiniGame.unity" }; if (withAltunity) { @@ -30,7 +34,7 @@ static void WindowsBuildFromCommandLine(bool withAltunity, int proxyPort = 13000 buildPlayerOptions.targetGroup = BuildTargetGroup.Standalone; if (withAltunity) { - buildPlayerOptions.options = BuildOptions.Development; + buildPlayerOptions.options = BuildOptions.Development| BuildOptions.IncludeTestAssemblies; } BuildGame(buildPlayerOptions, withAltunity, proxyPort: proxyPort); From 68a7dd7b1a5386297b417aeab30677282dee0b94 Mon Sep 17 00:00:00 2001 From: Kriszta Gombos Date: Tue, 31 Jan 2023 17:27:24 +0200 Subject: [PATCH 21/28] rename --- .github/workflows/workflows.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/workflows.yml b/.github/workflows/workflows.yml index 765893c..a18e010 100644 --- a/.github/workflows/workflows.yml +++ b/.github/workflows/workflows.yml @@ -29,9 +29,9 @@ jobs: buildMethod: BuildRollABall.WindowsBuildForRollABallFromCommandLine targetPlatform: StandaloneWindows - - run: ls - - run: ls build/StandaloneWindows/ + - run: ls RollABall/ + - run: ls RollABall/RollABallWindowsTest/ - uses: actions/upload-artifact@v3.1.0 with: name: RollABall - path: build + path: RollABall/RollABallWindowsTest From bcd9bcc3b33540b9133ae9db04cdbdb465708e64 Mon Sep 17 00:00:00 2001 From: Kriszta Gombos Date: Wed, 1 Feb 2023 16:47:23 +0200 Subject: [PATCH 22/28] run on windows 2019 --- .github/workflows/workflows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workflows.yml b/.github/workflows/workflows.yml index a18e010..a6d5092 100644 --- a/.github/workflows/workflows.yml +++ b/.github/workflows/workflows.yml @@ -5,7 +5,7 @@ on: jobs: build-windows: - runs-on: [macos-latest] + runs-on: windows-2019 steps: - name: Checkout repository uses: actions/checkout@v2 From 26534da9a70443b79fc36ec3f1bdd37b39640fb6 Mon Sep 17 00:00:00 2001 From: Kriszta Gombos Date: Wed, 1 Feb 2023 18:17:05 +0200 Subject: [PATCH 23/28] removed logs --- .github/workflows/workflows.yml | 2 -- RollABall/Assets/Editor/build/BuildRollABall.cs | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/workflows.yml b/.github/workflows/workflows.yml index a6d5092..6f4f5f3 100644 --- a/.github/workflows/workflows.yml +++ b/.github/workflows/workflows.yml @@ -29,8 +29,6 @@ jobs: buildMethod: BuildRollABall.WindowsBuildForRollABallFromCommandLine targetPlatform: StandaloneWindows - - run: ls RollABall/ - - run: ls RollABall/RollABallWindowsTest/ - uses: actions/upload-artifact@v3.1.0 with: name: RollABall diff --git a/RollABall/Assets/Editor/build/BuildRollABall.cs b/RollABall/Assets/Editor/build/BuildRollABall.cs index b4c5b92..6370171 100644 --- a/RollABall/Assets/Editor/build/BuildRollABall.cs +++ b/RollABall/Assets/Editor/build/BuildRollABall.cs @@ -27,7 +27,7 @@ static void WindowsBuildFromCommandLine(bool withAltunity, int proxyPort = 13000 } else { - buildPlayerOptions.locationPathName = "TrashCatWindows/RollABall.exe"; + buildPlayerOptions.locationPathName = "RollABallWindows/RollABall.exe"; } buildPlayerOptions.target = BuildTarget.StandaloneWindows; From 6527092dbf0860fd86244a298648926e69b2c455 Mon Sep 17 00:00:00 2001 From: Kriszta Gombos Date: Thu, 2 Feb 2023 13:11:47 +0200 Subject: [PATCH 24/28] use development --- RollABall/Assets/AltTester-Unity-SDK | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RollABall/Assets/AltTester-Unity-SDK b/RollABall/Assets/AltTester-Unity-SDK index 0e8d2b5..5fad49d 160000 --- a/RollABall/Assets/AltTester-Unity-SDK +++ b/RollABall/Assets/AltTester-Unity-SDK @@ -1 +1 @@ -Subproject commit 0e8d2b5259704518aee585f044b599f623e8558c +Subproject commit 5fad49d56852b268311c3fa10450117702744fad From f3468341d46823f043e631b582548493c20da3ec Mon Sep 17 00:00:00 2001 From: Kriszta Gombos Date: Mon, 6 Feb 2023 11:07:51 +0200 Subject: [PATCH 25/28] Modified shaders to normal shaders --- .github/workflows/workflows.yml | 2 +- RollABall/Assets/Materials/Background.mat | 27 ++++- RollABall/Assets/Materials/Pickup.mat | 27 ++++- RollABall/Assets/Materials/Player.mat | 27 ++++- RollABall/Assets/Materials/Walls.mat | 27 ++++- RollABall/Assets/Scenes/MiniGame.unity | 126 ++++++++++++++++++++-- 6 files changed, 208 insertions(+), 28 deletions(-) diff --git a/.github/workflows/workflows.yml b/.github/workflows/workflows.yml index 6f4f5f3..f94992e 100644 --- a/.github/workflows/workflows.yml +++ b/.github/workflows/workflows.yml @@ -5,7 +5,7 @@ on: jobs: build-windows: - runs-on: windows-2019 + runs-on: windows-latest steps: - name: Checkout repository uses: actions/checkout@v2 diff --git a/RollABall/Assets/Materials/Background.mat b/RollABall/Assets/Materials/Background.mat index ce917d7..bae80f6 100644 --- a/RollABall/Assets/Materials/Background.mat +++ b/RollABall/Assets/Materials/Background.mat @@ -21,16 +21,16 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Background - m_Shader: {fileID: 4800000, guid: b7839dad95683814aa64166edc107ae2, type: 3} - m_ValidKeywords: [] + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: + - _GLOSSYREFLECTIONS_OFF m_InvalidKeywords: - _FLIPBOOKBLENDING_OFF m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 @@ -43,6 +43,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _EmissionMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -59,6 +71,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SpecGlossMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -75,6 +91,7 @@ Material: - _ColorMode: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 - _DistortionBlend: 0.5 - _DistortionEnabled: 0 - _DistortionStrength: 1 @@ -89,6 +106,7 @@ Material: - _Metallic: 0 - _Mode: 0 - _OcclusionStrength: 1 + - _Parallax: 0.02 - _QueueOffset: 0 - _ReceiveShadows: 1 - _Smoothness: 0.25 @@ -99,6 +117,7 @@ Material: - _SpecularHighlights: 1 - _SrcBlend: 1 - _Surface: 0 + - _UVSec: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: diff --git a/RollABall/Assets/Materials/Pickup.mat b/RollABall/Assets/Materials/Pickup.mat index cb751dd..db4fe42 100644 --- a/RollABall/Assets/Materials/Pickup.mat +++ b/RollABall/Assets/Materials/Pickup.mat @@ -21,16 +21,16 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Pickup - m_Shader: {fileID: 4800000, guid: b7839dad95683814aa64166edc107ae2, type: 3} - m_ValidKeywords: [] + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: + - _GLOSSYREFLECTIONS_OFF m_InvalidKeywords: - _FLIPBOOKBLENDING_OFF m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 @@ -43,6 +43,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _EmissionMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -59,6 +71,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SpecGlossMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -75,6 +91,7 @@ Material: - _ColorMode: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 - _DistortionBlend: 0.5 - _DistortionEnabled: 0 - _DistortionStrength: 1 @@ -89,6 +106,7 @@ Material: - _Metallic: 0 - _Mode: 0 - _OcclusionStrength: 1 + - _Parallax: 0.02 - _QueueOffset: 0 - _ReceiveShadows: 1 - _Smoothness: 0.25 @@ -100,6 +118,7 @@ Material: - _SpecularHighlights: 1 - _SrcBlend: 1 - _Surface: 0 + - _UVSec: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: diff --git a/RollABall/Assets/Materials/Player.mat b/RollABall/Assets/Materials/Player.mat index e089129..c7df868 100644 --- a/RollABall/Assets/Materials/Player.mat +++ b/RollABall/Assets/Materials/Player.mat @@ -21,16 +21,16 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Player - m_Shader: {fileID: 4800000, guid: b7839dad95683814aa64166edc107ae2, type: 3} - m_ValidKeywords: [] + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: + - _GLOSSYREFLECTIONS_OFF m_InvalidKeywords: - _FLIPBOOKBLENDING_OFF m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 @@ -43,6 +43,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _EmissionMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -59,6 +71,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SpecGlossMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -75,6 +91,7 @@ Material: - _ColorMode: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 - _DistortionBlend: 0.5 - _DistortionEnabled: 0 - _DistortionStrength: 1 @@ -89,6 +106,7 @@ Material: - _Metallic: 0 - _Mode: 0 - _OcclusionStrength: 1 + - _Parallax: 0.02 - _QueueOffset: 0 - _ReceiveShadows: 1 - _Smoothness: 0.75 @@ -99,6 +117,7 @@ Material: - _SpecularHighlights: 1 - _SrcBlend: 1 - _Surface: 0 + - _UVSec: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: diff --git a/RollABall/Assets/Materials/Walls.mat b/RollABall/Assets/Materials/Walls.mat index 5f50d55..1932058 100644 --- a/RollABall/Assets/Materials/Walls.mat +++ b/RollABall/Assets/Materials/Walls.mat @@ -8,16 +8,16 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Walls - m_Shader: {fileID: 4800000, guid: b7839dad95683814aa64166edc107ae2, type: 3} - m_ValidKeywords: [] + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: + - _GLOSSYREFLECTIONS_OFF m_InvalidKeywords: - _FLIPBOOKBLENDING_OFF m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 @@ -30,6 +30,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _EmissionMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -46,6 +58,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SpecGlossMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -62,6 +78,7 @@ Material: - _ColorMode: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 - _DistortionBlend: 0.5 - _DistortionEnabled: 0 - _DistortionStrength: 1 @@ -76,6 +93,7 @@ Material: - _Metallic: 0 - _Mode: 0 - _OcclusionStrength: 1 + - _Parallax: 0.02 - _QueueOffset: 0 - _ReceiveShadows: 1 - _Smoothness: 0.25 @@ -86,6 +104,7 @@ Material: - _SpecularHighlights: 1 - _SrcBlend: 1 - _Surface: 0 + - _UVSec: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: diff --git a/RollABall/Assets/Scenes/MiniGame.unity b/RollABall/Assets/Scenes/MiniGame.unity index e3135ea..4df8594 100644 --- a/RollABall/Assets/Scenes/MiniGame.unity +++ b/RollABall/Assets/Scenes/MiniGame.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.4465785, g: 0.49641275, b: 0.5748151, a: 1} + m_IndirectSpecularColor: {r: 0.44657892, g: 0.49641353, b: 0.5748163, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -476,7 +476,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &84084726 GameObject: @@ -710,6 +710,111 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 121038709} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1001 &134691994 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 229047808239693275, guid: 3cfd2a2470624448e83ecabb3739898f, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 229047808239693275, guid: 3cfd2a2470624448e83ecabb3739898f, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 229047808239693275, guid: 3cfd2a2470624448e83ecabb3739898f, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 229047808239693275, guid: 3cfd2a2470624448e83ecabb3739898f, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 229047808239693275, guid: 3cfd2a2470624448e83ecabb3739898f, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 229047808239693275, guid: 3cfd2a2470624448e83ecabb3739898f, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2486512690666058911, guid: 3cfd2a2470624448e83ecabb3739898f, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2486512690666058911, guid: 3cfd2a2470624448e83ecabb3739898f, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2486512690666058911, guid: 3cfd2a2470624448e83ecabb3739898f, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2486512690666058911, guid: 3cfd2a2470624448e83ecabb3739898f, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2486512690666058911, guid: 3cfd2a2470624448e83ecabb3739898f, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2486512690666058911, guid: 3cfd2a2470624448e83ecabb3739898f, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5275682393695888382, guid: 3cfd2a2470624448e83ecabb3739898f, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5275682393695888382, guid: 3cfd2a2470624448e83ecabb3739898f, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5275682393695888382, guid: 3cfd2a2470624448e83ecabb3739898f, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5275682393695888382, guid: 3cfd2a2470624448e83ecabb3739898f, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5275682393695888382, guid: 3cfd2a2470624448e83ecabb3739898f, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5275682393695888382, guid: 3cfd2a2470624448e83ecabb3739898f, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5275682393695888382, guid: 3cfd2a2470624448e83ecabb3739898f, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5275682393695888382, guid: 3cfd2a2470624448e83ecabb3739898f, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5275682393695888382, guid: 3cfd2a2470624448e83ecabb3739898f, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5275682393695888382, guid: 3cfd2a2470624448e83ecabb3739898f, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5275682393695888382, guid: 3cfd2a2470624448e83ecabb3739898f, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7155360372610505065, guid: 3cfd2a2470624448e83ecabb3739898f, type: 3} + propertyPath: m_Name + value: AltTesterPrefab + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3cfd2a2470624448e83ecabb3739898f, type: 3} --- !u!1 &264509552 GameObject: m_ObjectHideFlags: 0 @@ -751,7 +856,7 @@ Transform: - {fileID: 1952296052} - {fileID: 1460371237} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &291529916 GameObject: @@ -957,7 +1062,7 @@ RectTransform: - {fileID: 1390010546} - {fileID: 84084727} m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1062,7 +1167,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!54 &323447574 Rigidbody: @@ -1420,7 +1525,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 340232489} m_HandleRect: {fileID: 340232488} m_Direction: 2 - m_Value: 1 + m_Value: 0.99999976 m_Size: 0.53169024 m_NumberOfSteps: 0 m_OnValueChanged: @@ -1718,7 +1823,7 @@ RectTransform: - {fileID: 291529917} - {fileID: 1221873839} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2868,7 +2973,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0} --- !u!114 &1201484075 MonoBehaviour: @@ -3953,7 +4058,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3} m_Name: m_EditorClassIdentifier: - m_SendPointerHoverToParent: 1 m_MoveRepeatDelay: 0.5 m_MoveRepeatRate: 0.1 m_XRTrackingOrigin: {fileID: 0} @@ -3999,7 +4103,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1721342812 GameObject: @@ -4898,7 +5002,7 @@ Transform: - {fileID: 1272449907} - {fileID: 1025413896} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &6002605684233859181 PrefabInstance: From f1d13fdd0d12349d749e3ce16a8c12a861a0cd35 Mon Sep 17 00:00:00 2001 From: Kriszta Gombos Date: Mon, 6 Feb 2023 11:50:27 +0200 Subject: [PATCH 26/28] change runner version to windows 2019 --- .github/workflows/workflows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workflows.yml b/.github/workflows/workflows.yml index f94992e..6f4f5f3 100644 --- a/.github/workflows/workflows.yml +++ b/.github/workflows/workflows.yml @@ -5,7 +5,7 @@ on: jobs: build-windows: - runs-on: windows-latest + runs-on: windows-2019 steps: - name: Checkout repository uses: actions/checkout@v2 From 9bff60220ca30c2f69c2b9aa934d66d0906b915b Mon Sep 17 00:00:00 2001 From: Kriszta Gombos Date: Mon, 6 Feb 2023 13:54:15 +0200 Subject: [PATCH 27/28] removed renderer pipeline universal --- RollABall/Packages/manifest.json | 7 ++- RollABall/Packages/packages-lock.json | 61 ++------------------------- 2 files changed, 7 insertions(+), 61 deletions(-) diff --git a/RollABall/Packages/manifest.json b/RollABall/Packages/manifest.json index ae34b78..2b21466 100644 --- a/RollABall/Packages/manifest.json +++ b/RollABall/Packages/manifest.json @@ -1,13 +1,12 @@ { "dependencies": { - "com.unity.collab-proxy": "1.17.2", + "com.unity.collab-proxy": "1.17.7", "com.unity.editorcoroutines": "1.0.0", - "com.unity.ide.rider": "3.0.15", + "com.unity.ide.rider": "3.0.16", "com.unity.ide.visualstudio": "2.0.16", "com.unity.ide.vscode": "1.2.5", - "com.unity.inputsystem": "1.4.1", + "com.unity.inputsystem": "1.4.4", "com.unity.nuget.newtonsoft-json": "3.0.2", - "com.unity.render-pipelines.universal": "12.1.7", "com.unity.test-framework": "1.1.31", "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.6.4", diff --git a/RollABall/Packages/packages-lock.json b/RollABall/Packages/packages-lock.json index fb808a5..1b54656 100644 --- a/RollABall/Packages/packages-lock.json +++ b/RollABall/Packages/packages-lock.json @@ -1,16 +1,7 @@ { "dependencies": { - "com.unity.burst": { - "version": "1.7.3", - "depth": 1, - "source": "registry", - "dependencies": { - "com.unity.mathematics": "1.2.1" - }, - "url": "https://packages.unity.com" - }, "com.unity.collab-proxy": { - "version": "1.17.2", + "version": "1.17.7", "depth": 0, "source": "registry", "dependencies": { @@ -33,7 +24,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.15", + "version": "3.0.16", "depth": 0, "source": "registry", "dependencies": { @@ -58,7 +49,7 @@ "url": "https://packages.unity.com" }, "com.unity.inputsystem": { - "version": "1.4.1", + "version": "1.4.4", "depth": 0, "source": "registry", "dependencies": { @@ -66,13 +57,6 @@ }, "url": "https://packages.unity.com" }, - "com.unity.mathematics": { - "version": "1.2.6", - "depth": 1, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, "com.unity.nuget.newtonsoft-json": { "version": "3.0.2", "depth": 0, @@ -80,36 +64,8 @@ "dependencies": {}, "url": "https://packages.unity.com" }, - "com.unity.render-pipelines.core": { - "version": "12.1.7", - "depth": 1, - "source": "builtin", - "dependencies": { - "com.unity.ugui": "1.0.0", - "com.unity.modules.physics": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0" - } - }, - "com.unity.render-pipelines.universal": { - "version": "12.1.7", - "depth": 0, - "source": "builtin", - "dependencies": { - "com.unity.mathematics": "1.2.1", - "com.unity.burst": "1.7.3", - "com.unity.render-pipelines.core": "12.1.7", - "com.unity.shadergraph": "12.1.7" - } - }, - "com.unity.searcher": { - "version": "4.9.1", - "depth": 2, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, "com.unity.services.core": { - "version": "1.4.2", + "version": "1.6.0", "depth": 1, "source": "registry", "dependencies": { @@ -119,15 +75,6 @@ }, "url": "https://packages.unity.com" }, - "com.unity.shadergraph": { - "version": "12.1.7", - "depth": 1, - "source": "builtin", - "dependencies": { - "com.unity.render-pipelines.core": "12.1.7", - "com.unity.searcher": "4.9.1" - } - }, "com.unity.test-framework": { "version": "1.1.31", "depth": 0, From e3faf3256465a97383745976a2162f99bb772e31 Mon Sep 17 00:00:00 2001 From: Kriszta Gombos Date: Mon, 6 Feb 2023 16:09:56 +0200 Subject: [PATCH 28/28] specify unity version --- .github/workflows/workflows.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/workflows.yml b/.github/workflows/workflows.yml index 6f4f5f3..cf2be38 100644 --- a/.github/workflows/workflows.yml +++ b/.github/workflows/workflows.yml @@ -28,6 +28,7 @@ jobs: projectPath: RollABall/ buildMethod: BuildRollABall.WindowsBuildForRollABallFromCommandLine targetPlatform: StandaloneWindows + customImage: 'unityci/editor:2021.3.16f1-base-0' - uses: actions/upload-artifact@v3.1.0 with: