From dc8a7126a287f35ae6c731ec9f09772ba932831a Mon Sep 17 00:00:00 2001 From: Keijiro Takahashi Date: Thu, 18 Apr 2019 18:07:26 +0900 Subject: [PATCH 1/2] Remove asmdef files to avoid package dependency problems --- Assets/Klak/Hap/Editor/Klak.Hap.Editor.asmdef | 16 ---------------- .../Klak/Hap/Editor/Klak.Hap.Editor.asmdef.meta | 7 ------- Assets/Klak/Hap/Runtime/Klak.Hap.asmdef | 3 --- Assets/Klak/Hap/Runtime/Klak.Hap.asmdef.meta | 7 ------- 4 files changed, 33 deletions(-) delete mode 100644 Assets/Klak/Hap/Editor/Klak.Hap.Editor.asmdef delete mode 100644 Assets/Klak/Hap/Editor/Klak.Hap.Editor.asmdef.meta delete mode 100644 Assets/Klak/Hap/Runtime/Klak.Hap.asmdef delete mode 100644 Assets/Klak/Hap/Runtime/Klak.Hap.asmdef.meta diff --git a/Assets/Klak/Hap/Editor/Klak.Hap.Editor.asmdef b/Assets/Klak/Hap/Editor/Klak.Hap.Editor.asmdef deleted file mode 100644 index 99912cc..0000000 --- a/Assets/Klak/Hap/Editor/Klak.Hap.Editor.asmdef +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "Klak.Hap.Editor", - "references": [ - "Klak.Hap" - ], - "optionalUnityReferences": [], - "includePlatforms": [ - "Editor" - ], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": true, - "defineConstraints": [] -} \ No newline at end of file diff --git a/Assets/Klak/Hap/Editor/Klak.Hap.Editor.asmdef.meta b/Assets/Klak/Hap/Editor/Klak.Hap.Editor.asmdef.meta deleted file mode 100644 index 4070854..0000000 --- a/Assets/Klak/Hap/Editor/Klak.Hap.Editor.asmdef.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 59c1346744fe3194291b617e412c56c4 -AssemblyDefinitionImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Klak/Hap/Runtime/Klak.Hap.asmdef b/Assets/Klak/Hap/Runtime/Klak.Hap.asmdef deleted file mode 100644 index 1820022..0000000 --- a/Assets/Klak/Hap/Runtime/Klak.Hap.asmdef +++ /dev/null @@ -1,3 +0,0 @@ -{ - "name": "Klak.Hap" -} diff --git a/Assets/Klak/Hap/Runtime/Klak.Hap.asmdef.meta b/Assets/Klak/Hap/Runtime/Klak.Hap.asmdef.meta deleted file mode 100644 index 745ccca..0000000 --- a/Assets/Klak/Hap/Runtime/Klak.Hap.asmdef.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 63ee2b3a69c095740bf1e4ff4d11f294 -AssemblyDefinitionImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: From 0ac129372ab1570736f0fafd9c51b6eac8389415 Mon Sep 17 00:00:00 2001 From: Keijiro Takahashi Date: Thu, 18 Apr 2019 18:08:17 +0900 Subject: [PATCH 2/2] Update project settings with Unity 2019.1 --- .gitignore | 1 + Assets/Test.unity | 44 +++++++++++++++++++++++--- Packages/manifest.json | 8 ++--- ProjectSettings/GraphicsSettings.asset | 1 + ProjectSettings/ProjectVersion.txt | 3 +- ProjectSettings/XRSettings.asset | 10 ++++++ 6 files changed, 55 insertions(+), 12 deletions(-) create mode 100644 ProjectSettings/XRSettings.asset diff --git a/.gitignore b/.gitignore index f133c4b..0f7d541 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,7 @@ Desktop.ini *.vcxproj.user # Unity +/Logs /Library /Temp diff --git a/Assets/Test.unity b/Assets/Test.unity index 43ab969..9456f5e 100644 --- a/Assets/Test.unity +++ b/Assets/Test.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} + m_IndirectSpecularColor: {r: 0.4465791, g: 0.4964133, b: 0.57481784, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -54,7 +54,7 @@ LightmapSettings: m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 1 m_LightmapEditorSettings: - serializedVersion: 10 + serializedVersion: 12 m_Resolution: 2 m_BakeResolution: 40 m_AtlasSize: 1024 @@ -62,6 +62,7 @@ LightmapSettings: m_AOMaxDistance: 1 m_CompAOExponent: 1 m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 m_Padding: 2 m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 @@ -76,10 +77,16 @@ LightmapSettings: m_PVRDirectSampleCount: 32 m_PVRSampleCount: 500 m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 500 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 m_PVRFilterTypeDirect: 0 m_PVRFilterTypeIndirect: 0 m_PVRFilterTypeAO: 0 - m_PVRFilteringMode: 1 + m_PVREnvironmentMIS: 0 m_PVRCulling: 1 m_PVRFilteringGaussRadiusDirect: 1 m_PVRFilteringGaussRadiusIndirect: 5 @@ -88,6 +95,7 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 m_ShowResolutionOverlay: 1 + m_ExportTrainingData: 0 m_LightingDataAsset: {fileID: 0} m_UseShadowmask: 1 --- !u!196 &4 @@ -723,17 +731,20 @@ MonoBehaviour: m_NormalColor: {r: 0.7264151, g: 0.7264151, b: 0.7264151, a: 1} m_HighlightedColor: {r: 0.764151, g: 0.764151, b: 0.764151, a: 1} m_PressedColor: {r: 0.3773585, g: 0.3773585, b: 0.3773585, a: 1} + m_SelectedColor: {r: 0.764151, g: 0.764151, b: 0.764151, a: 1} m_DisabledColor: {r: 0.2735849, g: 0.2735849, b: 0.2735849, a: 0.5019608} m_ColorMultiplier: 1 m_FadeDuration: 0.1 m_SpriteState: m_HighlightedSprite: {fileID: 0} m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} m_DisabledSprite: {fileID: 0} m_AnimationTriggers: m_NormalTrigger: Normal m_HighlightedTrigger: Highlighted m_PressedTrigger: Pressed + m_SelectedTrigger: Highlighted m_DisabledTrigger: Disabled m_Interactable: 1 m_TargetGraphic: {fileID: 141889089} @@ -1240,12 +1251,13 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2072668761} m_Enabled: 1 - serializedVersion: 8 + serializedVersion: 9 m_Type: 1 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 1 m_Range: 10 m_SpotAngle: 30 + m_InnerSpotAngle: 21.802082 m_CookieSize: 10 m_Shadows: m_Type: 0 @@ -1255,6 +1267,24 @@ Light: m_Bias: 0.05 m_NormalBias: 0.4 m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 m_Cookie: {fileID: 0} m_DrawHalo: 0 m_Flare: {fileID: 0} @@ -1262,12 +1292,15 @@ Light: m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 + m_RenderingLayerMask: 1 m_Lightmapping: 4 m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &2072668763 @@ -1313,9 +1346,10 @@ Camera: m_ClearFlags: 2 m_BackGroundColor: {r: 1, g: 0.07510988, b: 0, a: 0} m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_GateFitMode: 2 m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 diff --git a/Packages/manifest.json b/Packages/manifest.json index 16819bf..27ee8f2 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,11 +1,7 @@ { "dependencies": { - "com.unity.ads": "2.3.1", - "com.unity.analytics": "3.2.2", - "com.unity.collab-proxy": "1.2.15", - "com.unity.package-manager-ui": "2.0.3", - "com.unity.purchasing": "2.0.3", - "com.unity.textmeshpro": "1.3.0", + "com.unity.package-manager-ui": "2.1.2", + "com.unity.timeline": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.animation": "1.0.0", "com.unity.modules.assetbundle": "1.0.0", diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 1a6b7d1..e8293a6 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -38,6 +38,7 @@ GraphicsSettings: - {fileID: 10783, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 1816da4..241ebd0 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1 +1,2 @@ -m_EditorVersion: 2018.3.4f1 +m_EditorVersion: 2019.1.0f2 +m_EditorVersionWithRevision: 2019.1.0f2 (292b93d75a2c) diff --git a/ProjectSettings/XRSettings.asset b/ProjectSettings/XRSettings.asset new file mode 100644 index 0000000..482590c --- /dev/null +++ b/ProjectSettings/XRSettings.asset @@ -0,0 +1,10 @@ +{ + "m_SettingKeys": [ + "VR Device Disabled", + "VR Device User Alert" + ], + "m_SettingValues": [ + "False", + "False" + ] +} \ No newline at end of file