yangwu
/
mergemilitary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

升级unity2020

This commit is contained in:
yangjing 2022-09-26 16:49:31 +08:00
parent 954c0cf4d2
commit 5e7e9d3b31
4 changed files with 61 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Packages/manifest.json
View File

@ -1,14 +1,14 @@
{ {
"dependencies": { "dependencies": {
"com.unity.2d.sprite": "1.0.0", "com.unity.2d.sprite": "1.0.0",
"com.unity.collab-proxy": "1.14.15", "com.unity.collab-proxy": "1.17.2",
"com.unity.ide.rider": "1.2.1", "com.unity.ide.rider": "2.0.7",
"com.unity.ide.visualstudio": "2.0.14", "com.unity.ide.visualstudio": "2.0.16",
"com.unity.ide.vscode": "1.2.5", "com.unity.ide.vscode": "1.2.5",
"com.unity.purchasing": "4.1.3", "com.unity.purchasing": "4.4.1",
"com.unity.test-framework": "1.1.31", "com.unity.test-framework": "1.1.31",
"com.unity.textmeshpro": "2.1.6", "com.unity.textmeshpro": "3.0.6",
"com.unity.timeline": "1.2.18", "com.unity.timeline": "1.4.8",
"com.unity.ugui": "1.0.0", "com.unity.ugui": "1.0.0",
"com.unity.modules.ai": "1.0.0", "com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0", "com.unity.modules.androidjni": "1.0.0",

56
Packages/packages-lock.json
View File

@ -7,10 +7,12 @@
"dependencies": {} "dependencies": {}
}, },
"com.unity.collab-proxy": { "com.unity.collab-proxy": {
"version": "1.14.15", "version": "1.17.2",
"depth": 0, "depth": 0,
"source": "registry", "source": "registry",
"dependencies": {}, "dependencies": {
"com.unity.services.core": "1.0.1"
},
"url": "https://packages.unity.cn" "url": "https://packages.unity.cn"
}, },
"com.unity.ext.nunit": { "com.unity.ext.nunit": {
@ -21,7 +23,7 @@
"url": "https://packages.unity.cn" "url": "https://packages.unity.cn"
}, },
"com.unity.ide.rider": { "com.unity.ide.rider": {
"version": "1.2.1", "version": "2.0.7",
"depth": 0, "depth": 0,
"source": "registry", "source": "registry",
"dependencies": { "dependencies": {
@ -30,7 +32,7 @@
"url": "https://packages.unity.cn" "url": "https://packages.unity.cn"
}, },
"com.unity.ide.visualstudio": { "com.unity.ide.visualstudio": {
"version": "2.0.14", "version": "2.0.16",
"depth": 0, "depth": 0,
"source": "registry", "source": "registry",
"dependencies": { "dependencies": {
@ -45,8 +47,15 @@
"dependencies": {}, "dependencies": {},
"url": "https://packages.unity.cn" "url": "https://packages.unity.cn"
}, },
"com.unity.nuget.newtonsoft-json": {
"version": "3.0.2",
"depth": 2,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.cn"
},
"com.unity.purchasing": { "com.unity.purchasing": {
"version": "4.1.3", "version": "4.4.1",
"depth": 0, "depth": 0,
"source": "registry", "source": "registry",
"dependencies": { "dependencies": {
@ -55,16 +64,29 @@
"com.unity.modules.unitywebrequest": "1.0.0", "com.unity.modules.unitywebrequest": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0",
"com.unity.modules.androidjni": "1.0.0", "com.unity.modules.androidjni": "1.0.0",
"com.unity.services.core": "1.0.1" "com.unity.services.core": "1.3.1",
"com.unity.services.analytics": "4.0.1"
},
"url": "https://packages.unity.cn"
},
"com.unity.services.analytics": {
"version": "4.0.1",
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.ugui": "1.0.0",
"com.unity.services.core": "1.4.0"
}, },
"url": "https://packages.unity.cn" "url": "https://packages.unity.cn"
}, },
"com.unity.services.core": { "com.unity.services.core": {
"version": "1.0.1", "version": "1.4.0",
"depth": 1, "depth": 2,
"source": "registry", "source": "registry",
"dependencies": { "dependencies": {
"com.unity.modules.unitywebrequest": "1.0.0" "com.unity.modules.unitywebrequest": "1.0.0",
"com.unity.nuget.newtonsoft-json": "3.0.2",
"com.unity.modules.androidjni": "1.0.0"
}, },
"url": "https://packages.unity.cn" "url": "https://packages.unity.cn"
}, },
@ -80,7 +102,7 @@
"url": "https://packages.unity.cn" "url": "https://packages.unity.cn"
}, },
"com.unity.textmeshpro": { "com.unity.textmeshpro": {
"version": "2.1.6", "version": "3.0.6",
"depth": 0, "depth": 0,
"source": "registry", "source": "registry",
"dependencies": { "dependencies": {
@ -89,7 +111,7 @@
"url": "https://packages.unity.cn" "url": "https://packages.unity.cn"
}, },
"com.unity.timeline": { "com.unity.timeline": {
"version": "1.2.18", "version": "1.4.8",
"depth": 0, "depth": 0,
"source": "registry", "source": "registry",
"dependencies": { "dependencies": {
@ -242,6 +264,18 @@
"depth": 0, "depth": 0,
"source": "builtin", "source": "builtin",
"dependencies": { "dependencies": {
"com.unity.modules.ui": "1.0.0",
"com.unity.modules.imgui": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0",
"com.unity.modules.uielementsnative": "1.0.0"
}
},
"com.unity.modules.uielementsnative": {
"version": "1.0.0",
"depth": 1,
"source": "builtin",
"dependencies": {
"com.unity.modules.ui": "1.0.0",
"com.unity.modules.imgui": "1.0.0", "com.unity.modules.imgui": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0" "com.unity.modules.jsonserialize": "1.0.0"
} }

4
ProjectSettings/ProjectVersion.txt
View File

@ -1,2 +1,2 @@
m_EditorVersion: 2019.4.38f1c1 m_EditorVersion: 2020.3.38f1c1
m_EditorVersionWithRevision: 2019.4.38f1c1 (df80985e05f0) m_EditorVersionWithRevision: 2020.3.38f1c1 (7f6c29cb6f61)

8
ProjectSettings/VersionControlSettings.asset Normal file
View File

@ -0,0 +1,8 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!890905787 &1
VersionControlSettings:
m_ObjectHideFlags: 0
m_Mode: Visible Meta Files
m_CollabEditorSettings:
inProgressEnabled: 1