From 25917f5b445884a0e2059e8c66c75904f8a3acd5 Mon Sep 17 00:00:00 2001 From: ntr Date: Tue, 19 Sep 2023 12:48:17 +1000 Subject: [PATCH] fix reflection probes --- Assets/Effects/StartFinish.vfx | 191 +++++++++++++++++- Assets/Images/MEGASTRUCTURES.Filled.svg | 68 +++++++ Assets/Images/MEGASTRUCTURES.Filled.svg.meta | 54 +++++ Assets/Images/SpaceRace.Logo.png | 4 +- Assets/Images/SpaceRace.Logo.svg | 114 ++++++----- Assets/Prefabs/Menu/Menu.prefab | 47 +++++ Assets/Prefabs/Ship/Ship.prefab | 32 ++- Assets/Resources/URPAsset.asset | 8 +- Assets/Scenes/msg_blackstar.unity | 51 ----- Assets/Scenes/sr_junglism2.unity | 2 +- Assets/Scenes/sr_sfz.unity | 74 ++++--- Assets/Scenes/sr_sfz/LightingData.asset | Bin 18192 -> 18192 bytes Assets/Scenes/sr_sfz/LightingData.asset.meta | 0 .../sr_sfz/ReflectionProbe-0 - Copy.exr | 3 - .../sr_sfz/ReflectionProbe-0 - Copy.exr.meta | 140 ------------- Assets/Scenes/sr_sfz/ReflectionProbe-0.exr | 0 .../Scenes/sr_sfz/ReflectionProbe-0.exr.meta | 8 +- Assets/Scenes/sr_sfz/sfz_walls.mat | 0 Assets/Scenes/sr_sfz/spa.blend | 4 +- Assets/Scenes/sr_sfz/spa.blend1 | 2 +- Assets/Scenes/sr_sfz/spa.v2.blend | 3 + Assets/Scenes/sr_sfz/spa.v2.blend.meta | 109 ++++++++++ Assets/Scenes/sr_sfz/spa.v2.blend1 | 3 + Assets/Scenes/sr_sfz/spa.v2.blend1.meta | 7 + .../sr_sfz/sr_star_fraenkel_zermelo.Lighting | 0 Assets/Scenes/sr_silverstorage.unity | 23 ++- .../sr_silverstorage/LightingData.asset | Bin 18192 -> 18192 bytes .../sr_silverstorage/ReflectionProbe-0.exr | 4 +- .../ReflectionProbe-0.exr.meta | 4 +- .../sr_silverstorage/silverstorage_walls.mat | 4 +- .../sr_silverstorage.lighting | 2 +- Assets/Src/UI/Menu.uxml | 2 +- Assets/Src/UI/MenuUI.cs | 5 +- Assets/Src/UI/TimingUI.cs | 7 +- ProjectSettings/ProjectSettings.asset | 5 +- ProjectSettings/QualitySettings.asset | 8 +- 36 files changed, 664 insertions(+), 324 deletions(-) mode change 100644 => 100755 Assets/Effects/StartFinish.vfx create mode 100755 Assets/Images/MEGASTRUCTURES.Filled.svg create mode 100755 Assets/Images/MEGASTRUCTURES.Filled.svg.meta mode change 100644 => 100755 Assets/Prefabs/Ship/Ship.prefab mode change 100644 => 100755 Assets/Scenes/sr_sfz.unity mode change 100644 => 100755 Assets/Scenes/sr_sfz/LightingData.asset mode change 100644 => 100755 Assets/Scenes/sr_sfz/LightingData.asset.meta delete mode 100644 Assets/Scenes/sr_sfz/ReflectionProbe-0 - Copy.exr delete mode 100644 Assets/Scenes/sr_sfz/ReflectionProbe-0 - Copy.exr.meta mode change 100644 => 100755 Assets/Scenes/sr_sfz/ReflectionProbe-0.exr mode change 100644 => 100755 Assets/Scenes/sr_sfz/ReflectionProbe-0.exr.meta mode change 100644 => 100755 Assets/Scenes/sr_sfz/sfz_walls.mat mode change 100644 => 100755 Assets/Scenes/sr_sfz/spa.blend create mode 100755 Assets/Scenes/sr_sfz/spa.v2.blend create mode 100755 Assets/Scenes/sr_sfz/spa.v2.blend.meta create mode 100755 Assets/Scenes/sr_sfz/spa.v2.blend1 create mode 100755 Assets/Scenes/sr_sfz/spa.v2.blend1.meta mode change 100644 => 100755 Assets/Scenes/sr_sfz/sr_star_fraenkel_zermelo.Lighting mode change 100644 => 100755 Assets/Scenes/sr_silverstorage/sr_silverstorage.lighting mode change 100644 => 100755 ProjectSettings/QualitySettings.asset diff --git a/Assets/Effects/StartFinish.vfx b/Assets/Effects/StartFinish.vfx old mode 100644 new mode 100755 index 6537449..49d451f --- a/Assets/Effects/StartFinish.vfx +++ b/Assets/Effects/StartFinish.vfx @@ -20,7 +20,7 @@ MonoBehaviour: x: 24 y: -190 width: 1341 - height: 1977 + height: 2074 --- !u!114 &114350483966674976 MonoBehaviour: m_ObjectHideFlags: 1 @@ -172,7 +172,7 @@ MonoBehaviour: m_Type: m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - m_SerializableObject: 500 + m_SerializableObject: 1250 m_Space: 2147483647 m_Property: name: Rate @@ -548,7 +548,7 @@ MonoBehaviour: - {fileID: 8926484042661614583} - {fileID: 8926484042661614628} dataType: 0 - capacity: 5000 + capacity: 10000 stripCapacity: 16 particlePerStripCount: 16 needsComputeBounds: 0 @@ -1368,7 +1368,7 @@ MonoBehaviour: m_Type: m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - m_SerializableObject: 0.2 + m_SerializableObject: 0.5 m_Space: 2147483647 m_Property: name: Size @@ -1432,6 +1432,9 @@ MonoBehaviour: m_UICollapsed: 0 m_UISuperCollapsed: 0 m_InputSlots: + - {fileID: 8926484042661614737} + - {fileID: 8926484042661614742} + - {fileID: 8926484042661614740} - {fileID: 8926484042661614629} m_OutputSlots: [] m_Label: @@ -1446,15 +1449,15 @@ MonoBehaviour: cullMode: 0 zWriteMode: 0 zTestMode: 0 - useAlphaClipping: 0 + useAlphaClipping: 1 generateMotionVector: 0 excludeFromTAA: 0 sortingPriority: 0 m_SubOutputs: [] colorMapping: 0 - uvMode: 0 + uvMode: 1 flipbookLayout: 0 - useSoftParticle: 0 + useSoftParticle: 1 vfxSystemSortPriority: 0 sort: 0 sortMode: 0 @@ -1496,7 +1499,7 @@ MonoBehaviour: m_Type: m_SerializableType: UnityEngine.Texture2D, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - m_SerializableObject: '{"obj":{"fileID":10300,"guid":"0000000000000000f000000000000000","type":0}}' + m_SerializableObject: '{"obj":{"fileID":2800000,"guid":"ce547c28228577847b2ae2dbc1d62994","type":3}}' m_Space: 2147483647 m_Property: name: mainTexture @@ -2024,7 +2027,7 @@ MonoBehaviour: m_OutputSlots: [] m_Disabled: 0 m_ActivationSlot: {fileID: 8926484042661614682} - mode: 0 + mode: 6 axes: 4 --- !u!114 &8926484042661614682 MonoBehaviour: @@ -3541,3 +3544,173 @@ MonoBehaviour: PublicKeyToken=b77a5c561934e089 m_Direction: 0 m_LinkedSlots: [] +--- !u!114 &8926484042661614737 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b2b751071c7fc14f9fa503163991826, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UIIgnoredErrors: [] + m_Parent: {fileID: 0} + m_Children: + - {fileID: 8926484042661614738} + - {fileID: 8926484042661614739} + m_UIPosition: {x: 0, y: 0} + m_UICollapsed: 1 + m_UISuperCollapsed: 0 + m_MasterSlot: {fileID: 8926484042661614737} + m_MasterData: + m_Owner: {fileID: 8926484042661614628} + m_Value: + m_Type: + m_SerializableType: UnityEngine.Vector2, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + m_SerializableObject: '{"x":3.0,"y":3.0}' + m_Space: 2147483647 + m_Property: + name: flipBookSize + m_serializedType: + m_SerializableType: UnityEngine.Vector2, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + m_Direction: 0 + m_LinkedSlots: [] +--- !u!114 &8926484042661614738 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UIIgnoredErrors: [] + m_Parent: {fileID: 8926484042661614737} + m_Children: [] + m_UIPosition: {x: 0, y: 0} + m_UICollapsed: 1 + m_UISuperCollapsed: 0 + m_MasterSlot: {fileID: 8926484042661614737} + m_MasterData: + m_Owner: {fileID: 0} + m_Value: + m_Type: + m_SerializableType: + m_SerializableObject: + m_Space: 2147483647 + m_Property: + name: x + m_serializedType: + m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + m_Direction: 0 + m_LinkedSlots: [] +--- !u!114 &8926484042661614739 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UIIgnoredErrors: [] + m_Parent: {fileID: 8926484042661614737} + m_Children: [] + m_UIPosition: {x: 0, y: 0} + m_UICollapsed: 1 + m_UISuperCollapsed: 0 + m_MasterSlot: {fileID: 8926484042661614737} + m_MasterData: + m_Owner: {fileID: 0} + m_Value: + m_Type: + m_SerializableType: + m_SerializableObject: + m_Space: 2147483647 + m_Property: + name: y + m_serializedType: + m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + m_Direction: 0 + m_LinkedSlots: [] +--- !u!114 &8926484042661614740 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UIIgnoredErrors: [] + m_Parent: {fileID: 0} + m_Children: [] + m_UIPosition: {x: 0, y: 0} + m_UICollapsed: 1 + m_UISuperCollapsed: 0 + m_MasterSlot: {fileID: 8926484042661614740} + m_MasterData: + m_Owner: {fileID: 8926484042661614628} + m_Value: + m_Type: + m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + m_SerializableObject: 1 + m_Space: 2147483647 + m_Property: + name: softParticleFadeDistance + m_serializedType: + m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + m_Direction: 0 + m_LinkedSlots: [] +--- !u!114 &8926484042661614742 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UIIgnoredErrors: [] + m_Parent: {fileID: 0} + m_Children: [] + m_UIPosition: {x: 0, y: 0} + m_UICollapsed: 1 + m_UISuperCollapsed: 0 + m_MasterSlot: {fileID: 8926484042661614742} + m_MasterData: + m_Owner: {fileID: 8926484042661614628} + m_Value: + m_Type: + m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + m_SerializableObject: 0.5 + m_Space: 2147483647 + m_Property: + name: alphaThreshold + m_serializedType: + m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + m_Direction: 0 + m_LinkedSlots: [] diff --git a/Assets/Images/MEGASTRUCTURES.Filled.svg b/Assets/Images/MEGASTRUCTURES.Filled.svg new file mode 100755 index 0000000..6c1c5f0 --- /dev/null +++ b/Assets/Images/MEGASTRUCTURES.Filled.svg @@ -0,0 +1,68 @@ + + + + + + + + + + + + diff --git a/Assets/Images/MEGASTRUCTURES.Filled.svg.meta b/Assets/Images/MEGASTRUCTURES.Filled.svg.meta new file mode 100755 index 0000000..5a11abb --- /dev/null +++ b/Assets/Images/MEGASTRUCTURES.Filled.svg.meta @@ -0,0 +1,54 @@ +fileFormatVersion: 2 +guid: b57d7fbd6459faa4b8a8c0a36db82224 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: a57477913897c46af95d590f580878bd, type: 3} + svgType: 0 + texturedSpriteMeshType: 0 + svgPixelsPerUnit: 100 + gradientResolution: 64 + alignment: 0 + customPivot: {x: 0, y: 0} + generatePhysicsShape: 0 + viewportOptions: 0 + preserveViewport: 0 + advancedMode: 0 + predefinedResolutionIndex: 1 + targetResolution: 1080 + resolutionMultiplier: 1 + stepDistance: 10 + samplingStepDistance: 100 + maxCordDeviationEnabled: 0 + maxCordDeviation: 1 + maxTangentAngleEnabled: 0 + maxTangentAngle: 5 + keepTextureAspectRatio: 1 + textureSize: 256 + textureWidth: 256 + textureHeight: 256 + wrapMode: 0 + filterMode: 1 + sampleCount: 4 + preserveSVGImageAspect: 0 + useSVGPixelsPerUnit: 0 + spriteData: + TessellationDetail: 0 + SpriteRect: + name: + originalName: + pivot: {x: 0, y: 0} + alignment: 0 + border: {x: 0, y: 0, z: 0, w: 0} + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + spriteID: 5e4d7192c8beda54ea50361804958881 + PhysicsOutlines: [] diff --git a/Assets/Images/SpaceRace.Logo.png b/Assets/Images/SpaceRace.Logo.png index 088cfdb..ceac8f1 100755 --- a/Assets/Images/SpaceRace.Logo.png +++ b/Assets/Images/SpaceRace.Logo.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a658cc7a3a57fb0e7c2d9f64e8db9ef2775866a01bb90b191ea3a32fa2f1b93b -size 47869 +oid sha256:3bbc04308c2b1e47c7405352141092e8f0076b9a473efe5bd495e9ca66108a74 +size 44882 diff --git a/Assets/Images/SpaceRace.Logo.svg b/Assets/Images/SpaceRace.Logo.svg index 7406bc7..7269715 100755 --- a/Assets/Images/SpaceRace.Logo.svg +++ b/Assets/Images/SpaceRace.Logo.svg @@ -2,9 +2,9 @@ + only_selected="false" + uniform="false" /> @@ -2470,7 +2471,8 @@ helper_size="0" apply_no_weight="true" apply_with_weight="true" - only_selected="false" /> + only_selected="false" + uniform="false" /> + only_selected="false" + uniform="false" /> + only_selected="false" + uniform="false" /> + only_selected="false" + uniform="false" /> + only_selected="false" + uniform="false" /> + only_selected="false" + uniform="false" /> + only_selected="false" + uniform="false" /> + only_selected="false" + uniform="false" /> + only_selected="false" + uniform="false" /> + only_selected="false" + uniform="false" /> + only_selected="false" + uniform="false" /> + only_selected="false" + uniform="false" /> + only_selected="false" + uniform="false" /> @@ -2666,19 +2680,19 @@ inkscape:label="left" inkscape:groupmode="layer" id="layer1" - transform="translate(-323.18811,431.95252)" + transform="translate(-417.18799,337.95263)" style="display:inline"> + transform="matrix(1.2000212,0,0,1.2000212,-106.10541,349.13744)" + style="stroke-width:19.9996;stroke-dasharray:none"> + style="stroke-width:102.706;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none" /> + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20.7006px;font-family:Jura;-inkscape-font-specification:'Jura, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:19.9996;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0" /> + style="stroke-width:7.84313;stroke-dasharray:none"> + style="stroke-width:7.84313;stroke-dasharray:none"> VyXq1A`w_Zt@1V1ORNB3snFB delta 58 zcmbQx$2b9q%o$BKS_HbOo1_^sK!F#K<^o~~AU<5wWyhB=&u-DfS~~`Y2K&hy+!6qU C$PPvT diff --git a/Assets/Scenes/sr_sfz/LightingData.asset.meta b/Assets/Scenes/sr_sfz/LightingData.asset.meta old mode 100644 new mode 100755 diff --git a/Assets/Scenes/sr_sfz/ReflectionProbe-0 - Copy.exr b/Assets/Scenes/sr_sfz/ReflectionProbe-0 - Copy.exr deleted file mode 100644 index 0f1b6fe..0000000 --- a/Assets/Scenes/sr_sfz/ReflectionProbe-0 - Copy.exr +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:21927414ac4db49bf755084d3cfba0e5f0a49b27257389a5e94346407da5984e -size 147558 diff --git a/Assets/Scenes/sr_sfz/ReflectionProbe-0 - Copy.exr.meta b/Assets/Scenes/sr_sfz/ReflectionProbe-0 - Copy.exr.meta deleted file mode 100644 index 8a9780c..0000000 --- a/Assets/Scenes/sr_sfz/ReflectionProbe-0 - Copy.exr.meta +++ /dev/null @@ -1,140 +0,0 @@ -fileFormatVersion: 2 -guid: 6043e793c59b5e737977e0dc46841aa1 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 1 - seamlessCubemap: 1 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 2 - aniso: 0 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 2 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 100 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/sr_sfz/ReflectionProbe-0.exr b/Assets/Scenes/sr_sfz/ReflectionProbe-0.exr old mode 100644 new mode 100755 diff --git a/Assets/Scenes/sr_sfz/ReflectionProbe-0.exr.meta b/Assets/Scenes/sr_sfz/ReflectionProbe-0.exr.meta old mode 100644 new mode 100755 index 6484d41..72ac063 --- a/Assets/Scenes/sr_sfz/ReflectionProbe-0.exr.meta +++ b/Assets/Scenes/sr_sfz/ReflectionProbe-0.exr.meta @@ -71,7 +71,7 @@ TextureImporter: buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 + textureFormat: 4 textureCompression: 1 compressionQuality: 100 crunchedCompression: 0 @@ -94,10 +94,10 @@ TextureImporter: androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 - buildTarget: Server + buildTarget: Windows Store Apps maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 + textureFormat: 10 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 @@ -107,7 +107,7 @@ TextureImporter: androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 - buildTarget: WebGL + buildTarget: Server maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 diff --git a/Assets/Scenes/sr_sfz/sfz_walls.mat b/Assets/Scenes/sr_sfz/sfz_walls.mat old mode 100644 new mode 100755 diff --git a/Assets/Scenes/sr_sfz/spa.blend b/Assets/Scenes/sr_sfz/spa.blend old mode 100644 new mode 100755 index 205a9d8..6562ac2 --- a/Assets/Scenes/sr_sfz/spa.blend +++ b/Assets/Scenes/sr_sfz/spa.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:23290480489a592f19f38a5a4a6a670c11d6ef3159b06c9a6cefcea06cf700cd -size 3498316 +oid sha256:5b5255a4ab07a20622246e467375ef3441d4208fe23415c88aa5d7c8e1d331db +size 3472380 diff --git a/Assets/Scenes/sr_sfz/spa.blend1 b/Assets/Scenes/sr_sfz/spa.blend1 index cc345ef..205a9d8 100644 --- a/Assets/Scenes/sr_sfz/spa.blend1 +++ b/Assets/Scenes/sr_sfz/spa.blend1 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:be127ae7a8aa1562f48cdeb47feb80686a9ea2b265f83a7022b2a21194a4c612 +oid sha256:23290480489a592f19f38a5a4a6a670c11d6ef3159b06c9a6cefcea06cf700cd size 3498316 diff --git a/Assets/Scenes/sr_sfz/spa.v2.blend b/Assets/Scenes/sr_sfz/spa.v2.blend new file mode 100755 index 0000000..1f67762 --- /dev/null +++ b/Assets/Scenes/sr_sfz/spa.v2.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bad5b66a24e4c1a031d06cae7a50855763d8eca1a3e160f4bfaa5d8af0fe3bc6 +size 1206980 diff --git a/Assets/Scenes/sr_sfz/spa.v2.blend.meta b/Assets/Scenes/sr_sfz/spa.v2.blend.meta new file mode 100755 index 0000000..e05122f --- /dev/null +++ b/Assets/Scenes/sr_sfz/spa.v2.blend.meta @@ -0,0 +1,109 @@ +fileFormatVersion: 2 +guid: fbb22d7dfaa09744c81245d9b50d55f8 +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/sr_sfz/spa.v2.blend1 b/Assets/Scenes/sr_sfz/spa.v2.blend1 new file mode 100755 index 0000000..6f8920a --- /dev/null +++ b/Assets/Scenes/sr_sfz/spa.v2.blend1 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bdd7d531a08293b15c100cef50f9848f03c184328012b5cb61a4f050efd80603 +size 1206980 diff --git a/Assets/Scenes/sr_sfz/spa.v2.blend1.meta b/Assets/Scenes/sr_sfz/spa.v2.blend1.meta new file mode 100755 index 0000000..08cc70e --- /dev/null +++ b/Assets/Scenes/sr_sfz/spa.v2.blend1.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5c6659eb7b921f743bb3cabe545fba39 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/sr_sfz/sr_star_fraenkel_zermelo.Lighting b/Assets/Scenes/sr_sfz/sr_star_fraenkel_zermelo.Lighting old mode 100644 new mode 100755 diff --git a/Assets/Scenes/sr_silverstorage.unity b/Assets/Scenes/sr_silverstorage.unity index 043b359..7ba60c5 100755 --- a/Assets/Scenes/sr_silverstorage.unity +++ b/Assets/Scenes/sr_silverstorage.unity @@ -20,13 +20,13 @@ RenderSettings: m_FogDensity: 0.01 m_LinearFogStart: 0 m_LinearFogEnd: 300 - m_AmbientSkyColor: {r: 1, g: 1, b: 1, a: 1} + m_AmbientSkyColor: {r: 0.4811321, g: 0.4811321, b: 0.4811321, a: 1} m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} m_AmbientIntensity: 1 - m_AmbientMode: 0 - m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} - m_SkyboxMaterial: {fileID: 2100000, guid: bf085cc45596edc77987a6b5f36a4098, type: 2} + m_AmbientMode: 3 + m_SubtractiveShadowColor: {r: 0.6037736, g: 0.6037736, b: 0.6037736, a: 1} + m_SkyboxMaterial: {fileID: 2100000, guid: c5b2eb5d4ceadf3dd8fc481957dfdff1, type: 2} m_HaloStrength: 0.5 m_FlareStrength: 1 m_FlareFadeSpeed: 3 @@ -37,8 +37,8 @@ RenderSettings: m_ReflectionBounces: 1 m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} - m_Sun: {fileID: 705507994} - m_IndirectSpecularColor: {r: 0.61784047, g: 0.63485193, b: 0.64917755, a: 1} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0.20813203, g: 0.2539528, b: 0.19699469, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -311,7 +311,7 @@ Light: serializedVersion: 2 m_Bits: 4294967295 m_RenderingLayerMask: 1 - m_Lightmapping: 1 + m_Lightmapping: 4 m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 @@ -845,7 +845,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1906469785 Transform: m_ObjectHideFlags: 0 @@ -961,8 +961,7 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 3033317543584580398, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} + m_RemovedComponents: [] m_RemovedGameObjects: - {fileID: 7435896455896431905, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} m_AddedGameObjects: [] @@ -1126,6 +1125,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5823699807631455469, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: m_CameraType + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8925193253056788144, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} propertyPath: m_Name value: Ship diff --git a/Assets/Scenes/sr_silverstorage/LightingData.asset b/Assets/Scenes/sr_silverstorage/LightingData.asset index 0c4764cb77c625e7871e50aa21898c611fadfd55..f708b711ab8313c7a2447bc5b50f5833f9c49a49 100755 GIT binary patch delta 157 zcmbQx$2g&nal;+Sb_1CV9tyQ!`dHh3YY-m