浏览代码

Merge pull request #8 from Unity-Technologies/preview.15-update

Preview.15 update
/main
GitHub 3 年前
当前提交
a3da8a7f
共有 11 个文件被更改,包括 128 次插入55 次删除
  1. 10
      Assets/Settings/LWRP_Pipe_Asset.asset
  2. 3
      Assets/UI/UnityRoyalePanelSettings.asset
  3. 18
      Packages/manifest.json
  4. 100
      Packages/packages-lock.json
  5. 4
      ProjectSettings/ProjectVersion.txt
  6. 8
      Assets/UI Toolkit/UnityThemes.meta
  7. 21
      Assets/UITKRuntimeDemo.asmdef
  8. 7
      Assets/UITKRuntimeDemo.asmdef.meta
  9. 11
      Assets/UI Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss.meta
  10. 1
      Assets/UI Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss

10
Assets/Settings/LWRP_Pipe_Asset.asset


m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3}
m_Name: LWRP_Pipe_Asset
m_EditorClassIdentifier:
k_AssetVersion: 7
k_AssetPreviousVersion: 7
k_AssetVersion: 9
k_AssetPreviousVersion: 9
m_RendererType: 0
m_RendererData: {fileID: 11400000, guid: 01ef2771b975f45e29bd82cba55599e1, type: 2}
m_RendererDataList:

m_AdditionalLightsPerObjectLimit: 4
m_AdditionalLightShadowsSupported: 0
m_AdditionalLightsShadowmapResolution: 512
m_AdditionalLightsShadowResolutionTierLow: 256
m_AdditionalLightsShadowResolutionTierMedium: 512
m_AdditionalLightsShadowResolutionTierHigh: 1024
m_AdditionalLightsShadowResolutionTierLow: 128
m_AdditionalLightsShadowResolutionTierMedium: 256
m_AdditionalLightsShadowResolutionTierHigh: 512
m_ShadowDistance: 180
m_ShadowCascadeCount: 4
m_Cascade2Split: 0.25

3
Assets/UI/UnityRoyalePanelSettings.asset


m_Script: {fileID: 11500000, guid: 782f629a2df6243629ea8fe2873666a4, type: 3}
m_Name: UnityRoyalePanelSettings
m_EditorClassIdentifier:
themeUss: {fileID: 11400000, guid: f567955c754d54a108d615cb51ccbf2f, type: 2}
themeUss: {fileID: -4733365628477956816, guid: d759aaabe9049443383e8baa60184657,
type: 3}
m_TargetTexture: {fileID: 0}
m_ScaleMode: 0
m_Scale: 1

18
Packages/manifest.json


{
"dependencies": {
"com.unity.addressables": "1.16.15",
"com.unity.cinemachine": "2.7.1",
"com.unity.ide.rider": "3.0.3",
"com.unity.ide.visualstudio": "2.0.5",
"com.unity.addressables": "1.16.19",
"com.unity.cinemachine": "2.7.4",
"com.unity.ide.rider": "3.0.7",
"com.unity.ide.visualstudio": "2.0.9",
"com.unity.render-pipelines.lightweight": "10.1.0",
"com.unity.textmeshpro": "3.0.3",
"com.unity.timeline": "1.5.1-pre.3",
"com.unity.render-pipelines.lightweight": "10.5.0",
"com.unity.textmeshpro": "3.0.6",
"com.unity.timeline": "1.5.5",
"com.unity.ui": "1.0.0-preview.14",
"com.unity.ui.builder": "1.0.0-preview.12",
"com.unity.ui": "1.0.0-preview.15",
"com.unity.ui.builder": "1.0.0-preview.15",
"com.unity.vectorgraphics": "2.0.0-preview.12",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",

100
Packages/packages-lock.json


"dependencies": {}
},
"com.unity.addressables": {
"version": "1.16.15",
"version": "1.16.19",
"com.unity.scriptablebuildpipeline": "1.15.1",
"com.unity.scriptablebuildpipeline": "1.15.2",
"com.unity.modules.assetbundle": "1.0.0",
"com.unity.modules.unitywebrequest": "1.0.0",
"com.unity.modules.unitywebrequestassetbundle": "1.0.0"

"com.unity.cinemachine": {
"version": "2.7.1",
"version": "2.7.4",
"depth": 0,
"source": "registry",
"dependencies": {},

"version": "1.0.5",
"depth": 2,
"version": "1.0.6",
"depth": 1,
"version": "3.0.3",
"version": "3.0.7",
"com.unity.test-framework": "1.1.1"
"com.unity.ext.nunit": "1.0.6"
"version": "2.0.5",
"version": "2.0.9",
"dependencies": {},
"dependencies": {
"com.unity.test-framework": "1.1.9"
},
"url": "https://packages.unity.com"
},
"com.unity.ide.vscode": {

"url": "https://packages.unity.com"
},
"com.unity.mathematics": {
"version": "1.2.1",
"version": "1.1.0",
"depth": 2,
"source": "registry",
"dependencies": {},

"version": "3.0.2",
"version": "2.3.0",
"source": "builtin",
"dependencies": {}
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
"version": "11.0.0",
"version": "10.5.0",
"source": "builtin",
"source": "registry",
}
},
"url": "https://packages.unity.com"
"version": "10.1.0",
"version": "10.5.0",
"com.unity.render-pipelines.universal": "10.1.0",
"com.unity.render-pipelines.universal": "10.5.0",
"version": "11.0.0",
"version": "10.5.0",
"source": "builtin",
"source": "registry",
"com.unity.render-pipelines.core": "11.0.0",
"com.unity.shadergraph": "11.0.0"
}
"com.unity.render-pipelines.core": "10.5.0",
"com.unity.shadergraph": "10.5.0"
},
"url": "https://packages.unity.com"
"version": "1.15.1",
"version": "1.15.2",
"depth": 1,
"source": "registry",
"dependencies": {},

