Merge pull request #4 from Unity-Technologies/preview14_update

Updated project for preview 14 package release
4 年前 · 9443d479
--- a/Assets/Characters/Mage/Materials/FaceFire.mat
+++ b/Assets/Characters/Mage/Materials/FaceFire.mat
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
+    m_Ints: []
    m_Floats:
    - _AlphaClip: 0
    - _Blend: 0
  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  version: 3
+  version: 4
--- a/Assets/Characters/Mage/Materials/M_Fire.mat
+++ b/Assets/Characters/Mage/Materials/M_Fire.mat
  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  version: 3
+  version: 4
 --- !u!21 &2100000
 Material:
  serializedVersion: 6
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
+    m_Ints: []
    m_Floats:
    - _AlphaClip: 0
    - _Amplitude: 1
--- a/Assets/FX/Arrow/materials/M_Arrow.mat
+++ b/Assets/FX/Arrow/materials/M_Arrow.mat
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
+    m_Ints: []
    m_Floats:
    - _AlphaClip: 1
    - _Amplitude: 1
  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  version: 3
+  version: 4
--- a/Assets/FX/Tower/Materials/MAT_rockTiles.mat
+++ b/Assets/FX/Tower/Materials/MAT_rockTiles.mat
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
+    m_Ints: []
    m_Floats:
    - _AlphaClip: 0
    - _Blend: 0
  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  version: 3
+  version: 4
--- a/Assets/FX/Tower/Materials/MAT_rope.mat
+++ b/Assets/FX/Tower/Materials/MAT_rope.mat
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
+    m_Ints: []
    m_Floats:
    - _AlphaClip: 0
    - _Blend: 0
  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  version: 3
+  version: 4
--- a/Assets/FX/Tower/Materials/MAT_woodTiles.mat
+++ b/Assets/FX/Tower/Materials/MAT_woodTiles.mat
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
+    m_Ints: []
    m_Floats:
    - _AlphaClip: 0
    - _Blend: 0
  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  version: 3
+  version: 4
--- a/Assets/Black_Mat.mat
+++ b/Assets/Black_Mat.mat
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
+    m_Ints: []
    m_Floats:
    - _AlphaClip: 0
    - _Blend: 0
  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  version: 3
+  version: 4
--- a/Assets/Grid_Blue_Mat.mat
+++ b/Assets/Grid_Blue_Mat.mat
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
+    m_Ints: []
    m_Floats:
    - _AlphaClip: 0
    - _Blend: 0
  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  version: 3
+  version: 4
--- a/Assets/Grid_Grey_Mat.mat
+++ b/Assets/Grid_Grey_Mat.mat
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
+    m_Ints: []
    m_Floats:
    - _AlphaClip: 0
    - _Blend: 0
  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  version: 3
+  version: 4
--- a/Assets/Grid_Orange_Mat.mat
+++ b/Assets/Grid_Orange_Mat.mat
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
+    m_Ints: []
    m_Floats:
    - _AlphaClip: 0
    - _Blend: 0
  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  version: 3
+  version: 4
--- a/Assets/Particles/Materials/SmokeSingle.mat
+++ b/Assets/Particles/Materials/SmokeSingle.mat
  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  version: 3
+  version: 4
 --- !u!21 &2100000
 Material:
  serializedVersion: 6
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
+    m_Ints: []
    m_Floats:
    - _AlphaClip: 0
    - _Blend: 0
--- a/Assets/Props/ENVground/Materials/MAT_farmplots.mat
+++ b/Assets/Props/ENVground/Materials/MAT_farmplots.mat
  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  version: 3
+  version: 4
 --- !u!21 &2100000
 Material:
  serializedVersion: 6
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
+    m_Ints: []
    m_Floats:
    - _AlphaClip: 0
    - _Blend: 0
--- a/Assets/Props/ENVground/Materials/MAT_grass1.mat
+++ b/Assets/Props/ENVground/Materials/MAT_grass1.mat
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
+    m_Ints: []
    m_Floats:
    - _AlphaClip: 0
    - _Blend: 0
  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  version: 3
