Skip to content

Commit 50eb288

Browse files
committed
Upgrade to support Unity 2020.3.4f1 LTS
1 parent 6a4f725 commit 50eb288

14 files changed

+58
-5
lines changed
2.31 KB
Binary file not shown.
2.31 KB
Binary file not shown.
1.55 KB
Binary file not shown.
1.35 KB
Binary file not shown.
1.55 KB
Binary file not shown.
1.49 KB
Binary file not shown.
Binary file not shown.

Packages/manifest.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
"com.unity.2d.sprite": "1.0.0",
44
"com.unity.2d.tilemap": "1.0.0",
55
"com.unity.ext.nunit": "1.0.6",
6-
"com.unity.ide.rider": "1.1.4",
6+
"com.unity.ide.rider": "2.0.7",
7+
"com.unity.ide.visualstudio": "2.0.7",
78
"com.unity.ide.vscode": "1.2.3",
89
"com.unity.postprocessing": "3.0.3",
910
"com.unity.test-framework": "1.1.24",

Packages/packages-lock.json

+22-1
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,23 @@
2020
"url": "https://packages.unity.com"
2121
},
2222
"com.unity.ide.rider": {
23-
"version": "1.1.4",
23+
"version": "2.0.7",
2424
"depth": 0,
2525
"source": "registry",
2626
"dependencies": {
2727
"com.unity.test-framework": "1.1.1"
2828
},
2929
"url": "https://packages.unity.com"
3030
},
31+
"com.unity.ide.visualstudio": {
32+
"version": "2.0.7",
33+
"depth": 0,
34+
"source": "registry",
35+
"dependencies": {
36+
"com.unity.test-framework": "1.1.9"
37+
},
38+
"url": "https://packages.unity.com"
39+
},
3140
"com.unity.ide.vscode": {
3241
"version": "1.2.3",
3342
"depth": 0,
@@ -197,6 +206,18 @@
197206
"depth": 0,
198207
"source": "builtin",
199208
"dependencies": {
209+
"com.unity.modules.ui": "1.0.0",
210+
"com.unity.modules.imgui": "1.0.0",
211+
"com.unity.modules.jsonserialize": "1.0.0",
212+
"com.unity.modules.uielementsnative": "1.0.0"
213+
}
214+
},
215+
"com.unity.modules.uielementsnative": {
216+
"version": "1.0.0",
217+
"depth": 1,
218+
"source": "builtin",
219+
"dependencies": {
220+
"com.unity.modules.ui": "1.0.0",
200221
"com.unity.modules.imgui": "1.0.0",
201222
"com.unity.modules.jsonserialize": "1.0.0"
202223
}

ProjectSettings/ProjectSettings.asset

1.76 KB
Binary file not shown.

ProjectSettings/ProjectVersion.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 2019.4.21f1
2-
m_EditorVersionWithRevision: 2019.4.21f1 (b76dac84db26)
1+
m_EditorVersion: 2020.3.4f1
2+
m_EditorVersionWithRevision: 2020.3.4f1 (0abb6314276a)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!890905787 &1
4+
VersionControlSettings:
5+
m_ObjectHideFlags: 0
6+
m_Mode: Visible Meta Files
7+
m_CollabEditorSettings:
8+
inProgressEnabled: 1

README.md

+5-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@
44
[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
55
[![Template from jarvis](https://img.shields.io/badge/Hi-Jarvis-ff69b4.svg)](https://github.com/Armour/Jarvis)
66

7-
A multiplayer first-person shooter game based on Unity3D. Different types of input devices are supported, including Kinect, Xbox controllers, Leap motion, and VR Glasses. (Each contained in a different branch)
7+
A multiplayer first-person shooter game based on Unity3D. Different types of input devices are supported, including Kinect, Xbox controllers, Leap motion, and VR Glasses. (Each contained in a different branch, *UPDATE: those are not maintained since 2020, use at your own risk*)
8+
9+
## Requirement
10+
11+
[Unity 2020.3.4f1 (LTS)](https://unity.cn/release-notes/lts/2020/2020.3.4f1)
812

913
## Game logic and functionality
1014

UserSettings/EditorUserSettings.asset

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!162 &1
4+
EditorUserSettings:
5+
m_ObjectHideFlags: 0
6+
serializedVersion: 4
7+
m_ConfigSettings:
8+
vcSharedLogLevel:
9+
value: 0d5e400f0650
10+
flags: 0
11+
m_VCAutomaticAdd: 1
12+
m_VCDebugCom: 0
13+
m_VCDebugCmd: 0
14+
m_VCDebugOut: 0
15+
m_SemanticMergeMode: 2
16+
m_VCShowFailedCheckout: 1
17+
m_VCOverwriteFailedCheckoutAssets: 1
18+
m_VCOverlayIcons: 1
19+
m_VCAllowAsyncUpdate: 0

0 commit comments

Comments
 (0)