比较提交

...
此合并请求有变更与目标分支冲突。
/.gitignore
/Packages/manifest.json
/ProjectSettings/ProjectVersion.txt
/ProjectSettings/ProjectSettings.asset
/ProjectSettings/VersionControlSettings.asset
/Assets/link.xml
/Assets/link.xml.meta

4 次代码提交

共有 26 个文件被更改,包括 263 次插入12 次删除
  1. 1
      .gitignore
  2. 19
      ProjectSettings/ProjectSettings.asset
  3. 4
      ProjectSettings/ProjectVersion.txt
  4. 3
      ProjectSettings/VFXManager.asset
  5. 20
      Packages/manifest.json
  6. 8
      ProjectSettings/VersionControlSettings.asset
  7. 8
      Assets/BuildConfigurations.meta
  8. 8
      Assets/IncrementalPipelineSupport.meta
  9. 11
      Assets/link.xml
  10. 7
      Assets/link.xml.meta
  11. 22
      Assets/BuildConfigurations/Android-Build.buildconfiguration
  12. 10
      Assets/BuildConfigurations/Android-Build.buildconfiguration.meta
  13. 8
      Assets/BuildConfigurations/Android-LiveLink.buildconfiguration
  14. 10
      Assets/BuildConfigurations/Android-LiveLink.buildconfiguration.meta
  15. 18
      Assets/BuildConfigurations/BaseBuildConfiguration.buildconfiguration
  16. 10
      Assets/BuildConfigurations/BaseBuildConfiguration.buildconfiguration.meta
  17. 14
      Assets/BuildConfigurations/Win64-Build.buildconfiguration
  18. 10
      Assets/BuildConfigurations/Win64-Build.buildconfiguration.meta
  19. 12
      Assets/BuildConfigurations/Win64-LiveLink.buildconfiguration
  20. 10
      Assets/BuildConfigurations/Win64-LiveLink.buildconfiguration.meta
  21. 18
      Assets/IncrementalPipelineSupport/IncrementalPipelineSupport.asmdef
  22. 7
      Assets/IncrementalPipelineSupport/IncrementalPipelineSupport.asmdef.meta
  23. 26
      Assets/IncrementalPipelineSupport/AddressablesBuildPipelineCustomizer.cs
  24. 11
      Assets/IncrementalPipelineSupport/AddressablesBuildPipelineCustomizer.cs.meta

1
.gitignore


MemoryCaptures
Assets/BuildReports
SerializedBuildInfo
standalone/

19
ProjectSettings/ProjectSettings.asset


m_StereoRenderingPath: 1
m_ActiveColorSpace: 1
m_MTRendering: 1
mipStripping: 0
numberOfMipsStripped: 0
m_StackTraceTypes: 010000000100000001000000000000000100000001000000
iosShowActivityIndicatorOnLoading: -1
androidShowActivityIndicatorOnLoading: -1

xboxOneMonoLoggingLevel: 0
xboxOneLoggingLevel: 1
xboxOneDisableEsram: 0
xboxOneEnableTypeOptimization: 0
xboxOnePresentImmediateThreshold: 0
switchQueueCommandMemory: 0
switchQueueControlMemory: 0

bundleVersion: 0.9
preloadedAssets:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
metroInputSource: 0
wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1

iOSTargetOSVersionString: 11.0
tvOSSdkVersion: 0
tvOSRequireExtendedGameController: 0
tvOSTargetOSVersionString: 10.0
tvOSTargetOSVersionString: 11.0
uIPrerenderedIcon: 0
uIRequiresPersistentWiFi: 0
uIRequiresFullScreen: 1

cameraUsageDescription:
locationUsageDescription:
microphoneUsageDescription:
switchNMETAOverride:
switchNetLibKey:
switchSocketMemoryPoolSize: 6144
switchSocketAllocatorPoolSize: 128

switchUseGOLDLinker: 0
switchApplicationID: 0x01004b9000490000
switchNSODependencies:
switchTitleNames_0:

webGLAnalyzeBuildSize: 0
webGLUseEmbeddedResources: 0
webGLCompressionFormat: 1
webGLWasmArithmeticExceptions: 0
webGLWasmStreaming: 0
webGLDecompressionFallback: 0
1:
1: UNITY_BUILD_CLASS_BASED_PIPELINES
7:
7: UNITY_BUILD_CLASS_BASED_PIPELINES
13:
14:
17:

Standalone: 0
il2cppCompilerConfiguration: {}
managedStrippingLevel:
Standalone: 3
Standalone: 0
iPhone: 2
incrementalIl2cppBuild: {}
allowUnsafeCode: 0

enableNativePlatformBackendsForNewInputSystem: 1
disableOldInputManagerSupport: 1
legacyClampBlendShapeWeights: 0
virtualTexturingSupportEnabled: 0

4
ProjectSettings/ProjectVersion.txt


m_EditorVersion: 2019.3.0f6
m_EditorVersionWithRevision: 2019.3.0f6 (27ab2135bccf)
m_EditorVersion: 2020.1.0b2
m_EditorVersionWithRevision: 2020.1.0b2 (2c72f6782f7a)