+  version: 4
--- a/Assets/Props/ENVground/Materials/MAT_grass2.mat
+++ b/Assets/Props/ENVground/Materials/MAT_grass2.mat
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
+    m_Ints: []
    m_Floats:
    - _AlphaClip: 0
    - _Blend: 0
  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  version: 3
+  version: 4
--- a/Assets/Props/ENVground/Materials/MAT_grass3.mat
+++ b/Assets/Props/ENVground/Materials/MAT_grass3.mat
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
+    m_Ints: []
    m_Floats:
    - _AlphaClip: 0
    - _Blend: 0
  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  version: 3
+  version: 4
--- a/Assets/Props/ENVground/Materials/MAT_sand1.mat
+++ b/Assets/Props/ENVground/Materials/MAT_sand1.mat
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
+    m_Ints: []
    m_Floats:
    - _AlphaClip: 0
    - _Blend: 0
  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  version: 3
+  version: 4
--- a/Assets/Props/ENVground/Materials/MAT_sand2.mat
+++ b/Assets/Props/ENVground/Materials/MAT_sand2.mat
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
+    m_Ints: []
    m_Floats:
    - _AlphaClip: 0
    - _Blend: 0
  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  version: 3
+  version: 4
--- a/Assets/Settings/LWRP_Pipe_Asset.asset
+++ b/Assets/Settings/LWRP_Pipe_Asset.asset
  m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3}
  m_Name: LWRP_Pipe_Asset
  m_EditorClassIdentifier: 
-  k_AssetVersion: 4
+  k_AssetVersion: 7
+  k_AssetPreviousVersion: 7
+  m_RendererDataList:
+  - {fileID: 11400000, guid: 01ef2771b975f45e29bd82cba55599e1, type: 2}
+  m_DefaultRendererIndex: 0
+  m_SupportsTerrainHoles: 1
  m_SupportsHDR: 1
  m_MSAA: 1
  m_RenderScale: 1
  m_AdditionalLightsPerObjectLimit: 4
  m_AdditionalLightShadowsSupported: 0
  m_AdditionalLightsShadowmapResolution: 512
+  m_AdditionalLightsShadowResolutionTierLow: 256
+  m_AdditionalLightsShadowResolutionTierMedium: 512
+  m_AdditionalLightsShadowResolutionTierHigh: 1024
-  m_ShadowCascades: 2
+  m_ShadowCascadeCount: 4
+  m_Cascade3Split: {x: 0.1, y: 0.3}
  m_Cascade4Split: {x: 0.067, y: 0.2, z: 0.467}
  m_ShadowDepthBias: 0.3
  m_ShadowNormalBias: 0.2
  m_MixedLightingSupported: 0
+  m_DebugLevel: 0
+  m_UseAdaptivePerformance: 1
+  m_UseFastSRGBLinearConversion: 0
  m_ShadowType: 1
  m_LocalShadowsSupported: 0
  m_LocalShadowsAtlasResolution: 256
+  m_ShadowCascades: 2
--- a/Assets/UI/UnityRoyalePanelSettings.asset
+++ b/Assets/UI/UnityRoyalePanelSettings.asset
  m_ScreenMatchMode: 0
  m_Match: 1
  m_SortingOrder: 0
