From 3db450e78dc38d792e13643173d35db8d6bf2bf7 Mon Sep 17 00:00:00 2001 From: nakjun Date: Thu, 23 Jul 2026 10:21:48 +0900 Subject: [PATCH] =?UTF-8?q?=EC=B1=95=ED=84=B01,2=20=EB=9D=BC=EC=9D=B4?= =?UTF-8?q?=ED=8C=85=20=EB=8B=A4=EC=8B=9C=20=EA=B5=AC=EC=9B=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Hischool_Chapter1 Baking Set.asset | 3 + .../Hischool_Chapter1 Baking Set.asset.meta | 8 + .../Hischool_Chapter1/LightingData.asset | 4 +- .../Hischool_Chapter1/Lightmap-0_comp_dir.png | 4 +- .../Lightmap-0_comp_dir.png.meta | 21 +-- .../Lightmap-0_comp_light.exr | 4 +- .../Lightmap-0_comp_light.exr.meta | 21 +-- .../Lightmap-0_comp_shadowmask.png.meta | 23 +-- .../Hischool_Chapter1/Lightmap-1_comp_dir.png | 4 +- .../Lightmap-1_comp_dir.png.meta | 21 +-- .../Lightmap-1_comp_light.exr | 4 +- .../Lightmap-1_comp_light.exr.meta | 21 +-- .../Lightmap-1_comp_shadowmask.png | 4 +- .../Lightmap-1_comp_shadowmask.png.meta | 23 +-- .../Hischool_Chapter1/Lightmap-2_comp_dir.png | 4 +- .../Lightmap-2_comp_dir.png.meta | 21 +-- .../Lightmap-2_comp_light.exr | 4 +- .../Lightmap-2_comp_light.exr.meta | 21 +-- .../Lightmap-2_comp_shadowmask.png | 4 +- .../Lightmap-2_comp_shadowmask.png.meta | 23 +-- .../Hischool_Chapter1/Lightmap-3_comp_dir.png | 4 +- .../Lightmap-3_comp_dir.png.meta | 21 +-- .../Lightmap-3_comp_light.exr | 4 +- .../Lightmap-3_comp_light.exr.meta | 21 +-- .../Lightmap-3_comp_shadowmask.png | 4 +- .../Lightmap-3_comp_shadowmask.png.meta | 23 +-- .../Hischool_Chapter1/Lightmap-4_comp_dir.png | 4 +- .../Lightmap-4_comp_dir.png.meta | 21 +-- .../Lightmap-4_comp_light.exr | 4 +- .../Lightmap-4_comp_light.exr.meta | 21 +-- .../Lightmap-4_comp_shadowmask.png | 4 +- .../Lightmap-4_comp_shadowmask.png.meta | 23 +-- .../Hischool_Chapter1/Lightmap-5_comp_dir.png | 4 +- .../Lightmap-5_comp_dir.png.meta | 21 +-- .../Lightmap-5_comp_light.exr | 4 +- .../Lightmap-5_comp_light.exr.meta | 21 +-- .../Lightmap-5_comp_shadowmask.png | 2 +- .../Lightmap-5_comp_shadowmask.png.meta | 23 +-- .../Hischool_Chapter1/Lightmap-6_comp_dir.png | 4 +- .../Lightmap-6_comp_dir.png.meta | 21 +-- .../Lightmap-6_comp_light.exr | 4 +- .../Lightmap-6_comp_light.exr.meta | 21 +-- .../Lightmap-6_comp_shadowmask.png | 4 +- .../Lightmap-6_comp_shadowmask.png.meta | 23 +-- .../Hischool_Chapter1/Lightmap-7_comp_dir.png | 4 +- .../Lightmap-7_comp_dir.png.meta | 21 +-- .../Lightmap-7_comp_light.exr | 4 +- .../Lightmap-7_comp_light.exr.meta | 21 +-- .../Lightmap-7_comp_shadowmask.png | 4 +- .../Lightmap-7_comp_shadowmask.png.meta | 23 +-- .../Hischool_Chapter1/Lightmap-8_comp_dir.png | 4 +- .../Lightmap-8_comp_dir.png.meta | 21 +-- .../Lightmap-8_comp_light.exr | 4 +- .../Lightmap-8_comp_light.exr.meta | 21 +-- .../Lightmap-8_comp_shadowmask.png | 4 +- .../Lightmap-8_comp_shadowmask.png.meta | 23 +-- .../Hischool_Chapter1/ReflectionProbe-0.exr | 4 +- .../ReflectionProbe-0.exr.meta | 25 +-- .../Hischool_Chapter1/ReflectionProbe-1.exr | 4 +- .../ReflectionProbe-1.exr.meta | 25 +-- .../Hischool_Chapter1/ReflectionProbe-10.exr | 4 +- .../ReflectionProbe-10.exr.meta | 25 +-- .../Hischool_Chapter1/ReflectionProbe-11.exr | 4 +- .../ReflectionProbe-11.exr.meta | 25 +-- .../Hischool_Chapter1/ReflectionProbe-12.exr | 4 +- .../ReflectionProbe-12.exr.meta | 25 +-- .../Hischool_Chapter1/ReflectionProbe-13.exr | 4 +- .../ReflectionProbe-13.exr.meta | 25 +-- .../Hischool_Chapter1/ReflectionProbe-14.exr | 4 +- .../ReflectionProbe-14.exr.meta | 25 +-- .../Hischool_Chapter1/ReflectionProbe-15.exr | 4 +- .../ReflectionProbe-15.exr.meta | 25 +-- .../Hischool_Chapter1/ReflectionProbe-16.exr | 4 +- .../ReflectionProbe-16.exr.meta | 25 +-- .../Hischool_Chapter1/ReflectionProbe-17.exr | 4 +- .../ReflectionProbe-17.exr.meta | 25 +-- .../Hischool_Chapter1/ReflectionProbe-18.exr | 4 +- .../ReflectionProbe-18.exr.meta | 25 +-- .../Hischool_Chapter1/ReflectionProbe-19.exr | 4 +- .../ReflectionProbe-19.exr.meta | 25 +-- .../Hischool_Chapter1/ReflectionProbe-2.exr | 4 +- .../ReflectionProbe-2.exr.meta | 25 +-- .../Hischool_Chapter1/ReflectionProbe-20.exr | 4 +- .../ReflectionProbe-20.exr.meta | 25 +-- .../Hischool_Chapter1/ReflectionProbe-21.exr | 4 +- .../ReflectionProbe-21.exr.meta | 25 +-- .../Hischool_Chapter1/ReflectionProbe-22.exr | 4 +- .../ReflectionProbe-22.exr.meta | 25 +-- .../Hischool_Chapter1/ReflectionProbe-23.exr | 4 +- .../ReflectionProbe-23.exr.meta | 25 +-- .../Hischool_Chapter1/ReflectionProbe-24.exr | 4 +- .../ReflectionProbe-24.exr.meta | 25 +-- .../Hischool_Chapter1/ReflectionProbe-25.exr | 4 +- .../ReflectionProbe-25.exr.meta | 25 +-- .../Hischool_Chapter1/ReflectionProbe-26.exr | 4 +- .../ReflectionProbe-26.exr.meta | 25 +-- .../ReflectionProbe-27.exr.meta | 25 +-- .../Hischool_Chapter1/ReflectionProbe-3.exr | 4 +- .../ReflectionProbe-3.exr.meta | 25 +-- .../Hischool_Chapter1/ReflectionProbe-4.exr | 4 +- .../ReflectionProbe-4.exr.meta | 25 +-- .../Hischool_Chapter1/ReflectionProbe-5.exr | 4 +- .../ReflectionProbe-5.exr.meta | 25 +-- .../Hischool_Chapter1/ReflectionProbe-6.exr | 4 +- .../ReflectionProbe-6.exr.meta | 25 +-- .../Hischool_Chapter1/ReflectionProbe-7.exr | 4 +- .../ReflectionProbe-7.exr.meta | 25 +-- .../Hischool_Chapter1/ReflectionProbe-8.exr | 4 +- .../ReflectionProbe-8.exr.meta | 25 +-- .../Hischool_Chapter1/ReflectionProbe-9.exr | 4 +- .../ReflectionProbe-9.exr.meta | 25 +-- .../Hischool_Chapter2 Baking Set.asset | 3 + .../Hischool_Chapter2 Baking Set.asset.meta | 8 + .../Hischool_Chapter2/LightingData.asset | 4 +- .../Hischool_Chapter2/Lightmap-0_comp_dir.png | 4 +- .../Lightmap-0_comp_light.exr | 4 +- .../Hischool_Chapter2/Lightmap-1_comp_dir.png | 4 +- .../Lightmap-1_comp_light.exr | 4 +- .../Hischool_Chapter2/Lightmap-2_comp_dir.png | 4 +- .../Lightmap-2_comp_light.exr | 4 +- .../Hischool_Chapter2/Lightmap-3_comp_dir.png | 4 +- .../Lightmap-3_comp_light.exr | 4 +- .../Hischool_Chapter2/Lightmap-4_comp_dir.png | 4 +- .../Lightmap-4_comp_light.exr | 4 +- .../Hischool_Chapter2/Lightmap-5_comp_dir.png | 4 +- .../Lightmap-5_comp_light.exr | 4 +- .../Hischool_Chapter2/Lightmap-6_comp_dir.png | 4 +- .../Lightmap-6_comp_light.exr | 4 +- .../Hischool_Chapter2/Lightmap-7_comp_dir.png | 4 +- .../Lightmap-7_comp_light.exr | 4 +- .../Hischool_Chapter2/Lightmap-8_comp_dir.png | 4 +- .../Lightmap-8_comp_light.exr | 4 +- .../Hischool_Chapter2/ReflectionProbe-0.exr | 4 +- .../Hischool_Chapter2/ReflectionProbe-1.exr | 4 +- .../Hischool_Chapter2/ReflectionProbe-10.exr | 4 +- .../Hischool_Chapter2/ReflectionProbe-11.exr | 4 +- .../Hischool_Chapter2/ReflectionProbe-12.exr | 4 +- .../Hischool_Chapter2/ReflectionProbe-13.exr | 4 +- .../Hischool_Chapter2/ReflectionProbe-14.exr | 4 +- .../Hischool_Chapter2/ReflectionProbe-15.exr | 4 +- .../Hischool_Chapter2/ReflectionProbe-16.exr | 4 +- .../Hischool_Chapter2/ReflectionProbe-17.exr | 4 +- .../Hischool_Chapter2/ReflectionProbe-18.exr | 4 +- .../Hischool_Chapter2/ReflectionProbe-19.exr | 4 +- .../Hischool_Chapter2/ReflectionProbe-2.exr | 4 +- .../Hischool_Chapter2/ReflectionProbe-20.exr | 4 +- .../Hischool_Chapter2/ReflectionProbe-21.exr | 4 +- .../Hischool_Chapter2/ReflectionProbe-22.exr | 4 +- .../Hischool_Chapter2/ReflectionProbe-23.exr | 4 +- .../Hischool_Chapter2/ReflectionProbe-24.exr | 4 +- .../Hischool_Chapter2/ReflectionProbe-25.exr | 4 +- .../Hischool_Chapter2/ReflectionProbe-26.exr | 4 +- .../Hischool_Chapter2/ReflectionProbe-3.exr | 4 +- .../Hischool_Chapter2/ReflectionProbe-4.exr | 4 +- .../Hischool_Chapter2/ReflectionProbe-5.exr | 4 +- .../Hischool_Chapter2/ReflectionProbe-6.exr | 4 +- .../Hischool_Chapter2/ReflectionProbe-7.exr | 4 +- .../Hischool_Chapter2/ReflectionProbe-8.exr | 4 +- .../Hischool_Chapter2/ReflectionProbe-9.exr | 4 +- .../Canopy/swing-sofa/shaded 1.png.meta | 156 ++++++++++++++++++ .../swing-sofa/texture_diffuse 1.png.meta | 156 ++++++++++++++++++ .../swing-sofa/texture_metallic 1.png.meta | 156 ++++++++++++++++++ .../swing-sofa/texture_normal 1.png.meta | 156 ++++++++++++++++++ .../swing-sofa/texture_roughness 1.png.meta | 156 ++++++++++++++++++ .../XR/Settings/OpenXR Package Settings.asset | 4 +- 165 files changed, 1453 insertions(+), 1036 deletions(-) create mode 100644 Assets/01_Scenes/Hischool_Chapter1/Hischool_Chapter1 Baking Set.asset create mode 100644 Assets/01_Scenes/Hischool_Chapter1/Hischool_Chapter1 Baking Set.asset.meta create mode 100644 Assets/01_Scenes/Hischool_Chapter2/Hischool_Chapter2 Baking Set.asset create mode 100644 Assets/01_Scenes/Hischool_Chapter2/Hischool_Chapter2 Baking Set.asset.meta create mode 100644 Assets/04_Models/Festival/Canopy/swing-sofa/shaded 1.png.meta create mode 100644 Assets/04_Models/Festival/Canopy/swing-sofa/texture_diffuse 1.png.meta create mode 100644 Assets/04_Models/Festival/Canopy/swing-sofa/texture_metallic 1.png.meta create mode 100644 Assets/04_Models/Festival/Canopy/swing-sofa/texture_normal 1.png.meta create mode 100644 Assets/04_Models/Festival/Canopy/swing-sofa/texture_roughness 1.png.meta diff --git a/Assets/01_Scenes/Hischool_Chapter1/Hischool_Chapter1 Baking Set.asset b/Assets/01_Scenes/Hischool_Chapter1/Hischool_Chapter1 Baking Set.asset new file mode 100644 index 00000000..ae521d00 --- /dev/null +++ b/Assets/01_Scenes/Hischool_Chapter1/Hischool_Chapter1 Baking Set.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:274d4ec3cf89d6abd2f60105204e03e1fe2311b4cbc5314cf3822bf32fd5d4f7 +size 3344 diff --git a/Assets/01_Scenes/Hischool_Chapter1/Hischool_Chapter1 Baking Set.asset.meta b/Assets/01_Scenes/Hischool_Chapter1/Hischool_Chapter1 Baking Set.asset.meta new file mode 100644 index 00000000..7bc52e0b --- /dev/null +++ b/Assets/01_Scenes/Hischool_Chapter1/Hischool_Chapter1 Baking Set.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ccec3822d9296c7468aec794007f7c32 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/01_Scenes/Hischool_Chapter1/LightingData.asset b/Assets/01_Scenes/Hischool_Chapter1/LightingData.asset index 7c4aa360..74e45e8a 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/LightingData.asset +++ b/Assets/01_Scenes/Hischool_Chapter1/LightingData.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aa9dd65070387e62f60706cf384ea873be9ddafd5984ac441a98107e127dec5c -size 230309 +oid sha256:1f054fb4c079b06183a200bc1b390b31ec8b411b4f2477dcab0e4f9d7dc1c3f7 +size 159425 diff --git a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-0_comp_dir.png b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-0_comp_dir.png index 006c00b6..b137cb43 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-0_comp_dir.png +++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-0_comp_dir.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:64ce6288e4c25e004b1cc50817f5a3ea353f1d0f11138ed70fc31b3a64625ca3 -size 3155471 +oid sha256:6bf25ac17556fc168269aef156ae3d45760da1dc936bb465eb99585b2b1df6b4 +size 3148692 diff --git a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-0_comp_dir.png.meta b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-0_comp_dir.png.meta index 112e03f5..3401b21f 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-0_comp_dir.png.meta +++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-0_comp_dir.png.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: 1837adc38cf370045b28716154e43412 -======= -guid: 8def38bc499e92b4f985b6c97e19c954 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -11,7 +7,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -26,7 +22,7 @@ TextureImporter: normalMapFilter: 0 flipGreenChannel: 0 isReadable: 0 - streamingMipmaps: 0 + streamingMipmaps: 1 streamingMipmapsPriority: 0 vTOnly: 0 ignoreMipmapLimit: 0 @@ -39,11 +35,11 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 1 - aniso: 1 + aniso: 3 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -58,7 +54,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 + textureType: 12 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -97,8 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 -<<<<<<< HEAD -======= - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -138,7 +132,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-0_comp_light.exr b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-0_comp_light.exr index 81a1b91a..fb0d94bc 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-0_comp_light.exr +++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-0_comp_light.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8e63be0bfaef5c47177fdb80fc5ae967df3e7f206086ff80b8ce6507b1684a2f -size 34504759 +oid sha256:a7897f14bfd92282bac1b164cb46552fd613e3d001c207fa0af4e433510dff9f +size 34512432 diff --git a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-0_comp_light.exr.meta b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-0_comp_light.exr.meta index 4d7b4df5..ee421589 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-0_comp_light.exr.meta +++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-0_comp_light.exr.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: 2e96ec11a1748334da66d853d15ee66d -======= -guid: 46b4006d48b64bb488fb1dfecd2d09f3 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -26,7 +22,7 @@ TextureImporter: normalMapFilter: 0 flipGreenChannel: 0 isReadable: 0 - streamingMipmaps: 0 + streamingMipmaps: 1 streamingMipmapsPriority: 0 vTOnly: 0 ignoreMipmapLimit: 0 @@ -39,11 +35,11 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 1 - aniso: 1 + aniso: 3 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -55,10 +51,10 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + alphaUsage: 0 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 + textureType: 6 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -97,8 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 -<<<<<<< HEAD -======= - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -138,7 +132,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-0_comp_shadowmask.png.meta b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-0_comp_shadowmask.png.meta index c5a78fe8..3476d0de 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-0_comp_shadowmask.png.meta +++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-0_comp_shadowmask.png.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: 0225eef1af1806d479ddaab6e7080a90 -======= -guid: 4395b832618ba3b4ba7e1bc76b5825c4 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -11,7 +7,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -26,7 +22,7 @@ TextureImporter: normalMapFilter: 0 flipGreenChannel: 0 isReadable: 0 - streamingMipmaps: 0 + streamingMipmaps: 1 streamingMipmapsPriority: 0 vTOnly: 0 ignoreMipmapLimit: 0 @@ -39,11 +35,11 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 1 - aniso: 1 + aniso: 3 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -55,10 +51,10 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + alphaUsage: 0 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 + textureType: 11 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -97,8 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 -<<<<<<< HEAD -======= - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -138,7 +132,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-1_comp_dir.png b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-1_comp_dir.png index 9f23e67f..fadf3c11 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-1_comp_dir.png +++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-1_comp_dir.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0f91378f89f295ddff001c9d3dba577bc4af2b92a47835378b6604ac6204a39f -size 3475706 +oid sha256:ec9f493846fcc17031b91db73e32d67d7f57b52a537e994ec4e71a99cba56aab +size 3466453 diff --git a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-1_comp_dir.png.meta b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-1_comp_dir.png.meta index 0433f448..437a1e5a 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-1_comp_dir.png.meta +++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-1_comp_dir.png.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: 1afa39d80c7cbaf4882ca16170efe2c6 -======= -guid: 33850af6c4bc24548909806b783c3b63 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -11,7 +7,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -26,7 +22,7 @@ TextureImporter: normalMapFilter: 0 flipGreenChannel: 0 isReadable: 0 - streamingMipmaps: 0 + streamingMipmaps: 1 streamingMipmapsPriority: 0 vTOnly: 0 ignoreMipmapLimit: 0 @@ -39,11 +35,11 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 1 - aniso: 1 + aniso: 3 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -58,7 +54,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 + textureType: 12 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -97,8 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 -<<<<<<< HEAD -======= - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -138,7 +132,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-1_comp_light.exr b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-1_comp_light.exr index 08d691a3..9b39bcd7 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-1_comp_light.exr +++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-1_comp_light.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bc3bd1c2217f37d0c7da2f1ba52eff6eca410fe14fd215c9c259feb2f832a558 -size 39370557 +oid sha256:dee798e67070b1d8b45e9c7c5c130c8bc4b302aa769d752ccbdb9ea7e4759c05 +size 39386481 diff --git a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-1_comp_light.exr.meta b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-1_comp_light.exr.meta index 7c0ff4b3..a52f5f97 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-1_comp_light.exr.meta +++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-1_comp_light.exr.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: c5e5e1d01355936468cc5cfb4e1c4d37 -======= -guid: b2ce6dea8b907b3448c4a0159ca23826 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -26,7 +22,7 @@ TextureImporter: normalMapFilter: 0 flipGreenChannel: 0 isReadable: 0 - streamingMipmaps: 0 + streamingMipmaps: 1 streamingMipmapsPriority: 0 vTOnly: 0 ignoreMipmapLimit: 0 @@ -39,11 +35,11 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 1 - aniso: 1 + aniso: 3 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -55,10 +51,10 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + alphaUsage: 0 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 + textureType: 6 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -97,8 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 -<<<<<<< HEAD -======= - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -138,7 +132,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-1_comp_shadowmask.png b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-1_comp_shadowmask.png index 4bbcef4c..69dd8ad9 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-1_comp_shadowmask.png +++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-1_comp_shadowmask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1de3796952470fb17c22cd77bfb944a79367eece30d00443d1ce9d3de448b619 -size 59704 +oid sha256:5aae965127067a916a50833da58fce33b0b680472c20f8c94731334c1c345281 +size 59705 diff --git a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-1_comp_shadowmask.png.meta b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-1_comp_shadowmask.png.meta index 5ecbca39..457c8525 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-1_comp_shadowmask.png.meta +++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-1_comp_shadowmask.png.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: 22d09a781b276b74cbf597b7821d6680 -======= -guid: 2a717d1bb4a34924491ff85d332590be ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -11,7 +7,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -26,7 +22,7 @@ TextureImporter: normalMapFilter: 0 flipGreenChannel: 0 isReadable: 0 - streamingMipmaps: 0 + streamingMipmaps: 1 streamingMipmapsPriority: 0 vTOnly: 0 ignoreMipmapLimit: 0 @@ -39,11 +35,11 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 1 - aniso: 1 + aniso: 3 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -55,10 +51,10 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + alphaUsage: 0 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 + textureType: 11 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -97,8 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 -<<<<<<< HEAD -======= - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -138,7 +132,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-2_comp_dir.png b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-2_comp_dir.png index 5241b95e..317094cd 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-2_comp_dir.png +++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-2_comp_dir.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:db7987a7cfb4fc0f1c7278e0d341fbcfa87fc19a45db025378c6617ddcb0814b -size 3113724 +oid sha256:34fadb07afa9ab74f8fe8c10dd0553d0641c408e8e206b6b4f808334d2553b29 +size 3106161 diff --git a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-2_comp_dir.png.meta b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-2_comp_dir.png.meta index 63c9ea7e..30a8850c 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-2_comp_dir.png.meta +++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-2_comp_dir.png.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: d70136cf365dd754287af1fac036a61a -======= -guid: b382ddbfff52f4f48976839072aeeba8 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -11,7 +7,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -26,7 +22,7 @@ TextureImporter: normalMapFilter: 0 flipGreenChannel: 0 isReadable: 0 - streamingMipmaps: 0 + streamingMipmaps: 1 streamingMipmapsPriority: 0 vTOnly: 0 ignoreMipmapLimit: 0 @@ -39,11 +35,11 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 1 - aniso: 1 + aniso: 3 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -58,7 +54,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 + textureType: 12 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -97,8 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 -<<<<<<< HEAD -======= - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -138,7 +132,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-2_comp_light.exr b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-2_comp_light.exr index 48f4ee50..d3017d93 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-2_comp_light.exr +++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-2_comp_light.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:922c200e7849b88c3a63699fdd047a4ac50bb9dd94b4428cd29a119270f6b76c -size 38938801 +oid sha256:f63e5da893fc2d85c34836f799d9a108c554c743f65584cc5f8c123932ab6e04 +size 38951646 diff --git a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-2_comp_light.exr.meta b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-2_comp_light.exr.meta index 062851cf..6c1aaea9 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-2_comp_light.exr.meta +++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-2_comp_light.exr.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: 1f9ccad55473a8a45ac8399d547ff56c -======= -guid: 24fd37be4f7093647ac57772dfccc001 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -26,7 +22,7 @@ TextureImporter: normalMapFilter: 0 flipGreenChannel: 0 isReadable: 0 - streamingMipmaps: 0 + streamingMipmaps: 1 streamingMipmapsPriority: 0 vTOnly: 0 ignoreMipmapLimit: 0 @@ -39,11 +35,11 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 1 - aniso: 1 + aniso: 3 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -55,10 +51,10 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + alphaUsage: 0 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 + textureType: 6 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -97,8 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 -<<<<<<< HEAD -======= - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -138,7 +132,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-2_comp_shadowmask.png b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-2_comp_shadowmask.png index 84af89b2..cdfe5bcc 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-2_comp_shadowmask.png +++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-2_comp_shadowmask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:60e0feb5508c3291a4a298035110c77578beb929b1709f1edb26f1f06336ee0d -size 100054 +oid sha256:22a3ff097811b035fd2dea206d0f479901e246d93c4aef693b91353aa3101184 +size 100055 diff --git a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-2_comp_shadowmask.png.meta b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-2_comp_shadowmask.png.meta index 084c93a9..e34b690d 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-2_comp_shadowmask.png.meta +++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-2_comp_shadowmask.png.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: e53bb422f66bc2e4f9ca8e5f60656e23 -======= -guid: da7810d4302cab140a947bd30da6b09c ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -11,7 +7,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -26,7 +22,7 @@ TextureImporter: normalMapFilter: 0 flipGreenChannel: 0 isReadable: 0 - streamingMipmaps: 0 + streamingMipmaps: 1 streamingMipmapsPriority: 0 vTOnly: 0 ignoreMipmapLimit: 0 @@ -39,11 +35,11 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 1 - aniso: 1 + aniso: 3 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -55,10 +51,10 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + alphaUsage: 0 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 + textureType: 11 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -97,8 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 -<<<<<<< HEAD -======= - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -138,7 +132,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-3_comp_dir.png b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-3_comp_dir.png index cad9e5ac..5704d6fa 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-3_comp_dir.png +++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-3_comp_dir.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a5b80b66987ec37412701faee6b6c1fbebdcc9f59c7adfce685249eef8c4618e -size 3261397 +oid sha256:9cd920711963bf14d6280225d3eaf6acb530d92b22301d4966d3b50f56d57d59 +size 3253470 diff --git a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-3_comp_dir.png.meta b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-3_comp_dir.png.meta index 7d25243d..e58f9b76 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-3_comp_dir.png.meta +++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-3_comp_dir.png.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: ff42f2a9d7e504e49994eada1848954a -======= -guid: ef517d88292a3b346b277b9e37b17eca ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -11,7 +7,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -26,7 +22,7 @@ TextureImporter: normalMapFilter: 0 flipGreenChannel: 0 isReadable: 0 - streamingMipmaps: 0 + streamingMipmaps: 1 streamingMipmapsPriority: 0 vTOnly: 0 ignoreMipmapLimit: 0 @@ -39,11 +35,11 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 1 - aniso: 1 + aniso: 3 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -58,7 +54,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 + textureType: 12 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -97,8 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 -<<<<<<< HEAD -======= - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -138,7 +132,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-3_comp_light.exr b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-3_comp_light.exr index e7502ced..3c1984ae 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-3_comp_light.exr +++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-3_comp_light.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:05db71eda0d99da82bd10a21149383ca2fd726e7b2d34e58fbb0bdd3159699b0 -size 38792726 +oid sha256:74ef3f502cb49eb13e9f7ac9d745bab520368e8fffdb94576ee6ba289b42926b +size 38805561 diff --git a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-3_comp_light.exr.meta b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-3_comp_light.exr.meta index 947a3a92..14270fb1 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-3_comp_light.exr.meta +++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-3_comp_light.exr.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: dffcbe54508da074a8c11a5487db909d -======= -guid: 0055e5da05c789e43a03003421fdd746 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -26,7 +22,7 @@ TextureImporter: normalMapFilter: 0 flipGreenChannel: 0 isReadable: 0 - streamingMipmaps: 0 + streamingMipmaps: 1 streamingMipmapsPriority: 0 vTOnly: 0 ignoreMipmapLimit: 0 @@ -39,11 +35,11 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 1 - aniso: 1 + aniso: 3 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -55,10 +51,10 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + alphaUsage: 0 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 + textureType: 6 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -97,8 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 -<<<<<<< HEAD -======= - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -138,7 +132,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-3_comp_shadowmask.png b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-3_comp_shadowmask.png index 14627743..22d4f812 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-3_comp_shadowmask.png +++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-3_comp_shadowmask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aba9b684f9330df6e2981872acea531cef86195cafea2d88d93ee21481ff6873 -size 86372 +oid sha256:af55b0d6bf0bebab5e864260a9b0e51839437aebb2f6c4ad439c1cc54512b055 +size 86376 diff --git a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-3_comp_shadowmask.png.meta b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-3_comp_shadowmask.png.meta index 904e905f..ca9fd5ac 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-3_comp_shadowmask.png.meta +++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-3_comp_shadowmask.png.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: fe1151d3f4e83f14cb2e1eae7d517ddf -======= -guid: 4a3f0de6a758a0c4990efb0c2be97eb4 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -11,7 +7,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -26,7 +22,7 @@ TextureImporter: normalMapFilter: 0 flipGreenChannel: 0 isReadable: 0 - streamingMipmaps: 0 + streamingMipmaps: 1 streamingMipmapsPriority: 0 vTOnly: 0 ignoreMipmapLimit: 0 @@ -39,11 +35,11 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 1 - aniso: 1 + aniso: 3 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -55,10 +51,10 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + alphaUsage: 0 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 + textureType: 11 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -97,8 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 -<<<<<<< HEAD -======= - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -138,7 +132,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-4_comp_dir.png b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-4_comp_dir.png index 5d50a005..d1c34e10 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-4_comp_dir.png +++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-4_comp_dir.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:81df9595918c37e6a28dd0ff5d2c44bfbd2845f643871195ae0f50a6d09e247a -size 2856196 +oid sha256:65dfa5fc6bc654d0fb83b864135256cd5aaf5fa9a5d7cf03932afdce60b413e4 +size 2846887 diff --git a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-4_comp_dir.png.meta b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-4_comp_dir.png.meta index 35f175a5..047b845f 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-4_comp_dir.png.meta +++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-4_comp_dir.png.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: 7687168296a02ba4285577087adf137f -======= -guid: 0103c2e4943b05347ad1ca900f1bd52d ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -11,7 +7,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -26,7 +22,7 @@ TextureImporter: normalMapFilter: 0 flipGreenChannel: 0 isReadable: 0 - streamingMipmaps: 0 + streamingMipmaps: 1 streamingMipmapsPriority: 0 vTOnly: 0 ignoreMipmapLimit: 0 @@ -39,11 +35,11 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 1 - aniso: 1 + aniso: 3 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -58,7 +54,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 + textureType: 12 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -97,8 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 -<<<<<<< HEAD -======= - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -138,7 +132,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-4_comp_light.exr b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-4_comp_light.exr index b077b1bb..fedf5f1f 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-4_comp_light.exr +++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-4_comp_light.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bbef099be37994f45f617b199b11cf4b8f8f669f08961cdf1ba0c10399a425be -size 36229740 +oid sha256:f26c62921dcdf2c76b8df0a86f52b98504c5d180a599b00aaa362a533fab8ce2 +size 36247302 diff --git a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-4_comp_light.exr.meta b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-4_comp_light.exr.meta index 1a5bd209..8d9cf90b 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-4_comp_light.exr.meta +++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-4_comp_light.exr.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: f8b45e82a5b73e240b01a5a1a2e9f37e -======= -guid: 002fa0af3c966584da250980f61ce038 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -26,7 +22,7 @@ TextureImporter: normalMapFilter: 0 flipGreenChannel: 0 isReadable: 0 - streamingMipmaps: 0 + streamingMipmaps: 1 streamingMipmapsPriority: 0 vTOnly: 0 ignoreMipmapLimit: 0 @@ -39,11 +35,11 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 1 - aniso: 1 + aniso: 3 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -55,10 +51,10 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + alphaUsage: 0 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 + textureType: 6 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -97,8 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 -<<<<<<< HEAD -======= - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -138,7 +132,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-4_comp_shadowmask.png b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-4_comp_shadowmask.png index 4f220f95..4463d292 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-4_comp_shadowmask.png +++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-4_comp_shadowmask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e3b19e10f614f3bded27d40821a136d920fd00828aa444d4217455a5daa7ea5b -size 35079 +oid sha256:134ea741edf558a060bd8ad2bbe2173c7af0f536c6d088185244f1bdb48c51c6 +size 35080 diff --git a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-4_comp_shadowmask.png.meta b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-4_comp_shadowmask.png.meta index 80d5f4f1..eba9441b 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-4_comp_shadowmask.png.meta +++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-4_comp_shadowmask.png.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: b93bd0ad7f93d9845bafa621da7de554 -======= -guid: ea8379ad8b9bf314f9e3d995f60d247c ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -11,7 +7,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -26,7 +22,7 @@ TextureImporter: normalMapFilter: 0 flipGreenChannel: 0 isReadable: 0 - streamingMipmaps: 0 + streamingMipmaps: 1 streamingMipmapsPriority: 0 vTOnly: 0 ignoreMipmapLimit: 0 @@ -39,11 +35,11 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 1 - aniso: 1 + aniso: 3 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -55,10 +51,10 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + alphaUsage: 0 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 + textureType: 11 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -97,8 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 -<<<<<<< HEAD -======= - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -138,7 +132,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-5_comp_dir.png b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-5_comp_dir.png index 05c75419..92da5414 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-5_comp_dir.png +++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-5_comp_dir.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:31214a47a592a41b0b1a5c412cfeda3be4b34893431f1e1c0e86172684c7f2f6 -size 2639072 +oid sha256:4408cdd9259c318498a9bcd365a0f2fa43b368f794636793d7d84ee2f69fa760 +size 2635649 diff --git a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-5_comp_dir.png.meta b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-5_comp_dir.png.meta index 9a09c7cb..f563212c 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-5_comp_dir.png.meta +++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-5_comp_dir.png.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: b251592e9a9d4a447a234ee05602e101 -======= -guid: eb6f95e00fcc61040888b682c91253ae ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -11,7 +7,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -26,7 +22,7 @@ TextureImporter: normalMapFilter: 0 flipGreenChannel: 0 isReadable: 0 - streamingMipmaps: 0 + streamingMipmaps: 1 streamingMipmapsPriority: 0 vTOnly: 0 ignoreMipmapLimit: 0 @@ -39,11 +35,11 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 1 - aniso: 1 + aniso: 3 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -58,7 +54,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 + textureType: 12 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -97,8 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 -<<<<<<< HEAD -======= - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -138,7 +132,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-5_comp_light.exr b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-5_comp_light.exr index bf2241f3..f464d2ef 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-5_comp_light.exr +++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-5_comp_light.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3a58b05c408997892ebdd87b40fee7d1364c3ea25d14726b15509b3efde52d77 -size 33012666 +oid sha256:cfb1195c8913e4a4a5efebe0b89541472af30c7f9cca6a7d6c3c381eba5c539c +size 33017342 diff --git a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-5_comp_light.exr.meta b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-5_comp_light.exr.meta index a2d6eed7..2c73f6de 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-5_comp_light.exr.meta +++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-5_comp_light.exr.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: 69c91dbf8c4a40049a55b25451eaf624 -======= -guid: ef2bc6db3c514f94d8179beb1f1694a7 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -26,7 +22,7 @@ TextureImporter: normalMapFilter: 0 flipGreenChannel: 0 isReadable: 0 - streamingMipmaps: 0 + streamingMipmaps: 1 streamingMipmapsPriority: 0 vTOnly: 0 ignoreMipmapLimit: 0 @@ -39,11 +35,11 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 1 - aniso: 1 + aniso: 3 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -55,10 +51,10 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + alphaUsage: 0 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 + textureType: 6 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -97,8 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 -<<<<<<< HEAD -======= - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -138,7 +132,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-5_comp_shadowmask.png b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-5_comp_shadowmask.png index 970e892c..37e6eb3e 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-5_comp_shadowmask.png +++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-5_comp_shadowmask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:16c851423cd3ece742c4e27868d3f5ba376b26629693f786cdd294d54ed9e65c +oid sha256:7af93ced9754b22928f1540c789f927af033f42e4be0f854b142176821f45fc7 size 77782 diff --git a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-5_comp_shadowmask.png.meta b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-5_comp_shadowmask.png.meta index 17284f65..158b37d9 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-5_comp_shadowmask.png.meta +++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-5_comp_shadowmask.png.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: 6cc0d3b48afa6064bbd207bab93870f1 -======= -guid: 74263ed10de4fec468e7d5bc95ed08d6 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -11,7 +7,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -26,7 +22,7 @@ TextureImporter: normalMapFilter: 0 flipGreenChannel: 0 isReadable: 0 - streamingMipmaps: 0 + streamingMipmaps: 1 streamingMipmapsPriority: 0 vTOnly: 0 ignoreMipmapLimit: 0 @@ -39,11 +35,11 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 1 - aniso: 1 + aniso: 3 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -55,10 +51,10 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + alphaUsage: 0 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 + textureType: 11 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -97,8 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 -<<<<<<< HEAD -======= - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -138,7 +132,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-6_comp_dir.png b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-6_comp_dir.png index aadbfcf2..88a8076d 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-6_comp_dir.png +++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-6_comp_dir.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:88d497b1165aba0f226073ff4fe8e4b0d75f0880006d48d0f9eae0662037ca06 -size 1970421 +oid sha256:86f23a920d884f06da1f7d93b2d6a0ed7c8ad967e9d7a3caf2184dc612c70214 +size 1967886 diff --git a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-6_comp_dir.png.meta b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-6_comp_dir.png.meta index 0926fe43..dbe0bbe9 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-6_comp_dir.png.meta +++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-6_comp_dir.png.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: 24e7124ab7be26c48a58791fc9711ccf -======= -guid: 13d4dc2ebf9d5d843a747c82ea806d66 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -11,7 +7,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -26,7 +22,7 @@ TextureImporter: normalMapFilter: 0 flipGreenChannel: 0 isReadable: 0 - streamingMipmaps: 0 + streamingMipmaps: 1 streamingMipmapsPriority: 0 vTOnly: 0 ignoreMipmapLimit: 0 @@ -39,11 +35,11 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 1 - aniso: 1 + aniso: 3 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -58,7 +54,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 + textureType: 12 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -97,8 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 -<<<<<<< HEAD -======= - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -138,7 +132,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-6_comp_light.exr b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-6_comp_light.exr index 6f05bdc9..badc9ec9 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-6_comp_light.exr +++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-6_comp_light.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d431d0bfc5c3b4e1faf67c710e155f3ddded5fd24acfd8ab86f6a5d264832bd3 -size 39387155 +oid sha256:235926856e1ead97a2896a5b5d00c874348d179c6752e6ec18fbad2977390615 +size 39388105 diff --git a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-6_comp_light.exr.meta b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-6_comp_light.exr.meta index 1db4383c..bd5143b7 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-6_comp_light.exr.meta +++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-6_comp_light.exr.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: 9043a5151de4c1641a0902234c27f6ab -======= -guid: 3055acf1d2b49a048baaeb5885c21922 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -26,7 +22,7 @@ TextureImporter: normalMapFilter: 0 flipGreenChannel: 0 isReadable: 0 - streamingMipmaps: 0 + streamingMipmaps: 1 streamingMipmapsPriority: 0 vTOnly: 0 ignoreMipmapLimit: 0 @@ -39,11 +35,11 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 1 - aniso: 1 + aniso: 3 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -55,10 +51,10 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + alphaUsage: 0 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 + textureType: 6 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -97,8 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 -<<<<<<< HEAD -======= - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -138,7 +132,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-6_comp_shadowmask.png b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-6_comp_shadowmask.png index 9bbaebd6..cffb933d 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-6_comp_shadowmask.png +++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-6_comp_shadowmask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fe29f81289b38101920bb431785409af53afb4c89e8c806520096ff2ac6a4d63 -size 111466 +oid sha256:ff6fa3cfa4e935871d80a3e6736a2b8c2bbde29b7563fd3da5ca5b59123ac05d +size 111462 diff --git a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-6_comp_shadowmask.png.meta b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-6_comp_shadowmask.png.meta index 9a93e83e..995379fc 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-6_comp_shadowmask.png.meta +++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-6_comp_shadowmask.png.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: 3dfe1cdc948e3c4448a9f164c3faca2e -======= -guid: 73538cc77b6cb4c44b9885adb1e3f4ec ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -11,7 +7,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -26,7 +22,7 @@ TextureImporter: normalMapFilter: 0 flipGreenChannel: 0 isReadable: 0 - streamingMipmaps: 0 + streamingMipmaps: 1 streamingMipmapsPriority: 0 vTOnly: 0 ignoreMipmapLimit: 0 @@ -39,11 +35,11 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 1 - aniso: 1 + aniso: 3 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -55,10 +51,10 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + alphaUsage: 0 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 + textureType: 11 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -97,8 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 -<<<<<<< HEAD -======= - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -138,7 +132,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-7_comp_dir.png b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-7_comp_dir.png index 6eede45c..b9fcbdd3 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-7_comp_dir.png +++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-7_comp_dir.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b8ab53d76bf0224718d64dc7c1e64f79d430ead4914774cf70e39ff5363ed7a8 -size 1622833 +oid sha256:af1dc787f8eabbacedb1e7a3e2dfce327b278364de71ca2195036d51caaf2e97 +size 1622116 diff --git a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-7_comp_dir.png.meta b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-7_comp_dir.png.meta index 22456d11..5fcd3ece 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-7_comp_dir.png.meta +++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-7_comp_dir.png.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: 7c6c1f76b9de79f47aa7a06ac939489a -======= -guid: 947fab023c98f684493c056a7a3c4880 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -11,7 +7,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -26,7 +22,7 @@ TextureImporter: normalMapFilter: 0 flipGreenChannel: 0 isReadable: 0 - streamingMipmaps: 0 + streamingMipmaps: 1 streamingMipmapsPriority: 0 vTOnly: 0 ignoreMipmapLimit: 0 @@ -39,11 +35,11 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 1 - aniso: 1 + aniso: 3 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -58,7 +54,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 + textureType: 12 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -97,8 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 -<<<<<<< HEAD -======= - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -138,7 +132,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-7_comp_light.exr b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-7_comp_light.exr index 42f66f32..884c7a7f 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-7_comp_light.exr +++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-7_comp_light.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:027c7334c951d685dd2891c2536f6d3d592dee72c65371bf3945597b81e70aa0 -size 41750324 +oid sha256:0d0e08541e6fcbbf9d7381a2eece43813b2b4d2afd700c43f62c9a440b02e3b4 +size 41749136 diff --git a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-7_comp_light.exr.meta b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-7_comp_light.exr.meta index 860c1d31..38cabf78 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-7_comp_light.exr.meta +++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-7_comp_light.exr.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: e3d2c6be33c62244e851360e6a51380f -======= -guid: 3a7b1e4b2b575224c9d17ae5e87a2a5e ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -26,7 +22,7 @@ TextureImporter: normalMapFilter: 0 flipGreenChannel: 0 isReadable: 0 - streamingMipmaps: 0 + streamingMipmaps: 1 streamingMipmapsPriority: 0 vTOnly: 0 ignoreMipmapLimit: 0 @@ -39,11 +35,11 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 1 - aniso: 1 + aniso: 3 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -55,10 +51,10 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + alphaUsage: 0 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 + textureType: 6 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -97,8 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 -<<<<<<< HEAD -======= - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -138,7 +132,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-7_comp_shadowmask.png b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-7_comp_shadowmask.png index 1c41025a..998af684 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-7_comp_shadowmask.png +++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-7_comp_shadowmask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:91e3080aa2723e69a100c29a98f2531342ed182ae314084630c9ddb7515ced17 -size 127373 +oid sha256:a69631ec8a0ababdf89c7be67b6629cdaeab07b4b1aca10e53bf63245428316f +size 127338 diff --git a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-7_comp_shadowmask.png.meta b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-7_comp_shadowmask.png.meta index 758e95c0..65f036a8 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-7_comp_shadowmask.png.meta +++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-7_comp_shadowmask.png.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: 0df48fdae84b1f64aae0c4fbfbbad7d5 -======= -guid: b8850955b4ce10349a74d79a8e7e7fc9 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -11,7 +7,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -26,7 +22,7 @@ TextureImporter: normalMapFilter: 0 flipGreenChannel: 0 isReadable: 0 - streamingMipmaps: 0 + streamingMipmaps: 1 streamingMipmapsPriority: 0 vTOnly: 0 ignoreMipmapLimit: 0 @@ -39,11 +35,11 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 1 - aniso: 1 + aniso: 3 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -55,10 +51,10 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + alphaUsage: 0 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 + textureType: 11 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -97,8 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 -<<<<<<< HEAD -======= - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -138,7 +132,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-8_comp_dir.png b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-8_comp_dir.png index d181a04a..86061580 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-8_comp_dir.png +++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-8_comp_dir.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f85430546693072162c6b08f33d20d60787d60f2a20dc4035c7e6461592ee797 -size 1292249 +oid sha256:96f82431d3df6aa53d988765fa188e031412eec67d158c0aa18f48d47f62bc86 +size 1291557 diff --git a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-8_comp_dir.png.meta b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-8_comp_dir.png.meta index 1c7865e8..29402a44 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-8_comp_dir.png.meta +++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-8_comp_dir.png.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: a07d1baacdab8fb43acee6ab428a7bd7 -======= -guid: 094d27b965be01448bc2068327468e44 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -11,7 +7,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -26,7 +22,7 @@ TextureImporter: normalMapFilter: 0 flipGreenChannel: 0 isReadable: 0 - streamingMipmaps: 0 + streamingMipmaps: 1 streamingMipmapsPriority: 0 vTOnly: 0 ignoreMipmapLimit: 0 @@ -39,11 +35,11 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 1 - aniso: 1 + aniso: 3 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -58,7 +54,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 + textureType: 12 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -97,8 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 -<<<<<<< HEAD -======= - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -138,7 +132,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-8_comp_light.exr b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-8_comp_light.exr index 9dea369a..10ec23dd 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-8_comp_light.exr +++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-8_comp_light.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b22beff050940e8e4d7c2dd54cffbb9f76fa9e1a24c5042cc705cb15e575f364 -size 16750356 +oid sha256:f9bdf6eec622d89b5dbc3b2b8f187b955055eb86dac82b7990b80a403767c718 +size 16748696 diff --git a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-8_comp_light.exr.meta b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-8_comp_light.exr.meta index 87e030a2..eef75af5 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-8_comp_light.exr.meta +++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-8_comp_light.exr.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: 3476519240fba2c4299bf72121414504 -======= -guid: d84e9811515dfcf4c8066d2c3e252bec ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -26,7 +22,7 @@ TextureImporter: normalMapFilter: 0 flipGreenChannel: 0 isReadable: 0 - streamingMipmaps: 0 + streamingMipmaps: 1 streamingMipmapsPriority: 0 vTOnly: 0 ignoreMipmapLimit: 0 @@ -39,11 +35,11 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 1 - aniso: 1 + aniso: 3 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -55,10 +51,10 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + alphaUsage: 0 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 + textureType: 6 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -97,8 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 -<<<<<<< HEAD -======= - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -138,7 +132,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-8_comp_shadowmask.png b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-8_comp_shadowmask.png index a7f3a9a5..81dbfbf4 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-8_comp_shadowmask.png +++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-8_comp_shadowmask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f6fd8af518b4da4ece25db5129fca09e1c275d46a40721dc80daf804f7cff478 -size 183496 +oid sha256:6efdf5188c40a84c2ba70e26421997143de9359715783c26b2ecb3f0c17e8522 +size 183497 diff --git a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-8_comp_shadowmask.png.meta b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-8_comp_shadowmask.png.meta index 3edb798b..18ca4e00 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-8_comp_shadowmask.png.meta +++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-8_comp_shadowmask.png.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: be1844c9e15701648977a2897dbe4543 -======= -guid: 2b7a4acfa597f574688efd52d7556181 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -11,7 +7,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -26,7 +22,7 @@ TextureImporter: normalMapFilter: 0 flipGreenChannel: 0 isReadable: 0 - streamingMipmaps: 0 + streamingMipmaps: 1 streamingMipmapsPriority: 0 vTOnly: 0 ignoreMipmapLimit: 0 @@ -39,11 +35,11 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 1 - aniso: 1 + aniso: 3 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -55,10 +51,10 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + alphaUsage: 0 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 + textureType: 11 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -97,8 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 -<<<<<<< HEAD -======= - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -138,7 +132,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-0.exr b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-0.exr index 9c09e9d0..9598fd29 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-0.exr +++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-0.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9a8f8c4d5339cfe44b372fb6c7949899fdf27df747f5f21b2e74d79c7208a46d -size 1247045 +oid sha256:ffb489b4e564f118f50ac789e87672ab71f57c289240ec926b7d7acd0ba50230 +size 1245447 diff --git a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-0.exr.meta b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-0.exr.meta index 9f90a184..169ab664 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-0.exr.meta +++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-0.exr.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: 4255b323ad196464b809034660e5d649 -======= -guid: b08deb25524bf7d4986430214154f18c ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -32,18 +28,18 @@ TextureImporter: ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 + cubemapConvolution: 1 + seamlessCubemap: 1 textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 - aniso: 1 + filterMode: 2 + aniso: 0 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -59,7 +55,7 @@ TextureImporter: alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 - textureShape: 1 + textureShape: 2 singleChannelComponent: 0 flipbookRows: 1 flipbookColumns: 1 @@ -77,7 +73,7 @@ TextureImporter: resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 - compressionQuality: 50 + compressionQuality: 100 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 @@ -97,8 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 -<<<<<<< HEAD -======= - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -138,7 +132,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-1.exr b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-1.exr index 93b3729d..80dc97f1 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-1.exr +++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-1.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f47cef55e5a10490e9df8eef8f30c796176ee757902c309b66f854f52938714b -size 1329478 +oid sha256:3f13c11f9a0134b4d30f21d52c386aa7e9876a057b96c9eb07988642fef59529 +size 1360275 diff --git a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-1.exr.meta b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-1.exr.meta index 897bdbf5..a342f640 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-1.exr.meta +++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-1.exr.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: 5f8cff137c8ede943a5464931fb9ed4b -======= -guid: e2e4b7cd76d97334e97dcebd120615c0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -32,18 +28,18 @@ TextureImporter: ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 + cubemapConvolution: 1 + seamlessCubemap: 1 textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 - aniso: 1 + filterMode: 2 + aniso: 0 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -59,7 +55,7 @@ TextureImporter: alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 - textureShape: 1 + textureShape: 2 singleChannelComponent: 0 flipbookRows: 1 flipbookColumns: 1 @@ -77,7 +73,7 @@ TextureImporter: resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 - compressionQuality: 50 + compressionQuality: 100 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 @@ -97,8 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 -<<<<<<< HEAD -======= - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -138,7 +132,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-10.exr b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-10.exr index 4901b969..064b8cdc 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-10.exr +++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-10.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4c1e2f474807b1e103521fcd17a73dd724320fb5261a4fc924b78078c840b422 -size 1351578 +oid sha256:9faa120836ae15e27d1ead1a0aeb7f629e047372a4324ab4c650314908731a9b +size 1352158 diff --git a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-10.exr.meta b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-10.exr.meta index 473997c7..75589dad 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-10.exr.meta +++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-10.exr.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: 6a66124e7c4ff184582a2f272a3b6a2e -======= -guid: 143e17a91b255ff49a428632971d049d ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -32,18 +28,18 @@ TextureImporter: ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 + cubemapConvolution: 1 + seamlessCubemap: 1 textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 - aniso: 1 + filterMode: 2 + aniso: 0 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -59,7 +55,7 @@ TextureImporter: alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 - textureShape: 1 + textureShape: 2 singleChannelComponent: 0 flipbookRows: 1 flipbookColumns: 1 @@ -77,7 +73,7 @@ TextureImporter: resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 - compressionQuality: 50 + compressionQuality: 100 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 @@ -97,8 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 -<<<<<<< HEAD -======= - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -138,7 +132,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-11.exr b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-11.exr index 18c8b4da..21513e75 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-11.exr +++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-11.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:324a7c336c8536116f95101c4c6537d3e641b983663cdcaaaabf1f5286b6ee74 -size 1354752 +oid sha256:7b9750e91f4c467177cc698e5ea114d1941549d5929916f405bcea1df7c388d5 +size 1356550 diff --git a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-11.exr.meta b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-11.exr.meta index 19cd2e34..478f3b82 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-11.exr.meta +++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-11.exr.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: 3b9bef808d546844fa83dcfcbb116cbf -======= -guid: b532846a716bfa447a0d0e33220bf137 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -32,18 +28,18 @@ TextureImporter: ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 + cubemapConvolution: 1 + seamlessCubemap: 1 textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 - aniso: 1 + filterMode: 2 + aniso: 0 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -59,7 +55,7 @@ TextureImporter: alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 - textureShape: 1 + textureShape: 2 singleChannelComponent: 0 flipbookRows: 1 flipbookColumns: 1 @@ -77,7 +73,7 @@ TextureImporter: resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 - compressionQuality: 50 + compressionQuality: 100 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 @@ -97,8 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 -<<<<<<< HEAD -======= - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -138,7 +132,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-12.exr b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-12.exr index abeb7f5e..e942e825 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-12.exr +++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-12.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0a9830c6b9b0506908a95158cf250cced4dd0a1d66d778bbfd1eaba192f245f6 -size 1325676 +oid sha256:47b1561ee6a0fb950700b193b02b3a6386073dc0642bffd827e78064b68ac379 +size 1324595 diff --git a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-12.exr.meta b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-12.exr.meta index c4ce8b8b..1a40e3c3 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-12.exr.meta +++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-12.exr.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: 968fcb5d970e7a449b0c07b390dcbe92 -======= -guid: 916bf1bd7534f414590cd81417c782d9 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -32,18 +28,18 @@ TextureImporter: ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 + cubemapConvolution: 1 + seamlessCubemap: 1 textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 - aniso: 1 + filterMode: 2 + aniso: 0 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -59,7 +55,7 @@ TextureImporter: alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 - textureShape: 1 + textureShape: 2 singleChannelComponent: 0 flipbookRows: 1 flipbookColumns: 1 @@ -77,7 +73,7 @@ TextureImporter: resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 - compressionQuality: 50 + compressionQuality: 100 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 @@ -97,8 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 -<<<<<<< HEAD -======= - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -138,7 +132,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-13.exr b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-13.exr index 572cc2b0..157d42dc 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-13.exr +++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-13.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c7a5f84b4a1dc4ab5db0cfb6c8d2722fb7f3e28f337e95ce84c967108b96e8be -size 1386965 +oid sha256:d3ba44a9e31988355b626bc47274911b381537e622022905f8c6801c3a30dff0 +size 1387220 diff --git a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-13.exr.meta b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-13.exr.meta index 081a116d..e3b4b2bc 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-13.exr.meta +++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-13.exr.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: c1ab167b7e486cf47a088547dd31195a -======= -guid: 8d6c553260bd79049b6b9d21eee463ae ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -32,18 +28,18 @@ TextureImporter: ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 + cubemapConvolution: 1 + seamlessCubemap: 1 textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 - aniso: 1 + filterMode: 2 + aniso: 0 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -59,7 +55,7 @@ TextureImporter: alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 - textureShape: 1 + textureShape: 2 singleChannelComponent: 0 flipbookRows: 1 flipbookColumns: 1 @@ -77,7 +73,7 @@ TextureImporter: resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 - compressionQuality: 50 + compressionQuality: 100 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 @@ -97,8 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 -<<<<<<< HEAD -======= - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -138,7 +132,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-14.exr b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-14.exr index cdf6b098..a54716a9 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-14.exr +++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-14.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f5a50d567ac23213b120f025e010ae693a5a480b79b7609720c69282622476d4 -size 1274896 +oid sha256:fc1741b5b581f4b2f7a556641bc352bc5bdbdc362cee8845251407120c32d26d +size 1278849 diff --git a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-14.exr.meta b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-14.exr.meta index bbd2db2f..f624e111 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-14.exr.meta +++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-14.exr.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: 6cf0ecde935b19a4fbfdfb0c6786cf23 -======= -guid: ffe487f894c8a4046b191e2de0018a09 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -32,18 +28,18 @@ TextureImporter: ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 + cubemapConvolution: 1 + seamlessCubemap: 1 textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 - aniso: 1 + filterMode: 2 + aniso: 0 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -59,7 +55,7 @@ TextureImporter: alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 - textureShape: 1 + textureShape: 2 singleChannelComponent: 0 flipbookRows: 1 flipbookColumns: 1 @@ -77,7 +73,7 @@ TextureImporter: resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 - compressionQuality: 50 + compressionQuality: 100 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 @@ -97,8 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 -<<<<<<< HEAD -======= - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -138,7 +132,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-15.exr b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-15.exr index 763b64e5..3f187f8a 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-15.exr +++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-15.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a27fb3ac6380e90c6a4f69c2b51f46acbd20019cabca3d736bb6d7c35888424a -size 1326529 +oid sha256:8181a7ef758bd8e0a33e50590d8f2b709df1347250c8b388d2e3afaf2efd6ca9 +size 1326451 diff --git a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-15.exr.meta b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-15.exr.meta index dafdac95..8fbec34d 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-15.exr.meta +++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-15.exr.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: fc54e9711ee8407418aa82e5a594d4df -======= -guid: 4a01ff35aec696b40ba04fbc16c2939a ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -32,18 +28,18 @@ TextureImporter: ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 + cubemapConvolution: 1 + seamlessCubemap: 1 textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 - aniso: 1 + filterMode: 2 + aniso: 0 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -59,7 +55,7 @@ TextureImporter: alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 - textureShape: 1 + textureShape: 2 singleChannelComponent: 0 flipbookRows: 1 flipbookColumns: 1 @@ -77,7 +73,7 @@ TextureImporter: resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 - compressionQuality: 50 + compressionQuality: 100 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 @@ -97,8 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 -<<<<<<< HEAD -======= - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -138,7 +132,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-16.exr b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-16.exr index 992dde70..02117f02 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-16.exr +++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-16.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:34adb3387a4add367e63f95972fcfb1957eb883b0f605070d7360b77148c19a2 -size 1377245 +oid sha256:fa83a05208e4c0865c64c0290266fabd5059048b903b767a832047973e23eef3 +size 1376597 diff --git a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-16.exr.meta b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-16.exr.meta index 276dcf2a..20905f61 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-16.exr.meta +++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-16.exr.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: 1c94eb19874fce94cb4df38fc9afb93e -======= -guid: eef804b29d8fb0343b09c7dfeefeaae8 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -32,18 +28,18 @@ TextureImporter: ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 + cubemapConvolution: 1 + seamlessCubemap: 1 textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 - aniso: 1 + filterMode: 2 + aniso: 0 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -59,7 +55,7 @@ TextureImporter: alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 - textureShape: 1 + textureShape: 2 singleChannelComponent: 0 flipbookRows: 1 flipbookColumns: 1 @@ -77,7 +73,7 @@ TextureImporter: resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 - compressionQuality: 50 + compressionQuality: 100 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 @@ -97,8 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 -<<<<<<< HEAD -======= - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -138,7 +132,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-17.exr b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-17.exr index 6c8108f8..818063e2 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-17.exr +++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-17.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ce181568b3a677ce64f6ec55c59fa8d0fc84407d1a0b9f0b6ea5de9e2fe4600c -size 1314972 +oid sha256:ad5f3ffedbfae098dfe1f649ba9bce990e5d3d95ff58d8fe7fa475684ee4921f +size 1314115 diff --git a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-17.exr.meta b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-17.exr.meta index e657d946..6ec9c63e 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-17.exr.meta +++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-17.exr.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: ada8f5ba1f626064d903e1f87aed4b7d -======= -guid: 5e6066cc15cb8fc428e63dfeef9ab13b ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -32,18 +28,18 @@ TextureImporter: ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 + cubemapConvolution: 1 + seamlessCubemap: 1 textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 - aniso: 1 + filterMode: 2 + aniso: 0 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -59,7 +55,7 @@ TextureImporter: alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 - textureShape: 1 + textureShape: 2 singleChannelComponent: 0 flipbookRows: 1 flipbookColumns: 1 @@ -77,7 +73,7 @@ TextureImporter: resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 - compressionQuality: 50 + compressionQuality: 100 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 @@ -97,8 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 -<<<<<<< HEAD -======= - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -138,7 +132,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-18.exr b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-18.exr index da639cc3..02f79307 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-18.exr +++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-18.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:18c33e8fcf2a56aaee25af7a078b8c6bb2a4018e282d369e2e4c71d32d093cac -size 1384722 +oid sha256:1b9ca1d36518d5066b11f77322fc992713087fbdc4afa1ec2560a5fb74cfa5a3 +size 1385513 diff --git a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-18.exr.meta b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-18.exr.meta index a050532e..35fe6110 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-18.exr.meta +++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-18.exr.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: 0b85feee5d4c6834b80fd833a356d012 -======= -guid: 4052c42d527ed9c49acea90b8dd7bd47 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -32,18 +28,18 @@ TextureImporter: ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 + cubemapConvolution: 1 + seamlessCubemap: 1 textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 - aniso: 1 + filterMode: 2 + aniso: 0 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -59,7 +55,7 @@ TextureImporter: alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 - textureShape: 1 + textureShape: 2 singleChannelComponent: 0 flipbookRows: 1 flipbookColumns: 1 @@ -77,7 +73,7 @@ TextureImporter: resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 - compressionQuality: 50 + compressionQuality: 100 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 @@ -97,8 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 -<<<<<<< HEAD -======= - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -138,7 +132,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-19.exr b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-19.exr index dbb34f2d..93c0d6f3 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-19.exr +++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-19.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9b18d178e8a8928332c2adee95184e179f76afbeaeaa2567fce5d9366dd042a7 -size 1276633 +oid sha256:cde7f1f1c5fc624d7e437cf5a6950843cb9831158b94615ed1c81bd5625c8e97 +size 1281117 diff --git a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-19.exr.meta b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-19.exr.meta index 9d606ac1..a16ac6a6 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-19.exr.meta +++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-19.exr.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: 49615049bc8d7fb42ba5905b404d1531 -======= -guid: 490a260ea8973f740ab308b0b8019940 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -32,18 +28,18 @@ TextureImporter: ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 + cubemapConvolution: 1 + seamlessCubemap: 1 textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 - aniso: 1 + filterMode: 2 + aniso: 0 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -59,7 +55,7 @@ TextureImporter: alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 - textureShape: 1 + textureShape: 2 singleChannelComponent: 0 flipbookRows: 1 flipbookColumns: 1 @@ -77,7 +73,7 @@ TextureImporter: resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 - compressionQuality: 50 + compressionQuality: 100 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 @@ -97,8 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 -<<<<<<< HEAD -======= - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -138,7 +132,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-2.exr b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-2.exr index aef4b0ac..bd7e6469 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-2.exr +++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-2.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f64dec0f65f61dcbaf4d41cac72d4a05f513239d90f6992f587f7250a32f5880 -size 1344319 +oid sha256:78233dc077e64dc268b3a0c22053cfb4a1cfcf080e7a4ebd57969281c9827393 +size 1346511 diff --git a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-2.exr.meta b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-2.exr.meta index ca31964d..2cd70791 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-2.exr.meta +++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-2.exr.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: ad09759275f3dc34aa5390ec9512a341 -======= -guid: b9cac4c3f0eb05649aae78cd44d55e51 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -32,18 +28,18 @@ TextureImporter: ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 + cubemapConvolution: 1 + seamlessCubemap: 1 textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 - aniso: 1 + filterMode: 2 + aniso: 0 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -59,7 +55,7 @@ TextureImporter: alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 - textureShape: 1 + textureShape: 2 singleChannelComponent: 0 flipbookRows: 1 flipbookColumns: 1 @@ -77,7 +73,7 @@ TextureImporter: resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 - compressionQuality: 50 + compressionQuality: 100 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 @@ -97,8 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 -<<<<<<< HEAD -======= - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -138,7 +132,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-20.exr b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-20.exr index 0ac71225..4748881a 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-20.exr +++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-20.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e99db4f9483760ae71413d26b572393704a0966085507890d4f8edbe9232ede7 -size 1320870 +oid sha256:d9220a7f831ec7c48b3ab5b890928fb1fcc007f8fa6d61bb48456458a2a7e515 +size 1318416 diff --git a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-20.exr.meta b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-20.exr.meta index 924976e3..ee86b548 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-20.exr.meta +++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-20.exr.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: 6b09163e222c9b749b817805561b9405 -======= -guid: 7b4805aa02522104796a5ad5701e5cb8 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -32,18 +28,18 @@ TextureImporter: ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 + cubemapConvolution: 1 + seamlessCubemap: 1 textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 - aniso: 1 + filterMode: 2 + aniso: 0 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -59,7 +55,7 @@ TextureImporter: alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 - textureShape: 1 + textureShape: 2 singleChannelComponent: 0 flipbookRows: 1 flipbookColumns: 1 @@ -77,7 +73,7 @@ TextureImporter: resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 - compressionQuality: 50 + compressionQuality: 100 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 @@ -97,8 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 -<<<<<<< HEAD -======= - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -138,7 +132,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-21.exr b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-21.exr index 46d86d26..50abe947 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-21.exr +++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-21.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cdad558563a2ce815068f006b663419f137bfa47f0e16ebde4d6c247e0b6fccd -size 1282172 +oid sha256:f3e43cb05b1e1784cbc230e0ffd619e9546dbb70d3166e183049b082040cf12c +size 1282161 diff --git a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-21.exr.meta b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-21.exr.meta index a021716f..6e1cf269 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-21.exr.meta +++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-21.exr.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: d5a4f2c47e0a9b84bbcfad155407b53b -======= -guid: d767de91ba37c0649a116c273c310bd7 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -32,18 +28,18 @@ TextureImporter: ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 + cubemapConvolution: 1 + seamlessCubemap: 1 textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 - aniso: 1 + filterMode: 2 + aniso: 0 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -59,7 +55,7 @@ TextureImporter: alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 - textureShape: 1 + textureShape: 2 singleChannelComponent: 0 flipbookRows: 1 flipbookColumns: 1 @@ -77,7 +73,7 @@ TextureImporter: resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 - compressionQuality: 50 + compressionQuality: 100 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 @@ -97,8 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 -<<<<<<< HEAD -======= - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -138,7 +132,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-22.exr b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-22.exr index ecd9eae5..50ac7eef 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-22.exr +++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-22.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f62dbd24557a62b8cb5ecb4e0b73657351fae8926c88dd71d8ea181f31ec6cf3 -size 1344652 +oid sha256:4cb7551b7d242f72a7bfff177d9c3fbf45ec6cadc9483652b24bca436ba2fc9a +size 1344915 diff --git a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-22.exr.meta b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-22.exr.meta index ec687f37..7a582e9b 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-22.exr.meta +++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-22.exr.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: ef75a33d732eee348979398b4c3bca80 -======= -guid: 3821ee106f3800f4ea048b44676991e8 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -32,18 +28,18 @@ TextureImporter: ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 + cubemapConvolution: 1 + seamlessCubemap: 1 textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 - aniso: 1 + filterMode: 2 + aniso: 0 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -59,7 +55,7 @@ TextureImporter: alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 - textureShape: 1 + textureShape: 2 singleChannelComponent: 0 flipbookRows: 1 flipbookColumns: 1 @@ -77,7 +73,7 @@ TextureImporter: resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 - compressionQuality: 50 + compressionQuality: 100 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 @@ -97,8 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 -<<<<<<< HEAD -======= - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -138,7 +132,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-23.exr b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-23.exr index 873f26c3..403d5f8f 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-23.exr +++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-23.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1eb6c639cc3671762fbdb3e43421d7c7ce9390aac1036a68ff57a7b1cdce0595 -size 1324465 +oid sha256:83907f3bba6443f3ed0d7ca784427493c36c730c74c4048b98c48f5d0bc9a74f +size 1323182 diff --git a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-23.exr.meta b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-23.exr.meta index ea9f02cb..882ce287 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-23.exr.meta +++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-23.exr.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: 184fb9ff427996a4c86908106d66455e -======= -guid: 792eb5d4e2cff33428c0e37670cccd04 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -32,18 +28,18 @@ TextureImporter: ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 + cubemapConvolution: 1 + seamlessCubemap: 1 textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 - aniso: 1 + filterMode: 2 + aniso: 0 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -59,7 +55,7 @@ TextureImporter: alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 - textureShape: 1 + textureShape: 2 singleChannelComponent: 0 flipbookRows: 1 flipbookColumns: 1 @@ -77,7 +73,7 @@ TextureImporter: resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 - compressionQuality: 50 + compressionQuality: 100 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 @@ -97,8 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 -<<<<<<< HEAD -======= - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -138,7 +132,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-24.exr b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-24.exr index d81473e1..e81b42c8 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-24.exr +++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-24.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9c06be0b58d27451ae0af1856f66b71e9e3a045f637523f0b5ed917a0b07c3d9 -size 1342742 +oid sha256:bad0d6b83dcaa4b50f76f35578a6ac06bd3c0d62b0e15b56f75f3d253dbecee0 +size 1341360 diff --git a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-24.exr.meta b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-24.exr.meta index 49b1a9e3..6a09e8d4 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-24.exr.meta +++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-24.exr.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: d571540911a91d14e8443adeb1e98920 -======= -guid: 55c7f8c66001fd54e94bccafc8626c0f ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -32,18 +28,18 @@ TextureImporter: ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 + cubemapConvolution: 1 + seamlessCubemap: 1 textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 - aniso: 1 + filterMode: 2 + aniso: 0 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -59,7 +55,7 @@ TextureImporter: alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 - textureShape: 1 + textureShape: 2 singleChannelComponent: 0 flipbookRows: 1 flipbookColumns: 1 @@ -77,7 +73,7 @@ TextureImporter: resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 - compressionQuality: 50 + compressionQuality: 100 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 @@ -97,8 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 -<<<<<<< HEAD -======= - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -138,7 +132,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-25.exr b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-25.exr index 2899166d..868ccd2e 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-25.exr +++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-25.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5d6c03c597b3dc46fede0c2bf3acdb7727b0a8d7afe88b8eb3b9b9972a7c1180 -size 358343 +oid sha256:99fac97ef162235d93b2311514740af93cd94871ed77e739de078da4e2f3ff84 +size 356871 diff --git a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-25.exr.meta b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-25.exr.meta index 1e19aa10..34273303 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-25.exr.meta +++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-25.exr.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: 9b398f624fd46c34594b7ec6afa4ce20 -======= -guid: fadf061a9cc23df40a2b3cc0c5635426 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -32,18 +28,18 @@ TextureImporter: ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 + cubemapConvolution: 1 + seamlessCubemap: 1 textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 - aniso: 1 + filterMode: 2 + aniso: 0 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -59,7 +55,7 @@ TextureImporter: alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 - textureShape: 1 + textureShape: 2 singleChannelComponent: 0 flipbookRows: 1 flipbookColumns: 1 @@ -77,7 +73,7 @@ TextureImporter: resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 - compressionQuality: 50 + compressionQuality: 100 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 @@ -97,8 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 -<<<<<<< HEAD -======= - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -138,7 +132,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-26.exr b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-26.exr index 9ed6a9eb..619190f5 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-26.exr +++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-26.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f98295cb7549f05eb3ed2fa8e86582497effb99c9015fc7c19f8103c8ac9ad02 -size 1049339 +oid sha256:241fca0142b1db90adb7a3cbc6f466e761b76acf8d22b0820c418f648eeb3b54 +size 1052598 diff --git a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-26.exr.meta b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-26.exr.meta index 83cc110f..cbb1d821 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-26.exr.meta +++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-26.exr.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: 75a18c01bba4c4f44b0ca1ed69cf6247 -======= -guid: 8a2182758f32ae645b0611d95e3b8d97 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -32,18 +28,18 @@ TextureImporter: ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 + cubemapConvolution: 1 + seamlessCubemap: 1 textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 - aniso: 1 + filterMode: 2 + aniso: 0 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -59,7 +55,7 @@ TextureImporter: alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 - textureShape: 1 + textureShape: 2 singleChannelComponent: 0 flipbookRows: 1 flipbookColumns: 1 @@ -77,7 +73,7 @@ TextureImporter: resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 - compressionQuality: 50 + compressionQuality: 100 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 @@ -97,8 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 -<<<<<<< HEAD -======= - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -138,7 +132,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-27.exr.meta b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-27.exr.meta index 2b3cd3f8..aba28f48 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-27.exr.meta +++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-27.exr.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: a2deb54af9b95db418127e0e002851cd -======= -guid: 5453c523276a6c541ab0cf2f154950c7 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -32,18 +28,18 @@ TextureImporter: ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 + cubemapConvolution: 1 + seamlessCubemap: 1 textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 - aniso: 1 + filterMode: 2 + aniso: 0 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -59,7 +55,7 @@ TextureImporter: alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 - textureShape: 1 + textureShape: 2 singleChannelComponent: 0 flipbookRows: 1 flipbookColumns: 1 @@ -77,7 +73,7 @@ TextureImporter: resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 - compressionQuality: 50 + compressionQuality: 100 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 @@ -97,8 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 -<<<<<<< HEAD -======= - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -138,7 +132,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-3.exr b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-3.exr index 04168052..47679cde 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-3.exr +++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-3.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8a5bad8cd363f3216ba6e6f3234be4fce13ad643f5fd27012c08daa5d2d030c8 -size 1403230 +oid sha256:c157d139ce1f5249fa8cdcf57ef907b92a8f9acf41db2c1dad398ad062b5de39 +size 1405798 diff --git a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-3.exr.meta b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-3.exr.meta index 8a94a103..28348d77 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-3.exr.meta +++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-3.exr.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: 12d97a366dce5a943a2511b0f6dafb89 -======= -guid: 8d4bf1ffca7455640a15c21ebe8a5fa0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -32,18 +28,18 @@ TextureImporter: ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 + cubemapConvolution: 1 + seamlessCubemap: 1 textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 - aniso: 1 + filterMode: 2 + aniso: 0 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -59,7 +55,7 @@ TextureImporter: alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 - textureShape: 1 + textureShape: 2 singleChannelComponent: 0 flipbookRows: 1 flipbookColumns: 1 @@ -77,7 +73,7 @@ TextureImporter: resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 - compressionQuality: 50 + compressionQuality: 100 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 @@ -97,8 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 -<<<<<<< HEAD -======= - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -138,7 +132,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-4.exr b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-4.exr index e759c91a..b9e6cf60 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-4.exr +++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-4.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5ea23d1ea45d58991b0b0ac4fff8cbef1fc1531d7e184b0f725cd8cdffd9eb24 -size 1321585 +oid sha256:b1ce2c5be4d32006e5886eb9e516adff450ce43f33ddcaea4758c98d0e077f9d +size 1323129 diff --git a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-4.exr.meta b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-4.exr.meta index 44b77769..e79e65b3 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-4.exr.meta +++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-4.exr.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: 54c114c0461df824da6c020a3c95f977 -======= -guid: 9c228d18c3ba5c341808ef35764fcfb1 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -32,18 +28,18 @@ TextureImporter: ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 + cubemapConvolution: 1 + seamlessCubemap: 1 textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 - aniso: 1 + filterMode: 2 + aniso: 0 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -59,7 +55,7 @@ TextureImporter: alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 - textureShape: 1 + textureShape: 2 singleChannelComponent: 0 flipbookRows: 1 flipbookColumns: 1 @@ -77,7 +73,7 @@ TextureImporter: resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 - compressionQuality: 50 + compressionQuality: 100 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 @@ -97,8 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 -<<<<<<< HEAD -======= - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -138,7 +132,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-5.exr b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-5.exr index f8d170c5..34e48ee6 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-5.exr +++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-5.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b368cfc52429f3b93b276b09e9696aa98d8242c6916f5a19faeb7df7129c3a3a -size 1354144 +oid sha256:5c61f3739ea3a8c75d639099720ffc39b59b2850600bd69fd73f5ad657017d16 +size 1348898 diff --git a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-5.exr.meta b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-5.exr.meta index e0f0d0b7..413fa068 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-5.exr.meta +++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-5.exr.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: 876a25761839fa945974a31eeb490bee -======= -guid: 41ce91f8e3ca4c248a0b9a293722712b ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -32,18 +28,18 @@ TextureImporter: ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 + cubemapConvolution: 1 + seamlessCubemap: 1 textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 - aniso: 1 + filterMode: 2 + aniso: 0 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -59,7 +55,7 @@ TextureImporter: alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 - textureShape: 1 + textureShape: 2 singleChannelComponent: 0 flipbookRows: 1 flipbookColumns: 1 @@ -77,7 +73,7 @@ TextureImporter: resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 - compressionQuality: 50 + compressionQuality: 100 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 @@ -97,8 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 -<<<<<<< HEAD -======= - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -138,7 +132,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-6.exr b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-6.exr index e56f3f80..bb02d009 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-6.exr +++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-6.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eb18ef469b15143b2448cecbea2e98682ed1f8ac46e3a27294be1fc48f8d0927 -size 1346442 +oid sha256:e85ac8bb0af7c6defbd54ff219d8ea7deb62bb0ff0cd6ceb568c4d4e6e8ddca5 +size 1349055 diff --git a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-6.exr.meta b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-6.exr.meta index f1c632f1..8d446a6c 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-6.exr.meta +++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-6.exr.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: 12213b59da16cc94abebb2de7039305d -======= -guid: 419a512b7d6e65a44add6f8c3044f716 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -32,18 +28,18 @@ TextureImporter: ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 + cubemapConvolution: 1 + seamlessCubemap: 1 textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 - aniso: 1 + filterMode: 2 + aniso: 0 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -59,7 +55,7 @@ TextureImporter: alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 - textureShape: 1 + textureShape: 2 singleChannelComponent: 0 flipbookRows: 1 flipbookColumns: 1 @@ -77,7 +73,7 @@ TextureImporter: resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 - compressionQuality: 50 + compressionQuality: 100 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 @@ -97,8 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 -<<<<<<< HEAD -======= - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -138,7 +132,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-7.exr b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-7.exr index 3646423f..6da9cbdb 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-7.exr +++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-7.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:081aef7dba071e3c96b2651adce863acaf409cc81522437014b0ff3860b40718 -size 1339091 +oid sha256:f01f12580ac327b33c01958a24f907febe90f02aecb65473ae924b0615d7fe74 +size 1339229 diff --git a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-7.exr.meta b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-7.exr.meta index 3b4ef42a..1c7bd05b 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-7.exr.meta +++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-7.exr.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: 1ba4b6780d47ce94db4b9b12d89b10b0 -======= -guid: 2966edd7c30c4574bbdedaa82b375017 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -32,18 +28,18 @@ TextureImporter: ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 + cubemapConvolution: 1 + seamlessCubemap: 1 textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 - aniso: 1 + filterMode: 2 + aniso: 0 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -59,7 +55,7 @@ TextureImporter: alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 - textureShape: 1 + textureShape: 2 singleChannelComponent: 0 flipbookRows: 1 flipbookColumns: 1 @@ -77,7 +73,7 @@ TextureImporter: resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 - compressionQuality: 50 + compressionQuality: 100 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 @@ -97,8 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 -<<<<<<< HEAD -======= - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -138,7 +132,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-8.exr b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-8.exr index b5f43e9b..1fadc9a8 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-8.exr +++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-8.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b441a66c2de357ab8f3b8cde5fac509e6427ad8be0a7a64f32fa2e150da3405e -size 1289919 +oid sha256:41a473670b998d5912c0e218150da81c67546b75a2f3f594ca918169c3be9370 +size 1292228 diff --git a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-8.exr.meta b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-8.exr.meta index 143aac41..bbe458cf 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-8.exr.meta +++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-8.exr.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: 87d827792a3bd4e4aa48582a9db56a0b -======= -guid: 94a86d070c542df43a2ac818a0e3ce39 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -32,18 +28,18 @@ TextureImporter: ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 + cubemapConvolution: 1 + seamlessCubemap: 1 textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 - aniso: 1 + filterMode: 2 + aniso: 0 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -59,7 +55,7 @@ TextureImporter: alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 - textureShape: 1 + textureShape: 2 singleChannelComponent: 0 flipbookRows: 1 flipbookColumns: 1 @@ -77,7 +73,7 @@ TextureImporter: resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 - compressionQuality: 50 + compressionQuality: 100 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 @@ -97,8 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 -<<<<<<< HEAD -======= - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -138,7 +132,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-9.exr b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-9.exr index f401968d..5d7cd72b 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-9.exr +++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-9.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:730a0580f21216544049c5a936afe21fc27a5f66532570c79abf30960dedbf37 -size 1331874 +oid sha256:e2dc24fab285ba98b72240645cf0810b9fe6ee5ebb37794d72a1f003d84f53b0 +size 1328813 diff --git a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-9.exr.meta b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-9.exr.meta index c1547c18..44d6e092 100644 --- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-9.exr.meta +++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-9.exr.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: d693c024f4412d642ac3c9c024aaf32e -======= -guid: e73348bc38e7cb44ab4a098227116d6a ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -32,18 +28,18 @@ TextureImporter: ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 + cubemapConvolution: 1 + seamlessCubemap: 1 textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 - aniso: 1 + filterMode: 2 + aniso: 0 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 1 lightmap: 0 compressionQuality: 50 @@ -59,7 +55,7 @@ TextureImporter: alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 - textureShape: 1 + textureShape: 2 singleChannelComponent: 0 flipbookRows: 1 flipbookColumns: 1 @@ -77,7 +73,7 @@ TextureImporter: resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 - compressionQuality: 50 + compressionQuality: 100 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 @@ -97,8 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 -<<<<<<< HEAD -======= - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 @@ -138,7 +132,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 ->>>>>>> 088d2088e7e69ea09881011dbbb19d314a4b4e13 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/01_Scenes/Hischool_Chapter2/Hischool_Chapter2 Baking Set.asset b/Assets/01_Scenes/Hischool_Chapter2/Hischool_Chapter2 Baking Set.asset new file mode 100644 index 00000000..f71121f5 --- /dev/null +++ b/Assets/01_Scenes/Hischool_Chapter2/Hischool_Chapter2 Baking Set.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:03479884c37f6e75e4876b27cb8aae772fab5dfe7ba98383f1cdae57ba8b76ed +size 3344 diff --git a/Assets/01_Scenes/Hischool_Chapter2/Hischool_Chapter2 Baking Set.asset.meta b/Assets/01_Scenes/Hischool_Chapter2/Hischool_Chapter2 Baking Set.asset.meta new file mode 100644 index 00000000..23add364 --- /dev/null +++ b/Assets/01_Scenes/Hischool_Chapter2/Hischool_Chapter2 Baking Set.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7e815ec7626154b4c8e436b8b0a2eed0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/01_Scenes/Hischool_Chapter2/LightingData.asset b/Assets/01_Scenes/Hischool_Chapter2/LightingData.asset index 991972a9..ca04805d 100644 --- a/Assets/01_Scenes/Hischool_Chapter2/LightingData.asset +++ b/Assets/01_Scenes/Hischool_Chapter2/LightingData.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bd1cdcb0be2d0a815f90f4e5fa0f4bc73006787bfb5a2b368ed4a774bda127b8 -size 223172 +oid sha256:a479eb8bc8126d122fdaf13c11dab649f99b55b1022adc8327818ce309580c64 +size 158049 diff --git a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-0_comp_dir.png b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-0_comp_dir.png index ab8a2044..c55b8c64 100644 --- a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-0_comp_dir.png +++ b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-0_comp_dir.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1eff2937994743d240b1d9579d944ea54e02b118b552ce6c3d6824fa9cc3d38c -size 2571762 +oid sha256:22e2a9cd968fa3784797d1f1ca15e621dc572528cb6c00d5978aa07f56795357 +size 2563624 diff --git a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-0_comp_light.exr b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-0_comp_light.exr index 05332baa..34866a2f 100644 --- a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-0_comp_light.exr +++ b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-0_comp_light.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:174e938b768fc3419d28798103b8108f7185ea7926308a7783dbb9d2e2283083 -size 34447769 +oid sha256:b353e6117f15da056a7bc2518455bc5317510b95f52b4bc2f071b79df0548426 +size 34468264 diff --git a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-1_comp_dir.png b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-1_comp_dir.png index d8dcd13a..e33fee42 100644 --- a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-1_comp_dir.png +++ b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-1_comp_dir.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:20dad137b03efc7d5c5c414a3568cacd1a620e1b4a36d3a8b7f7de14039664be -size 2916365 +oid sha256:075a1a894d4d8237575ea981baede5eca92c2bd8fd5f959360bc71140c70ee2e +size 2909020 diff --git a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-1_comp_light.exr b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-1_comp_light.exr index 53078aa5..badc3b9f 100644 --- a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-1_comp_light.exr +++ b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-1_comp_light.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b6df96335579ef44aa1734d7ecde9012d24dfdb88fc49d5f8742ef531131dbe5 -size 39132349 +oid sha256:4a8a9409fa634fc28b1e051240745c02a58d45d3b228d8b1e9d51ce990553227 +size 39147957 diff --git a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-2_comp_dir.png b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-2_comp_dir.png index fe69865b..2259e1de 100644 --- a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-2_comp_dir.png +++ b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-2_comp_dir.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:058048568b4a711eac49ace64f77b38deda6097ff4e1837f2cc2860aae198ad6 -size 2536055 +oid sha256:de611b5111e2451ce6fc9dde11a52c08ac96b5adf8ed0c8603027575f20f9489 +size 2492048 diff --git a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-2_comp_light.exr b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-2_comp_light.exr index d4a2e59a..c6a0c4c3 100644 --- a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-2_comp_light.exr +++ b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-2_comp_light.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:46e179694faf2e1e75b3afdc2439c7aa347359aab8f45e889383e6c72dcdcef0 -size 38578093 +oid sha256:6734182b2e82ffc39ab8a40069ae02b9e27cc97ea169716350925fcfc876499a +size 38547409 diff --git a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-3_comp_dir.png b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-3_comp_dir.png index 59f99bee..d87ebbc7 100644 --- a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-3_comp_dir.png +++ b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-3_comp_dir.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b690766000a8a30a60ddf802ef4dd473a65e147316087993be6227ea3c51d64 -size 2702887 +oid sha256:3fc3d3a1b8ad3e7a70abf82bd8e45267ac6020a694d5e6f9b08178ed31b8b26c +size 2731093 diff --git a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-3_comp_light.exr b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-3_comp_light.exr index 82494972..26c5cf5e 100644 --- a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-3_comp_light.exr +++ b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-3_comp_light.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:30e5cd4e009a1de694fc0402f1f8259a26ab8f69409c734e51f0904e0e684b39 -size 38683290 +oid sha256:6c175eafd46c8a86448cdbeaac24d4b48be39e3e0e2e345b847e506c147bbe9e +size 38773772 diff --git a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-4_comp_dir.png b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-4_comp_dir.png index 5443de30..c2035143 100644 --- a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-4_comp_dir.png +++ b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-4_comp_dir.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3e5e3831e37fb5d83a320ecf948497aea5bbfe9842cf2204db94a8b2eb3008b4 -size 2300270 +oid sha256:629ff1e3c66da94111881c6b8002a25aa6f7a9de078c3f25cfc3014d680be8c7 +size 2289822 diff --git a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-4_comp_light.exr b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-4_comp_light.exr index 48eba3be..77a78316 100644 --- a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-4_comp_light.exr +++ b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-4_comp_light.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1c96f15700c6fbf7fb28440f34863e2c5f8395f55d3c3d46226118d27972d4a4 -size 35900836 +oid sha256:bda79d9cf9734c13d897dedf03e06b7bc9955e29ea884bfee0c9f8b86abb4e06 +size 35925742 diff --git a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-5_comp_dir.png b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-5_comp_dir.png index 8d516a2c..9dce004a 100644 --- a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-5_comp_dir.png +++ b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-5_comp_dir.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:693cfeee47e3c23396a83a295326eec00d32875007d5759675061db9384582d3 -size 2215559 +oid sha256:54bbb210085dc614921e0fbaa298145495885d619cc7bf06ea5731a13ffffbd7 +size 2211173 diff --git a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-5_comp_light.exr b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-5_comp_light.exr index e7e19d6e..b80bc6bf 100644 --- a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-5_comp_light.exr +++ b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-5_comp_light.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e242c8f5020262e07edf2f8dd6189c33c0312546d2f3cf480eb49b0dc9ea818c -size 32068386 +oid sha256:addfd7da4a595280c6b7a2c9d8484a1662f6d3a9e9b9c0c77e8d55c69683df7f +size 32074936 diff --git a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-6_comp_dir.png b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-6_comp_dir.png index 566fa35d..08d85577 100644 --- a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-6_comp_dir.png +++ b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-6_comp_dir.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e268255f709e2b0cc2b5f4eb9bcd6cd67fb1582a3a3d76d228d7038ad190024f -size 1466318 +oid sha256:836b38aa8c5e3fb6692aa9672727f6e8587823e35573c0fb71b4f33c3e8aa9f5 +size 1464168 diff --git a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-6_comp_light.exr b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-6_comp_light.exr index ca1d2fc6..be9f8cf0 100644 --- a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-6_comp_light.exr +++ b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-6_comp_light.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:47f673bc7a20a42120b44142b99f1a2d28aa0a54c4fb5465a1e90c75c8aaa1ec -size 39379088 +oid sha256:cac0c578cb3159d0c965e581135ab37d47e731d38bfbc02347add8cc7edc223f +size 39378740 diff --git a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-7_comp_dir.png b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-7_comp_dir.png index f188e848..91c04fa9 100644 --- a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-7_comp_dir.png +++ b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-7_comp_dir.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c9a865bd0ad48097f96e0be64f1a5358d35813a30a3d09efe6c9151105459118 -size 1233658 +oid sha256:48f567d4928042eeea2ed654fcb9b9854ca221fb655d5a5e99de5a37e3b71c6e +size 1230891 diff --git a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-7_comp_light.exr b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-7_comp_light.exr index f21032be..d04b21ad 100644 --- a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-7_comp_light.exr +++ b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-7_comp_light.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a41d335db76a7ebb217696816bcd7610387fd4add918ac47434ddb9651a080eb -size 41297436 +oid sha256:cd6eab757317b9f2f10809485ab3e7bd57a9b3adf2b7fd8eac0a4bacd1537821 +size 41299596 diff --git a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-8_comp_dir.png b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-8_comp_dir.png index fd9a3455..777ff9dd 100644 --- a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-8_comp_dir.png +++ b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-8_comp_dir.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9512d754ac899d847b72469aac55f5873ab007c6cb4e5521175083425594e563 -size 1079721 +oid sha256:7cd61166a79222d519a52e042a7bde7f96f841227bb9407aeb6b0a148f913ef8 +size 1076376 diff --git a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-8_comp_light.exr b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-8_comp_light.exr index f20c5731..b07b10dc 100644 --- a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-8_comp_light.exr +++ b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-8_comp_light.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:079b543bae1058e33c768c80134ecb195a3acfae269265e1f48c01c5d1517c89 -size 15049637 +oid sha256:ea3e073499c65274b8af508407ed29185c13eb0db6b4421f0897f899028293f5 +size 15011433 diff --git a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-0.exr b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-0.exr index 43659b15..ff1963ca 100644 --- a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-0.exr +++ b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-0.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:01ff3f90be9a2bef3015b2236914a18f629e2462d5c021d619b5bf85012af3e4 -size 1243957 +oid sha256:fa7a901493eb0fb197e65d618f5153913451d70c8e2629cba5040d534cf54d2f +size 1240437 diff --git a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-1.exr b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-1.exr index 4f20319a..40ea1aa7 100644 --- a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-1.exr +++ b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-1.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:309a92907f769f48ec2587d88d5b89465afa69e3c8a67fbd2373d8ba85d59319 -size 1373763 +oid sha256:de2aa9aa3b5ee42658aae8506881a8d720da25c36e060e84cc16e98d34580344 +size 1358257 diff --git a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-10.exr b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-10.exr index 06623f58..50dc4b94 100644 --- a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-10.exr +++ b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-10.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:014a71546e58ec122cec916d47163e40dc70550fd673e1ca98a1d2efca1f2cd8 -size 1347180 +oid sha256:b792cfd39edebec9472166360305defd3fcdbcd632a18e0b2ac2d8a3ae61ea9a +size 1347434 diff --git a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-11.exr b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-11.exr index b8b04622..993f37b7 100644 --- a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-11.exr +++ b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-11.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:91be1c7d0f553285159ca26a1b43605ccfcb35409263c614dab7db77efa15769 -size 1358972 +oid sha256:37dcf52fcea82b8fb196897a341b251d56112941f36897291a7b8f6cd6cdfd76 +size 1357702 diff --git a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-12.exr b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-12.exr index a9ac298a..a935a680 100644 --- a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-12.exr +++ b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-12.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f35270f7a63ed3f252a2b35f9cf397741ffcef0e3f2df6fbe21f26e4a29dfbe -size 1320846 +oid sha256:4bf6e59a48587d8f6ac169a7ac39f2b69c9f8a73a8b6dbd31cd6e6d741b447b7 +size 1320350 diff --git a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-13.exr b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-13.exr index c1df0a44..c06a33cf 100644 --- a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-13.exr +++ b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-13.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:66356832a883bf2464ce38521a6b78535cad84502c9f237b48bceb9a11112296 -size 1383793 +oid sha256:e6d3eb9e634c1c689a75e42604688ad8ca83e8d344826ee7cf3e1579c868b3b5 +size 1383412 diff --git a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-14.exr b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-14.exr index ad9e4f9c..ada8af2a 100644 --- a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-14.exr +++ b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-14.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6796528e7e98933f2cf75c77ac6100cb62f24d74dbdb36e4eb0b63266c18b3a0 -size 1271597 +oid sha256:1eb2d54cef52c764f180128afac926021835de5fb6ebbc911067beac5e32d613 +size 1274233 diff --git a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-15.exr b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-15.exr index 5b7ce194..601fe9b0 100644 --- a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-15.exr +++ b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-15.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:214ba4f5239aecd11cb8d8b28cf9fb682e928fe99b1b9595854af479581169d9 -size 1322397 +oid sha256:95d090603b695ab141cf7876a6d345e2c716681be0b4ff9ddaf53e7bd7a2899b +size 1323081 diff --git a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-16.exr b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-16.exr index a72f9611..68ebb865 100644 --- a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-16.exr +++ b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-16.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f15d46315a023319d63ddf1420b1be4834abce9cdc2a2f134e9b2860786e8fa4 -size 1370242 +oid sha256:5f848886a29613a465fa9e1e1e78ccafdf3f26af65e045d3ef68dfef43b4035b +size 1370163 diff --git a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-17.exr b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-17.exr index df40af14..9166dce5 100644 --- a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-17.exr +++ b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-17.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d78d3f01e6309b563665b0ca4d897c55ad84e5de9a69c5c0600e4654541c044e -size 1309803 +oid sha256:cf8876c5c7114d846caa7eca597125871fd14b502ed2dc475947d30092876504 +size 1307652 diff --git a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-18.exr b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-18.exr index 1b42d978..be6e7234 100644 --- a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-18.exr +++ b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-18.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:327cfd7295904da25930a1b3670337e3291d21fbbf1d8a20a151be4ac2962ce1 -size 1377795 +oid sha256:c789b116d9abfdf2794576366c394a0e8b780b1360ac864eea11ac09caf96dac +size 1378795 diff --git a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-19.exr b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-19.exr index 7aa3d0d5..cd609a17 100644 --- a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-19.exr +++ b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-19.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d34c1c31094118fcb0bc31c6841f823881a32baabd3477211e73cdecc644e045 -size 1271163 +oid sha256:c78d7819c0b9a3c4ba79d266206f43db99c9fb7b64a64bd5e85cbfac63f3ac4e +size 1276429 diff --git a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-2.exr b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-2.exr index de737fc3..3fa93b94 100644 --- a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-2.exr +++ b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-2.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c24978f55ad6ea6548feb3d3584f5773a4ab266fca6ab6392a0e6c6e4e7e6928 -size 1341726 +oid sha256:defeeead1415e0176afd811af627f52a981f67c4b7cb46d48709b9926d72afba +size 1343777 diff --git a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-20.exr b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-20.exr index d8c4158b..c76c3013 100644 --- a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-20.exr +++ b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-20.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4e61c8e6cc765169dfbd6a8e603b73e09f24888a71cdab851313ba8a7b928317 -size 1325027 +oid sha256:476dc956c6936829d5bb5619e71390915f72f22a67c8e5ba81f56c521c2a6382 +size 1317366 diff --git a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-21.exr b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-21.exr index efb17be4..83cee401 100644 --- a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-21.exr +++ b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-21.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d9cedd15490d1a04d8a891f818e2e1c2d21fa458dd98303959f8a424d54e957f -size 1280969 +oid sha256:6eed48237b4785f0497b665d66f2f9e4da53c458285769783144448e3f96a414 +size 1279736 diff --git a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-22.exr b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-22.exr index e2580a46..a96e2e45 100644 --- a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-22.exr +++ b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-22.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cdfda454abf98ef4aafc5d4f839d54caced094523fc96ae72b9f627474204ecf -size 1343261 +oid sha256:36f34c49cd95031ebea80bac41f703bd3147542e97ef0b3b9a665414c47a6075 +size 1343032 diff --git a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-23.exr b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-23.exr index 9e1a6e5e..c31f35de 100644 --- a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-23.exr +++ b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-23.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7bec1dce7769fd94e1b9529f93956eccfe096c74c79a92c866828de7f097118f -size 1319925 +oid sha256:582bb9e0f3c578705693d525305b46f18162b963184e064bac7c8c432dc51a24 +size 1319877 diff --git a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-24.exr b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-24.exr index e12b07cb..f939a471 100644 --- a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-24.exr +++ b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-24.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cf6bc5bab66265d8fdbfa967f0218233b99922738655e2fe12db7b960519e69d -size 1338596 +oid sha256:a13644f6af1810a189d42879b4418f62b6d504349a2c196530e672e36d24b3b6 +size 1337286 diff --git a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-25.exr b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-25.exr index 664e712e..ac48818c 100644 --- a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-25.exr +++ b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-25.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:09f8fec55c33c46bda8f917be66402e30eeaeb6759dd673527c9a58c93cab2a2 -size 358987 +oid sha256:972e21e71af7f3d5b65dc858a437dc361e71397b7447cf9d24656647a7a8059b +size 357738 diff --git a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-26.exr b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-26.exr index 6f1943a0..ccb83772 100644 --- a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-26.exr +++ b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-26.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:335b211b380f8ee723c1d90ec27d6a8800c875e8e8f42686656fec55216cc887 -size 1030265 +oid sha256:87b17f862783b12db22372fc40d3ed1857d2f0065ff003a359c25d2a0c91de5a +size 1032975 diff --git a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-3.exr b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-3.exr index ecfe4659..4f96d8cd 100644 --- a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-3.exr +++ b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-3.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:95288e8c5bbec9b67e8b0028286d898c3fbff8983e7d5549f8af94528ab7b743 -size 1401576 +oid sha256:5eb201a7f9ccc661adb2c14a8d99afbeecca0afaecbb864cdb1a26fd775ccdd6 +size 1402473 diff --git a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-4.exr b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-4.exr index b876047f..ad07a304 100644 --- a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-4.exr +++ b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-4.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9b36d43d169f387b2c45db31cb1353178dd7586a5798eb46a23cda7cd9c6e17b -size 1316178 +oid sha256:89f340e5a70dd3c8bbecca60b58b04939dc55c18788ca5ad03e21dd457611e31 +size 1312863 diff --git a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-5.exr b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-5.exr index f1d20738..864d81e2 100644 --- a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-5.exr +++ b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-5.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:60ea2e92b49c27df03495dee1df61909e20008163d31d67a371c41a70a058b70 -size 1355152 +oid sha256:6785ba112c9c91e063e7139cc26bd3039ea661f8c388bf78ad34847e091245bc +size 1347769 diff --git a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-6.exr b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-6.exr index a4b4c983..b6e132fd 100644 --- a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-6.exr +++ b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-6.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1bd5a5dd27f47b7f5cc92d05e0aa6640e39d230d50858b35f28252369ccbe929 -size 1343868 +oid sha256:603181779e08a7e5114ca7bb9ed4abfee71031435779cc83b1b7fb47926b8f22 +size 1345877 diff --git a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-7.exr b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-7.exr index 2560582a..8a213c7b 100644 --- a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-7.exr +++ b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-7.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c8b8bf7b1ce11de55a1bdba32b08ac4c11ad57baefd82763b09fdf215093f27b -size 1334580 +oid sha256:8eed40f44c4c34b14ada6a40c43ca4cf8e162830aabc59479347efa9b8172287 +size 1330880 diff --git a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-8.exr b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-8.exr index 0e43ee51..0c096262 100644 --- a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-8.exr +++ b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-8.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:87c486487c4ca85d6e85ce30576beb3e8fe520f3055482fc20f1293606a9b890 -size 1295078 +oid sha256:03217516ae44af8fba4773bea139f6177def800f00a1304ceca8b9605accf8dd +size 1292026 diff --git a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-9.exr b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-9.exr index 0c7c9193..eaf1a9b8 100644 --- a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-9.exr +++ b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-9.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aa587247fb88b4ead708b042d01c7c843cb3f96b1658c7d5233a4f975efae359 -size 1330230 +oid sha256:c984442286f3c7e8f602d6c8a8091fd4a40d9e76d3c1b0815e236f9c75c50054 +size 1323907 diff --git a/Assets/04_Models/Festival/Canopy/swing-sofa/shaded 1.png.meta b/Assets/04_Models/Festival/Canopy/swing-sofa/shaded 1.png.meta new file mode 100644 index 00000000..bcc9a0df --- /dev/null +++ b/Assets/04_Models/Festival/Canopy/swing-sofa/shaded 1.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: 336c9049a0355e54e8afdbef0dc9ea0d +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + 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: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + 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: 4 + 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: 4 + buildTarget: Android + 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: 4 + 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 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + 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: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Models/Festival/Canopy/swing-sofa/texture_diffuse 1.png.meta b/Assets/04_Models/Festival/Canopy/swing-sofa/texture_diffuse 1.png.meta new file mode 100644 index 00000000..31b72e90 --- /dev/null +++ b/Assets/04_Models/Festival/Canopy/swing-sofa/texture_diffuse 1.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: aa06df57eccb4bd4c89d98981353dbd2 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + 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: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + 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: 4 + 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: 4 + buildTarget: Android + 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: 4 + 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 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + 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: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Models/Festival/Canopy/swing-sofa/texture_metallic 1.png.meta b/Assets/04_Models/Festival/Canopy/swing-sofa/texture_metallic 1.png.meta new file mode 100644 index 00000000..ecc24812 --- /dev/null +++ b/Assets/04_Models/Festival/Canopy/swing-sofa/texture_metallic 1.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: b566158a6e8990b4b90525bc92318a12 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + 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: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + 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: 4 + 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: 4 + buildTarget: Android + 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: 4 + 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 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + 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: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Models/Festival/Canopy/swing-sofa/texture_normal 1.png.meta b/Assets/04_Models/Festival/Canopy/swing-sofa/texture_normal 1.png.meta new file mode 100644 index 00000000..7a3368df --- /dev/null +++ b/Assets/04_Models/Festival/Canopy/swing-sofa/texture_normal 1.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: 3011f0222b698d24a9e46ff4fcd5bc7e +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + 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: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + 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: 4 + 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: 4 + buildTarget: Android + 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: 4 + 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 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + 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: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Models/Festival/Canopy/swing-sofa/texture_roughness 1.png.meta b/Assets/04_Models/Festival/Canopy/swing-sofa/texture_roughness 1.png.meta new file mode 100644 index 00000000..eee0b533 --- /dev/null +++ b/Assets/04_Models/Festival/Canopy/swing-sofa/texture_roughness 1.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: d7736ca612dcdd542a825b4c406f61fd +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + 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: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + 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: 4 + 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: 4 + buildTarget: Android + 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: 4 + 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 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + 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: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/XR/Settings/OpenXR Package Settings.asset b/Assets/XR/Settings/OpenXR Package Settings.asset index 637e2840..f40d563a 100644 --- a/Assets/XR/Settings/OpenXR Package Settings.asset +++ b/Assets/XR/Settings/OpenXR Package Settings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5db4c445f1dec50b6d37ca4d4a3cab3a50eca13447b3016f2456415217eb8fe2 -size 287 +oid sha256:6bcdde57c13b4de6adb733f0d2005ef0f49ff1748979bb36e0c0f5550f342acb +size 93980