3
ProjectSettings/VFXManager.asset


m_IndirectShader: {fileID: 0}
m_CopyBufferShader: {fileID: 0}
m_SortShader: {fileID: 0}
m_StripUpdateShader: {fileID: 0}
m_CompiledVersion: 0
m_RuntimeVersion: 0

20
Packages/manifest.json


{
"dependencies": {
"com.unity.2d.sprite": "1.0.0",
"com.unity.addressables": "1.6.0",
"com.unity.addressables": "1.6.2",
"com.unity.burst": "1.1.2",
"com.unity.cinemachine": "2.5.0",
"com.unity.ide.rider": "1.2.1",
"com.unity.ide.visualstudio": "2.0.0",

"com.unity.memoryprofiler": "0.2.1-preview.1",
"com.unity.recorder": "2.1.0-preview.1",
"com.unity.render-pipelines.universal": "7.2.1",
"com.unity.render-pipelines.universal": "8.0.1",
"com.unity.textmeshpro": "2.1.0-preview.4",
"com.unity.textmeshpro": "3.0.0-preview.1",
"com.unity.timeline": "1.2.11",
"com.unity.ugui": "1.0.0",
"net.peeweek.gameplay-ingredients": "https://github.com/peeweek/net.peeweek.gameplay-ingredients.git#2019.3.0",

"com.unity.modules.video": "1.0.0",
"com.unity.modules.vr": "1.0.0",
"com.unity.modules.wind": "1.0.0",
"com.unity.modules.xr": "1.0.0"
"com.unity.modules.xr": "1.0.0",
"com.unity.collections": "file:../../../dots/Samples/Packages/com.unity.collections",
"com.unity.entities": "file:../../../dots/Samples/Packages/com.unity.entities",
"com.unity.jobs": "file:../../../dots/Samples/Packages/com.unity.jobs",
"com.unity.mobile.android-logcat": "1.1.0",
"com.unity.platforms": "file:../../../dots-platforms/com.unity.platforms",
"com.unity.platforms.android": "file:../../../dots-platforms/com.unity.platforms.android",
"com.unity.platforms.ios": "file:../../../dots-platforms/com.unity.platforms.ios",
"com.unity.platforms.linux": "file:../../../dots-platforms/com.unity.platforms.linux",
"com.unity.platforms.macos": "file:../../../dots-platforms/com.unity.platforms.macos",
"com.unity.platforms.windows": "file:../../../dots-platforms/com.unity.platforms.windows",
"com.unity.rendering.hybrid": "file:../../../dots/Samples/Packages/com.unity.rendering.hybrid"
},
"lock": {
"net.peeweek.gameplay-ingredients": {

8
ProjectSettings/VersionControlSettings.asset


%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

8
Assets/BuildConfigurations.meta


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

8
Assets/IncrementalPipelineSupport.meta


fileFormatVersion: 2
guid: 84a25b9711507b140b981b35c2f5a63a
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

11
Assets/link.xml


<linker>
<assembly fullname="Unity.2D.IK.Runtime" preserve="all"/>
<assembly fullname="Unity.Entities" preserve="all"/>
<assembly fullname="Unity.Entities.Hybrid" preserve="all"/>
<assembly fullname="Unity.InputSystem" preserve="all"/>
<assembly fullname="Unity.RenderPipelines.Universal.Runtime" preserve="all"/>
<assembly fullname="Unity.Timeline" preserve="all"/>
<assembly fullname="Unity.Addressables" preserve="all"/>
<assembly fullname="Unity.ResourceManager" preserve="all"/>
</linker>

7
Assets/link.xml.meta


fileFormatVersion: 2
guid: 813b3929c051a9f4fb90120f9daa6984
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

22
Assets/BuildConfigurations/Android-Build.buildconfiguration


{
"Dependencies": [
"GlobalObjectId_V1-1-f19661c01bdcad546b54998aa9a0d08a-93214019566545601-0"
],
"Components": [{
"$type": "Unity.Build.Classic.ClassicBuildProfile, Unity.Build.Classic",
"Target": -2,
"Platform": "Android",
"Configuration": 2,
"Incremental": true,
"Pipeline": "Unity.Platforms.Android.Build.AndroidClassicIncrementalPipeline, Unity.Platforms.Android.Build",
"ExcludedAssemblies": []
}, {
"$type": "Unity.Platforms.Android.Build.ApplicationIdentifier, Unity.Platforms.Android.Build",
"PackageName": "com.UnityTechnologies.Samples"
}, {
"$type": "Unity.Platforms.Android.Build.AndroidExportSettings, Unity.Platforms.Android.Build",
"TargetType": 0,
"ExportProject": true,
"BuildSystem": 0
}]
}

10
Assets/BuildConfigurations/Android-Build.buildconfiguration.meta


fileFormatVersion: 2
guid: f1063fa3bfbea9f4bbd6cc7a039192a4
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 627ef77bce55554428c21a56f59002bd, type: 3}

8
Assets/BuildConfigurations/Android-LiveLink.buildconfiguration


{
"Dependencies": [
"GlobalObjectId_V1-1-f1063fa3bfbea9f4bbd6cc7a039192a4-93214019566545601-0"
],
"Components": [{
"$type": "Unity.Scenes.Editor.LiveLinkComponent, Unity.Scenes.Editor"
}]
}

10
Assets/BuildConfigurations/Android-LiveLink.buildconfiguration.meta


fileFormatVersion: 2
guid: a139f433fa6ccc2478c0e12aba627dbe
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 627ef77bce55554428c21a56f59002bd, type: 3}

18
Assets/BuildConfigurations/BaseBuildConfiguration.buildconfiguration


{
"Dependencies": [],
"Components": [{
"$type": "Unity.Build.Common.GeneralSettings, Unity.Build.Common",
"ProductName": "BoatAttack",
"CompanyName": "Unity Technologies"
}, {
"$type": "Unity.Build.Common.SceneList, Unity.Build.Common",
"BuildCurrentScene": true,
"SceneInfos": [],
"Scenes": []
}, {
"$type": "Unity.Build.Classic.ClassicScriptingSettings, Unity.Build.Classic",
"ScriptingBackend": 0,
"Il2CppCompilerConfiguration": 1,
"UseIncrementalGC": false
}]
}

10
Assets/BuildConfigurations/BaseBuildConfiguration.buildconfiguration.meta


fileFormatVersion: 2
guid: f19661c01bdcad546b54998aa9a0d08a
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 627ef77bce55554428c21a56f59002bd, type: 3}