+  m_TargetDisplay: 0
  m_ClearDepthStencil: 1
  m_ClearColor: 0
  m_ColorClearValue: {r: 0, g: 0, b: 0, a: 0}
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
 {
- "dependencies": {
-    "com.unity.addressables": "1.14.2",
-    "com.unity.cinemachine": "2.5.0",
-    "com.unity.ide.rider": "2.0.7",
-    "com.unity.ide.visualstudio": "2.0.3",
+  "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.textmeshpro": "3.0.1",
-    "com.unity.timeline": "1.2.6",
+    "com.unity.textmeshpro": "3.0.3",
+    "com.unity.timeline": "1.5.1-pre.3",
-    "com.unity.ui": "1.0.0-preview.12",
-    "com.unity.ui.builder": "1.0.0-preview.9",
+    "com.unity.ui": "1.0.0-preview.14",
+    "com.unity.ui.builder": "1.0.0-preview.12",
    "com.unity.vectorgraphics": "2.0.0-preview.12",
    "com.unity.modules.ai": "1.0.0",
    "com.unity.modules.androidjni": "1.0.0",
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
      "dependencies": {}
    },
    "com.unity.addressables": {
-      "version": "1.14.2",
+      "version": "1.16.15",
-        "com.unity.scriptablebuildpipeline": "1.11.1",
+        "com.unity.scriptablebuildpipeline": "1.15.1",
        "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.5.0",
+      "version": "2.7.1",
      "depth": 0,
      "source": "registry",
      "dependencies": {},
-      "version": "1.0.0",
+      "version": "1.0.5",
      "depth": 2,
      "source": "registry",
      "dependencies": {},
-      "version": "2.0.7",
+      "version": "3.0.3",
      "depth": 0,
      "source": "registry",
      "dependencies": {
    },
    "com.unity.ide.visualstudio": {
-      "version": "2.0.3",
+      "version": "2.0.5",
      "depth": 0,
      "source": "registry",
      "dependencies": {},
      "url": "https://packages.unity.com"
    },
    "com.unity.mathematics": {
-      "version": "1.1.0",
+      "version": "1.2.1",
      "depth": 2,
      "source": "registry",
      "dependencies": {},
-      "version": "2.3.0",
+      "version": "3.0.2",
-      "source": "registry",
-      "dependencies": {},
-      "url": "https://packages.unity.com"
+      "source": "builtin",
+      "dependencies": {}
-      "version": "10.1.0",
+      "version": "11.0.0",
-      "source": "registry",
+      "source": "builtin",
-      },
-      "url": "https://packages.unity.com"
+      }
    },
    "com.unity.render-pipelines.lightweight": {
      "version": "10.1.0",
      "url": "https://packages.unity.com"
    },
    "com.unity.render-pipelines.universal": {
-      "version": "10.1.0",
+      "version": "11.0.0",
-      "source": "registry",
+      "source": "builtin",
-        "com.unity.render-pipelines.core": "10.1.0",
-        "com.unity.shadergraph": "10.1.0"
-      },
-      "url": "https://packages.unity.com"
+        "com.unity.render-pipelines.core": "11.0.0",
+        "com.unity.shadergraph": "11.0.0"
+      }
-      "version": "1.11.1",
+      "version": "1.15.1",
      "depth": 1,
      "source": "registry",
      "dependencies": {},
      "url": "https://packages.unity.com"
    },
    "com.unity.shadergraph": {
-      "version": "10.1.0",
+      "version": "11.0.0",
-      "source": "registry",
+      "source": "builtin",
-        "com.unity.render-pipelines.core": "10.1.0",
+        "com.unity.render-pipelines.core": "11.0.0",
-      },
-      "url": "https://packages.unity.com"
+      }
-      "version": "1.1.18",
+      "version": "1.1.19",
-        "com.unity.ext.nunit": "1.0.0",
+        "com.unity.ext.nunit": "1.0.5",
        "com.unity.modules.imgui": "1.0.0",
        "com.unity.modules.jsonserialize": "1.0.0"
      },
      "url": "https://packages.unity.com"
    },
    "com.unity.textmeshpro": {
-      "version": "3.0.1",
+      "version": "3.0.3",
      "depth": 0,
      "source": "registry",
      "dependencies": {
    },
    "com.unity.timeline": {
-      "version": "1.2.6",
+      "version": "1.5.1-pre.3",
-      "dependencies": {},
+      "dependencies": {
+        "com.unity.modules.director": "1.0.0",
+        "com.unity.modules.animation": "1.0.0",
+        "com.unity.modules.audio": "1.0.0",
+        "com.unity.modules.particlesystem": "1.0.0"
+      },
      "url": "https://packages.unity.com"
    },
    "com.unity.ugui": {
      }
    },
    "com.unity.ui": {
-      "version": "1.0.0-preview.12",
+      "version": "1.0.0-preview.14",
-        "nuget.moq": "1.0.0",
-        "nuget.castle-core": "1.0.1",
        "com.unity.modules.uielementsnative": "1.0.0",
        "com.unity.textcore": "1.0.0-preview.2"
      },
