Fix hotkeys and upgrade to 6000.0.2f1

Guerra24 · May 20, 2024 · f689343 · f689343
1 parent 282745a
commit f689343
Show file tree

Hide file tree

Showing 28 changed files with 773 additions and 233 deletions.
diff --git a/.github/game-ci/Dockerfile b/.github/game-ci/Dockerfile
@@ -1,4 +1,4 @@
-ARG GAMECI_IMAGE=unityci/editor:ubuntu-6000.0.1f1-windows-mono-3
+ARG GAMECI_IMAGE=unityci/editor:ubuntu-6000.0.2f1-windows-mono-3
 FROM $GAMECI_IMAGE
 
 ARG BLENDER_SHORT_VERSION=3.5

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -9,8 +9,8 @@ jobs:
     strategy:
       matrix:
         build:
-         - { target-platform: StandaloneWindows64, image: 'unityci/editor:ubuntu-6000.0.1f1-windows-mono-3' }
-         - { target-platform: StandaloneLinux64, image: 'unityci/editor:ubuntu-6000.0.1f1-linux-il2cpp-3' }
+         - { target-platform: StandaloneWindows64, image: 'unityci/editor:ubuntu-6000.0.2f1-windows-mono-3' }
+         - { target-platform: StandaloneLinux64, image: 'unityci/editor:ubuntu-6000.0.2f1-linux-il2cpp-3' }
     steps:
       - name: Checkout
         uses: actions/checkout@v4

diff --git a/Assets/Scenes/Loader.unity b/Assets/Scenes/Loader.unity
@@ -38,7 +38,6 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -427,38 +426,17 @@ MonoBehaviour:
   m_GameObject: {fileID: 1331993513}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3}
+  m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_SendPointerHoverToParent: 1
-  m_MoveRepeatDelay: 0.5
-  m_MoveRepeatRate: 0.1
-  m_XRTrackingOrigin: {fileID: 0}
-  m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018,
-    type: 3}
-  m_PointAction: {fileID: -1654692200621890270, guid: ca9f5fa95ffab41fb9a615ab714db018,
-    type: 3}
-  m_MoveAction: {fileID: -8784545083839296357, guid: ca9f5fa95ffab41fb9a615ab714db018,
-    type: 3}
-  m_SubmitAction: {fileID: 392368643174621059, guid: ca9f5fa95ffab41fb9a615ab714db018,
-    type: 3}
-  m_CancelAction: {fileID: 7727032971491509709, guid: ca9f5fa95ffab41fb9a615ab714db018,
-    type: 3}
-  m_LeftClickAction: {fileID: 3001919216989983466, guid: ca9f5fa95ffab41fb9a615ab714db018,
-    type: 3}
-  m_MiddleClickAction: {fileID: -2185481485913320682, guid: ca9f5fa95ffab41fb9a615ab714db018,
-    type: 3}
-  m_RightClickAction: {fileID: -4090225696740746782, guid: ca9f5fa95ffab41fb9a615ab714db018,
-    type: 3}
-  m_ScrollWheelAction: {fileID: 6240969308177333660, guid: ca9f5fa95ffab41fb9a615ab714db018,
-    type: 3}
-  m_TrackedDevicePositionAction: {fileID: 6564999863303420839, guid: ca9f5fa95ffab41fb9a615ab714db018,
-    type: 3}
-  m_TrackedDeviceOrientationAction: {fileID: 7970375526676320489, guid: ca9f5fa95ffab41fb9a615ab714db018,
-    type: 3}
-  m_DeselectOnBackgroundClick: 1
-  m_PointerBehavior: 0
-  m_CursorLockBehavior: 0
+  m_HorizontalAxis: Horizontal
+  m_VerticalAxis: Vertical
+  m_SubmitButton: Submit
+  m_CancelButton: Cancel
+  m_InputActionsPerSecond: 10
+  m_RepeatDelay: 0.5
+  m_ForceModuleActive: 0
 --- !u!1001 &1764769161
 PrefabInstance:
   m_ObjectHideFlags: 0