Skip to content

Commit

Permalink
Upgrade unity ver and packages
Browse files Browse the repository at this point in the history
  • Loading branch information
Guerra24 committed Jul 13, 2024
1 parent e374301 commit c8300af
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 54 deletions.
2 changes: 1 addition & 1 deletion .github/game-ci/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG GAMECI_IMAGE=unityci/editor:ubuntu-6000.0.8f1-windows-mono-3
ARG GAMECI_IMAGE=unityci/editor:ubuntu-6000.0.10f1-windows-mono-3
FROM $GAMECI_IMAGE

ARG BLENDER_SHORT_VERSION=3.5
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ jobs:
strategy:
matrix:
build:
- { target-platform: StandaloneWindows64, image: 'unityci/editor:ubuntu-6000.0.8f1-windows-mono-3' }
- { target-platform: StandaloneLinux64, image: 'unityci/editor:ubuntu-6000.0.8f1-linux-il2cpp-3' }
- { target-platform: StandaloneWindows64, image: 'unityci/editor:ubuntu-6000.0.10f1-windows-mono-3' }
- { target-platform: StandaloneLinux64, image: 'unityci/editor:ubuntu-6000.0.10f1-linux-il2cpp-3' }
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
25 changes: 0 additions & 25 deletions Assets/AddressableAssetsData/link.xml

This file was deleted.

7 changes: 0 additions & 7 deletions Assets/AddressableAssetsData/link.xml.meta

This file was deleted.