-      "version": "1.0.0-preview.9",
+      "version": "1.0.0-preview.12",
      "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"
    },
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
 --- !u!129 &1
 PlayerSettings:
  m_ObjectHideFlags: 0
-  serializedVersion: 21
+  serializedVersion: 22
  productGUID: 84e51f6c7175d984cbd18a5412e170cf
  AndroidProfiler: 0
  AndroidFilterTouchesWhenObscured: 0
  metalEditorSupport: 1
  metalAPIValidation: 1
  iOSRenderExtraFrameOnPause: 0
+  iosCopyPluginsCodeInsteadOfSymlink: 0
  appleDeveloperTeamID: 
  iOSManualSigningProvisioningProfileID: 
  tvOSManualSigningProvisioningProfileID: 
  iOSRequireARKit: 0
  iOSAutomaticallyDetectAndAddCapabilities: 1
  appleEnableProMotion: 0
+  shaderPrecisionModel: 0
  clonedFromGUID: 9870af204204ab84596f8a656f2f2ce6
  templatePackageId: com.unity.template.lightweight@1.0.2
  templateDefaultScene: Assets/Scenes/SampleScene.unity
  switchScreenResolutionBehavior: 2
  switchUseCPUProfiler: 0
  switchUseGOLDLinker: 0
+  switchLTOSetting: 0
  switchApplicationID: 0x01004b9000490000
  switchNSODependencies: 
  switchTitleNames_0: 
    28: UNITY_POST_PROCESSING_STACK_V2
    29: UNITY_POST_PROCESSING_STACK_V2
    30: UNITY_POST_PROCESSING_STACK_V2
+    31: UNITY_POST_PROCESSING_STACK_V2
+    32: UNITY_POST_PROCESSING_STACK_V2
+    33: UNITY_POST_PROCESSING_STACK_V2
+  additionalCompilerArguments: {}
+  suppressCommonWarnings: 1
-  useReferenceAssemblies: 1
+  assemblyVersionValidation: 1
  gcWBarrierValidation: 0
  apiCompatibilityLevelPerPlatform: {}
  m_RenderingPath: 1
  XboxOneCapability: []
  XboxOneGameRating: {}
  XboxOneIsContentPackage: 0
+  XboxOneEnhancedXboxCompatibilityMode: 0
  XboxOneEnableGPUVariability: 0
  XboxOneSockets: {}
  XboxOneSplashScreen: {fileID: 0}
    m_VersionCode: 1
    m_VersionName: 
  apiCompatibilityLevel: 6
+  activeInputHandler: 0
  cloudProjectId: 
  framebufferDepthMemorylessMode: 0
  qualitySettingsNames: []
-  enableNativePlatformBackendsForNewInputSystem: 0
-  disableOldInputManagerSupport: 0
  legacyClampBlendShapeWeights: 1
  virtualTexturingSupportEnabled: 0
--- a/ProjectSettings/ProjectVersion.txt
+++ b/ProjectSettings/ProjectVersion.txt
-m_EditorVersion: 2020.2.0b11
-m_EditorVersionWithRevision: 2020.2.0b11 (c499c2bf2e80)
+m_EditorVersion: 2021.1.0b3
+m_EditorVersionWithRevision: 2021.1.0b3 (202fb86be42c)
--- a/ProjectSettings/URPProjectSettings.asset
+++ b/ProjectSettings/URPProjectSettings.asset
  m_Script: {fileID: 11500000, guid: 247994e1f5a72c2419c26a37e9334c01, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  m_LastMaterialVersion: 3
+  m_LastMaterialVersion: 4