update unity to 2021

This commit is contained in:
zhangjie0072 2022-08-01 11:45:58 +08:00
parent 6f3a204a9e
commit dc47e1dfd2
10 changed files with 62 additions and 68 deletions

View File

@ -90,7 +90,7 @@ namespace ES3Internal
public void GeneratePrefabReferences() public void GeneratePrefabReferences()
{ {
#if UNITY_2018_3_OR_NEWER #if UNITY_2018_3_OR_NEWER
if (this.gameObject.scene.name != null || UnityEditor.Experimental.SceneManagement.PrefabStageUtility.GetCurrentPrefabStage() != null) if (this.gameObject.scene.name != null || UnityEditor.SceneManagement.PrefabStageUtility.GetCurrentPrefabStage() != null)
#else #else
if (this.gameObject.scene.name != null) if (this.gameObject.scene.name != null)
#endif #endif

View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 14077bb4dfcdf487aa222261b4719a0e
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: b24e50552812c4744bee4993ab8c8100
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 080a33cc99a93e04f919698d4ba695dd
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: fff90a9752fcf4776ac78b63a2dc5bbe
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: ef04dda9954cb475e837d171f41edddc
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 0f23cc7cad673124cba2684fe768a345
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 33f2ecc6bd637416a867bd317d8fe151
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -2,11 +2,11 @@
"dependencies": { "dependencies": {
"com.unity.2d.animation": "3.2.16", "com.unity.2d.animation": "3.2.16",
"com.unity.2d.pixel-perfect": "2.1.0", "com.unity.2d.pixel-perfect": "2.1.0",
"com.unity.2d.psdimporter": "2.1.11", "com.unity.2d.psdimporter": "6.0.4",
"com.unity.2d.sprite": "1.0.0", "com.unity.2d.sprite": "1.0.0",
"com.unity.2d.spriteshape": "3.0.18", "com.unity.2d.spriteshape": "7.0.5",
"com.unity.2d.tilemap": "1.0.0", "com.unity.2d.tilemap": "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": "1.2.1",
"com.unity.ide.visualstudio": "2.0.14", "com.unity.ide.visualstudio": "2.0.14",
"com.unity.ide.vscode": "1.2.5", "com.unity.ide.vscode": "1.2.5",

View File

@ -1,12 +1,11 @@
{ {
"dependencies": { "dependencies": {
"com.unity.2d.animation": { "com.unity.2d.animation": {
"version": "3.2.17", "version": "7.0.6",
"depth": 1, "depth": 1,
"source": "registry", "source": "registry",
"dependencies": { "dependencies": {
"com.unity.2d.common": "2.1.2", "com.unity.2d.common": "6.0.3",
"com.unity.mathematics": "1.1.0",
"com.unity.2d.sprite": "1.0.0", "com.unity.2d.sprite": "1.0.0",
"com.unity.modules.animation": "1.0.0", "com.unity.modules.animation": "1.0.0",
"com.unity.modules.uielements": "1.0.0" "com.unity.modules.uielements": "1.0.0"
@ -14,17 +13,19 @@
"url": "https://packages.unity.cn" "url": "https://packages.unity.cn"
}, },
"com.unity.2d.common": { "com.unity.2d.common": {
"version": "2.1.2", "version": "6.0.3",
"depth": 1, "depth": 1,
"source": "registry", "source": "registry",
"dependencies": { "dependencies": {
"com.unity.2d.sprite": "1.0.0", "com.unity.2d.sprite": "1.0.0",
"com.unity.modules.uielements": "1.0.0" "com.unity.mathematics": "1.1.0",
"com.unity.modules.uielements": "1.0.0",
"com.unity.burst": "1.5.1"
}, },
"url": "https://packages.unity.cn" "url": "https://packages.unity.cn"
}, },
"com.unity.2d.path": { "com.unity.2d.path": {
"version": "2.1.1", "version": "5.0.2",
"depth": 1, "depth": 1,
"source": "registry", "source": "registry",
"dependencies": {}, "dependencies": {},
@ -38,12 +39,12 @@
"url": "https://packages.unity.cn" "url": "https://packages.unity.cn"
}, },
"com.unity.2d.psdimporter": { "com.unity.2d.psdimporter": {
"version": "2.1.11", "version": "6.0.4",
"depth": 0, "depth": 0,
"source": "registry", "source": "registry",
"dependencies": { "dependencies": {
"com.unity.2d.common": "2.1.2", "com.unity.2d.animation": "7.0.6",
"com.unity.2d.animation": "3.2.17", "com.unity.2d.common": "6.0.3",
"com.unity.2d.sprite": "1.0.0" "com.unity.2d.sprite": "1.0.0"
}, },
"url": "https://packages.unity.cn" "url": "https://packages.unity.cn"
@ -55,13 +56,14 @@
"dependencies": {} "dependencies": {}
}, },
"com.unity.2d.spriteshape": { "com.unity.2d.spriteshape": {
"version": "3.0.18", "version": "7.0.5",
"depth": 0, "depth": 0,
"source": "registry", "source": "registry",
"dependencies": { "dependencies": {
"com.unity.mathematics": "1.1.0", "com.unity.mathematics": "1.1.0",
"com.unity.2d.common": "2.1.0", "com.unity.2d.common": "6.0.3",
"com.unity.2d.path": "2.1.1" "com.unity.2d.path": "5.0.2",
"com.unity.modules.physics2d": "1.0.0"
}, },
"url": "https://packages.unity.cn" "url": "https://packages.unity.cn"
}, },
@ -71,11 +73,22 @@
"source": "builtin", "source": "builtin",
"dependencies": {} "dependencies": {}
}, },
"com.unity.burst": {
"version": "1.6.6",
"depth": 2,
"source": "registry",
"dependencies": {
"com.unity.mathematics": "1.2.1"
},
"url": "https://packages.unity.cn"
},
"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": {
@ -111,12 +124,30 @@
"url": "https://packages.unity.cn" "url": "https://packages.unity.cn"
}, },
"com.unity.mathematics": { "com.unity.mathematics": {
"version": "1.1.0", "version": "1.2.6",
"depth": 1, "depth": 1,
"source": "registry", "source": "registry",
"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.services.core": {
"version": "1.4.0",
"depth": 1,
"source": "registry",
"dependencies": {
"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"
},
"com.unity.test-framework": { "com.unity.test-framework": {
"version": "1.1.31", "version": "1.1.31",
"depth": 0, "depth": 0,
@ -291,6 +322,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"
} }