2 changes: 2 additions & 0 deletions Assets/UI Toolkit/PanelSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
themeUss: {fileID: -4733365628477956816, guid: 86f830a54601a9c4ba34bd6328815b39,
type: 3}
m_DisableNoThemeWarning: 0
m_TargetTexture: {fileID: 0}
m_RenderMode: 0
m_WorldSpaceLayer: 0
Expand Down Expand Up @@ -42,4 +43,5 @@ MonoBehaviour:
m_RuntimeShader: {fileID: 9100, guid: 0000000000000000f000000000000000, type: 0}
m_RuntimeWorldShader: {fileID: 9102, guid: 0000000000000000f000000000000000, type: 0}
m_ICUDataAsset: {fileID: 0}
forceGammaRendering: 0
textSettings: {fileID: 0}
10 changes: 5 additions & 5 deletions Packages/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"dependencies": {
"com.cysharp.unitask": "https://github.com/Cysharp/UniTask.git?path=src/UniTask/Assets/Plugins/UniTask",
"com.dbrizov.naughtyattributes": "https://github.com/dbrizov/NaughtyAttributes.git#upm",
"com.hecomi.ulipsync": "3.1.2",
"com.hecomi.ulipsync": "3.1.3",
"com.jimmycushnie.jimmysunityutilities": "https://github.com/JimmyCushnie/JimmysUnityUtilities.git",
"com.unity.2d.sprite": "1.0.0",
"com.unity.collab-proxy": "2.3.1",
"com.unity.collab-proxy": "2.4.3",
"com.unity.ide.visualstudio": "2.0.22",
"com.unity.localization": "1.5.2",
"com.unity.memoryprofiler": "1.1.0",
Expand All @@ -14,9 +14,9 @@
"com.unity.test-framework": "1.4.4",
"com.unity.timeline": "1.8.7",
"com.unity.ugui": "2.0.0",
"com.vrmc.gltf": "https://github.com/vrm-c/UniVRM.git?path=/Assets/UniGLTF#v0.123.0",
"com.vrmc.univrm": "https://github.com/vrm-c/UniVRM.git?path=/Assets/VRM#v0.123.0",
"com.vrmc.vrmshaders": "https://github.com/vrm-c/UniVRM.git?path=/Assets/VRMShaders#v0.123.0",
"com.vrmc.gltf": "https://github.com/vrm-c/UniVRM.git?path=/Assets/UniGLTF#v0.124.1",
"com.vrmc.univrm": "https://github.com/vrm-c/UniVRM.git?path=/Assets/VRM#v0.124.1",
"com.vrmc.vrmshaders": "https://github.com/vrm-c/UniVRM.git?path=/Assets/VRMShaders#v0.124.1",
"jp.keijiro.klak.spout": "2.0.3",
"com.unity.modules.accessibility": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",
Expand Down
24 changes: 12 additions & 12 deletions Packages/packages-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"depth": 0,
"source": "git",
"dependencies": {},
"hash": "2e225fb8414e023df2aa3acae2ef225471981316"
"hash": "cdf88c6a6ac8c9b7e6e5d3c0a360a4af29641c24"
},
"com.dbrizov.naughtyattributes": {
"version": "https://github.com/dbrizov/NaughtyAttributes.git#upm",
Expand All @@ -15,7 +15,7 @@
"hash": "8a8fa5a9659a6d63f196391c71e06c4286c8acd7"
},
"com.hecomi.ulipsync": {
"version": "3.1.2",
"version": "3.1.3",
"depth": 0,
"source": "registry",
"dependencies": {
Expand Down Expand Up @@ -63,7 +63,7 @@
"url": "https://packages.unity.com"
},
"com.unity.collab-proxy": {
"version": "2.3.1",
"version": "2.4.3",
"depth": 0,
"source": "registry",
"dependencies": {},
Expand Down Expand Up @@ -181,34 +181,34 @@
}
},
"com.vrmc.gltf": {
"version": "https://github.com/vrm-c/UniVRM.git?path=/Assets/UniGLTF#v0.123.0",
"version": "https://github.com/vrm-c/UniVRM.git?path=/Assets/UniGLTF#v0.124.1",
"depth": 0,
"source": "git",
"dependencies": {
"com.vrmc.vrmshaders": "0.123.0",
"com.vrmc.vrmshaders": "0.124.1",
"com.unity.modules.animation": "1.0.0"
},
"hash": "3104b4c75511032765a21ca4365e2d3fe78030fc"
"hash": "8b1dd9602c8d2aafb7239be7f39ca5f377dc0c0d"
},
"com.vrmc.univrm": {
"version": "https://github.com/vrm-c/UniVRM.git?path=/Assets/VRM#v0.123.0",
"version": "https://github.com/vrm-c/UniVRM.git?path=/Assets/VRM#v0.124.1",
"depth": 0,
"source": "git",
"dependencies": {
"com.vrmc.vrmshaders": "0.123.0",
"com.vrmc.gltf": "0.123.0",
"com.vrmc.vrmshaders": "0.124.1",
"com.vrmc.gltf": "0.124.1",
"com.unity.ugui": "1.0.0"
},
"hash": "3104b4c75511032765a21ca4365e2d3fe78030fc"
"hash": "8b1dd9602c8d2aafb7239be7f39ca5f377dc0c0d"
},
"com.vrmc.vrmshaders": {
"version": "https://github.com/vrm-c/UniVRM.git?path=/Assets/VRMShaders#v0.123.0",
"version": "https://github.com/vrm-c/UniVRM.git?path=/Assets/VRMShaders#v0.124.1",
"depth": 0,
"source": "git",
"dependencies": {
"com.unity.modules.imageconversion": "1.0.0"
},
"hash": "3104b4c75511032765a21ca4365e2d3fe78030fc"
"hash": "8b1dd9602c8d2aafb7239be7f39ca5f377dc0c0d"
},
"jp.keijiro.klak.spout": {
"version": "2.0.3",
Expand Down
4 changes: 2 additions & 2 deletions ProjectSettings/ProjectVersion.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
m_EditorVersion: 6000.0.8f1
m_EditorVersionWithRevision: 6000.0.8f1 (fa7102f01711)
m_EditorVersion: 6000.0.10f1
m_EditorVersionWithRevision: 6000.0.10f1 (413673acabac)

0 comments on commit c8300af

Please sign in to comment.