"version": "4.3.1",
"version": "4.3.2",
"depth": 3,
"source": "registry",
"dependencies": {},

"version": "11.0.0",
"version": "10.5.0",
"source": "builtin",
"source": "registry",
"com.unity.render-pipelines.core": "11.0.0",
"com.unity.searcher": "4.3.1"
}
"com.unity.render-pipelines.core": "10.5.0",
"com.unity.searcher": "4.3.2"
},
"url": "https://packages.unity.com"
"version": "1.1.19",
"version": "1.1.27",
"com.unity.ext.nunit": "1.0.5",
"com.unity.ext.nunit": "1.0.6",
"com.unity.modules.imgui": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0"
},

"version": "1.0.0-preview.2",
"version": "1.0.0-preview.3",
"depth": 1,
"source": "registry",
"dependencies": {},

"version": "3.0.3",
"version": "3.0.6",
"depth": 0,
"source": "registry",
"dependencies": {

},
"com.unity.timeline": {
"version": "1.5.1-pre.3",
"version": "1.5.5",
"depth": 0,
"source": "registry",
"dependencies": {

}
},
"com.unity.ui": {
"version": "1.0.0-preview.14",
"version": "1.0.0-preview.15",
"nuget.moq": "1.0.0",
"nuget.castle-core": "1.0.1",
"com.unity.textcore": "1.0.0-preview.2"
"com.unity.textcore": "1.0.0-preview.3"
"version": "1.0.0-preview.12",
"version": "1.0.0-preview.15",
"depth": 0,
"source": "registry",
"dependencies": {},

"dependencies": {
"com.unity.2d.sprite": "1.0.0",
"com.unity.ugui": "1.0.0"
},
"url": "https://packages.unity.com"
},
"nuget.castle-core": {
"version": "1.0.1",
"depth": 1,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"nuget.moq": {
"version": "1.0.0",
"depth": 1,
"source": "registry",
"dependencies": {
"nuget.castle-core": "1.0.1"
},
"url": "https://packages.unity.com"
},

4
ProjectSettings/ProjectVersion.txt


m_EditorVersion: 2021.1.0b3
m_EditorVersionWithRevision: 2021.1.0b3 (202fb86be42c)
m_EditorVersion: 2020.3.14f1
m_EditorVersionWithRevision: 2020.3.14f1 (d0d1bb862f9d)

8
Assets/UI Toolkit/UnityThemes.meta


fileFormatVersion: 2
guid: 34dce80d98f7e49cb80983bdfedd9369
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

21
Assets/UITKRuntimeDemo.asmdef


{
"name": "UITKRuntimeDemo",
"rootNamespace": "",
"references": [
"UnityEngine.UIElementsModule",
"Unity.Addressables",
"Unity.ResourceManager",
"Cinemachine",
"Unity.Timeline",
"NavMeshComponents"
],
"includePlatforms": [],
"excludePlatforms": [],
"allowUnsafeCode": false,
"overrideReferences": false,
"precompiledReferences": [],
"autoReferenced": false,
"defineConstraints": [],
"versionDefines": [],
"noEngineReferences": false
}

7
Assets/UITKRuntimeDemo.asmdef.meta


fileFormatVersion: 2
guid: 0707d8fe56492483ca06ec601d312298
AssemblyDefinitionImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

11
Assets/UI Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss.meta


fileFormatVersion: 2
guid: d759aaabe9049443383e8baa60184657
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 12388, guid: 0000000000000000e000000000000000, type: 0}
disableValidation: 0

1
Assets/UI Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss


@import url("unity-theme://default");
正在加载...
取消
保存