14
Assets/BuildConfigurations/Win64-Build.buildconfiguration


{
"Dependencies": [
"GlobalObjectId_V1-1-f19661c01bdcad546b54998aa9a0d08a-93214019566545601-0"
],
"Components": [{
"$type": "Unity.Build.Classic.ClassicBuildProfile, Unity.Build.Classic",
"Target": -2,
"Platform": "Windows",
"Configuration": 2,
"Incremental": true,
"Pipeline": "Unity.Platforms.Windows.Build.WindowsClassicIncrementalPipeline, Unity.Platforms.Windows.Build",
"ExcludedAssemblies": []
}]
}

10
Assets/BuildConfigurations/Win64-Build.buildconfiguration.meta


fileFormatVersion: 2
guid: 118d5ea88fee4914a890b73b65a40b1d
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 627ef77bce55554428c21a56f59002bd, type: 3}

12
Assets/BuildConfigurations/Win64-LiveLink.buildconfiguration


{
"Dependencies": [
"GlobalObjectId_V1-1-118d5ea88fee4914a890b73b65a40b1d-93214019566545601-0"
],
"Components": [{
"$type": "Unity.Scenes.Editor.LiveLinkComponent, Unity.Scenes.Editor"
}, {
"$type": "Unity.Build.Common.GeneralSettings, Unity.Build.Common",
"ProductName": "BoatAttackLiveLink",
"CompanyName": "Unity Technologies"
}]
}

10
Assets/BuildConfigurations/Win64-LiveLink.buildconfiguration.meta


fileFormatVersion: 2
guid: 6f98e77d61b9d4d4ebeb57e5f4541773
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 627ef77bce55554428c21a56f59002bd, type: 3}

18
Assets/IncrementalPipelineSupport/IncrementalPipelineSupport.asmdef


{
"name": "IncrementalPipelineSupport",
"references": [
"Unity.Build.Classic",
"Unity.Addressables.Editor",
"Unity.Addressables"
],
"includePlatforms": [
"Editor"
],
"excludePlatforms": [],
"allowUnsafeCode": false,
"overrideReferences": false,
"precompiledReferences": [],
"autoReferenced": true,
"defineConstraints": [],
"noEngineReferences": false
}

7
Assets/IncrementalPipelineSupport/IncrementalPipelineSupport.asmdef.meta


fileFormatVersion: 2
guid: 489f93d75f914b44b8295270b197317c
AssemblyDefinitionImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

26
Assets/IncrementalPipelineSupport/AddressablesBuildPipelineCustomizer.cs


using System;
using System.IO;
using System.Linq;
using Unity.Build.Classic;
using UnityEngine.AddressableAssets;
public class AddressablesBuildPipelineCustomizer : ClassicBuildPipelineCustomizer
{
public override void RegisterAdditionalFilesToDeploy(Action<string, string> registerAdditionalFileToDeploy)
{
if (!Directory.Exists(Addressables.BuildPath))
return;
var buildPath = Addressables.BuildPath;
var relativeRoot = Path.GetDirectoryName(Path.GetDirectoryName(buildPath));
var fileToCopies = Directory.GetFiles(buildPath, "*.*", SearchOption.AllDirectories).ToArray();
foreach (var fileToCopy in fileToCopies)
{
var relative = fileToCopy.Substring(relativeRoot.Length+1);
var targetFile = $"{StreamingAssetsDirectory}/{relative}";
registerAdditionalFileToDeploy(fileToCopy, targetFile);
}
}
}

11
Assets/IncrementalPipelineSupport/AddressablesBuildPipelineCustomizer.cs.meta


fileFormatVersion: 2
guid: fbf20bc7f77cf1a47987c5805bd1e35b
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
正在加载...
取消
保存