浏览代码

Circumventing broken Canvas prefab in changelist.

/main/staging/UI_Marketing_Assets
当前提交
aea6cc91
共有 5 个文件被更改,包括 1522 次插入385 次删除
  1. 883
      Assets/Scenes/mainScene.unity
  2. 6
      Packages/manifest.json
  3. 10
      Packages/packages-lock.json
  4. 1001
      Assets/Prefabs/UI/GameCanvas 1.prefab
  5. 7
      Assets/Prefabs/UI/GameCanvas 1.prefab.meta

883
Assets/Scenes/mainScene.unity
文件差异内容过多而无法显示
查看文件

6
Packages/manifest.json


{
"dependencies": {
"com.unity.2d.sprite": "1.0.0",
"com.unity.collab-proxy": "1.7.1",
"com.unity.collab-proxy": "1.9.0",
"com.unity.ide.visualstudio": "2.0.9",
"com.unity.ide.visualstudio": "2.0.11",
"com.unity.ide.vscode": "1.2.3",
"com.unity.nuget.newtonsoft-json": "2.0.0",
"com.unity.services.authentication": "1.0.0-pre.4",

"com.unity.services.vivox": "15.1.150000-pre.6",
"com.unity.sysroot.linux-x86_64": "0.1.15-preview",
"com.unity.test-framework": "1.1.27",
"com.unity.test-framework": "1.1.29",
"com.unity.textmeshpro": "3.0.6",
"com.unity.toolchain.win-x86_64-linux-x86_64": "0.1.20-preview",
"com.unity.transport": "1.0.0-pre.5",

10
Packages/packages-lock.json


"url": "https://packages.unity.com"
},
"com.unity.collab-proxy": {
"version": "1.7.1",
"version": "1.9.0",
"dependencies": {
"com.unity.nuget.newtonsoft-json": "2.0.0"
},
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.collections": {

"url": "https://packages.unity.com"
},
"com.unity.ide.visualstudio": {
"version": "2.0.9",
"version": "2.0.11",
"depth": 0,
"source": "registry",
"dependencies": {

"url": "https://packages.unity.com"
},
"com.unity.test-framework": {
"version": "1.1.27",
"version": "1.1.29",
"depth": 0,
"source": "registry",
"dependencies": {

1001
Assets/Prefabs/UI/GameCanvas 1.prefab
文件差异内容过多而无法显示
查看文件

7
Assets/Prefabs/UI/GameCanvas 1.prefab.meta


fileFormatVersion: 2
guid: 9aae991127b410c45a001ecd7f75311d
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
正在加载...
取消
保存