Maroon-410 Unity 2021 LTS Update

.github/workflows/main.yml

@@ -56,7 +56,7 @@ jobs:
 
       # check out repo 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -99,7 +99,7 @@ jobs:
 
     steps:
       - name: Build
-        uses: game-ci/unity-builder@v2
+        uses: game-ci/unity-builder@v4
 
         # environment vars needed by unity-builder to activate the unity license
         # defined in the Actions Secrets in the repo settings
@@ -118,6 +118,8 @@ jobs:
           projectPath: unity
           buildName: ${{ matrix.maroonBuildTarget }}
           buildsPath: build
+          # run as host user or default root container user, should fix most permission issues on self-hosted runners
+          runAsHostUser: true
 
           # if this is set to false, the job will fail if any file has changed since checkout
           # since it is set to true, it will only raise a warning
@@ -151,6 +153,7 @@ jobs:
   test:
     name: Run tests
     runs-on: self-hosted
+    timeout-minutes: 60
     needs: [setup, build]
     strategy:
       # if fail-fast is set to true, the job will abort if one of the tests fail
@@ -163,7 +166,7 @@ jobs:
           - editmode
     steps:
       - name: Test
-        uses: game-ci/unity-test-runner@v2
+        uses: game-ci/unity-test-runner@v4
         id: tests
         env:
           UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }}
@@ -172,6 +175,8 @@ jobs:
         with:
           projectPath: ${{ matrix.projectPath }}
           testMode: ${{ matrix.testMode }}
+          # run as host user or default root container user, should fix most permission issues on self-hosted runners
+          runAsHostUser: true
           # save test results to ./test-results/
           artifactsPath: ./test-results/${{ matrix.testMode }}-results
 

unity/Assets/Maroon/reusableGui/Menu/Materials/sdrMenuBlur.shader

@@ -115,6 +115,7 @@
 #endif
             o.uvgrab.xy = (float2(o.vertex.x, o.vertex.y * scale) + o.vertex.w) * 0.5;
             o.uvgrab.zw = o.vertex.zw;
+            o.color = v.color;
             return o;
         }
 
@@ -184,7 +185,6 @@
         {
             v2f OUT;
             UNITY_SETUP_INSTANCE_ID(v);
-            UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(OUT);
             OUT.worldPosition = v.vertex;
             OUT.vertex = UnityObjectToClipPos(OUT.worldPosition);
 

unity/Assets/Maroon/reusablePrefabs/experimentSetting/experimentRoom/Prefabs/ExperimentRoom.prefab

@@ -3822,15 +3822,15 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 1992526434041577280}
   m_PrefabAsset: {fileID: 0}
---- !u!1 &1992526434041477608 stripped
+--- !u!1 &1992526434041477514 stripped
 GameObject:
-  m_CorrespondingSourceObject: {fileID: 100008, guid: c2c0c3b4fad1a4c4eb1f35b55830a1a6,
+  m_CorrespondingSourceObject: {fileID: 100042, guid: c2c0c3b4fad1a4c4eb1f35b55830a1a6,
     type: 3}
   m_PrefabInstance: {fileID: 1992526434041577280}
   m_PrefabAsset: {fileID: 0}
---- !u!1 &1992526434041477514 stripped
+--- !u!1 &1992526434041477608 stripped
 GameObject:
-  m_CorrespondingSourceObject: {fileID: 100042, guid: c2c0c3b4fad1a4c4eb1f35b55830a1a6,
+  m_CorrespondingSourceObject: {fileID: 100008, guid: c2c0c3b4fad1a4c4eb1f35b55830a1a6,
     type: 3}
   m_PrefabInstance: {fileID: 1992526434041577280}
   m_PrefabAsset: {fileID: 0}
@@ -5305,88 +5305,12 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: b94cdbb36bb76a944afabc4c05e0fd7c, type: 3}
---- !u!1 &1992526435444581130 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 100006, guid: b94cdbb36bb76a944afabc4c05e0fd7c,
-    type: 3}
-  m_PrefabInstance: {fileID: 1992526435444483500}
-  m_PrefabAsset: {fileID: 0}
---- !u!1 &1992526435444581128 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 100004, guid: b94cdbb36bb76a944afabc4c05e0fd7c,
-    type: 3}
-  m_PrefabInstance: {fileID: 1992526435444483500}
-  m_PrefabAsset: {fileID: 0}
---- !u!1 &1992526435444581132 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 100000, guid: b94cdbb36bb76a944afabc4c05e0fd7c,
-    type: 3}
-  m_PrefabInstance: {fileID: 1992526435444483500}
-  m_PrefabAsset: {fileID: 0}
 --- !u!4 &1992526435444096804 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 400008, guid: b94cdbb36bb76a944afabc4c05e0fd7c,
     type: 3}
   m_PrefabInstance: {fileID: 1992526435444483500}
   m_PrefabAsset: {fileID: 0}
---- !u!1 &1992526435444581134 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 100002, guid: b94cdbb36bb76a944afabc4c05e0fd7c,
-    type: 3}
-  m_PrefabInstance: {fileID: 1992526435444483500}
-  m_PrefabAsset: {fileID: 0}
---- !u!65 &6062521452412096393
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1992526435444581132}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 2.0000005, y: 3.9999998, z: 0.2964981}
-  m_Center: {x: 0.00000017881393, y: 0, z: -0.0000009536743}
---- !u!65 &5389845935758972749
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1992526435444581134}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 2.0000005, y: 3.9999995, z: 0.2964981}
-  m_Center: {x: -0.0000019073486, y: -0.00000011920929, z: -0.0000009536743}
---- !u!65 &3288611028156167540
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1992526435444581128}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 3.0000007, y: 1.0000976, z: 0.29649794}
-  m_Center: {x: -0.00000047683716, y: 0.5000486, z: -0.0000009760261}
---- !u!65 &5183170483465052376
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1992526435444581130}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 3.0000007, y: 1.0000976, z: 0.29649794}
-  m_Center: {x: -0.00000047683716, y: -0.50004876, z: -0.0000009313226}
 --- !u!1001 &1992526435483273675
 PrefabInstance:
   m_ObjectHideFlags: 0

unity/Assets/Maroon/reusablePrefabs/experimentSetting/experimentRoom/Profiles/PostProcessing Profile.asset

@@ -1422,7 +1422,7 @@ MonoBehaviour:
     value: 1
   mode:
     overrideState: 1
-    value: 1
+    value: 0
   intensity:
     overrideState: 1
     value: 0.57