From 3db450e78dc38d792e13643173d35db8d6bf2bf7 Mon Sep 17 00:00:00 2001 From: nakjun Date: Thu, 23 Jul 2026 10:21:48 +0900 Subject: [PATCH 1/4] =?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 From e1c43c9b3d24a41b67e1bae201edf5217970bb6c Mon Sep 17 00:00:00 2001 From: nakjun Date: Thu, 23 Jul 2026 10:50:22 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=ED=9E=88=EB=93=A0=EB=B6=84=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Communication/Dialog/DialogGestureZone.cs | 25 ++++ .../Dialog/DialogGestureZone.cs.meta | 2 + .../Communication/Dialog/DialogNode.cs | 13 ++ .../Communication/Dialog/DialogPlayer.cs | 140 ++++++++++++++++-- .../Dialog/HiddenBranchResolver.cs | 58 ++++++++ .../Dialog/HiddenBranchResolver.cs.meta | 2 + 6 files changed, 228 insertions(+), 12 deletions(-) create mode 100644 Assets/02_Scripts/Communication/Dialog/DialogGestureZone.cs create mode 100644 Assets/02_Scripts/Communication/Dialog/DialogGestureZone.cs.meta create mode 100644 Assets/02_Scripts/Communication/Dialog/HiddenBranchResolver.cs create mode 100644 Assets/02_Scripts/Communication/Dialog/HiddenBranchResolver.cs.meta diff --git a/Assets/02_Scripts/Communication/Dialog/DialogGestureZone.cs b/Assets/02_Scripts/Communication/Dialog/DialogGestureZone.cs new file mode 100644 index 00000000..db0f4e9b --- /dev/null +++ b/Assets/02_Scripts/Communication/Dialog/DialogGestureZone.cs @@ -0,0 +1,25 @@ +using UnityEngine; + +// 히든 분기를 물리 접촉으로 발동시키는 트리거 존 (KimchiHitZone과 같은 방식). +// +// 예) NPC 얼굴에 IsTrigger 콜라이더를 붙이고 GestureKey="slap", RequiredTag="PlayerHand". +// 대화 노드의 HiddenBranch가 설정되고 HiddenGestureKey="slap"인 순간에만 +// 이 존을 손으로 치면 히든 분기를 탄다. 그 외 시간엔 쳐도 아무 일도 안 일어난다. +// +// 콜라이더는 항상 켜 둬도 된다 — 발동 여부는 DialogPlayer의 무장 상태가 결정하므로, +// 노드마다 존을 껐다 켰다 할 필요가 없다. +public class DialogGestureZone : MonoBehaviour +{ + [Tooltip("이 존이 발동시킬 제스처 키. 대화 노드의 HiddenGestureKey와 일치해야 한다. " + + "노드 쪽 키가 비어 있으면 아무 존이나 발동 가능")] + [SerializeField] private string _gestureKey = "slap"; + + [Tooltip("이 태그를 가진 콜라이더가 들어와야 발동 (예: 손 컨트롤러). 비우면 태그 무시")] + [SerializeField] private string _requiredTag = "PlayerHand"; + + private void OnTriggerEnter(Collider other) + { + if (!string.IsNullOrEmpty(_requiredTag) && !other.CompareTag(_requiredTag)) return; + HiddenBranchResolver.Fire(_gestureKey); + } +} diff --git a/Assets/02_Scripts/Communication/Dialog/DialogGestureZone.cs.meta b/Assets/02_Scripts/Communication/Dialog/DialogGestureZone.cs.meta new file mode 100644 index 00000000..ed4b22ee --- /dev/null +++ b/Assets/02_Scripts/Communication/Dialog/DialogGestureZone.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 408261957835e514186f6a6f82e367e1 \ No newline at end of file diff --git a/Assets/02_Scripts/Communication/Dialog/DialogNode.cs b/Assets/02_Scripts/Communication/Dialog/DialogNode.cs index 490efe1a..b41fa39f 100644 --- a/Assets/02_Scripts/Communication/Dialog/DialogNode.cs +++ b/Assets/02_Scripts/Communication/Dialog/DialogNode.cs @@ -40,6 +40,19 @@ public class DialogNode : ScriptableObject public DialogNode Next; // 선택지 없을 때 자동으로 갈 노드 public List Choices; // 있으면 플레이어 선택 대기 + [Header("Hidden Branch")] + [Tooltip("이 대사가 재생되는 동안 특정 행동(제스처)을 하면 Next/선택지 대신 이 노드로 몰래 분기. " + + "비우면 히든 분기 없음 — 평소엔 존재하지 않는 것처럼 보인다")] + public DialogNode HiddenBranch; + + [Tooltip("히든 분기를 여는 제스처 키 (DialogGestureZone의 Gesture Key와 일치). " + + "비우면 아무 제스처 존이나 발동 가능")] + public string HiddenGestureKey; + + [Tooltip("히든 분기를 탔을 때 기록할 선택지 Code (선택지의 Code와 동일한 용도). " + + "비우면 기록 안 함. 이후 대화 조건(RequiredChoiceCodes)에서 검사 가능")] + public string HiddenCode; + [Header("ChoiceQuestion")] [TextArea(2,5)] public string ChoiceQuestion; diff --git a/Assets/02_Scripts/Communication/Dialog/DialogPlayer.cs b/Assets/02_Scripts/Communication/Dialog/DialogPlayer.cs index 7ed197b9..d3d5e49c 100644 --- a/Assets/02_Scripts/Communication/Dialog/DialogPlayer.cs +++ b/Assets/02_Scripts/Communication/Dialog/DialogPlayer.cs @@ -269,17 +269,41 @@ private async Awaitable PlayEntry(DialogEntry entry) var node = entry.Group.StartNode; while (node != null) { - await PlayNode(node); + // 이 노드가 히든 분기를 가지면, 노드가 재생되는 동안 제스처 감시를 무장한다. + // (무장 안 된 노드는 아래 대기/선택이 기존과 완전히 동일하게 동작) + bool armed = node.HiddenBranch != null; + if (armed) HiddenBranchResolver.Arm(node.HiddenGestureKey); + try + { + bool diverted = await PlayNode(node); // 대사 표시 + 대기(무장 시 제스처 감시 포함) - if (node.Choices != null && node.Choices.Count > 0) - { - int picked = await WaitForChoice(node); - RecordChoice(node, picked); - node = node.Choices[picked].DestinationNode; + if (diverted) + { + RecordHiddenChoice(node); + node = node.HiddenBranch; // 대사 도중 제스처 발동 → 몰래 분기 + } + else if (node.Choices != null && node.Choices.Count > 0) + { + int picked = await WaitForChoice(node); // 메뉴(무장 시 제스처 감시 포함) + if (picked == DivertIndex) + { + RecordHiddenChoice(node); + node = node.HiddenBranch; // 메뉴 도중 제스처 발동 → 메뉴엔 없던 히든 분기 + } + else + { + RecordChoice(node, picked); + node = node.Choices[picked].DestinationNode; + } + } + else + { + node = node.Next; + } } - else + finally { - node = node.Next; + if (armed) HiddenBranchResolver.Disarm(); } } @@ -433,7 +457,8 @@ private void LateUpdate() } } - private async Awaitable PlayNode(DialogNode node) + // 반환: true = 대기 도중 히든 제스처가 발동됨(→ HiddenBranch로 분기), false = 평범하게 진행 + private async Awaitable PlayNode(DialogNode node) { // 화자 옆 DialogHud에 대사 표시 // (배치는 화자의 DialogHudPlacement 담당, 없으면 DialogHud 기본값. 이름은 노드 오버라이드 우선) @@ -528,6 +553,11 @@ private async Awaitable PlayNode(DialogNode node) } // 진행 방식 결정 + // 히든 분기가 무장된 노드는 대기 중 제스처를 함께 감시(레이스)한다. + // 무장 안 된 노드는 아래 기존 대기 그대로 → 동작 100% 동일, 반환 false. + if (HiddenBranchResolver.Armed) + return await WaitAdvanceOrDivert(node); + if (node.WaitForInput) { await WaitForAdvanceInput(); // B버튼 입력이 있어야만 다음으로 @@ -543,6 +573,7 @@ private async Awaitable PlayNode(DialogNode node) else await WaitForAdvanceInput(); // 지정 시간이 없으면 입력으로 진행 } + return false; } // 노드의 EventKey와 같은 Key를 가진 이벤트들을 호출 @@ -564,17 +595,102 @@ private void RecordChoice(DialogNode node, int index) StoryManager.Instance.RecordChoice(code); } + // 히든 분기 기록: 노드의 HiddenCode를 선택지 Code와 동일하게 StoryState에 영구 기록 + private void RecordHiddenChoice(DialogNode node) + { + string code = DialogVariables.Format(node.HiddenCode); // {token} 치환 + if (!string.IsNullOrEmpty(code)) + StoryManager.Instance.RecordChoice(code); + } + + // 히든 분기 신호값 — 선택지 인덱스(0..n-1)와 절대 겹치지 않는 값. + private const int DivertIndex = -1; + private async Awaitable WaitForChoice(DialogNode node) { - //선택을 기다리는 함수 수정해서 사용할것 - if (ChoiceHud.Instance == null) { Debug.LogWarning("[DialogPlayer] ChoiceHud 없음 — 0번 자동 선택"); return 0; } - return await ChoiceHud.Instance.Show(node.ChoiceQuestion, node.Choices); + // 무장 안 된 노드는 기존과 동일 — 그냥 메뉴 선택을 기다린다. + if (!HiddenBranchResolver.Armed) + return await ChoiceHud.Instance.Show(node.ChoiceQuestion, node.Choices); + + // 무장된 노드: 메뉴가 떠 있는 동안 제스처가 들어오면 메뉴를 취소하고 히든으로 분기. + if (HiddenBranchResolver.Fired) + return DivertIndex; // 메뉴가 뜨기 전에 이미 발동한 경우 + + void OnFired() => ChoiceHud.Instance.CancelPending(); // 제스처 → 메뉴 즉시 취소 + HiddenBranchResolver.FiredEvent += OnFired; + try + { + return await ChoiceHud.Instance.Show(node.ChoiceQuestion, node.Choices); + } + catch (OperationCanceledException) + { + // 우리가 제스처로 취소한 것이면 히든 분기, 아니면(씬 전환 등) 위로 전파 + if (HiddenBranchResolver.Fired) return DivertIndex; + throw; + } + finally + { + HiddenBranchResolver.FiredEvent -= OnFired; + } + } + + // 노드 대기 + 히든 제스처 감시(레이스). 무장된 노드에서만 호출된다. + // 반환: true = 대기 도중 제스처 발동(→히든 분기), false = 평범하게 진행(입력/시간) + private async Awaitable WaitAdvanceOrDivert(DialogNode node) + { + // 기존 PlayNode 대기 규칙 그대로 계산 — 입력 대기냐, 시간 대기냐 + bool waitForInput; + float timeoutSeconds; + if (node.WaitForInput) + { + waitForInput = true; timeoutSeconds = -1f; + } + else + { + float wait = (node.Voice != null && node.Voice.Clip != null) + ? node.Voice.Clip.length + : node.LineDuration; + if (wait > 0f) { waitForInput = false; timeoutSeconds = wait; } + else { waitForInput = true; timeoutSeconds = -1f; } + } + + var im = InputManager.Instance; + bool advance = false; + void OnAdvance() => advance = true; + if (waitForInput && im != null) im.OnDialogNext_Event += OnAdvance; + + // 입력 대기인데 InputManager가 없으면 기존 WaitForAdvanceInput처럼 1초 후 진행 + float timeLeft = timeoutSeconds; + if (waitForInput && im == null) timeLeft = 1f; + + try + { + while (true) + { + if (HiddenBranchResolver.Fired) return true; // 제스처 발동 → 히든 분기 + if (waitForInput && advance) return false; // B버튼 → 평범하게 진행 + if (timeLeft >= 0f) + { + timeLeft -= Time.deltaTime; + if (timeLeft <= 0f) return false; // 시간 경과 → 평범하게 진행 + } + await Awaitable.NextFrameAsync(destroyCancellationToken); + } + } + catch (OperationCanceledException) + { + return false; // 대기 중 파괴/씬 전환 — 기존과 동일하게 조용히 종료 + } + finally + { + if (waitForInput && im != null) im.OnDialogNext_Event -= OnAdvance; + } } // 대화 진행 입력(OnDialogNext = VR B버튼) 한 번을 대기 diff --git a/Assets/02_Scripts/Communication/Dialog/HiddenBranchResolver.cs b/Assets/02_Scripts/Communication/Dialog/HiddenBranchResolver.cs new file mode 100644 index 00000000..b7e1f23f --- /dev/null +++ b/Assets/02_Scripts/Communication/Dialog/HiddenBranchResolver.cs @@ -0,0 +1,58 @@ +using System; +using UnityEngine; + +// 히든 분기 감시 허브 (씬 오브젝트 불필요, 순수 static). +// +// 대화 노드가 재생되는 동안 DialogPlayer가 Arm(key)로 무장하고, 끝나면 Disarm()한다. +// 그 창(무장 구간) 안에서 DialogGestureZone이 Fire(key)를 호출하면 Fired가 켜지고, +// DialogPlayer가 이를 감지해 Next(또는 선택지) 대신 노드의 HiddenBranch로 몰래 분기한다. +// +// 무장돼 있지 않으면 어떤 Fire도 무시된다 → 평소엔 존재하지 않는 것처럼 동작(=히든). +public static class HiddenBranchResolver +{ + private static string _armedKey; + + // 지금 히든 분기를 받을 수 있는 상태인가 (노드 재생 중) + public static bool Armed { get; private set; } + + // 이번 무장 구간에서 제스처가 발동했는가 + public static bool Fired { get; private set; } + + // 발동 즉시 알림 — 떠 있는 선택지 메뉴를 그 자리에서 취소시키는 용도 + public static event Action FiredEvent; + + // Enter Play Mode(도메인 리로드 off)에서 이전 상태가 안 남게 + [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)] + private static void ResetStatics() + { + _armedKey = null; + Armed = false; + Fired = false; + FiredEvent = null; + } + + // 노드 진입 시 무장. key가 비면 아무 제스처 존이나 발동시킬 수 있다. + public static void Arm(string key) + { + _armedKey = key; + Armed = true; + Fired = false; + } + + // 노드 종료 시 해제. + public static void Disarm() + { + Armed = false; + _armedKey = null; + Fired = false; + } + + // 제스처 존이 호출. 무장 중이고 key가 맞을 때만 1회 발동. + public static void Fire(string key) + { + if (!Armed || Fired) return; + if (!string.IsNullOrEmpty(_armedKey) && _armedKey != key) return; + Fired = true; + FiredEvent?.Invoke(); + } +} diff --git a/Assets/02_Scripts/Communication/Dialog/HiddenBranchResolver.cs.meta b/Assets/02_Scripts/Communication/Dialog/HiddenBranchResolver.cs.meta new file mode 100644 index 00000000..ca59658d --- /dev/null +++ b/Assets/02_Scripts/Communication/Dialog/HiddenBranchResolver.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 1622ac8790b08674cbb2164b2a8dd1f7 \ No newline at end of file From de5fe5b85ae662d001bf3951150dc5f86a587a1d Mon Sep 17 00:00:00 2001 From: nakjun Date: Thu, 23 Jul 2026 13:08:43 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=ED=9E=88=EB=93=A0=EC=A0=9C=EC=8A=A4?= =?UTF-8?q?=EC=B2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/01_Scenes/Festival_Chapter5.unity | 4 +- .../Communication/Dialog/DialogGestureItem.cs | 55 + .../Dialog/DialogGestureItem.cs.meta | 2 + .../Communication/Dialog/DialogGestureZone.cs | 25 - .../Dialog/DialogGestureZone.cs.meta | 2 - .../Communication/Dialog/DialogNode.cs | 4 +- .../GraphTool/Editor/DialogGraphImporter.cs | 25 +- .../Dialog/GraphTool/Editor/DialogLineNode.cs | 60 +- .../Dialog/HiddenBranchResolver.cs | 8 +- .../Interact/DialogInteractionBlocker.cs | 14 +- Assets/04_Models/obj/FlowerBuquet.meta | 8 + .../04_Models/obj/FlowerBuquet/Materials.meta | 8 + .../obj/FlowerBuquet/Materials/Leaves1.mat | 139 + .../FlowerBuquet/Materials/Leaves1.mat.meta | 8 + .../obj/FlowerBuquet/Materials/Leaves6.mat | 139 + .../FlowerBuquet/Materials/Leaves6.mat.meta | 8 + .../obj/FlowerBuquet/Materials/Petals1.mat | 139 + .../FlowerBuquet/Materials/Petals1.mat.meta | 8 + .../obj/FlowerBuquet/Materials/Petals10.mat | 139 + .../FlowerBuquet/Materials/Petals10.mat.meta | 8 + .../obj/FlowerBuquet/Materials/Petals11.mat | 139 + .../FlowerBuquet/Materials/Petals11.mat.meta | 8 + .../obj/FlowerBuquet/Materials/Petals12.mat | 139 + .../FlowerBuquet/Materials/Petals12.mat.meta | 8 + .../obj/FlowerBuquet/Materials/Petals14.mat | 139 + .../FlowerBuquet/Materials/Petals14.mat.meta | 8 + .../obj/FlowerBuquet/Materials/Petals2.mat | 139 + .../FlowerBuquet/Materials/Petals2.mat.meta | 8 + .../obj/FlowerBuquet/Materials/Petals3.mat | 139 + .../FlowerBuquet/Materials/Petals3.mat.meta | 8 + .../obj/FlowerBuquet/Materials/Petals4.mat | 139 + .../FlowerBuquet/Materials/Petals4.mat.meta | 8 + .../obj/FlowerBuquet/Materials/Petals5.mat | 139 + .../FlowerBuquet/Materials/Petals5.mat.meta | 8 + .../obj/FlowerBuquet/Materials/Petals6.mat | 139 + .../FlowerBuquet/Materials/Petals6.mat.meta | 8 + .../obj/FlowerBuquet/Materials/Petals7.mat | 139 + .../FlowerBuquet/Materials/Petals7.mat.meta | 8 + .../obj/FlowerBuquet/Materials/Petals8.mat | 139 + .../FlowerBuquet/Materials/Petals8.mat.meta | 8 + .../obj/FlowerBuquet/Materials/Petals9.mat | 143 + .../FlowerBuquet/Materials/Petals9.mat.meta | 8 + .../obj/FlowerBuquet/Materials/Ribbons1.mat | 139 + .../FlowerBuquet/Materials/Ribbons1.mat.meta | 8 + .../FlowerBuquet/Materials/SmallPlants1.mat | 139 + .../Materials/SmallPlants1.mat.meta | 8 + .../FlowerBuquet/Materials/SmallPlants2.mat | 139 + .../Materials/SmallPlants2.mat.meta | 8 + .../FlowerBuquet/Materials/SmallPlants3.mat | 139 + .../Materials/SmallPlants3.mat.meta | 8 + .../obj/FlowerBuquet/Materials/Stems.mat | 139 + .../obj/FlowerBuquet/Materials/Stems.mat.meta | 8 + .../04_Models/obj/FlowerBuquet/Prefabs.meta | 8 + .../Prefabs/SM_Buquet_Bv11.prefab | 3 + .../Prefabs/SM_Buquet_Bv11.prefab.meta | 7 + .../obj/FlowerBuquet/SM_Buquet_Bv11.fbx | 3 + .../obj/FlowerBuquet/SM_Buquet_Bv11.fbx.meta | 214 ++ .../04_Models/obj/FlowerBuquet/Textures.meta | 8 + .../Textures/Leaves1_basecolor.jpg | 3 + .../Textures/Leaves1_basecolor.jpg.meta | 156 + .../Textures/Leaves6_basecolor.jpg | 3 + .../Textures/Leaves6_basecolor.jpg.meta | 156 + .../Textures/Petals10_basecolor.jpg | 3 + .../Textures/Petals10_basecolor.jpg.meta | 156 + .../Textures/Petals11_basecolor.jpg | 3 + .../Textures/Petals11_basecolor.jpg.meta | 156 + .../Textures/Petals12_basecolor.jpg | 3 + .../Textures/Petals12_basecolor.jpg.meta | 156 + .../Textures/Petals14_basecolor.jpg | 3 + .../Textures/Petals14_basecolor.jpg.meta | 156 + .../Textures/Petals1_basecolor.jpg | 3 + .../Textures/Petals1_basecolor.jpg.meta | 156 + .../Textures/Petals2_basecolor.jpg | 3 + .../Textures/Petals2_basecolor.jpg.meta | 156 + .../Textures/Petals3_basecolor.jpg | 3 + .../Textures/Petals3_basecolor.jpg.meta | 156 + .../Textures/Petals4_basecolor.jpg | 3 + .../Textures/Petals4_basecolor.jpg.meta | 156 + .../Textures/Petals5_basecolor.jpg | 3 + .../Textures/Petals5_basecolor.jpg.meta | 156 + .../Textures/Petals6_basecolor.jpg | 3 + .../Textures/Petals6_basecolor.jpg.meta | 156 + .../Textures/Petals7_basecolor.jpg | 3 + .../Textures/Petals7_basecolor.jpg.meta | 156 + .../Textures/Petals8_basecolor.jpg | 3 + .../Textures/Petals8_basecolor.jpg.meta | 156 + .../Textures/Petals9_basecolor.jpg | 3 + .../Textures/Petals9_basecolor.jpg.meta | 156 + .../Textures/Ribbons1_basecolor.jpg | 3 + .../Textures/Ribbons1_basecolor.jpg.meta | 156 + .../Textures/SmallPlants1_basecolor.jpg | 3 + .../Textures/SmallPlants1_basecolor.jpg.meta | 156 + .../Textures/SmallPlants2_basecolor.jpg | 3 + .../Textures/SmallPlants2_basecolor.jpg.meta | 156 + .../Textures/SmallPlants3_basecolor.jpg | 3 + .../Textures/SmallPlants3_basecolor.jpg.meta | 156 + .../FlowerBuquet/Textures/Stems_basecolor.jpg | 3 + .../Textures/Stems_basecolor.jpg.meta | 156 + .../Textures/ribbons_Cylinder.019_D.png | 3 + .../Textures/ribbons_Cylinder.019_D.png.meta | 156 + .../Textures/stems_flowers_Cylinder.002_D.jpg | 3 + .../stems_flowers_Cylinder.002_D.jpg.meta | 156 + .../Chapter5/Chapter5_Styracosaurus1.dlg | 55 +- .../Chapter5/Chapter5_Troodon1.dlg | 686 +++++ .../Chapter5/Chapter5_Troodon1.dlg.meta | 10 + .../DialogGraph/Chapter5/Chapter5_Yuna1.dlg | 2508 ++++++++++++++++- .../XR/Settings/OpenXR Package Settings.asset | 2 +- .../Resources/InteractionLayerSettings.asset | 4 +- ProjectSettings/TagManager.asset | 4 +- 109 files changed, 10034 insertions(+), 135 deletions(-) create mode 100644 Assets/02_Scripts/Communication/Dialog/DialogGestureItem.cs create mode 100644 Assets/02_Scripts/Communication/Dialog/DialogGestureItem.cs.meta delete mode 100644 Assets/02_Scripts/Communication/Dialog/DialogGestureZone.cs delete mode 100644 Assets/02_Scripts/Communication/Dialog/DialogGestureZone.cs.meta create mode 100644 Assets/04_Models/obj/FlowerBuquet.meta create mode 100644 Assets/04_Models/obj/FlowerBuquet/Materials.meta create mode 100644 Assets/04_Models/obj/FlowerBuquet/Materials/Leaves1.mat create mode 100644 Assets/04_Models/obj/FlowerBuquet/Materials/Leaves1.mat.meta create mode 100644 Assets/04_Models/obj/FlowerBuquet/Materials/Leaves6.mat create mode 100644 Assets/04_Models/obj/FlowerBuquet/Materials/Leaves6.mat.meta create mode 100644 Assets/04_Models/obj/FlowerBuquet/Materials/Petals1.mat create mode 100644 Assets/04_Models/obj/FlowerBuquet/Materials/Petals1.mat.meta create mode 100644 Assets/04_Models/obj/FlowerBuquet/Materials/Petals10.mat create mode 100644 Assets/04_Models/obj/FlowerBuquet/Materials/Petals10.mat.meta create mode 100644 Assets/04_Models/obj/FlowerBuquet/Materials/Petals11.mat create mode 100644 Assets/04_Models/obj/FlowerBuquet/Materials/Petals11.mat.meta create mode 100644 Assets/04_Models/obj/FlowerBuquet/Materials/Petals12.mat create mode 100644 Assets/04_Models/obj/FlowerBuquet/Materials/Petals12.mat.meta create mode 100644 Assets/04_Models/obj/FlowerBuquet/Materials/Petals14.mat create mode 100644 Assets/04_Models/obj/FlowerBuquet/Materials/Petals14.mat.meta create mode 100644 Assets/04_Models/obj/FlowerBuquet/Materials/Petals2.mat create mode 100644 Assets/04_Models/obj/FlowerBuquet/Materials/Petals2.mat.meta create mode 100644 Assets/04_Models/obj/FlowerBuquet/Materials/Petals3.mat create mode 100644 Assets/04_Models/obj/FlowerBuquet/Materials/Petals3.mat.meta create mode 100644 Assets/04_Models/obj/FlowerBuquet/Materials/Petals4.mat create mode 100644 Assets/04_Models/obj/FlowerBuquet/Materials/Petals4.mat.meta create mode 100644 Assets/04_Models/obj/FlowerBuquet/Materials/Petals5.mat create mode 100644 Assets/04_Models/obj/FlowerBuquet/Materials/Petals5.mat.meta create mode 100644 Assets/04_Models/obj/FlowerBuquet/Materials/Petals6.mat create mode 100644 Assets/04_Models/obj/FlowerBuquet/Materials/Petals6.mat.meta create mode 100644 Assets/04_Models/obj/FlowerBuquet/Materials/Petals7.mat create mode 100644 Assets/04_Models/obj/FlowerBuquet/Materials/Petals7.mat.meta create mode 100644 Assets/04_Models/obj/FlowerBuquet/Materials/Petals8.mat create mode 100644 Assets/04_Models/obj/FlowerBuquet/Materials/Petals8.mat.meta create mode 100644 Assets/04_Models/obj/FlowerBuquet/Materials/Petals9.mat create mode 100644 Assets/04_Models/obj/FlowerBuquet/Materials/Petals9.mat.meta create mode 100644 Assets/04_Models/obj/FlowerBuquet/Materials/Ribbons1.mat create mode 100644 Assets/04_Models/obj/FlowerBuquet/Materials/Ribbons1.mat.meta create mode 100644 Assets/04_Models/obj/FlowerBuquet/Materials/SmallPlants1.mat create mode 100644 Assets/04_Models/obj/FlowerBuquet/Materials/SmallPlants1.mat.meta create mode 100644 Assets/04_Models/obj/FlowerBuquet/Materials/SmallPlants2.mat create mode 100644 Assets/04_Models/obj/FlowerBuquet/Materials/SmallPlants2.mat.meta create mode 100644 Assets/04_Models/obj/FlowerBuquet/Materials/SmallPlants3.mat create mode 100644 Assets/04_Models/obj/FlowerBuquet/Materials/SmallPlants3.mat.meta create mode 100644 Assets/04_Models/obj/FlowerBuquet/Materials/Stems.mat create mode 100644 Assets/04_Models/obj/FlowerBuquet/Materials/Stems.mat.meta create mode 100644 Assets/04_Models/obj/FlowerBuquet/Prefabs.meta create mode 100644 Assets/04_Models/obj/FlowerBuquet/Prefabs/SM_Buquet_Bv11.prefab create mode 100644 Assets/04_Models/obj/FlowerBuquet/Prefabs/SM_Buquet_Bv11.prefab.meta create mode 100644 Assets/04_Models/obj/FlowerBuquet/SM_Buquet_Bv11.fbx create mode 100644 Assets/04_Models/obj/FlowerBuquet/SM_Buquet_Bv11.fbx.meta create mode 100644 Assets/04_Models/obj/FlowerBuquet/Textures.meta create mode 100644 Assets/04_Models/obj/FlowerBuquet/Textures/Leaves1_basecolor.jpg create mode 100644 Assets/04_Models/obj/FlowerBuquet/Textures/Leaves1_basecolor.jpg.meta create mode 100644 Assets/04_Models/obj/FlowerBuquet/Textures/Leaves6_basecolor.jpg create mode 100644 Assets/04_Models/obj/FlowerBuquet/Textures/Leaves6_basecolor.jpg.meta create mode 100644 Assets/04_Models/obj/FlowerBuquet/Textures/Petals10_basecolor.jpg create mode 100644 Assets/04_Models/obj/FlowerBuquet/Textures/Petals10_basecolor.jpg.meta create mode 100644 Assets/04_Models/obj/FlowerBuquet/Textures/Petals11_basecolor.jpg create mode 100644 Assets/04_Models/obj/FlowerBuquet/Textures/Petals11_basecolor.jpg.meta create mode 100644 Assets/04_Models/obj/FlowerBuquet/Textures/Petals12_basecolor.jpg create mode 100644 Assets/04_Models/obj/FlowerBuquet/Textures/Petals12_basecolor.jpg.meta create mode 100644 Assets/04_Models/obj/FlowerBuquet/Textures/Petals14_basecolor.jpg create mode 100644 Assets/04_Models/obj/FlowerBuquet/Textures/Petals14_basecolor.jpg.meta create mode 100644 Assets/04_Models/obj/FlowerBuquet/Textures/Petals1_basecolor.jpg create mode 100644 Assets/04_Models/obj/FlowerBuquet/Textures/Petals1_basecolor.jpg.meta create mode 100644 Assets/04_Models/obj/FlowerBuquet/Textures/Petals2_basecolor.jpg create mode 100644 Assets/04_Models/obj/FlowerBuquet/Textures/Petals2_basecolor.jpg.meta create mode 100644 Assets/04_Models/obj/FlowerBuquet/Textures/Petals3_basecolor.jpg create mode 100644 Assets/04_Models/obj/FlowerBuquet/Textures/Petals3_basecolor.jpg.meta create mode 100644 Assets/04_Models/obj/FlowerBuquet/Textures/Petals4_basecolor.jpg create mode 100644 Assets/04_Models/obj/FlowerBuquet/Textures/Petals4_basecolor.jpg.meta create mode 100644 Assets/04_Models/obj/FlowerBuquet/Textures/Petals5_basecolor.jpg create mode 100644 Assets/04_Models/obj/FlowerBuquet/Textures/Petals5_basecolor.jpg.meta create mode 100644 Assets/04_Models/obj/FlowerBuquet/Textures/Petals6_basecolor.jpg create mode 100644 Assets/04_Models/obj/FlowerBuquet/Textures/Petals6_basecolor.jpg.meta create mode 100644 Assets/04_Models/obj/FlowerBuquet/Textures/Petals7_basecolor.jpg create mode 100644 Assets/04_Models/obj/FlowerBuquet/Textures/Petals7_basecolor.jpg.meta create mode 100644 Assets/04_Models/obj/FlowerBuquet/Textures/Petals8_basecolor.jpg create mode 100644 Assets/04_Models/obj/FlowerBuquet/Textures/Petals8_basecolor.jpg.meta create mode 100644 Assets/04_Models/obj/FlowerBuquet/Textures/Petals9_basecolor.jpg create mode 100644 Assets/04_Models/obj/FlowerBuquet/Textures/Petals9_basecolor.jpg.meta create mode 100644 Assets/04_Models/obj/FlowerBuquet/Textures/Ribbons1_basecolor.jpg create mode 100644 Assets/04_Models/obj/FlowerBuquet/Textures/Ribbons1_basecolor.jpg.meta create mode 100644 Assets/04_Models/obj/FlowerBuquet/Textures/SmallPlants1_basecolor.jpg create mode 100644 Assets/04_Models/obj/FlowerBuquet/Textures/SmallPlants1_basecolor.jpg.meta create mode 100644 Assets/04_Models/obj/FlowerBuquet/Textures/SmallPlants2_basecolor.jpg create mode 100644 Assets/04_Models/obj/FlowerBuquet/Textures/SmallPlants2_basecolor.jpg.meta create mode 100644 Assets/04_Models/obj/FlowerBuquet/Textures/SmallPlants3_basecolor.jpg create mode 100644 Assets/04_Models/obj/FlowerBuquet/Textures/SmallPlants3_basecolor.jpg.meta create mode 100644 Assets/04_Models/obj/FlowerBuquet/Textures/Stems_basecolor.jpg create mode 100644 Assets/04_Models/obj/FlowerBuquet/Textures/Stems_basecolor.jpg.meta create mode 100644 Assets/04_Models/obj/FlowerBuquet/Textures/ribbons_Cylinder.019_D.png create mode 100644 Assets/04_Models/obj/FlowerBuquet/Textures/ribbons_Cylinder.019_D.png.meta create mode 100644 Assets/04_Models/obj/FlowerBuquet/Textures/stems_flowers_Cylinder.002_D.jpg create mode 100644 Assets/04_Models/obj/FlowerBuquet/Textures/stems_flowers_Cylinder.002_D.jpg.meta create mode 100644 Assets/07_Data/DialogGraph/Chapter5/Chapter5_Troodon1.dlg create mode 100644 Assets/07_Data/DialogGraph/Chapter5/Chapter5_Troodon1.dlg.meta diff --git a/Assets/01_Scenes/Festival_Chapter5.unity b/Assets/01_Scenes/Festival_Chapter5.unity index b89c0ee6..d41671f7 100644 --- a/Assets/01_Scenes/Festival_Chapter5.unity +++ b/Assets/01_Scenes/Festival_Chapter5.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5d45b84b42e2de932840daabe21af7b0ecba6ce9048584a911d36fd3ef6a87a3 -size 1587135 +oid sha256:dc6508913ab354d604980a3b0ef749c10b8152edb1e91446f5745f991fa41447 +size 1629262 diff --git a/Assets/02_Scripts/Communication/Dialog/DialogGestureItem.cs b/Assets/02_Scripts/Communication/Dialog/DialogGestureItem.cs new file mode 100644 index 00000000..e235cdf0 --- /dev/null +++ b/Assets/02_Scripts/Communication/Dialog/DialogGestureItem.cs @@ -0,0 +1,55 @@ +using UnityEngine; +using UnityEngine.Events; + +// 대화 중 "건네기/터치" 제스처를 수행하는 오브젝트(꽃다발·김치·손 등)에 붙인다. +// 이 오브젝트가 NPC의 받는 존(_targetTag 태그의 트리거)에 닿으면, 자신의 GestureKey로 히든 분기를 발동시킨다. +// +// 어떤 아이템인지는 GestureKey로 구분된다: +// - 노드가 HiddenGestureKey="kimchi"로 무장 → 김치(GestureKey="kimchi")만 발동, 꽃다발("bouquet")은 무시. +// 그래서 "김치를 줘야 하는데 꽃다발을 주면 이벤트가 안 진행"이 자동으로 보장된다. +// +// 콜라이더가 있는 오브젝트에 붙일 것 (잡는 아이템은 보통 XRGrabInteractable이 있는 루트). +// 존은 무장 여부와 무관하게 항상 닿을 수 있지만, 무장 안 된 순간에 닿으면 아무 일도 안 일어난다. +public class DialogGestureItem : MonoBehaviour +{ + [Tooltip("이 오브젝트의 제스처 키. 대화 노드의 HiddenGestureKey와 일치할 때만 발동 (예: kimchi, bouquet, slap)")] + [SerializeField] private string _gestureKey; + + [Tooltip("이 태그를 가진 트리거(NPC 받는 존)에 닿아야 발동. 비우면 태그 무시(아무 트리거나)")] + [SerializeField] private string _targetTag = "GiveZone"; + + [Header("Consume (건넨 뒤 사라지게)")] + [Tooltip("켜면 발동 시 이 오브젝트가 사라진다(건넨 연출). 손처럼 사라지면 안 되는 건 꺼둘 것")] + [SerializeField] private bool _consumeOnGiven = true; + + [Tooltip("사라지는 방식: 켜면 완전 파괴(Destroy), 끄면 비활성화(SetActive false — 재사용 가능)")] + [SerializeField] private bool _destroy = true; + + [Tooltip("사라지기 직전 호출 (파티클·사운드 연출용)")] + [SerializeField] private UnityEvent _onConsumed; + + private void OnTriggerEnter(Collider other) + { + if (!string.IsNullOrEmpty(_targetTag) && !other.CompareTag(_targetTag)) return; + + // 노드가 이 키로 무장 중일 때만 true — 그때만 소비한다(엉뚱한 타이밍/엉뚱한 아이템은 안 사라짐). + if (!HiddenBranchResolver.Fire(_gestureKey)) return; + + if (_consumeOnGiven) + Consume(); + } + + private void Consume() + { + // 스크립트가 자식 콜라이더에 붙어 있어도 아이템 전체(Rigidbody 루트)를 처리 + var body = GetComponentInParent(); + var target = body != null ? body.gameObject : gameObject; + + _onConsumed?.Invoke(); + + if (_destroy) + Destroy(target); // XRGrabInteractable도 파괴 시 손에서 자동 해제됨 + else + target.SetActive(false); // 비활성화도 XRI가 선택을 취소해 손에서 놓게 됨 + } +} diff --git a/Assets/02_Scripts/Communication/Dialog/DialogGestureItem.cs.meta b/Assets/02_Scripts/Communication/Dialog/DialogGestureItem.cs.meta new file mode 100644 index 00000000..6a934b01 --- /dev/null +++ b/Assets/02_Scripts/Communication/Dialog/DialogGestureItem.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: c11477ec44fef124bb7279924beb66af \ No newline at end of file diff --git a/Assets/02_Scripts/Communication/Dialog/DialogGestureZone.cs b/Assets/02_Scripts/Communication/Dialog/DialogGestureZone.cs deleted file mode 100644 index db0f4e9b..00000000 --- a/Assets/02_Scripts/Communication/Dialog/DialogGestureZone.cs +++ /dev/null @@ -1,25 +0,0 @@ -using UnityEngine; - -// 히든 분기를 물리 접촉으로 발동시키는 트리거 존 (KimchiHitZone과 같은 방식). -// -// 예) NPC 얼굴에 IsTrigger 콜라이더를 붙이고 GestureKey="slap", RequiredTag="PlayerHand". -// 대화 노드의 HiddenBranch가 설정되고 HiddenGestureKey="slap"인 순간에만 -// 이 존을 손으로 치면 히든 분기를 탄다. 그 외 시간엔 쳐도 아무 일도 안 일어난다. -// -// 콜라이더는 항상 켜 둬도 된다 — 발동 여부는 DialogPlayer의 무장 상태가 결정하므로, -// 노드마다 존을 껐다 켰다 할 필요가 없다. -public class DialogGestureZone : MonoBehaviour -{ - [Tooltip("이 존이 발동시킬 제스처 키. 대화 노드의 HiddenGestureKey와 일치해야 한다. " + - "노드 쪽 키가 비어 있으면 아무 존이나 발동 가능")] - [SerializeField] private string _gestureKey = "slap"; - - [Tooltip("이 태그를 가진 콜라이더가 들어와야 발동 (예: 손 컨트롤러). 비우면 태그 무시")] - [SerializeField] private string _requiredTag = "PlayerHand"; - - private void OnTriggerEnter(Collider other) - { - if (!string.IsNullOrEmpty(_requiredTag) && !other.CompareTag(_requiredTag)) return; - HiddenBranchResolver.Fire(_gestureKey); - } -} diff --git a/Assets/02_Scripts/Communication/Dialog/DialogGestureZone.cs.meta b/Assets/02_Scripts/Communication/Dialog/DialogGestureZone.cs.meta deleted file mode 100644 index ed4b22ee..00000000 --- a/Assets/02_Scripts/Communication/Dialog/DialogGestureZone.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 408261957835e514186f6a6f82e367e1 \ No newline at end of file diff --git a/Assets/02_Scripts/Communication/Dialog/DialogNode.cs b/Assets/02_Scripts/Communication/Dialog/DialogNode.cs index b41fa39f..068f8e16 100644 --- a/Assets/02_Scripts/Communication/Dialog/DialogNode.cs +++ b/Assets/02_Scripts/Communication/Dialog/DialogNode.cs @@ -45,8 +45,8 @@ public class DialogNode : ScriptableObject "비우면 히든 분기 없음 — 평소엔 존재하지 않는 것처럼 보인다")] public DialogNode HiddenBranch; - [Tooltip("히든 분기를 여는 제스처 키 (DialogGestureZone의 Gesture Key와 일치). " + - "비우면 아무 제스처 존이나 발동 가능")] + [Tooltip("히든 분기를 여는 제스처 키 (아이템의 DialogGestureItem의 Gesture Key와 일치). " + + "예: kimchi, bouquet, slap. 비우면 아무 제스처 오브젝트나 발동 가능")] public string HiddenGestureKey; [Tooltip("히든 분기를 탔을 때 기록할 선택지 Code (선택지의 Code와 동일한 용도). " + diff --git a/Assets/02_Scripts/Communication/Dialog/GraphTool/Editor/DialogGraphImporter.cs b/Assets/02_Scripts/Communication/Dialog/GraphTool/Editor/DialogGraphImporter.cs index e249ea94..760f083b 100644 --- a/Assets/02_Scripts/Communication/Dialog/GraphTool/Editor/DialogGraphImporter.cs +++ b/Assets/02_Scripts/Communication/Dialog/GraphTool/Editor/DialogGraphImporter.cs @@ -10,7 +10,7 @@ namespace DinoLove.Dialog.GraphTool.Editor // .dlg 그래프 에셋을 기존 런타임 타입(DialogGroup / DialogNode / DialogChoice)으로 변환한다. // 생성된 DialogNode들은 서브에셋으로, DialogGroup이 메인 에셋으로 등록된다. // 따라서 DialogPlayer는 수정 없이 임포트된 .dlg 에셋(= DialogGroup)을 그대로 사용한다. - [ScriptedImporter(8, DialogGraph.AssetExtension)] // 버전 올리면 기존 .dlg 에셋이 재임포트됨 + [ScriptedImporter(9, DialogGraph.AssetExtension)] // 버전 올리면 기존 .dlg 에셋이 재임포트됨 internal class DialogGraphImporter : ScriptedImporter { public override void OnImportAsset(AssetImportContext ctx) @@ -128,6 +128,23 @@ public override void OnImportAsset(AssetImportContext ctx) }); } } + + // 히든 분기 (켜져 있으면) — 목적지 노드 + 제스처 키 + 기록 코드 + bool hasHidden = false; + line.GetNodeOptionByName(DialogLineNode.OPTION_HIDDEN_BRANCH)?.TryGetValue(out hasHidden); + if (hasHidden) + { + var hiddenDest = GetConnectedNode(gn, DialogLineNode.PORT_HIDDEN_OUT); + dn.HiddenBranch = hiddenDest != null && map.TryGetValue(hiddenDest, out var hiddenDn) ? hiddenDn : null; + + string gestureKey = null; + line.GetNodeOptionByName(DialogLineNode.OPTION_HIDDEN_GESTURE)?.TryGetValue(out gestureKey); + dn.HiddenGestureKey = gestureKey; + + string hiddenCode = null; + line.GetNodeOptionByName(DialogLineNode.OPTION_HIDDEN_CODE)?.TryGetValue(out hiddenCode); + dn.HiddenCode = hiddenCode; + } } group.StartNode = map.TryGetValue(firstGraphNode, out var startDn) ? startDn : null; @@ -178,6 +195,12 @@ static IEnumerable GetSuccessors(INode node) for (int i = 0; i < choiceCount; i++) yield return GetConnectedNode(node, DialogLineNode.ChoiceOutPort(i)); } + + // 히든 분기 후속도 도달 가능해야 DialogNode로 생성된다 + bool hasHidden = false; + line.GetNodeOptionByName(DialogLineNode.OPTION_HIDDEN_BRANCH)?.TryGetValue(out hasHidden); + if (hasHidden) + yield return GetConnectedNode(node, DialogLineNode.PORT_HIDDEN_OUT); } // 출력 실행 포트에 연결된 노드 (없으면 null) diff --git a/Assets/02_Scripts/Communication/Dialog/GraphTool/Editor/DialogLineNode.cs b/Assets/02_Scripts/Communication/Dialog/GraphTool/Editor/DialogLineNode.cs index 4dc1b2fa..0273c3ab 100644 --- a/Assets/02_Scripts/Communication/Dialog/GraphTool/Editor/DialogLineNode.cs +++ b/Assets/02_Scripts/Communication/Dialog/GraphTool/Editor/DialogLineNode.cs @@ -30,9 +30,13 @@ internal class DialogLineNode : DialogGraphNode public const string PORT_AFFECTION = "Affection"; public const string PORT_PROGRESS = "Progress"; public const string PORT_QUESTION = "ChoiceQuestion"; + public const string PORT_HIDDEN_OUT = "HiddenOut"; - public const string OPTION_CHOICE_COUNT = "ChoiceCount"; - public const string OPTION_EVENT_KEY = "EventKey"; + public const string OPTION_CHOICE_COUNT = "ChoiceCount"; + public const string OPTION_EVENT_KEY = "EventKey"; + public const string OPTION_HIDDEN_BRANCH = "HasHiddenBranch"; + public const string OPTION_HIDDEN_GESTURE = "HiddenGestureKey"; + public const string OPTION_HIDDEN_CODE = "HiddenCode"; // 선택지별 포트 이름 규칙 (임포터와 공유) public static string ChoiceTextPort(int i) => $"Choice{i}Text"; @@ -51,6 +55,22 @@ protected override void OnDefineOptions(IOptionDefinitionContext context) .WithDisplayName("Event Key") .WithTooltip("비우면 없음. 이 노드 재생 시 DialogPlayer의 같은 Key 이벤트 호출 (영문 키 권장)") .Delayed(); + + context.AddOption(OPTION_HIDDEN_BRANCH) + .WithDisplayName("Hidden Branch") + .WithTooltip("켜면 맨 아래에 'Hidden →' 출력 포트가 생긴다. 이 대사 재생 중 특정 제스처(싸대기/터치)를 하면 " + + "Next/선택지 대신 그 포트로 연결된 노드로 몰래 분기한다") + .WithDefaultValue(false); + + context.AddOption(OPTION_HIDDEN_GESTURE) + .WithDisplayName("Hidden Gesture Key") + .WithTooltip("히든 분기를 여는 제스처 키 (DialogGestureZone의 Gesture Key와 일치). 비우면 아무 제스처 존이나 발동") + .Delayed(); + + context.AddOption(OPTION_HIDDEN_CODE) + .WithDisplayName("Hidden Code") + .WithTooltip("히든 분기를 탔을 때 기록할 선택지 Code (이후 대화 조건 RequiredChoiceCodes에서 검사). 비우면 기록 안 함") + .Delayed(); } protected override void OnDefinePorts(IPortDefinitionContext context) @@ -88,23 +108,31 @@ protected override void OnDefinePorts(IPortDefinitionContext context) { // 선형 진행 AddExecOutput(context, EXEC_OUT, string.Empty); - return; } - - // 가변 N지선다 - // (string 포트는 GraphToolkit 기본 에디터의 IME 중복입력 버그가 있어 DialogText로 통일) - context.AddInputPort(PORT_QUESTION).WithDisplayName("Choice Question").Build(); - - for (int i = 0; i < choiceCount; i++) + else { - context.AddInputPort(ChoiceTextPort(i)) - .WithDisplayName($"Choice {i + 1} Text") - .Build(); - context.AddInputPort(ChoiceCodePort(i)) - .WithDisplayName($"Choice {i + 1} Code") - .Build(); - AddExecOutput(context, ChoiceOutPort(i), $"Choice {i + 1} →"); + // 가변 N지선다 + // (string 포트는 GraphToolkit 기본 에디터의 IME 중복입력 버그가 있어 DialogText로 통일) + context.AddInputPort(PORT_QUESTION).WithDisplayName("Choice Question").Build(); + + for (int i = 0; i < choiceCount; i++) + { + context.AddInputPort(ChoiceTextPort(i)) + .WithDisplayName($"Choice {i + 1} Text") + .Build(); + context.AddInputPort(ChoiceCodePort(i)) + .WithDisplayName($"Choice {i + 1} Code") + .Build(); + AddExecOutput(context, ChoiceOutPort(i), $"Choice {i + 1} →"); + } } + + // 히든 분기 출력 — 켜져 있으면 선형/선택지 관계없이 맨 아래에 붙는다. + // 이 포트에 연결된 노드가 DialogNode.HiddenBranch가 된다. + bool hasHidden = false; + GetNodeOptionByName(OPTION_HIDDEN_BRANCH)?.TryGetValue(out hasHidden); + if (hasHidden) + AddExecOutput(context, PORT_HIDDEN_OUT, "Hidden →"); } } } diff --git a/Assets/02_Scripts/Communication/Dialog/HiddenBranchResolver.cs b/Assets/02_Scripts/Communication/Dialog/HiddenBranchResolver.cs index b7e1f23f..4db4214c 100644 --- a/Assets/02_Scripts/Communication/Dialog/HiddenBranchResolver.cs +++ b/Assets/02_Scripts/Communication/Dialog/HiddenBranchResolver.cs @@ -48,11 +48,13 @@ public static void Disarm() } // 제스처 존이 호출. 무장 중이고 key가 맞을 때만 1회 발동. - public static void Fire(string key) + // 반환: 이번 호출로 실제 발동했으면 true (호출 측이 "그때만" 아이템 소비 등에 쓸 수 있게). + public static bool Fire(string key) { - if (!Armed || Fired) return; - if (!string.IsNullOrEmpty(_armedKey) && _armedKey != key) return; + if (!Armed || Fired) return false; + if (!string.IsNullOrEmpty(_armedKey) && _armedKey != key) return false; Fired = true; FiredEvent?.Invoke(); + return true; } } diff --git a/Assets/02_Scripts/Interact/DialogInteractionBlocker.cs b/Assets/02_Scripts/Interact/DialogInteractionBlocker.cs index 2d42b7e9..7b913435 100644 --- a/Assets/02_Scripts/Interact/DialogInteractionBlocker.cs +++ b/Assets/02_Scripts/Interact/DialogInteractionBlocker.cs @@ -5,14 +5,24 @@ // 대화 중(선택 메뉴 포함) 월드 상호작용을 차단한다 — UI 상호작용은 유지. // XR Origin(리그 루트)에 붙이면 자식의 모든 인터랙터를 찾아서, 대화가 시작될 때 -// Interaction Layer를 None으로 바꿔 3D 인터랙터블과의 호버/선택/활성화를 막는다. +// Interaction Layer를 (기본) None으로 바꿔 3D 인터랙터블과의 호버/선택/활성화를 막는다. // 캔버스 UI(선택지 버튼 등)는 인터랙션 레이어를 거치지 않고 XRUIInputModule로 // 처리되므로 영향받지 않는다. 대화가 끝나면 원래 레이어로 복원. +// +// _keepActiveDuringDialog에 레이어를 넣으면, 대화 중에도 그 레이어의 인터랙터블만 상호작용된다. +// 예: 대화 중에 꽃다발을 잡아서 NPC에게 건네야 하는 상황 — 꽃다발(XRGrabInteractable)을 그 레이어에 +// 올려두면, NPC 대화는 계속 막힌 채 꽃다발만 잡고/들고 있을 수 있다. (대화 시작 시 이미 들고 있던 +// 오브젝트가 레이어 차단으로 손에서 떨어지는 것도 막아준다.) 건넸는지 판정은 아이템의 DialogGestureItem이 +// NPC의 받는 존(태그) 트리거에 닿는 순수 물리 트리거로 처리하므로 이 블로커와 무관하게 동작한다. public class DialogInteractionBlocker : MonoBehaviour { [Tooltip("차단에서 제외할 인터랙터 (예: 대화 중에도 텔레포트를 허용하고 싶을 때 텔레포트 레이 인터랙터)")] [SerializeField] private List _exclude = new(); + [Tooltip("대화 중에도 살려둘 인터랙션 레이어. 여기 든 레이어의 인터랙터블(예: 대화 중 건네야 하는 꽃다발)은 " + + "대화 중에도 잡기/들기가 된다. 비우면(None) 기존처럼 전부 차단")] + [SerializeField] private InteractionLayerMask _keepActiveDuringDialog; + // 차단 직전의 원래 레이어 — 복원용. 비어있지 않으면 차단 중이라는 뜻. private readonly Dictionary _saved = new(); @@ -43,7 +53,7 @@ private void Block() { if (_exclude.Contains(interactor)) continue; _saved[interactor] = interactor.interactionLayers; - interactor.interactionLayers = 0; // None — 3D 인터랙터블 전부 차단 + interactor.interactionLayers = _keepActiveDuringDialog; // 지정 레이어만 유지(비우면 None=전부 차단) } } diff --git a/Assets/04_Models/obj/FlowerBuquet.meta b/Assets/04_Models/obj/FlowerBuquet.meta new file mode 100644 index 00000000..7bf50055 --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4bfde4d0f2830984c83b6eb4fc30ad93 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Models/obj/FlowerBuquet/Materials.meta b/Assets/04_Models/obj/FlowerBuquet/Materials.meta new file mode 100644 index 00000000..eea2cbfd --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 37d4436a3f8448a4ca8d9e4ad7ef22fc +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Models/obj/FlowerBuquet/Materials/Leaves1.mat b/Assets/04_Models/obj/FlowerBuquet/Materials/Leaves1.mat new file mode 100644 index 00000000..12e4ba22 --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Materials/Leaves1.mat @@ -0,0 +1,139 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-2595200092815840871 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion + version: 10 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Leaves1 + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 43c7cfa9c2be0174fb194ebe80aa972a, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 43c7cfa9c2be0174fb194ebe80aa972a, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _UVSec: 0 + - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _Color: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/04_Models/obj/FlowerBuquet/Materials/Leaves1.mat.meta b/Assets/04_Models/obj/FlowerBuquet/Materials/Leaves1.mat.meta new file mode 100644 index 00000000..248d4694 --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Materials/Leaves1.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d804cd71aadf53b4f8ec6a2dc7281493 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Models/obj/FlowerBuquet/Materials/Leaves6.mat b/Assets/04_Models/obj/FlowerBuquet/Materials/Leaves6.mat new file mode 100644 index 00000000..5c011d79 --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Materials/Leaves6.mat @@ -0,0 +1,139 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Leaves6 + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 221a652310c358c458b741b272c06895, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 221a652310c358c458b741b272c06895, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _UVSec: 0 + - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _Color: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &699340112088778016 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion + version: 10 diff --git a/Assets/04_Models/obj/FlowerBuquet/Materials/Leaves6.mat.meta b/Assets/04_Models/obj/FlowerBuquet/Materials/Leaves6.mat.meta new file mode 100644 index 00000000..680620f9 --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Materials/Leaves6.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5be3e08aa0d4a354d8bbf5abc5c8ca6c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Models/obj/FlowerBuquet/Materials/Petals1.mat b/Assets/04_Models/obj/FlowerBuquet/Materials/Petals1.mat new file mode 100644 index 00000000..76c1d21a --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Materials/Petals1.mat @@ -0,0 +1,139 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-7844865744091520962 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion + version: 10 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Petals1 + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 9ee0ff1218cff09469174186284063ae, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 9ee0ff1218cff09469174186284063ae, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _UVSec: 0 + - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _Color: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/04_Models/obj/FlowerBuquet/Materials/Petals1.mat.meta b/Assets/04_Models/obj/FlowerBuquet/Materials/Petals1.mat.meta new file mode 100644 index 00000000..da0d3aa0 --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Materials/Petals1.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 33954d56b2d45ec4ba551fea18ab2ce4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Models/obj/FlowerBuquet/Materials/Petals10.mat b/Assets/04_Models/obj/FlowerBuquet/Materials/Petals10.mat new file mode 100644 index 00000000..bf905eef --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Materials/Petals10.mat @@ -0,0 +1,139 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-5475012735562841164 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion + version: 10 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Petals10 + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 4229923bb03cd354e84fe5515f67213a, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 4229923bb03cd354e84fe5515f67213a, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _UVSec: 0 + - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _Color: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/04_Models/obj/FlowerBuquet/Materials/Petals10.mat.meta b/Assets/04_Models/obj/FlowerBuquet/Materials/Petals10.mat.meta new file mode 100644 index 00000000..e3f354cc --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Materials/Petals10.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 04b6daa15b7d3664e9dcbd298f5590d8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Models/obj/FlowerBuquet/Materials/Petals11.mat b/Assets/04_Models/obj/FlowerBuquet/Materials/Petals11.mat new file mode 100644 index 00000000..a41b6627 --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Materials/Petals11.mat @@ -0,0 +1,139 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-6806991931964995306 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion + version: 10 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Petals11 + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 2526c7f25e0f42c40b86d81cfaa6a824, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 2526c7f25e0f42c40b86d81cfaa6a824, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _UVSec: 0 + - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _Color: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/04_Models/obj/FlowerBuquet/Materials/Petals11.mat.meta b/Assets/04_Models/obj/FlowerBuquet/Materials/Petals11.mat.meta new file mode 100644 index 00000000..c0a85fcb --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Materials/Petals11.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: baa3b00005f0e9142858748adb3e3d51 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Models/obj/FlowerBuquet/Materials/Petals12.mat b/Assets/04_Models/obj/FlowerBuquet/Materials/Petals12.mat new file mode 100644 index 00000000..243b1b05 --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Materials/Petals12.mat @@ -0,0 +1,139 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-7165416782036373313 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion + version: 10 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Petals12 + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 653417eee2fb0854780bce22956c4a2a, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 653417eee2fb0854780bce22956c4a2a, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _UVSec: 0 + - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _Color: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/04_Models/obj/FlowerBuquet/Materials/Petals12.mat.meta b/Assets/04_Models/obj/FlowerBuquet/Materials/Petals12.mat.meta new file mode 100644 index 00000000..765ce3c4 --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Materials/Petals12.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 66a3d8494218fb6489fad9f8e91a4b89 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Models/obj/FlowerBuquet/Materials/Petals14.mat b/Assets/04_Models/obj/FlowerBuquet/Materials/Petals14.mat new file mode 100644 index 00000000..4b5c2339 --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Materials/Petals14.mat @@ -0,0 +1,139 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Petals14 + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: f132b65b46a8fab4bb205a0dc881bfb1, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: f132b65b46a8fab4bb205a0dc881bfb1, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _UVSec: 0 + - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _Color: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &4097445299345672776 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion + version: 10 diff --git a/Assets/04_Models/obj/FlowerBuquet/Materials/Petals14.mat.meta b/Assets/04_Models/obj/FlowerBuquet/Materials/Petals14.mat.meta new file mode 100644 index 00000000..c69c54de --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Materials/Petals14.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 80d2d3280012e72449c410e2467c0489 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Models/obj/FlowerBuquet/Materials/Petals2.mat b/Assets/04_Models/obj/FlowerBuquet/Materials/Petals2.mat new file mode 100644 index 00000000..9147f8f1 --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Materials/Petals2.mat @@ -0,0 +1,139 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Petals2 + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 25cb64a1608618c438d419063f933377, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 25cb64a1608618c438d419063f933377, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _UVSec: 0 + - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _Color: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &7553347961566609397 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion + version: 10 diff --git a/Assets/04_Models/obj/FlowerBuquet/Materials/Petals2.mat.meta b/Assets/04_Models/obj/FlowerBuquet/Materials/Petals2.mat.meta new file mode 100644 index 00000000..7cf59cba --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Materials/Petals2.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 954e50fa68baa4249978474f07330a81 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Models/obj/FlowerBuquet/Materials/Petals3.mat b/Assets/04_Models/obj/FlowerBuquet/Materials/Petals3.mat new file mode 100644 index 00000000..df51e56e --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Materials/Petals3.mat @@ -0,0 +1,139 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Petals3 + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: c4834884d7a124c4186116f4bb75533f, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: c4834884d7a124c4186116f4bb75533f, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _UVSec: 0 + - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _Color: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &1161886928535023138 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion + version: 10 diff --git a/Assets/04_Models/obj/FlowerBuquet/Materials/Petals3.mat.meta b/Assets/04_Models/obj/FlowerBuquet/Materials/Petals3.mat.meta new file mode 100644 index 00000000..6b9433fc --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Materials/Petals3.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 028475b7d7297c241ae7b4ec3d149c57 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Models/obj/FlowerBuquet/Materials/Petals4.mat b/Assets/04_Models/obj/FlowerBuquet/Materials/Petals4.mat new file mode 100644 index 00000000..8e185395 --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Materials/Petals4.mat @@ -0,0 +1,139 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Petals4 + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: c43e4d26ed40d4c4594ccb3e42852dc8, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: c43e4d26ed40d4c4594ccb3e42852dc8, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _UVSec: 0 + - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _Color: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &427628734723097775 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion + version: 10 diff --git a/Assets/04_Models/obj/FlowerBuquet/Materials/Petals4.mat.meta b/Assets/04_Models/obj/FlowerBuquet/Materials/Petals4.mat.meta new file mode 100644 index 00000000..299623ca --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Materials/Petals4.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 33971d8783ed38547abbf98e45ce3d10 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Models/obj/FlowerBuquet/Materials/Petals5.mat b/Assets/04_Models/obj/FlowerBuquet/Materials/Petals5.mat new file mode 100644 index 00000000..5d5daa05 --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Materials/Petals5.mat @@ -0,0 +1,139 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Petals5 + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: c74e13032b5f4774c90a5246dcbc6d3f, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: c74e13032b5f4774c90a5246dcbc6d3f, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _UVSec: 0 + - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _Color: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &7435274083876797150 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion + version: 10 diff --git a/Assets/04_Models/obj/FlowerBuquet/Materials/Petals5.mat.meta b/Assets/04_Models/obj/FlowerBuquet/Materials/Petals5.mat.meta new file mode 100644 index 00000000..9ffdd65d --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Materials/Petals5.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5c0683b468c4cbb4da768c914675ceee +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Models/obj/FlowerBuquet/Materials/Petals6.mat b/Assets/04_Models/obj/FlowerBuquet/Materials/Petals6.mat new file mode 100644 index 00000000..bb374851 --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Materials/Petals6.mat @@ -0,0 +1,139 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-5668052183780685704 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion + version: 10 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Petals6 + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 4aef4761ac939a1479de5c6a4e729358, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 4aef4761ac939a1479de5c6a4e729358, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _UVSec: 0 + - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _Color: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/04_Models/obj/FlowerBuquet/Materials/Petals6.mat.meta b/Assets/04_Models/obj/FlowerBuquet/Materials/Petals6.mat.meta new file mode 100644 index 00000000..34e82ec9 --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Materials/Petals6.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 792b98a074bf7f8448b5f778857c165a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Models/obj/FlowerBuquet/Materials/Petals7.mat b/Assets/04_Models/obj/FlowerBuquet/Materials/Petals7.mat new file mode 100644 index 00000000..dd68009c --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Materials/Petals7.mat @@ -0,0 +1,139 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-3808587529605503810 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion + version: 10 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Petals7 + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 725922cc6a719554a815e54bec8bb8bf, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 725922cc6a719554a815e54bec8bb8bf, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _UVSec: 0 + - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _Color: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/04_Models/obj/FlowerBuquet/Materials/Petals7.mat.meta b/Assets/04_Models/obj/FlowerBuquet/Materials/Petals7.mat.meta new file mode 100644 index 00000000..8db52154 --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Materials/Petals7.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 22977d2e19a86844ba37a3c3616c65c8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Models/obj/FlowerBuquet/Materials/Petals8.mat b/Assets/04_Models/obj/FlowerBuquet/Materials/Petals8.mat new file mode 100644 index 00000000..1f36ce5d --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Materials/Petals8.mat @@ -0,0 +1,139 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-9187935018146916809 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion + version: 10 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Petals8 + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 7efe69210d9ad70458805b8c83d610c7, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 7efe69210d9ad70458805b8c83d610c7, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _UVSec: 0 + - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _Color: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/04_Models/obj/FlowerBuquet/Materials/Petals8.mat.meta b/Assets/04_Models/obj/FlowerBuquet/Materials/Petals8.mat.meta new file mode 100644 index 00000000..883ff50a --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Materials/Petals8.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 31ca629cb3407524d96d2f5e515eeecc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Models/obj/FlowerBuquet/Materials/Petals9.mat b/Assets/04_Models/obj/FlowerBuquet/Materials/Petals9.mat new file mode 100644 index 00000000..d60cf77d --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Materials/Petals9.mat @@ -0,0 +1,143 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Petals9 + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ALPHAPREMULTIPLY_ON + - _SURFACE_TYPE_TRANSPARENT + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: + - MOTIONVECTORS + - DepthOnly + - SHADOWCASTER + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 85fc08e63902903448e674c39d34ce8a, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 85fc08e63902903448e674c39d34ce8a, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 10 + - _DstBlendAlpha: 10 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 3 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 1 + - _UVSec: 0 + - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 + - _ZWrite: 0 + m_Colors: + - _BaseColor: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 0.94545454} + - _Color: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 0.94545454} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &5926739386128619552 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion + version: 10 diff --git a/Assets/04_Models/obj/FlowerBuquet/Materials/Petals9.mat.meta b/Assets/04_Models/obj/FlowerBuquet/Materials/Petals9.mat.meta new file mode 100644 index 00000000..11ac9b15 --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Materials/Petals9.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d6f3c95be9f41b04497e3331bd92e708 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Models/obj/FlowerBuquet/Materials/Ribbons1.mat b/Assets/04_Models/obj/FlowerBuquet/Materials/Ribbons1.mat new file mode 100644 index 00000000..325fa4bd --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Materials/Ribbons1.mat @@ -0,0 +1,139 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Ribbons1 + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 8e7ae615d3223134eadddad4a8b7e821, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 8e7ae615d3223134eadddad4a8b7e821, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _UVSec: 0 + - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.9585931, g: 1, b: 0.9579299, a: 1} + - _Color: {r: 0.9585931, g: 1, b: 0.9579299, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &3350397939834732544 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion + version: 10 diff --git a/Assets/04_Models/obj/FlowerBuquet/Materials/Ribbons1.mat.meta b/Assets/04_Models/obj/FlowerBuquet/Materials/Ribbons1.mat.meta new file mode 100644 index 00000000..80dc81d1 --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Materials/Ribbons1.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9feba817aefcbab4fbb08bf17a310191 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Models/obj/FlowerBuquet/Materials/SmallPlants1.mat b/Assets/04_Models/obj/FlowerBuquet/Materials/SmallPlants1.mat new file mode 100644 index 00000000..d0774525 --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Materials/SmallPlants1.mat @@ -0,0 +1,139 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: SmallPlants1 + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 33771ed22e32f3c49a460fc997eafaef, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 33771ed22e32f3c49a460fc997eafaef, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _UVSec: 0 + - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _Color: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &2995755469750203978 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion + version: 10 diff --git a/Assets/04_Models/obj/FlowerBuquet/Materials/SmallPlants1.mat.meta b/Assets/04_Models/obj/FlowerBuquet/Materials/SmallPlants1.mat.meta new file mode 100644 index 00000000..92a9f64b --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Materials/SmallPlants1.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ab5628fb749fd6e43a74ce612b42e9fa +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Models/obj/FlowerBuquet/Materials/SmallPlants2.mat b/Assets/04_Models/obj/FlowerBuquet/Materials/SmallPlants2.mat new file mode 100644 index 00000000..cec60894 --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Materials/SmallPlants2.mat @@ -0,0 +1,139 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-1004131927143013681 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion + version: 10 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: SmallPlants2 + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: a611e69b7b317c346b91c67a96123bb1, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: a611e69b7b317c346b91c67a96123bb1, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _UVSec: 0 + - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _Color: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/04_Models/obj/FlowerBuquet/Materials/SmallPlants2.mat.meta b/Assets/04_Models/obj/FlowerBuquet/Materials/SmallPlants2.mat.meta new file mode 100644 index 00000000..9f37f9e1 --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Materials/SmallPlants2.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 030edde16402a1f40b4b00246f927f09 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Models/obj/FlowerBuquet/Materials/SmallPlants3.mat b/Assets/04_Models/obj/FlowerBuquet/Materials/SmallPlants3.mat new file mode 100644 index 00000000..ddba2c83 --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Materials/SmallPlants3.mat @@ -0,0 +1,139 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: SmallPlants3 + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 0c62ea8185f736b4097408c8c381d254, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 0c62ea8185f736b4097408c8c381d254, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _UVSec: 0 + - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _Color: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &38797791860120129 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion + version: 10 diff --git a/Assets/04_Models/obj/FlowerBuquet/Materials/SmallPlants3.mat.meta b/Assets/04_Models/obj/FlowerBuquet/Materials/SmallPlants3.mat.meta new file mode 100644 index 00000000..23285817 --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Materials/SmallPlants3.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1848645b31a1cc1438eb5139d56dd67c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Models/obj/FlowerBuquet/Materials/Stems.mat b/Assets/04_Models/obj/FlowerBuquet/Materials/Stems.mat new file mode 100644 index 00000000..cd3f9a74 --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Materials/Stems.mat @@ -0,0 +1,139 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-3709318031832642048 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion + version: 10 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Stems + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: c63f063d487827a40968414bdd92e00d, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: c63f063d487827a40968414bdd92e00d, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.59999996 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.59999996 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _UVSec: 0 + - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _Color: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/04_Models/obj/FlowerBuquet/Materials/Stems.mat.meta b/Assets/04_Models/obj/FlowerBuquet/Materials/Stems.mat.meta new file mode 100644 index 00000000..38c9ec0b --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Materials/Stems.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: da706003db8bec543a8c98e44fb80d47 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Models/obj/FlowerBuquet/Prefabs.meta b/Assets/04_Models/obj/FlowerBuquet/Prefabs.meta new file mode 100644 index 00000000..85858fcb --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Prefabs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4662ec57520d8284389903bc4e06aeac +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Models/obj/FlowerBuquet/Prefabs/SM_Buquet_Bv11.prefab b/Assets/04_Models/obj/FlowerBuquet/Prefabs/SM_Buquet_Bv11.prefab new file mode 100644 index 00000000..baff7657 --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Prefabs/SM_Buquet_Bv11.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9cf08321feb010596169089ba7ee235487f8e945090da205718f890c25afbd99 +size 17723 diff --git a/Assets/04_Models/obj/FlowerBuquet/Prefabs/SM_Buquet_Bv11.prefab.meta b/Assets/04_Models/obj/FlowerBuquet/Prefabs/SM_Buquet_Bv11.prefab.meta new file mode 100644 index 00000000..6327078a --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Prefabs/SM_Buquet_Bv11.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2cbea056432969c49ab44a80ecfb1f26 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Models/obj/FlowerBuquet/SM_Buquet_Bv11.fbx b/Assets/04_Models/obj/FlowerBuquet/SM_Buquet_Bv11.fbx new file mode 100644 index 00000000..9d01048c --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/SM_Buquet_Bv11.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5d3312f841047130cf5a2fe539d232d44b25d48df1418cb03ed7be8984d39d32 +size 10518396 diff --git a/Assets/04_Models/obj/FlowerBuquet/SM_Buquet_Bv11.fbx.meta b/Assets/04_Models/obj/FlowerBuquet/SM_Buquet_Bv11.fbx.meta new file mode 100644 index 00000000..c5f86102 --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/SM_Buquet_Bv11.fbx.meta @@ -0,0 +1,214 @@ +fileFormatVersion: 2 +guid: 63842f9c41bc083458e8167b88902097 +ModelImporter: + serializedVersion: 24501 + internalIDToNameTable: [] + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Leaves1 + second: {fileID: 2100000, guid: d804cd71aadf53b4f8ec6a2dc7281493, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Leaves6 + second: {fileID: 2100000, guid: 5be3e08aa0d4a354d8bbf5abc5c8ca6c, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Petals1 + second: {fileID: 2100000, guid: 33954d56b2d45ec4ba551fea18ab2ce4, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Petals10 + second: {fileID: 2100000, guid: 04b6daa15b7d3664e9dcbd298f5590d8, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Petals11 + second: {fileID: 2100000, guid: baa3b00005f0e9142858748adb3e3d51, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Petals12 + second: {fileID: 2100000, guid: 66a3d8494218fb6489fad9f8e91a4b89, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Petals14 + second: {fileID: 2100000, guid: 80d2d3280012e72449c410e2467c0489, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Petals2 + second: {fileID: 2100000, guid: 954e50fa68baa4249978474f07330a81, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Petals3 + second: {fileID: 2100000, guid: 028475b7d7297c241ae7b4ec3d149c57, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Petals4 + second: {fileID: 2100000, guid: 33971d8783ed38547abbf98e45ce3d10, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Petals5 + second: {fileID: 2100000, guid: 5c0683b468c4cbb4da768c914675ceee, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Petals6 + second: {fileID: 2100000, guid: 792b98a074bf7f8448b5f778857c165a, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Petals7 + second: {fileID: 2100000, guid: 22977d2e19a86844ba37a3c3616c65c8, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Petals8 + second: {fileID: 2100000, guid: 31ca629cb3407524d96d2f5e515eeecc, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Petals9 + second: {fileID: 2100000, guid: d6f3c95be9f41b04497e3331bd92e708, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Ribbons1 + second: {fileID: 2100000, guid: 9feba817aefcbab4fbb08bf17a310191, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: SmallPlants1 + second: {fileID: 2100000, guid: ab5628fb749fd6e43a74ce612b42e9fa, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: SmallPlants2 + second: {fileID: 2100000, guid: 030edde16402a1f40b4b00246f927f09, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: SmallPlants3 + second: {fileID: 2100000, guid: 1848645b31a1cc1438eb5139d56dd67c, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Stems + second: {fileID: 2100000, guid: da706003db8bec543a8c98e44fb80d47, type: 2} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + searchTexturesGlobally: 0 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + generateMeshLods: 0 + meshLodGenerationFlags: 0 + maximumMeshLod: -1 + importUVs: -1 + importVertexColors: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + calculateBlendshapeNormalsDeltaFromImportedNormals: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Models/obj/FlowerBuquet/Textures.meta b/Assets/04_Models/obj/FlowerBuquet/Textures.meta new file mode 100644 index 00000000..4139e1df --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Textures.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 787e4f0482219c9469b7c48d637d3867 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Models/obj/FlowerBuquet/Textures/Leaves1_basecolor.jpg b/Assets/04_Models/obj/FlowerBuquet/Textures/Leaves1_basecolor.jpg new file mode 100644 index 00000000..9ee10ea4 --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Textures/Leaves1_basecolor.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:df668ad56cfb1f14d6d6494ef2d789b37ddb8f638dabb2327b08df882a5c0ee4 +size 1044942 diff --git a/Assets/04_Models/obj/FlowerBuquet/Textures/Leaves1_basecolor.jpg.meta b/Assets/04_Models/obj/FlowerBuquet/Textures/Leaves1_basecolor.jpg.meta new file mode 100644 index 00000000..b95e92e0 --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Textures/Leaves1_basecolor.jpg.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: 43c7cfa9c2be0174fb194ebe80aa972a +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/obj/FlowerBuquet/Textures/Leaves6_basecolor.jpg b/Assets/04_Models/obj/FlowerBuquet/Textures/Leaves6_basecolor.jpg new file mode 100644 index 00000000..5037565f --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Textures/Leaves6_basecolor.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:53d0c0c903e0dd6dfc7fb1f47c1f34e5fc89b5b5f8e7e390b65fc6b3fcf763c1 +size 1176376 diff --git a/Assets/04_Models/obj/FlowerBuquet/Textures/Leaves6_basecolor.jpg.meta b/Assets/04_Models/obj/FlowerBuquet/Textures/Leaves6_basecolor.jpg.meta new file mode 100644 index 00000000..9f2462ec --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Textures/Leaves6_basecolor.jpg.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: 221a652310c358c458b741b272c06895 +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/obj/FlowerBuquet/Textures/Petals10_basecolor.jpg b/Assets/04_Models/obj/FlowerBuquet/Textures/Petals10_basecolor.jpg new file mode 100644 index 00000000..c8cf2b07 --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Textures/Petals10_basecolor.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d7fd9e52f75ba7ea8eb3540cf0fe5600e1eef0eb513ad18d1b2287b7ddf58128 +size 1001132 diff --git a/Assets/04_Models/obj/FlowerBuquet/Textures/Petals10_basecolor.jpg.meta b/Assets/04_Models/obj/FlowerBuquet/Textures/Petals10_basecolor.jpg.meta new file mode 100644 index 00000000..6f433a5d --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Textures/Petals10_basecolor.jpg.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: 4229923bb03cd354e84fe5515f67213a +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/obj/FlowerBuquet/Textures/Petals11_basecolor.jpg b/Assets/04_Models/obj/FlowerBuquet/Textures/Petals11_basecolor.jpg new file mode 100644 index 00000000..c8d330ee --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Textures/Petals11_basecolor.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:63efd27be6955bc4408a6153963b1f01611718e1ccdd2c8a4bbae530cd100966 +size 890022 diff --git a/Assets/04_Models/obj/FlowerBuquet/Textures/Petals11_basecolor.jpg.meta b/Assets/04_Models/obj/FlowerBuquet/Textures/Petals11_basecolor.jpg.meta new file mode 100644 index 00000000..741a16cb --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Textures/Petals11_basecolor.jpg.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: 2526c7f25e0f42c40b86d81cfaa6a824 +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/obj/FlowerBuquet/Textures/Petals12_basecolor.jpg b/Assets/04_Models/obj/FlowerBuquet/Textures/Petals12_basecolor.jpg new file mode 100644 index 00000000..c1acce00 --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Textures/Petals12_basecolor.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:230378470765eae86b007c1876b7950f26ee776dce33b6d3253e8c740dc3f003 +size 810277 diff --git a/Assets/04_Models/obj/FlowerBuquet/Textures/Petals12_basecolor.jpg.meta b/Assets/04_Models/obj/FlowerBuquet/Textures/Petals12_basecolor.jpg.meta new file mode 100644 index 00000000..356fb8a6 --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Textures/Petals12_basecolor.jpg.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: 653417eee2fb0854780bce22956c4a2a +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/obj/FlowerBuquet/Textures/Petals14_basecolor.jpg b/Assets/04_Models/obj/FlowerBuquet/Textures/Petals14_basecolor.jpg new file mode 100644 index 00000000..d5d8860f --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Textures/Petals14_basecolor.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:270265f8ecc393c27db7f78b03aae160d15078c404d05db9d9a201c57a46b93a +size 875172 diff --git a/Assets/04_Models/obj/FlowerBuquet/Textures/Petals14_basecolor.jpg.meta b/Assets/04_Models/obj/FlowerBuquet/Textures/Petals14_basecolor.jpg.meta new file mode 100644 index 00000000..dcceb4d6 --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Textures/Petals14_basecolor.jpg.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: f132b65b46a8fab4bb205a0dc881bfb1 +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/obj/FlowerBuquet/Textures/Petals1_basecolor.jpg b/Assets/04_Models/obj/FlowerBuquet/Textures/Petals1_basecolor.jpg new file mode 100644 index 00000000..b66ab49f --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Textures/Petals1_basecolor.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:73866b8952f65a719eb46a904ed9008c30352e3257509250c5bf76af8326cc19 +size 877920 diff --git a/Assets/04_Models/obj/FlowerBuquet/Textures/Petals1_basecolor.jpg.meta b/Assets/04_Models/obj/FlowerBuquet/Textures/Petals1_basecolor.jpg.meta new file mode 100644 index 00000000..fd1160c6 --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Textures/Petals1_basecolor.jpg.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: 9ee0ff1218cff09469174186284063ae +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/obj/FlowerBuquet/Textures/Petals2_basecolor.jpg b/Assets/04_Models/obj/FlowerBuquet/Textures/Petals2_basecolor.jpg new file mode 100644 index 00000000..71e09e63 --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Textures/Petals2_basecolor.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e371b2e1dc1310e859b4be386f61ceff6d21dd80608f64a18444b2971b938399 +size 1015988 diff --git a/Assets/04_Models/obj/FlowerBuquet/Textures/Petals2_basecolor.jpg.meta b/Assets/04_Models/obj/FlowerBuquet/Textures/Petals2_basecolor.jpg.meta new file mode 100644 index 00000000..b474aeae --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Textures/Petals2_basecolor.jpg.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: 25cb64a1608618c438d419063f933377 +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/obj/FlowerBuquet/Textures/Petals3_basecolor.jpg b/Assets/04_Models/obj/FlowerBuquet/Textures/Petals3_basecolor.jpg new file mode 100644 index 00000000..35f0f3e9 --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Textures/Petals3_basecolor.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9e5b6c46169a111b85f8119f78558c0b26885be58e254f59e6ca0f720fa0dbf1 +size 1076231 diff --git a/Assets/04_Models/obj/FlowerBuquet/Textures/Petals3_basecolor.jpg.meta b/Assets/04_Models/obj/FlowerBuquet/Textures/Petals3_basecolor.jpg.meta new file mode 100644 index 00000000..fbc2902a --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Textures/Petals3_basecolor.jpg.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: c4834884d7a124c4186116f4bb75533f +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/obj/FlowerBuquet/Textures/Petals4_basecolor.jpg b/Assets/04_Models/obj/FlowerBuquet/Textures/Petals4_basecolor.jpg new file mode 100644 index 00000000..c1b4c0e5 --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Textures/Petals4_basecolor.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ad59b71ad4e8ea8fe3c255a7891a7623c103299e9baa7948cd34919e7087eeef +size 837785 diff --git a/Assets/04_Models/obj/FlowerBuquet/Textures/Petals4_basecolor.jpg.meta b/Assets/04_Models/obj/FlowerBuquet/Textures/Petals4_basecolor.jpg.meta new file mode 100644 index 00000000..320b2f5c --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Textures/Petals4_basecolor.jpg.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: c43e4d26ed40d4c4594ccb3e42852dc8 +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/obj/FlowerBuquet/Textures/Petals5_basecolor.jpg b/Assets/04_Models/obj/FlowerBuquet/Textures/Petals5_basecolor.jpg new file mode 100644 index 00000000..64f4d3b2 --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Textures/Petals5_basecolor.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3a137320d5bad8a072622254dd1aa4a7810c537f701bf60cdada157f6b7b6205 +size 795945 diff --git a/Assets/04_Models/obj/FlowerBuquet/Textures/Petals5_basecolor.jpg.meta b/Assets/04_Models/obj/FlowerBuquet/Textures/Petals5_basecolor.jpg.meta new file mode 100644 index 00000000..29fada00 --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Textures/Petals5_basecolor.jpg.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: c74e13032b5f4774c90a5246dcbc6d3f +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/obj/FlowerBuquet/Textures/Petals6_basecolor.jpg b/Assets/04_Models/obj/FlowerBuquet/Textures/Petals6_basecolor.jpg new file mode 100644 index 00000000..edbadc62 --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Textures/Petals6_basecolor.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d5e474b1402f6d37c2e33531050bf9c93979c6499e8704134b012f58f80c667f +size 922278 diff --git a/Assets/04_Models/obj/FlowerBuquet/Textures/Petals6_basecolor.jpg.meta b/Assets/04_Models/obj/FlowerBuquet/Textures/Petals6_basecolor.jpg.meta new file mode 100644 index 00000000..974e3257 --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Textures/Petals6_basecolor.jpg.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: 4aef4761ac939a1479de5c6a4e729358 +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/obj/FlowerBuquet/Textures/Petals7_basecolor.jpg b/Assets/04_Models/obj/FlowerBuquet/Textures/Petals7_basecolor.jpg new file mode 100644 index 00000000..577dc205 --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Textures/Petals7_basecolor.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6ebafbe5b4b62c2b1a06b778dd380e2336a6ee46d316d3a0f499d72b030bf613 +size 942238 diff --git a/Assets/04_Models/obj/FlowerBuquet/Textures/Petals7_basecolor.jpg.meta b/Assets/04_Models/obj/FlowerBuquet/Textures/Petals7_basecolor.jpg.meta new file mode 100644 index 00000000..9259eee0 --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Textures/Petals7_basecolor.jpg.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: 725922cc6a719554a815e54bec8bb8bf +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/obj/FlowerBuquet/Textures/Petals8_basecolor.jpg b/Assets/04_Models/obj/FlowerBuquet/Textures/Petals8_basecolor.jpg new file mode 100644 index 00000000..972c9034 --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Textures/Petals8_basecolor.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2c6014ea19c653912cc083250cbbae5ecb39fc3e99ecb126d7bcaa77827f1d35 +size 860300 diff --git a/Assets/04_Models/obj/FlowerBuquet/Textures/Petals8_basecolor.jpg.meta b/Assets/04_Models/obj/FlowerBuquet/Textures/Petals8_basecolor.jpg.meta new file mode 100644 index 00000000..9ddcc7c0 --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Textures/Petals8_basecolor.jpg.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: 7efe69210d9ad70458805b8c83d610c7 +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/obj/FlowerBuquet/Textures/Petals9_basecolor.jpg b/Assets/04_Models/obj/FlowerBuquet/Textures/Petals9_basecolor.jpg new file mode 100644 index 00000000..7fc30b79 --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Textures/Petals9_basecolor.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:df2bb3e9ecd2fffbd311a6f8dfe1123d613b8bb6836bcbe987aea91752fa99ca +size 789827 diff --git a/Assets/04_Models/obj/FlowerBuquet/Textures/Petals9_basecolor.jpg.meta b/Assets/04_Models/obj/FlowerBuquet/Textures/Petals9_basecolor.jpg.meta new file mode 100644 index 00000000..6e419afd --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Textures/Petals9_basecolor.jpg.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: 85fc08e63902903448e674c39d34ce8a +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/obj/FlowerBuquet/Textures/Ribbons1_basecolor.jpg b/Assets/04_Models/obj/FlowerBuquet/Textures/Ribbons1_basecolor.jpg new file mode 100644 index 00000000..3bc890f6 --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Textures/Ribbons1_basecolor.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:37f114ce2adaf4b588ec7d95e48aea48547b10b51b9c2aa4b1206071ac85bf3a +size 488527 diff --git a/Assets/04_Models/obj/FlowerBuquet/Textures/Ribbons1_basecolor.jpg.meta b/Assets/04_Models/obj/FlowerBuquet/Textures/Ribbons1_basecolor.jpg.meta new file mode 100644 index 00000000..8949bf89 --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Textures/Ribbons1_basecolor.jpg.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: 8e7ae615d3223134eadddad4a8b7e821 +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/obj/FlowerBuquet/Textures/SmallPlants1_basecolor.jpg b/Assets/04_Models/obj/FlowerBuquet/Textures/SmallPlants1_basecolor.jpg new file mode 100644 index 00000000..242a9f9d --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Textures/SmallPlants1_basecolor.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:29a3e05f3d74ceb06ee20dacf9cb70b299cff794ec7011ecc083ce4c04cbfaf2 +size 400585 diff --git a/Assets/04_Models/obj/FlowerBuquet/Textures/SmallPlants1_basecolor.jpg.meta b/Assets/04_Models/obj/FlowerBuquet/Textures/SmallPlants1_basecolor.jpg.meta new file mode 100644 index 00000000..7a11062a --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Textures/SmallPlants1_basecolor.jpg.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: 33771ed22e32f3c49a460fc997eafaef +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/obj/FlowerBuquet/Textures/SmallPlants2_basecolor.jpg b/Assets/04_Models/obj/FlowerBuquet/Textures/SmallPlants2_basecolor.jpg new file mode 100644 index 00000000..a517f216 --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Textures/SmallPlants2_basecolor.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1ca779784218a9a5893a9da7c83729552911787f10c1291bfafe04e7e3b10797 +size 417045 diff --git a/Assets/04_Models/obj/FlowerBuquet/Textures/SmallPlants2_basecolor.jpg.meta b/Assets/04_Models/obj/FlowerBuquet/Textures/SmallPlants2_basecolor.jpg.meta new file mode 100644 index 00000000..ff6fbdf8 --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Textures/SmallPlants2_basecolor.jpg.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: a611e69b7b317c346b91c67a96123bb1 +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/obj/FlowerBuquet/Textures/SmallPlants3_basecolor.jpg b/Assets/04_Models/obj/FlowerBuquet/Textures/SmallPlants3_basecolor.jpg new file mode 100644 index 00000000..518db780 --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Textures/SmallPlants3_basecolor.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:48e732a6706dc758c31075cdcb4ee3258305b8c879c957f2c802a3f083a25765 +size 718322 diff --git a/Assets/04_Models/obj/FlowerBuquet/Textures/SmallPlants3_basecolor.jpg.meta b/Assets/04_Models/obj/FlowerBuquet/Textures/SmallPlants3_basecolor.jpg.meta new file mode 100644 index 00000000..ca3d3946 --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Textures/SmallPlants3_basecolor.jpg.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: 0c62ea8185f736b4097408c8c381d254 +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/obj/FlowerBuquet/Textures/Stems_basecolor.jpg b/Assets/04_Models/obj/FlowerBuquet/Textures/Stems_basecolor.jpg new file mode 100644 index 00000000..ccdc643f --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Textures/Stems_basecolor.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d7436f2cf3d7ed921822b977f92d54d3be7cd7b188f381c1ff1d245251df3b17 +size 748565 diff --git a/Assets/04_Models/obj/FlowerBuquet/Textures/Stems_basecolor.jpg.meta b/Assets/04_Models/obj/FlowerBuquet/Textures/Stems_basecolor.jpg.meta new file mode 100644 index 00000000..8ec33642 --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Textures/Stems_basecolor.jpg.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: c63f063d487827a40968414bdd92e00d +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/obj/FlowerBuquet/Textures/ribbons_Cylinder.019_D.png b/Assets/04_Models/obj/FlowerBuquet/Textures/ribbons_Cylinder.019_D.png new file mode 100644 index 00000000..87afdc0f --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Textures/ribbons_Cylinder.019_D.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d63ac51655e0f1feeed1f00c99de3810b58855f51671710f6446603c2db3a5b1 +size 10315051 diff --git a/Assets/04_Models/obj/FlowerBuquet/Textures/ribbons_Cylinder.019_D.png.meta b/Assets/04_Models/obj/FlowerBuquet/Textures/ribbons_Cylinder.019_D.png.meta new file mode 100644 index 00000000..a8396385 --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Textures/ribbons_Cylinder.019_D.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: 3a0f4dc185e623a4ea720d7f79aa6c97 +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/obj/FlowerBuquet/Textures/stems_flowers_Cylinder.002_D.jpg b/Assets/04_Models/obj/FlowerBuquet/Textures/stems_flowers_Cylinder.002_D.jpg new file mode 100644 index 00000000..0d273980 --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Textures/stems_flowers_Cylinder.002_D.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bfd9a925e95cad084640d73887477ee85b7acc2c694671757ec24c586b34e5f3 +size 1061919 diff --git a/Assets/04_Models/obj/FlowerBuquet/Textures/stems_flowers_Cylinder.002_D.jpg.meta b/Assets/04_Models/obj/FlowerBuquet/Textures/stems_flowers_Cylinder.002_D.jpg.meta new file mode 100644 index 00000000..f57c6679 --- /dev/null +++ b/Assets/04_Models/obj/FlowerBuquet/Textures/stems_flowers_Cylinder.002_D.jpg.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: b310717f98e3bb841a6259565d6e5635 +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/07_Data/DialogGraph/Chapter5/Chapter5_Styracosaurus1.dlg b/Assets/07_Data/DialogGraph/Chapter5/Chapter5_Styracosaurus1.dlg index c1c65f07..6b782b43 100644 --- a/Assets/07_Data/DialogGraph/Chapter5/Chapter5_Styracosaurus1.dlg +++ b/Assets/07_Data/DialogGraph/Chapter5/Chapter5_Styracosaurus1.dlg @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 12501, guid: 0000000000000000e000000000000000, type: 0} - m_Name: Chapter1_Styracosaurus1 + m_Name: Chapter5_Styracosaurus1 m_EditorClassIdentifier: UnityEditor.dll::Unity.GraphToolkit.Editor.Implementation.GraphObjectImp m_GraphModel: rid: 4848514453388656899 @@ -45,8 +45,8 @@ MonoBehaviour: serializedVersion: 2 x: 173 y: 87 - width: 655 - height: 480 + width: 720 + height: 822 m_GraphElementMetaData: - m_Guid: m_Value0: 3953896658662454792 @@ -161,6 +161,13 @@ MonoBehaviour: - ForcePlayerLook - WaitForInput - HudAnchor + - Affection + - Progress + - ChoiceQuestion + - Choice0Text + - Choice0Code + - Choice1Text + - Choice1Code m_ValueList: - rid: 4848514453388656906 - rid: 4848514453388656907 @@ -177,6 +184,13 @@ MonoBehaviour: - rid: 4848514453388656918 - rid: 4848514453388656919 - rid: 4848514455607443580 + - rid: 4848514747977957409 + - rid: 4848514747977957410 + - rid: 4848514747977957411 + - rid: 4848514747977957412 + - rid: 4848514747977957413 + - rid: 4848514747977957414 + - rid: 4848514747977957415 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -227,7 +241,7 @@ MonoBehaviour: - rid: 4848514453388656906 type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: 0 + m_Value: 2 - rid: 4848514453388656907 type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -245,7 +259,7 @@ MonoBehaviour: type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: - Value: "\uB108 \uC774\uB984\uC774 \uBB50\uC57C?" + Value: "\uC2DC\uCF1C\uC918. \uC740\uC794\uB514 \uBA85\uC608\uC18C\uBC29\uAD00" - rid: 4848514453388656911 type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -289,3 +303,34 @@ MonoBehaviour: type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: {fileID: 11400000, guid: c6477f09ddbfaaa43b73a8eb323ba389, type: 2} + - rid: 4848514747977957409 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957410 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957411 + type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + Value: + - rid: 4848514747977957412 + type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + Value: + - rid: 4848514747977957413 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 4848514747977957414 + type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + Value: + - rid: 4848514747977957415 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: diff --git a/Assets/07_Data/DialogGraph/Chapter5/Chapter5_Troodon1.dlg b/Assets/07_Data/DialogGraph/Chapter5/Chapter5_Troodon1.dlg new file mode 100644 index 00000000..c1b715a8 --- /dev/null +++ b/Assets/07_Data/DialogGraph/Chapter5/Chapter5_Troodon1.dlg @@ -0,0 +1,686 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 61 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12501, guid: 0000000000000000e000000000000000, type: 0} + m_Name: Chapter5_Troodon1 + m_EditorClassIdentifier: UnityEditor.dll::Unity.GraphToolkit.Editor.Implementation.GraphObjectImp + m_GraphModel: + rid: 4848514453388656899 + references: + version: 2 + RefIds: + - rid: -2 + type: {class: , ns: , asm: } + - rid: 4848514453388656899 + type: {class: GraphModelImp, ns: Unity.GraphToolkit.Editor.Implementation, asm: UnityEditor.GraphToolkitModule} + data: + m_Guid: + m_Value0: 10378577389719029742 + m_Value1: 14990812597565823167 + m_HashGuid: + serializedVersion: 2 + Hash: ee871adc251d0890bf985cfca1100ad0 + m_Name: Chapter5_Troodon1 + m_GraphNodeModels: + - rid: 4848514453388656902 + - rid: 4848514453388656904 + - rid: 4848514747977957578 + - rid: 4848514747977957598 + m_GraphWireModels: + - rid: 4848514453388656905 + - rid: 4848514747977957579 + - rid: 4848514747977957599 + m_GraphStickyNoteModels: [] + m_GraphPlacematModels: [] + m_GraphVariableModels: [] + m_GraphPortalModels: [] + m_SectionModels: + - rid: 4848514453388656900 + m_LocalSubgraphs: [] + m_LastKnownBounds: + serializedVersion: 2 + x: 173 + y: 83 + width: 1637 + height: 562 + m_GraphElementMetaData: + - m_Guid: + m_Value0: 3953896658662454792 + m_Value1: 17132231479142926168 + m_HashGuid: + serializedVersion: 2 + Hash: 08f62dfa0f10df3658471484c2e9c1ed + m_Category: 0 + m_Index: 0 + - m_Guid: + m_Value0: 1570429254835387755 + m_Value1: 6686057499624100012 + m_HashGuid: + serializedVersion: 2 + Hash: 6b3d58371649cb15ac50ee24dfa5c95c + m_Category: 0 + m_Index: 1 + - m_Guid: + m_Value0: 6438258882588987619 + m_Value1: 16280232558899195376 + m_HashGuid: + serializedVersion: 2 + Hash: e350b8a4574a5959f06def854101efe1 + m_Category: 2 + m_Index: 0 + - m_Guid: + m_Value0: 8755001300590711394 + m_Value1: 3324842512673580538 + m_HashGuid: + serializedVersion: 2 + Hash: 62d2ca014c038079faa50646a636242e + m_Category: 0 + m_Index: 2 + - m_Guid: + m_Value0: 5717126213892872592 + m_Value1: 8302263756413074955 + m_HashGuid: + serializedVersion: 2 + Hash: 9099283b0050574f0bfe9930e6903773 + m_Category: 2 + m_Index: 1 + - m_Guid: + m_Value0: 8553737683129261220 + m_Value1: 9136446305676401823 + m_HashGuid: + serializedVersion: 2 + Hash: a4dcca681afbb4769f9c450f822dcb7e + m_Category: 0 + m_Index: 3 + - m_Guid: + m_Value0: 16238082788724016532 + m_Value1: 16982767371128022189 + m_HashGuid: + serializedVersion: 2 + Hash: 94854767434259e1ad242e0bf2e8aeeb + m_Category: 2 + m_Index: 2 + m_EntryPoint: + rid: 4848514453388656902 + m_Graph: + rid: 4848514453388656901 + - rid: 4848514453388656900 + type: {class: SectionModel, ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Guid: + m_Value0: 5167448814378227062 + m_Value1: 6149631618382083437 + m_HashGuid: + serializedVersion: 2 + Hash: 761507805177b6476db52cf15fe15755 + m_Version: 2 + m_Items: [] + m_Title: + - rid: 4848514453388656901 + type: {class: DialogGraph, ns: DinoLove.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} + data: + - rid: 4848514453388656902 + type: {class: UserNodeModelImp, ns: Unity.GraphToolkit.Editor.Implementation, asm: UnityEditor.GraphToolkitModule} + data: + m_Guid: + m_Value0: 3953896658662454792 + m_Value1: 17132231479142926168 + m_HashGuid: + serializedVersion: 2 + Hash: 08f62dfa0f10df3658471484c2e9c1ed + m_Version: 2 + m_Position: {x: 172.69565, y: 140} + m_Title: + m_Tooltip: + m_NodePreviewModel: + rid: -2 + m_State: 0 + m_InputConstantsById: + m_KeyList: [] + m_ValueList: [] + m_InputPortInfos: + expandedPortsById: + m_KeyList: [] + m_ValueList: + m_OutputPortInfos: + expandedPortsById: + m_KeyList: [] + m_ValueList: + m_Collapsed: 0 + m_CurrentModeIndex: 0 + m_ElementColor: + m_Color: {r: 0, g: 0, b: 0, a: 0} + m_HasUserColor: 0 + m_Node: + rid: 4848514453388656903 + - rid: 4848514453388656903 + type: {class: DialogStartNode, ns: DinoLove.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} + data: + - rid: 4848514453388656904 + type: {class: UserNodeModelImp, ns: Unity.GraphToolkit.Editor.Implementation, asm: UnityEditor.GraphToolkitModule} + data: + m_Guid: + m_Value0: 1570429254835387755 + m_Value1: 6686057499624100012 + m_HashGuid: + serializedVersion: 2 + Hash: 6b3d58371649cb15ac50ee24dfa5c95c + m_Version: 2 + m_Position: {x: 406, y: 87.17392} + m_Title: + m_Tooltip: + m_NodePreviewModel: + rid: -2 + m_State: 0 + m_InputConstantsById: + m_KeyList: + - __option_ChoiceCount + - __option_EventKey + - Speaker + - SpeakerNameOverride + - TalkText + - Gesture + - Expression + - Voice + - Bgm + - Vfx + - LineDuration + - LookAtPlayer + - ForcePlayerLook + - WaitForInput + - HudAnchor + - Affection + - Progress + m_ValueList: + - rid: 4848514453388656906 + - rid: 4848514453388656907 + - rid: 4848514453388656908 + - rid: 4848514453388656909 + - rid: 4848514453388656910 + - rid: 4848514453388656911 + - rid: 4848514453388656912 + - rid: 4848514453388656913 + - rid: 4848514453388656914 + - rid: 4848514453388656915 + - rid: 4848514453388656916 + - rid: 4848514453388656917 + - rid: 4848514453388656918 + - rid: 4848514453388656919 + - rid: 4848514455607443580 + - rid: 4848514566923223232 + - rid: 4848514566923223233 + m_InputPortInfos: + expandedPortsById: + m_KeyList: [] + m_ValueList: + m_OutputPortInfos: + expandedPortsById: + m_KeyList: [] + m_ValueList: + m_Collapsed: 0 + m_CurrentModeIndex: 0 + m_ElementColor: + m_Color: {r: 0, g: 0, b: 0, a: 0} + m_HasUserColor: 0 + m_Node: + rid: 4848514453388656920 + - rid: 4848514453388656905 + type: {class: WireModel, ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Guid: + m_Value0: 6438258882588987619 + m_Value1: 16280232558899195376 + m_HashGuid: + serializedVersion: 2 + Hash: e350b8a4574a5959f06def854101efe1 + m_Version: 2 + m_FromPortReference: + m_NodeModelGuid: + m_Value0: 3953896658662454792 + m_Value1: 17132231479142926168 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: 08f62dfa0f10df3658471484c2e9c1ed + m_UniqueId: Out + m_PortDirection: 2 + m_PortOrientation: 0 + m_Title: + m_ToPortReference: + m_NodeModelGuid: + m_Value0: 1570429254835387755 + m_Value1: 6686057499624100012 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: 6b3d58371649cb15ac50ee24dfa5c95c + m_UniqueId: In + m_PortDirection: 1 + m_PortOrientation: 0 + m_Title: + - rid: 4848514453388656906 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514453388656907 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 4848514453388656908 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: 4daac1abc41648e429f85ab0d4c535ba, type: 2} + - rid: 4848514453388656909 + type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogShortText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + Value: + - rid: 4848514453388656910 + type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + Value: "\uB0B4\uAC00 \uC65C \uC5EC\uAE30 \uC788\uB290\uB0D0\uACE0?" + - rid: 4848514453388656911 + type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514453388656912 + type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514453388656913 + type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514453388656914 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514453388656915 + type: {class: 'Constant`1[[UnityEngine.GameObject, UnityEngine.CoreModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514453388656916 + type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 3 + - rid: 4848514453388656917 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514453388656918 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514453388656919 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514453388656920 + type: {class: DialogLineNode, ns: DinoLove.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} + data: + - rid: 4848514455607443580 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: 4daac1abc41648e429f85ab0d4c535ba, type: 2} + - rid: 4848514566923223232 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514566923223233 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957578 + type: {class: UserNodeModelImp, ns: Unity.GraphToolkit.Editor.Implementation, asm: UnityEditor.GraphToolkitModule} + data: + m_Guid: + m_Value0: 8755001300590711394 + m_Value1: 3324842512673580538 + m_HashGuid: + serializedVersion: 2 + Hash: 62d2ca014c038079faa50646a636242e + m_Version: 2 + m_Position: {x: 915.75757, y: 93.21251} + m_Title: + m_Tooltip: + m_NodePreviewModel: + rid: -2 + m_State: 0 + m_InputConstantsById: + m_KeyList: + - __option_ChoiceCount + - __option_EventKey + - Speaker + - SpeakerNameOverride + - HudAnchor + - TalkText + - Gesture + - Expression + - Voice + - Bgm + - Vfx + - LineDuration + - LookAtPlayer + - ForcePlayerLook + - WaitForInput + - Affection + - Progress + m_ValueList: + - rid: 4848514747977957580 + - rid: 4848514747977957581 + - rid: 4848514747977957582 + - rid: 4848514747977957583 + - rid: 4848514747977957584 + - rid: 4848514747977957585 + - rid: 4848514747977957586 + - rid: 4848514747977957587 + - rid: 4848514747977957588 + - rid: 4848514747977957589 + - rid: 4848514747977957590 + - rid: 4848514747977957591 + - rid: 4848514747977957592 + - rid: 4848514747977957593 + - rid: 4848514747977957594 + - rid: 4848514747977957595 + - rid: 4848514747977957596 + m_InputPortInfos: + expandedPortsById: + m_KeyList: [] + m_ValueList: + m_OutputPortInfos: + expandedPortsById: + m_KeyList: [] + m_ValueList: + m_Collapsed: 0 + m_CurrentModeIndex: 0 + m_ElementColor: + m_Color: {r: 0, g: 0, b: 0, a: 0} + m_HasUserColor: 0 + m_Node: + rid: 4848514747977957597 + - rid: 4848514747977957579 + type: {class: WireModel, ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Guid: + m_Value0: 5717126213892872592 + m_Value1: 8302263756413074955 + m_HashGuid: + serializedVersion: 2 + Hash: 9099283b0050574f0bfe9930e6903773 + m_Version: 2 + m_FromPortReference: + m_NodeModelGuid: + m_Value0: 1570429254835387755 + m_Value1: 6686057499624100012 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: 6b3d58371649cb15ac50ee24dfa5c95c + m_UniqueId: Out + m_PortDirection: 2 + m_PortOrientation: 0 + m_Title: + m_ToPortReference: + m_NodeModelGuid: + m_Value0: 8755001300590711394 + m_Value1: 3324842512673580538 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: 62d2ca014c038079faa50646a636242e + m_UniqueId: In + m_PortDirection: 1 + m_PortOrientation: 0 + m_Title: + - rid: 4848514747977957580 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957581 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 4848514747977957582 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: 4daac1abc41648e429f85ab0d4c535ba, type: 2} + - rid: 4848514747977957583 + type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogShortText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + Value: + - rid: 4848514747977957584 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: 4daac1abc41648e429f85ab0d4c535ba, type: 2} + - rid: 4848514747977957585 + type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + Value: "\uACE0\uBBFC\uC880 \uD560\uAC8C \uC788\uC5B4\uC11C \uADF8\uB798." + - rid: 4848514747977957586 + type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957587 + type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957588 + type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957589 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957590 + type: {class: 'Constant`1[[UnityEngine.GameObject, UnityEngine.CoreModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957591 + type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 3 + - rid: 4848514747977957592 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957593 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957594 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957595 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957596 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957597 + type: {class: DialogLineNode, ns: DinoLove.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} + data: + - rid: 4848514747977957598 + type: {class: UserNodeModelImp, ns: Unity.GraphToolkit.Editor.Implementation, asm: UnityEditor.GraphToolkitModule} + data: + m_Guid: + m_Value0: 8553737683129261220 + m_Value1: 9136446305676401823 + m_HashGuid: + serializedVersion: 2 + Hash: a4dcca681afbb4769f9c450f822dcb7e + m_Version: 2 + m_Position: {x: 1422.3146, y: 83.13174} + m_Title: + m_Tooltip: + m_NodePreviewModel: + rid: -2 + m_State: 0 + m_InputConstantsById: + m_KeyList: + - __option_ChoiceCount + - __option_EventKey + - Speaker + - SpeakerNameOverride + - HudAnchor + - TalkText + - Gesture + - Expression + - Voice + - Bgm + - Vfx + - LineDuration + - LookAtPlayer + - ForcePlayerLook + - WaitForInput + - Affection + - Progress + m_ValueList: + - rid: 4848514747977957600 + - rid: 4848514747977957601 + - rid: 4848514747977957602 + - rid: 4848514747977957603 + - rid: 4848514747977957604 + - rid: 4848514747977957605 + - rid: 4848514747977957606 + - rid: 4848514747977957607 + - rid: 4848514747977957608 + - rid: 4848514747977957609 + - rid: 4848514747977957610 + - rid: 4848514747977957611 + - rid: 4848514747977957612 + - rid: 4848514747977957613 + - rid: 4848514747977957614 + - rid: 4848514747977957615 + - rid: 4848514747977957616 + m_InputPortInfos: + expandedPortsById: + m_KeyList: [] + m_ValueList: + m_OutputPortInfos: + expandedPortsById: + m_KeyList: [] + m_ValueList: + m_Collapsed: 0 + m_CurrentModeIndex: 0 + m_ElementColor: + m_Color: {r: 0, g: 0, b: 0, a: 0} + m_HasUserColor: 0 + m_Node: + rid: 4848514747977957617 + - rid: 4848514747977957599 + type: {class: WireModel, ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Guid: + m_Value0: 16238082788724016532 + m_Value1: 16982767371128022189 + m_HashGuid: + serializedVersion: 2 + Hash: 94854767434259e1ad242e0bf2e8aeeb + m_Version: 2 + m_FromPortReference: + m_NodeModelGuid: + m_Value0: 8755001300590711394 + m_Value1: 3324842512673580538 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: 62d2ca014c038079faa50646a636242e + m_UniqueId: Out + m_PortDirection: 2 + m_PortOrientation: 0 + m_Title: + m_ToPortReference: + m_NodeModelGuid: + m_Value0: 8553737683129261220 + m_Value1: 9136446305676401823 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: a4dcca681afbb4769f9c450f822dcb7e + m_UniqueId: In + m_PortDirection: 1 + m_PortOrientation: 0 + m_Title: + - rid: 4848514747977957600 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957601 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 4848514747977957602 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: 4daac1abc41648e429f85ab0d4c535ba, type: 2} + - rid: 4848514747977957603 + type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogShortText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + Value: + - rid: 4848514747977957604 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: 4daac1abc41648e429f85ab0d4c535ba, type: 2} + - rid: 4848514747977957605 + type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + Value: "\uC800 \uC55E\uC758 \uAF43\uB2E4\uBC1C\uC740 \uC190\uB300\uBA74 + \uC548\uB41C\uB2E4?" + - rid: 4848514747977957606 + type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957607 + type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957608 + type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957609 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957610 + type: {class: 'Constant`1[[UnityEngine.GameObject, UnityEngine.CoreModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957611 + type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 3 + - rid: 4848514747977957612 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957613 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957614 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957615 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957616 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957617 + type: {class: DialogLineNode, ns: DinoLove.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} + data: diff --git a/Assets/07_Data/DialogGraph/Chapter5/Chapter5_Troodon1.dlg.meta b/Assets/07_Data/DialogGraph/Chapter5/Chapter5_Troodon1.dlg.meta new file mode 100644 index 00000000..a9fd594f --- /dev/null +++ b/Assets/07_Data/DialogGraph/Chapter5/Chapter5_Troodon1.dlg.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: b7c88d0ec6f374241bdaec6d516306a4 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 2ae5ca89bbed445479d9023586f0c041, type: 3} diff --git a/Assets/07_Data/DialogGraph/Chapter5/Chapter5_Yuna1.dlg b/Assets/07_Data/DialogGraph/Chapter5/Chapter5_Yuna1.dlg index 61c4ae1f..7fe8317f 100644 --- a/Assets/07_Data/DialogGraph/Chapter5/Chapter5_Yuna1.dlg +++ b/Assets/07_Data/DialogGraph/Chapter5/Chapter5_Yuna1.dlg @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 12501, guid: 0000000000000000e000000000000000, type: 0} - m_Name: Chapter1_Yuna1 + m_Name: Chapter5_Yuna1 m_EditorClassIdentifier: UnityEditor.dll::Unity.GraphToolkit.Editor.Implementation.GraphObjectImp m_GraphModel: rid: 4848514365209968918 @@ -32,10 +32,32 @@ MonoBehaviour: m_GraphNodeModels: - rid: 4848514365209968921 - rid: 4848514365209968923 - - rid: 4848514365209968938 + - rid: 4848514747977957622 + - rid: 4848514747977957645 + - rid: 4848514747977957668 + - rid: 4848514747977957691 + - rid: 4848514747977957714 + - rid: 4848514747977957737 + - rid: 4848514747977957760 + - rid: 4848514747977957783 + - rid: 4848514747977957806 + - rid: 4848514747977957830 + - rid: 4848514747977957853 + - rid: 4848514747977957876 m_GraphWireModels: - rid: 4848514365209968937 - - rid: 4848514365209968939 + - rid: 4848514747977957646 + - rid: 4848514747977957669 + - rid: 4848514747977957692 + - rid: 4848514747977957715 + - rid: 4848514747977957738 + - rid: 4848514747977957761 + - rid: 4848514747977957784 + - rid: 4848514747977957807 + - rid: 4848514747977957829 + - rid: 4848514747977957831 + - rid: 4848514747977957854 + - rid: 4848514747977957877 m_GraphStickyNoteModels: [] m_GraphPlacematModels: [] m_GraphVariableModels: [] @@ -47,8 +69,8 @@ MonoBehaviour: serializedVersion: 2 x: -86 y: 92 - width: 1072 - height: 480 + width: 6072 + height: 1019 m_GraphElementMetaData: - m_Guid: m_Value0: 11886921906498108818 @@ -75,21 +97,197 @@ MonoBehaviour: m_Category: 2 m_Index: 0 - m_Guid: - m_Value0: 18033278169514442201 - m_Value1: 7595949161354533057 + m_Value0: 17215604678487783510 + m_Value1: 11023397290836655426 m_HashGuid: serializedVersion: 2 - Hash: d9fdb665f31243fac1987666843b6a69 + Hash: 5638d12e3e1deaee427d527a6ef9fa98 m_Category: 0 m_Index: 2 - m_Guid: - m_Value0: 1372665982324540530 - m_Value1: 4413923243976307164 + m_Value0: 3978311698235662307 + m_Value1: 17861474854590383594 m_HashGuid: serializedVersion: 2 - Hash: 7284b72f70b00c13dc310cefcd67413d + Hash: e31f1e5b69cd3537ea856e00bfb4e0f7 + m_Category: 0 + m_Index: 3 + - m_Guid: + m_Value0: 3010937856948916854 + m_Value1: 18117525853029027962 + m_HashGuid: + serializedVersion: 2 + Hash: 7652373c0700c9297a50c0c6c5616efb m_Category: 2 m_Index: 1 + - m_Guid: + m_Value0: 5816738045406338405 + m_Value1: 5809025227242857052 + m_HashGuid: + serializedVersion: 2 + Hash: 65ddf1136f34b9505ce217a9aacd9d50 + m_Category: 0 + m_Index: 4 + - m_Guid: + m_Value0: 9112895484136516558 + m_Value1: 13947631632140390249 + m_HashGuid: + serializedVersion: 2 + Hash: ceeb371f2982777e69cfba5b12f18fc1 + m_Category: 2 + m_Index: 2 + - m_Guid: + m_Value0: 14863661979765811861 + m_Value1: 8877480293401447594 + m_HashGuid: + serializedVersion: 2 + Hash: 95aa6bcdd15546ceaa4cb9bc4a25337b + m_Category: 0 + m_Index: 5 + - m_Guid: + m_Value0: 691932103438980804 + m_Value1: 2149613207080751678 + m_HashGuid: + serializedVersion: 2 + Hash: c4562b02953c9a093e52899cd2f5d41d + m_Category: 2 + m_Index: 3 + - m_Guid: + m_Value0: 16388368569593636463 + m_Value1: 8143439984919920224 + m_HashGuid: + serializedVersion: 2 + Hash: 6f26ce7e622e6fe3603edd3e854f0371 + m_Category: 0 + m_Index: 6 + - m_Guid: + m_Value0: 18245524905968214987 + m_Value1: 16540800362287643633 + m_HashGuid: + serializedVersion: 2 + Hash: cb23c7a83b2035fdf1bbcee64aba8ce5 + m_Category: 2 + m_Index: 4 + - m_Guid: + m_Value0: 1733562115813196109 + m_Value1: 9431629142223945813 + m_HashGuid: + serializedVersion: 2 + Hash: 4dc11e3d8fd90e1855007be3bbe0e382 + m_Category: 0 + m_Index: 7 + - m_Guid: + m_Value0: 12947974551036043293 + m_Value1: 6952938912206829245 + m_HashGuid: + serializedVersion: 2 + Hash: 1d204dbb4072b0b3bd3614371acd7d60 + m_Category: 2 + m_Index: 5 + - m_Guid: + m_Value0: 15914499336670453520 + m_Value1: 18030075823714729847 + m_HashGuid: + serializedVersion: 2 + Hash: 109f6efcd3a8dbdc77ffdf296fb237fa + m_Category: 0 + m_Index: 8 + - m_Guid: + m_Value0: 10446290376199150185 + m_Value1: 7164757434230020866 + m_HashGuid: + serializedVersion: 2 + Hash: 699aee15c0adf890029b1e09ed546e63 + m_Category: 2 + m_Index: 6 + - m_Guid: + m_Value0: 7586455698718400070 + m_Value1: 8174878562410442217 + m_HashGuid: + serializedVersion: 2 + Hash: 461e596243814869e92d6e7abd007371 + m_Category: 0 + m_Index: 9 + - m_Guid: + m_Value0: 11142141976908746036 + m_Value1: 1188931787100558256 + m_HashGuid: + serializedVersion: 2 + Hash: 344d9d2a18d7a09ab0934c4029ef7f10 + m_Category: 2 + m_Index: 7 + - m_Guid: + m_Value0: 9630584752907015612 + m_Value1: 13154217185274564089 + m_HashGuid: + serializedVersion: 2 + Hash: bcd550c8ceb5a685f90da102d62a8db6 + m_Category: 0 + m_Index: 10 + - m_Guid: + m_Value0: 1103859569408951306 + m_Value1: 18062018862671500683 + m_HashGuid: + serializedVersion: 2 + Hash: 0a44890c6eb2510f8b95f07b752ea9fa + m_Category: 2 + m_Index: 8 + - m_Guid: + m_Value0: 5130592802688826365 + m_Value1: 15958334840875678483 + m_HashGuid: + serializedVersion: 2 + Hash: fd7b7193f8863347137b22a5fc6477dd + m_Category: 2 + m_Index: 9 + - m_Guid: + m_Value0: 17268841050108353855 + m_Value1: 7519074306148390797 + m_HashGuid: + serializedVersion: 2 + Hash: 3f5d64da703fa7ef8dd7bd613e1e5968 + m_Category: 0 + m_Index: 11 + - m_Guid: + m_Value0: 15565892791566016557 + m_Value1: 10690464463787016215 + m_HashGuid: + serializedVersion: 2 + Hash: 2d201bb5052905d81740f60fca285c94 + m_Category: 2 + m_Index: 10 + - m_Guid: + m_Value0: 7429343088266201924 + m_Value1: 10472421487330738825 + m_HashGuid: + serializedVersion: 2 + Hash: 444b9c2a2d541a6789428482db835591 + m_Category: 0 + m_Index: 12 + - m_Guid: + m_Value0: 10666657801225917205 + m_Value1: 3541211789073379167 + m_HashGuid: + serializedVersion: 2 + Hash: 1553b87ec19407945fef242a5ce92431 + m_Category: 2 + m_Index: 11 + - m_Guid: + m_Value0: 18009455515538643562 + m_Value1: 13514993144465539571 + m_HashGuid: + serializedVersion: 2 + Hash: 6a5ae1895f70eef9f341b5cda8e68ebb + m_Category: 0 + m_Index: 13 + - m_Guid: + m_Value0: 13951113292047392843 + m_Value1: 5215648240221414710 + m_HashGuid: + serializedVersion: 2 + Hash: 4b20b7799f4f9cc136e5c9d770b46148 + m_Category: 2 + m_Index: 12 m_EntryPoint: rid: 4848514365209968921 m_Graph: @@ -179,6 +377,11 @@ MonoBehaviour: - SpeakerNameOverride - ForcePlayerLook - HudAnchor + - Affection + - Progress + - __option_HasHiddenBranch + - __option_HiddenGestureKey + - __option_HiddenCode m_ValueList: - rid: 4848514365209968924 - rid: 4848514365209968925 @@ -195,6 +398,11 @@ MonoBehaviour: - rid: 4848514453388656921 - rid: 4848514453388656816 - rid: 4848514455607443608 + - rid: 4848514747977957572 + - rid: 4848514747977957573 + - rid: 4848514747977957619 + - rid: 4848514747977957620 + - rid: 4848514747977957621 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -226,7 +434,8 @@ MonoBehaviour: type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: - Value: "\uC774\uACF3\uC774 \uC6B0\uB9AC \uBC18\uC774\uC57C!" + Value: "\uC794\uB514\uC57C \uBD88\uAF43\uB180\uC774\uAC00 \uB108\uBB34 + \uC608\uC058\uB2E4. \uB108\uB3C4 \uADF8\uB807\uAC8C \uC0DD\uAC01\uD558\uC9C0?" - rid: 4848514365209968928 type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -250,7 +459,7 @@ MonoBehaviour: - rid: 4848514365209968933 type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: 3 + m_Value: 6 - rid: 4848514365209968934 type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -294,17 +503,50 @@ MonoBehaviour: m_PortDirection: 1 m_PortOrientation: 0 m_Title: - - rid: 4848514365209968938 + - rid: 4848514453388656816 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514453388656921 + type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogShortText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + Value: + - rid: 4848514455607443608 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: ccaea1cd59b6def4e93764f1965fe26f, type: 2} + - rid: 4848514747977957572 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957573 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957619 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 1 + - rid: 4848514747977957620 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: GiveFlower + - rid: 4848514747977957621 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: C5_Yuna_1-Hidden1 + - rid: 4848514747977957622 type: {class: UserNodeModelImp, ns: Unity.GraphToolkit.Editor.Implementation, asm: UnityEditor.GraphToolkitModule} data: m_Guid: - m_Value0: 18033278169514442201 - m_Value1: 7595949161354533057 + m_Value0: 17215604678487783510 + m_Value1: 11023397290836655426 m_HashGuid: serializedVersion: 2 - Hash: d9fdb665f31243fac1987666843b6a69 + Hash: 5638d12e3e1deaee427d527a6ef9fa98 m_Version: 2 - m_Position: {x: 617.28503, y: 92} + m_Position: {x: 1308.6831, y: 478.90247} m_Title: m_Tooltip: m_NodePreviewModel: @@ -314,7 +556,12 @@ MonoBehaviour: m_KeyList: - __option_ChoiceCount - __option_EventKey + - __option_HasHiddenBranch + - __option_HiddenGestureKey + - __option_HiddenCode - Speaker + - SpeakerNameOverride + - HudAnchor - TalkText - Gesture - Expression @@ -323,26 +570,31 @@ MonoBehaviour: - Vfx - LineDuration - LookAtPlayer - - WaitForInput - - SpeakerNameOverride - ForcePlayerLook - - HudAnchor + - WaitForInput + - Affection + - Progress m_ValueList: - - rid: 4848514365209968940 - - rid: 4848514365209968941 - - rid: 4848514365209968942 - - rid: 4848514365209968943 - - rid: 4848514365209968944 - - rid: 4848514365209968945 - - rid: 4848514365209968946 - - rid: 4848514365209968947 - - rid: 4848514365209968948 - - rid: 4848514365209968949 - - rid: 4848514365209968950 - - rid: 4848514365209968951 - - rid: 4848514453388656922 - - rid: 4848514453388656818 - - rid: 4848514455607443609 + - rid: 4848514747977957624 + - rid: 4848514747977957625 + - rid: 4848514747977957626 + - rid: 4848514747977957627 + - rid: 4848514747977957628 + - rid: 4848514747977957629 + - rid: 4848514747977957630 + - rid: 4848514747977957631 + - rid: 4848514747977957632 + - rid: 4848514747977957633 + - rid: 4848514747977957634 + - rid: 4848514747977957635 + - rid: 4848514747977957636 + - rid: 4848514747977957637 + - rid: 4848514747977957638 + - rid: 4848514747977957639 + - rid: 4848514747977957640 + - rid: 4848514747977957641 + - rid: 4848514747977957642 + - rid: 4848514747977957643 m_InputPortInfos: expandedPortsById: m_KeyList: [] @@ -357,16 +609,1516 @@ MonoBehaviour: m_Color: {r: 0, g: 0, b: 0, a: 0} m_HasUserColor: 0 m_Node: - rid: 4848514365209968952 - - rid: 4848514365209968939 + rid: 4848514747977957644 + - rid: 4848514747977957624 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957625 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 4848514747977957626 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957627 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 4848514747977957628 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 4848514747977957629 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: ccaea1cd59b6def4e93764f1965fe26f, type: 2} + - rid: 4848514747977957630 + type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogShortText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + Value: + - rid: 4848514747977957631 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: ccaea1cd59b6def4e93764f1965fe26f, type: 2} + - rid: 4848514747977957632 + type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + Value: "\uC794\uB514\uC57C \uADF8 \uAF43 \uC5B4\uB514\uC11C \uB0AC\uC5B4?" + - rid: 4848514747977957633 + type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957634 + type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957635 + type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957636 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957637 + type: {class: 'Constant`1[[UnityEngine.GameObject, UnityEngine.CoreModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957638 + type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 4 + - rid: 4848514747977957639 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957640 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957641 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957642 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957643 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957644 + type: {class: DialogLineNode, ns: DinoLove.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} + data: + - rid: 4848514747977957645 + type: {class: UserNodeModelImp, ns: Unity.GraphToolkit.Editor.Implementation, asm: UnityEditor.GraphToolkitModule} + data: + m_Guid: + m_Value0: 3978311698235662307 + m_Value1: 17861474854590383594 + m_HashGuid: + serializedVersion: 2 + Hash: e31f1e5b69cd3537ea856e00bfb4e0f7 + m_Version: 2 + m_Position: {x: 1716.1333, y: 483.72394} + m_Title: + m_Tooltip: + m_NodePreviewModel: + rid: -2 + m_State: 0 + m_InputConstantsById: + m_KeyList: + - __option_ChoiceCount + - __option_EventKey + - __option_HasHiddenBranch + - __option_HiddenGestureKey + - __option_HiddenCode + - Speaker + - SpeakerNameOverride + - HudAnchor + - TalkText + - Gesture + - Expression + - Voice + - Bgm + - Vfx + - LineDuration + - LookAtPlayer + - ForcePlayerLook + - WaitForInput + - Affection + - Progress + m_ValueList: + - rid: 4848514747977957647 + - rid: 4848514747977957648 + - rid: 4848514747977957649 + - rid: 4848514747977957650 + - rid: 4848514747977957651 + - rid: 4848514747977957652 + - rid: 4848514747977957653 + - rid: 4848514747977957654 + - rid: 4848514747977957655 + - rid: 4848514747977957656 + - rid: 4848514747977957657 + - rid: 4848514747977957658 + - rid: 4848514747977957659 + - rid: 4848514747977957660 + - rid: 4848514747977957661 + - rid: 4848514747977957662 + - rid: 4848514747977957663 + - rid: 4848514747977957664 + - rid: 4848514747977957665 + - rid: 4848514747977957666 + m_InputPortInfos: + expandedPortsById: + m_KeyList: [] + m_ValueList: + m_OutputPortInfos: + expandedPortsById: + m_KeyList: [] + m_ValueList: + m_Collapsed: 0 + m_CurrentModeIndex: 0 + m_ElementColor: + m_Color: {r: 0, g: 0, b: 0, a: 0} + m_HasUserColor: 0 + m_Node: + rid: 4848514747977957667 + - rid: 4848514747977957646 type: {class: WireModel, ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Guid: - m_Value0: 1372665982324540530 - m_Value1: 4413923243976307164 + m_Value0: 3010937856948916854 + m_Value1: 18117525853029027962 m_HashGuid: serializedVersion: 2 - Hash: 7284b72f70b00c13dc310cefcd67413d + Hash: 7652373c0700c9297a50c0c6c5616efb + m_Version: 2 + m_FromPortReference: + m_NodeModelGuid: + m_Value0: 17215604678487783510 + m_Value1: 11023397290836655426 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: 5638d12e3e1deaee427d527a6ef9fa98 + m_UniqueId: Out + m_PortDirection: 2 + m_PortOrientation: 0 + m_Title: + m_ToPortReference: + m_NodeModelGuid: + m_Value0: 3978311698235662307 + m_Value1: 17861474854590383594 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: e31f1e5b69cd3537ea856e00bfb4e0f7 + m_UniqueId: In + m_PortDirection: 1 + m_PortOrientation: 0 + m_Title: + - rid: 4848514747977957647 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957648 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 4848514747977957649 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957650 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 4848514747977957651 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 4848514747977957652 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: ccaea1cd59b6def4e93764f1965fe26f, type: 2} + - rid: 4848514747977957653 + type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogShortText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + Value: + - rid: 4848514747977957654 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: ccaea1cd59b6def4e93764f1965fe26f, type: 2} + - rid: 4848514747977957655 + type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + Value: "\uADF8\uAC70 \uB0B4\uAC00 \uC18C\uC774\uC815\uB178\uB3C8 \uC120\uBC30\uD55C\uD14C + \uC900\uAC74\uB370..." + - rid: 4848514747977957656 + type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957657 + type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957658 + type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957659 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957660 + type: {class: 'Constant`1[[UnityEngine.GameObject, UnityEngine.CoreModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957661 + type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 4 + - rid: 4848514747977957662 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957663 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957664 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957665 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957666 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957667 + type: {class: DialogLineNode, ns: DinoLove.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} + data: + - rid: 4848514747977957668 + type: {class: UserNodeModelImp, ns: Unity.GraphToolkit.Editor.Implementation, asm: UnityEditor.GraphToolkitModule} + data: + m_Guid: + m_Value0: 5816738045406338405 + m_Value1: 5809025227242857052 + m_HashGuid: + serializedVersion: 2 + Hash: 65ddf1136f34b9505ce217a9aacd9d50 + m_Version: 2 + m_Position: {x: 2136.326, y: 482.5084} + m_Title: + m_Tooltip: + m_NodePreviewModel: + rid: -2 + m_State: 0 + m_InputConstantsById: + m_KeyList: + - __option_ChoiceCount + - __option_EventKey + - __option_HasHiddenBranch + - __option_HiddenGestureKey + - __option_HiddenCode + - Speaker + - SpeakerNameOverride + - HudAnchor + - TalkText + - Gesture + - Expression + - Voice + - Bgm + - Vfx + - LineDuration + - LookAtPlayer + - ForcePlayerLook + - WaitForInput + - Affection + - Progress + m_ValueList: + - rid: 4848514747977957670 + - rid: 4848514747977957671 + - rid: 4848514747977957672 + - rid: 4848514747977957673 + - rid: 4848514747977957674 + - rid: 4848514747977957675 + - rid: 4848514747977957676 + - rid: 4848514747977957677 + - rid: 4848514747977957678 + - rid: 4848514747977957679 + - rid: 4848514747977957680 + - rid: 4848514747977957681 + - rid: 4848514747977957682 + - rid: 4848514747977957683 + - rid: 4848514747977957684 + - rid: 4848514747977957685 + - rid: 4848514747977957686 + - rid: 4848514747977957687 + - rid: 4848514747977957688 + - rid: 4848514747977957689 + m_InputPortInfos: + expandedPortsById: + m_KeyList: [] + m_ValueList: + m_OutputPortInfos: + expandedPortsById: + m_KeyList: [] + m_ValueList: + m_Collapsed: 0 + m_CurrentModeIndex: 0 + m_ElementColor: + m_Color: {r: 0, g: 0, b: 0, a: 0} + m_HasUserColor: 0 + m_Node: + rid: 4848514747977957690 + - rid: 4848514747977957669 + type: {class: WireModel, ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Guid: + m_Value0: 9112895484136516558 + m_Value1: 13947631632140390249 + m_HashGuid: + serializedVersion: 2 + Hash: ceeb371f2982777e69cfba5b12f18fc1 + m_Version: 2 + m_FromPortReference: + m_NodeModelGuid: + m_Value0: 3978311698235662307 + m_Value1: 17861474854590383594 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: e31f1e5b69cd3537ea856e00bfb4e0f7 + m_UniqueId: Out + m_PortDirection: 2 + m_PortOrientation: 0 + m_Title: + m_ToPortReference: + m_NodeModelGuid: + m_Value0: 5816738045406338405 + m_Value1: 5809025227242857052 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: 65ddf1136f34b9505ce217a9aacd9d50 + m_UniqueId: In + m_PortDirection: 1 + m_PortOrientation: 0 + m_Title: + - rid: 4848514747977957670 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957671 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 4848514747977957672 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957673 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 4848514747977957674 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 4848514747977957675 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: ccaea1cd59b6def4e93764f1965fe26f, type: 2} + - rid: 4848514747977957676 + type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogShortText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + Value: + - rid: 4848514747977957677 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: ccaea1cd59b6def4e93764f1965fe26f, type: 2} + - rid: 4848514747977957678 + type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + Value: "\uC124\uB9C8 \uC120\uBC30\uAC00 \uB108\uC5D0\uAC8C \uADF8 \uAF43\uC744 + \uC900\uAC70\uB2C8?" + - rid: 4848514747977957679 + type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957680 + type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957681 + type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957682 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957683 + type: {class: 'Constant`1[[UnityEngine.GameObject, UnityEngine.CoreModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957684 + type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 4 + - rid: 4848514747977957685 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957686 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957687 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957688 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957689 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957690 + type: {class: DialogLineNode, ns: DinoLove.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} + data: + - rid: 4848514747977957691 + type: {class: UserNodeModelImp, ns: Unity.GraphToolkit.Editor.Implementation, asm: UnityEditor.GraphToolkitModule} + data: + m_Guid: + m_Value0: 14863661979765811861 + m_Value1: 8877480293401447594 + m_HashGuid: + serializedVersion: 2 + Hash: 95aa6bcdd15546ceaa4cb9bc4a25337b + m_Version: 2 + m_Position: {x: 2598.226, y: 491.95187} + m_Title: + m_Tooltip: + m_NodePreviewModel: + rid: -2 + m_State: 0 + m_InputConstantsById: + m_KeyList: + - __option_ChoiceCount + - __option_EventKey + - __option_HasHiddenBranch + - __option_HiddenGestureKey + - __option_HiddenCode + - Speaker + - SpeakerNameOverride + - HudAnchor + - TalkText + - Gesture + - Expression + - Voice + - Bgm + - Vfx + - LineDuration + - LookAtPlayer + - ForcePlayerLook + - WaitForInput + - Affection + - Progress + m_ValueList: + - rid: 4848514747977957693 + - rid: 4848514747977957694 + - rid: 4848514747977957695 + - rid: 4848514747977957696 + - rid: 4848514747977957697 + - rid: 4848514747977957698 + - rid: 4848514747977957699 + - rid: 4848514747977957700 + - rid: 4848514747977957701 + - rid: 4848514747977957702 + - rid: 4848514747977957703 + - rid: 4848514747977957704 + - rid: 4848514747977957705 + - rid: 4848514747977957706 + - rid: 4848514747977957707 + - rid: 4848514747977957708 + - rid: 4848514747977957709 + - rid: 4848514747977957710 + - rid: 4848514747977957711 + - rid: 4848514747977957712 + m_InputPortInfos: + expandedPortsById: + m_KeyList: [] + m_ValueList: + m_OutputPortInfos: + expandedPortsById: + m_KeyList: [] + m_ValueList: + m_Collapsed: 0 + m_CurrentModeIndex: 0 + m_ElementColor: + m_Color: {r: 0, g: 0, b: 0, a: 0} + m_HasUserColor: 0 + m_Node: + rid: 4848514747977957713 + - rid: 4848514747977957692 + type: {class: WireModel, ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Guid: + m_Value0: 691932103438980804 + m_Value1: 2149613207080751678 + m_HashGuid: + serializedVersion: 2 + Hash: c4562b02953c9a093e52899cd2f5d41d + m_Version: 2 + m_FromPortReference: + m_NodeModelGuid: + m_Value0: 5816738045406338405 + m_Value1: 5809025227242857052 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: 65ddf1136f34b9505ce217a9aacd9d50 + m_UniqueId: Out + m_PortDirection: 2 + m_PortOrientation: 0 + m_Title: + m_ToPortReference: + m_NodeModelGuid: + m_Value0: 14863661979765811861 + m_Value1: 8877480293401447594 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: 95aa6bcdd15546ceaa4cb9bc4a25337b + m_UniqueId: In + m_PortDirection: 1 + m_PortOrientation: 0 + m_Title: + - rid: 4848514747977957693 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957694 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 4848514747977957695 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957696 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 4848514747977957697 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 4848514747977957698 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: ccaea1cd59b6def4e93764f1965fe26f, type: 2} + - rid: 4848514747977957699 + type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogShortText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + Value: + - rid: 4848514747977957700 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: ccaea1cd59b6def4e93764f1965fe26f, type: 2} + - rid: 4848514747977957701 + type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + Value: "\uC794\uB514 \uB108. \uC120\uBC30\uB791 \uADF8\uB807\uACE0 \uADF8\uB7F0 + \uC0AC\uC774 \uC544\uB2C8\uC9C0?" + - rid: 4848514747977957702 + type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957703 + type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957704 + type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957705 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957706 + type: {class: 'Constant`1[[UnityEngine.GameObject, UnityEngine.CoreModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957707 + type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 4 + - rid: 4848514747977957708 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957709 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957710 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957711 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957712 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957713 + type: {class: DialogLineNode, ns: DinoLove.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} + data: + - rid: 4848514747977957714 + type: {class: UserNodeModelImp, ns: Unity.GraphToolkit.Editor.Implementation, asm: UnityEditor.GraphToolkitModule} + data: + m_Guid: + m_Value0: 16388368569593636463 + m_Value1: 8143439984919920224 + m_HashGuid: + serializedVersion: 2 + Hash: 6f26ce7e622e6fe3603edd3e854f0371 + m_Version: 2 + m_Position: {x: 3047.2622, y: 486.3221} + m_Title: + m_Tooltip: + m_NodePreviewModel: + rid: -2 + m_State: 0 + m_InputConstantsById: + m_KeyList: + - __option_ChoiceCount + - __option_EventKey + - __option_HasHiddenBranch + - __option_HiddenGestureKey + - __option_HiddenCode + - Speaker + - SpeakerNameOverride + - HudAnchor + - TalkText + - Gesture + - Expression + - Voice + - Bgm + - Vfx + - LineDuration + - LookAtPlayer + - ForcePlayerLook + - WaitForInput + - Affection + - Progress + m_ValueList: + - rid: 4848514747977957716 + - rid: 4848514747977957717 + - rid: 4848514747977957718 + - rid: 4848514747977957719 + - rid: 4848514747977957720 + - rid: 4848514747977957721 + - rid: 4848514747977957722 + - rid: 4848514747977957723 + - rid: 4848514747977957724 + - rid: 4848514747977957725 + - rid: 4848514747977957726 + - rid: 4848514747977957727 + - rid: 4848514747977957728 + - rid: 4848514747977957729 + - rid: 4848514747977957730 + - rid: 4848514747977957731 + - rid: 4848514747977957732 + - rid: 4848514747977957733 + - rid: 4848514747977957734 + - rid: 4848514747977957735 + m_InputPortInfos: + expandedPortsById: + m_KeyList: [] + m_ValueList: + m_OutputPortInfos: + expandedPortsById: + m_KeyList: [] + m_ValueList: + m_Collapsed: 0 + m_CurrentModeIndex: 0 + m_ElementColor: + m_Color: {r: 0, g: 0, b: 0, a: 0} + m_HasUserColor: 0 + m_Node: + rid: 4848514747977957736 + - rid: 4848514747977957715 + type: {class: WireModel, ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Guid: + m_Value0: 18245524905968214987 + m_Value1: 16540800362287643633 + m_HashGuid: + serializedVersion: 2 + Hash: cb23c7a83b2035fdf1bbcee64aba8ce5 + m_Version: 2 + m_FromPortReference: + m_NodeModelGuid: + m_Value0: 14863661979765811861 + m_Value1: 8877480293401447594 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: 95aa6bcdd15546ceaa4cb9bc4a25337b + m_UniqueId: Out + m_PortDirection: 2 + m_PortOrientation: 0 + m_Title: + m_ToPortReference: + m_NodeModelGuid: + m_Value0: 16388368569593636463 + m_Value1: 8143439984919920224 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: 6f26ce7e622e6fe3603edd3e854f0371 + m_UniqueId: In + m_PortDirection: 1 + m_PortOrientation: 0 + m_Title: + - rid: 4848514747977957716 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957717 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 4848514747977957718 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957719 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 4848514747977957720 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 4848514747977957721 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: ccaea1cd59b6def4e93764f1965fe26f, type: 2} + - rid: 4848514747977957722 + type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogShortText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + Value: + - rid: 4848514747977957723 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: ccaea1cd59b6def4e93764f1965fe26f, type: 2} + - rid: 4848514747977957724 + type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + Value: "\uC794\uB514\uC57C. \uB09C \uB108 \uCE5C\uAD6C\uB77C\uACE0 \uBBFF\uC5C8\uB294\uB370" + - rid: 4848514747977957725 + type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957726 + type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957727 + type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957728 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957729 + type: {class: 'Constant`1[[UnityEngine.GameObject, UnityEngine.CoreModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957730 + type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0.5 + - rid: 4848514747977957731 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957732 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957733 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957734 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957735 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957736 + type: {class: DialogLineNode, ns: DinoLove.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} + data: + - rid: 4848514747977957737 + type: {class: UserNodeModelImp, ns: Unity.GraphToolkit.Editor.Implementation, asm: UnityEditor.GraphToolkitModule} + data: + m_Guid: + m_Value0: 1733562115813196109 + m_Value1: 9431629142223945813 + m_HashGuid: + serializedVersion: 2 + Hash: 4dc11e3d8fd90e1855007be3bbe0e382 + m_Version: 2 + m_Position: {x: 3463.9858, y: 486.5584} + m_Title: + m_Tooltip: + m_NodePreviewModel: + rid: -2 + m_State: 0 + m_InputConstantsById: + m_KeyList: + - __option_ChoiceCount + - __option_EventKey + - __option_HasHiddenBranch + - __option_HiddenGestureKey + - __option_HiddenCode + - Speaker + - SpeakerNameOverride + - HudAnchor + - TalkText + - Gesture + - Expression + - Voice + - Bgm + - Vfx + - LineDuration + - LookAtPlayer + - ForcePlayerLook + - WaitForInput + - Affection + - Progress + m_ValueList: + - rid: 4848514747977957739 + - rid: 4848514747977957740 + - rid: 4848514747977957741 + - rid: 4848514747977957742 + - rid: 4848514747977957743 + - rid: 4848514747977957744 + - rid: 4848514747977957745 + - rid: 4848514747977957746 + - rid: 4848514747977957747 + - rid: 4848514747977957748 + - rid: 4848514747977957749 + - rid: 4848514747977957750 + - rid: 4848514747977957751 + - rid: 4848514747977957752 + - rid: 4848514747977957753 + - rid: 4848514747977957754 + - rid: 4848514747977957755 + - rid: 4848514747977957756 + - rid: 4848514747977957757 + - rid: 4848514747977957758 + m_InputPortInfos: + expandedPortsById: + m_KeyList: [] + m_ValueList: + m_OutputPortInfos: + expandedPortsById: + m_KeyList: [] + m_ValueList: + m_Collapsed: 0 + m_CurrentModeIndex: 0 + m_ElementColor: + m_Color: {r: 0, g: 0, b: 0, a: 0} + m_HasUserColor: 0 + m_Node: + rid: 4848514747977957759 + - rid: 4848514747977957738 + type: {class: WireModel, ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Guid: + m_Value0: 12947974551036043293 + m_Value1: 6952938912206829245 + m_HashGuid: + serializedVersion: 2 + Hash: 1d204dbb4072b0b3bd3614371acd7d60 + m_Version: 2 + m_FromPortReference: + m_NodeModelGuid: + m_Value0: 16388368569593636463 + m_Value1: 8143439984919920224 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: 6f26ce7e622e6fe3603edd3e854f0371 + m_UniqueId: Out + m_PortDirection: 2 + m_PortOrientation: 0 + m_Title: + m_ToPortReference: + m_NodeModelGuid: + m_Value0: 1733562115813196109 + m_Value1: 9431629142223945813 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: 4dc11e3d8fd90e1855007be3bbe0e382 + m_UniqueId: In + m_PortDirection: 1 + m_PortOrientation: 0 + m_Title: + - rid: 4848514747977957739 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957740 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 4848514747977957741 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957742 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 4848514747977957743 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 4848514747977957744 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: ccaea1cd59b6def4e93764f1965fe26f, type: 2} + - rid: 4848514747977957745 + type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogShortText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + Value: + - rid: 4848514747977957746 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: ccaea1cd59b6def4e93764f1965fe26f, type: 2} + - rid: 4848514747977957747 + type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + Value: "\uC5B4\uB5BB\uAC8C \uB108\uAC00 \uB098\uD55C\uD14C \uADF8\uB7F4 + \uC218 \uC788\uC5B4?" + - rid: 4848514747977957748 + type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957749 + type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957750 + type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957751 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957752 + type: {class: 'Constant`1[[UnityEngine.GameObject, UnityEngine.CoreModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957753 + type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0.5 + - rid: 4848514747977957754 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957755 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957756 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957757 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957758 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957759 + type: {class: DialogLineNode, ns: DinoLove.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} + data: + - rid: 4848514747977957760 + type: {class: UserNodeModelImp, ns: Unity.GraphToolkit.Editor.Implementation, asm: UnityEditor.GraphToolkitModule} + data: + m_Guid: + m_Value0: 15914499336670453520 + m_Value1: 18030075823714729847 + m_HashGuid: + serializedVersion: 2 + Hash: 109f6efcd3a8dbdc77ffdf296fb237fa + m_Version: 2 + m_Position: {x: 3875.161, y: 486.78088} + m_Title: + m_Tooltip: + m_NodePreviewModel: + rid: -2 + m_State: 0 + m_InputConstantsById: + m_KeyList: + - __option_ChoiceCount + - __option_EventKey + - __option_HasHiddenBranch + - __option_HiddenGestureKey + - __option_HiddenCode + - Speaker + - SpeakerNameOverride + - HudAnchor + - TalkText + - Gesture + - Expression + - Voice + - Bgm + - Vfx + - LineDuration + - LookAtPlayer + - ForcePlayerLook + - WaitForInput + - Affection + - Progress + m_ValueList: + - rid: 4848514747977957762 + - rid: 4848514747977957763 + - rid: 4848514747977957764 + - rid: 4848514747977957765 + - rid: 4848514747977957766 + - rid: 4848514747977957767 + - rid: 4848514747977957768 + - rid: 4848514747977957769 + - rid: 4848514747977957770 + - rid: 4848514747977957771 + - rid: 4848514747977957772 + - rid: 4848514747977957773 + - rid: 4848514747977957774 + - rid: 4848514747977957775 + - rid: 4848514747977957776 + - rid: 4848514747977957777 + - rid: 4848514747977957778 + - rid: 4848514747977957779 + - rid: 4848514747977957780 + - rid: 4848514747977957781 + m_InputPortInfos: + expandedPortsById: + m_KeyList: [] + m_ValueList: + m_OutputPortInfos: + expandedPortsById: + m_KeyList: [] + m_ValueList: + m_Collapsed: 0 + m_CurrentModeIndex: 0 + m_ElementColor: + m_Color: {r: 0, g: 0, b: 0, a: 0} + m_HasUserColor: 0 + m_Node: + rid: 4848514747977957782 + - rid: 4848514747977957761 + type: {class: WireModel, ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Guid: + m_Value0: 10446290376199150185 + m_Value1: 7164757434230020866 + m_HashGuid: + serializedVersion: 2 + Hash: 699aee15c0adf890029b1e09ed546e63 + m_Version: 2 + m_FromPortReference: + m_NodeModelGuid: + m_Value0: 1733562115813196109 + m_Value1: 9431629142223945813 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: 4dc11e3d8fd90e1855007be3bbe0e382 + m_UniqueId: Out + m_PortDirection: 2 + m_PortOrientation: 0 + m_Title: + m_ToPortReference: + m_NodeModelGuid: + m_Value0: 15914499336670453520 + m_Value1: 18030075823714729847 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: 109f6efcd3a8dbdc77ffdf296fb237fa + m_UniqueId: In + m_PortDirection: 1 + m_PortOrientation: 0 + m_Title: + - rid: 4848514747977957762 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957763 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 4848514747977957764 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957765 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 4848514747977957766 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 4848514747977957767 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: ccaea1cd59b6def4e93764f1965fe26f, type: 2} + - rid: 4848514747977957768 + type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogShortText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + Value: + - rid: 4848514747977957769 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: ccaea1cd59b6def4e93764f1965fe26f, type: 2} + - rid: 4848514747977957770 + type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + Value: "\uC0AC\uC2E4 \uB2E4 \uAC00\uC2DD\uC774\uC5C8\uB358 \uAC70\uC57C?" + - rid: 4848514747977957771 + type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957772 + type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957773 + type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957774 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957775 + type: {class: 'Constant`1[[UnityEngine.GameObject, UnityEngine.CoreModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957776 + type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0.5 + - rid: 4848514747977957777 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957778 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957779 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957780 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957781 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957782 + type: {class: DialogLineNode, ns: DinoLove.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} + data: + - rid: 4848514747977957783 + type: {class: UserNodeModelImp, ns: Unity.GraphToolkit.Editor.Implementation, asm: UnityEditor.GraphToolkitModule} + data: + m_Guid: + m_Value0: 7586455698718400070 + m_Value1: 8174878562410442217 + m_HashGuid: + serializedVersion: 2 + Hash: 461e596243814869e92d6e7abd007371 + m_Version: 2 + m_Position: {x: 4303.6606, y: 490.5035} + m_Title: + m_Tooltip: + m_NodePreviewModel: + rid: -2 + m_State: 0 + m_InputConstantsById: + m_KeyList: + - __option_ChoiceCount + - __option_EventKey + - __option_HasHiddenBranch + - __option_HiddenGestureKey + - __option_HiddenCode + - Speaker + - SpeakerNameOverride + - HudAnchor + - TalkText + - Gesture + - Expression + - Voice + - Bgm + - Vfx + - LineDuration + - LookAtPlayer + - ForcePlayerLook + - WaitForInput + - Affection + - Progress + m_ValueList: + - rid: 4848514747977957785 + - rid: 4848514747977957786 + - rid: 4848514747977957787 + - rid: 4848514747977957788 + - rid: 4848514747977957789 + - rid: 4848514747977957790 + - rid: 4848514747977957791 + - rid: 4848514747977957792 + - rid: 4848514747977957793 + - rid: 4848514747977957794 + - rid: 4848514747977957795 + - rid: 4848514747977957796 + - rid: 4848514747977957797 + - rid: 4848514747977957798 + - rid: 4848514747977957799 + - rid: 4848514747977957800 + - rid: 4848514747977957801 + - rid: 4848514747977957802 + - rid: 4848514747977957803 + - rid: 4848514747977957804 + m_InputPortInfos: + expandedPortsById: + m_KeyList: [] + m_ValueList: + m_OutputPortInfos: + expandedPortsById: + m_KeyList: [] + m_ValueList: + m_Collapsed: 0 + m_CurrentModeIndex: 0 + m_ElementColor: + m_Color: {r: 0, g: 0, b: 0, a: 0} + m_HasUserColor: 0 + m_Node: + rid: 4848514747977957805 + - rid: 4848514747977957784 + type: {class: WireModel, ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Guid: + m_Value0: 11142141976908746036 + m_Value1: 1188931787100558256 + m_HashGuid: + serializedVersion: 2 + Hash: 344d9d2a18d7a09ab0934c4029ef7f10 + m_Version: 2 + m_FromPortReference: + m_NodeModelGuid: + m_Value0: 15914499336670453520 + m_Value1: 18030075823714729847 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: 109f6efcd3a8dbdc77ffdf296fb237fa + m_UniqueId: Out + m_PortDirection: 2 + m_PortOrientation: 0 + m_Title: + m_ToPortReference: + m_NodeModelGuid: + m_Value0: 7586455698718400070 + m_Value1: 8174878562410442217 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: 461e596243814869e92d6e7abd007371 + m_UniqueId: In + m_PortDirection: 1 + m_PortOrientation: 0 + m_Title: + - rid: 4848514747977957785 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957786 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 4848514747977957787 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957788 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 4848514747977957789 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 4848514747977957790 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: ccaea1cd59b6def4e93764f1965fe26f, type: 2} + - rid: 4848514747977957791 + type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogShortText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + Value: + - rid: 4848514747977957792 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: ccaea1cd59b6def4e93764f1965fe26f, type: 2} + - rid: 4848514747977957793 + type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + Value: "\uC774\uB54C\uAE4C\uC9C0 \uB0A0 \uBE44\uC6C3\uC5C8\uACA0\uC9C0?" + - rid: 4848514747977957794 + type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957795 + type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957796 + type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957797 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957798 + type: {class: 'Constant`1[[UnityEngine.GameObject, UnityEngine.CoreModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957799 + type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0.5 + - rid: 4848514747977957800 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957801 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957802 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957803 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957804 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957805 + type: {class: DialogLineNode, ns: DinoLove.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} + data: + - rid: 4848514747977957806 + type: {class: UserNodeModelImp, ns: Unity.GraphToolkit.Editor.Implementation, asm: UnityEditor.GraphToolkitModule} + data: + m_Guid: + m_Value0: 9630584752907015612 + m_Value1: 13154217185274564089 + m_HashGuid: + serializedVersion: 2 + Hash: bcd550c8ceb5a685f90da102d62a8db6 + m_Version: 2 + m_Position: {x: 854.17004, y: 482.6838} + m_Title: + m_Tooltip: + m_NodePreviewModel: + rid: -2 + m_State: 0 + m_InputConstantsById: + m_KeyList: + - __option_ChoiceCount + - __option_EventKey + - __option_HasHiddenBranch + - __option_HiddenGestureKey + - __option_HiddenCode + - Speaker + - SpeakerNameOverride + - HudAnchor + - TalkText + - Gesture + - Expression + - Voice + - Bgm + - Vfx + - LineDuration + - LookAtPlayer + - ForcePlayerLook + - WaitForInput + - Affection + - Progress + m_ValueList: + - rid: 4848514747977957808 + - rid: 4848514747977957809 + - rid: 4848514747977957810 + - rid: 4848514747977957811 + - rid: 4848514747977957812 + - rid: 4848514747977957813 + - rid: 4848514747977957814 + - rid: 4848514747977957815 + - rid: 4848514747977957816 + - rid: 4848514747977957817 + - rid: 4848514747977957818 + - rid: 4848514747977957819 + - rid: 4848514747977957820 + - rid: 4848514747977957821 + - rid: 4848514747977957822 + - rid: 4848514747977957823 + - rid: 4848514747977957824 + - rid: 4848514747977957825 + - rid: 4848514747977957826 + - rid: 4848514747977957827 + m_InputPortInfos: + expandedPortsById: + m_KeyList: [] + m_ValueList: + m_OutputPortInfos: + expandedPortsById: + m_KeyList: [] + m_ValueList: + m_Collapsed: 0 + m_CurrentModeIndex: 0 + m_ElementColor: + m_Color: {r: 0, g: 0, b: 0, a: 0} + m_HasUserColor: 0 + m_Node: + rid: 4848514747977957828 + - rid: 4848514747977957807 + type: {class: WireModel, ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Guid: + m_Value0: 1103859569408951306 + m_Value1: 18062018862671500683 + m_HashGuid: + serializedVersion: 2 + Hash: 0a44890c6eb2510f8b95f07b752ea9fa m_Version: 2 m_FromPortReference: m_NodeModelGuid: @@ -375,96 +2127,708 @@ MonoBehaviour: m_NodeModelHashGuid: serializedVersion: 2 Hash: c01645bdd20ef14fe6d14014f59a9c49 + m_UniqueId: HiddenOut + m_PortDirection: 2 + m_PortOrientation: 0 + m_Title: "Hidden \u2192" + m_ToPortReference: + m_NodeModelGuid: + m_Value0: 9630584752907015612 + m_Value1: 13154217185274564089 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: bcd550c8ceb5a685f90da102d62a8db6 + m_UniqueId: In + m_PortDirection: 1 + m_PortOrientation: 0 + m_Title: + - rid: 4848514747977957808 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957809 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 4848514747977957810 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957811 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 4848514747977957812 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 4848514747977957813 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: ccaea1cd59b6def4e93764f1965fe26f, type: 2} + - rid: 4848514747977957814 + type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogShortText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + Value: + - rid: 4848514747977957815 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: ccaea1cd59b6def4e93764f1965fe26f, type: 2} + - rid: 4848514747977957816 + type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + Value: ... + - rid: 4848514747977957817 + type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957818 + type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957819 + type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957820 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957821 + type: {class: 'Constant`1[[UnityEngine.GameObject, UnityEngine.CoreModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957822 + type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 4 + - rid: 4848514747977957823 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957824 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957825 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957826 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957827 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957828 + type: {class: DialogLineNode, ns: DinoLove.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} + data: + - rid: 4848514747977957829 + type: {class: WireModel, ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Guid: + m_Value0: 5130592802688826365 + m_Value1: 15958334840875678483 + m_HashGuid: + serializedVersion: 2 + Hash: fd7b7193f8863347137b22a5fc6477dd + m_Version: 2 + m_FromPortReference: + m_NodeModelGuid: + m_Value0: 9630584752907015612 + m_Value1: 13154217185274564089 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: bcd550c8ceb5a685f90da102d62a8db6 m_UniqueId: Out m_PortDirection: 2 m_PortOrientation: 0 m_Title: m_ToPortReference: m_NodeModelGuid: - m_Value0: 18033278169514442201 - m_Value1: 7595949161354533057 + m_Value0: 17215604678487783510 + m_Value1: 11023397290836655426 m_NodeModelHashGuid: serializedVersion: 2 - Hash: d9fdb665f31243fac1987666843b6a69 + Hash: 5638d12e3e1deaee427d527a6ef9fa98 m_UniqueId: In m_PortDirection: 1 m_PortOrientation: 0 m_Title: - - rid: 4848514365209968940 + - rid: 4848514747977957830 + type: {class: UserNodeModelImp, ns: Unity.GraphToolkit.Editor.Implementation, asm: UnityEditor.GraphToolkitModule} + data: + m_Guid: + m_Value0: 17268841050108353855 + m_Value1: 7519074306148390797 + m_HashGuid: + serializedVersion: 2 + Hash: 3f5d64da703fa7ef8dd7bd613e1e5968 + m_Version: 2 + m_Position: {x: 4729, y: 489.30005} + m_Title: + m_Tooltip: + m_NodePreviewModel: + rid: -2 + m_State: 0 + m_InputConstantsById: + m_KeyList: + - __option_ChoiceCount + - __option_EventKey + - __option_HasHiddenBranch + - __option_HiddenGestureKey + - __option_HiddenCode + - Speaker + - SpeakerNameOverride + - HudAnchor + - TalkText + - Gesture + - Expression + - Voice + - Bgm + - Vfx + - LineDuration + - LookAtPlayer + - ForcePlayerLook + - WaitForInput + - Affection + - Progress + m_ValueList: + - rid: 4848514747977957832 + - rid: 4848514747977957833 + - rid: 4848514747977957834 + - rid: 4848514747977957835 + - rid: 4848514747977957836 + - rid: 4848514747977957837 + - rid: 4848514747977957838 + - rid: 4848514747977957839 + - rid: 4848514747977957840 + - rid: 4848514747977957841 + - rid: 4848514747977957842 + - rid: 4848514747977957843 + - rid: 4848514747977957844 + - rid: 4848514747977957845 + - rid: 4848514747977957846 + - rid: 4848514747977957847 + - rid: 4848514747977957848 + - rid: 4848514747977957849 + - rid: 4848514747977957850 + - rid: 4848514747977957851 + m_InputPortInfos: + expandedPortsById: + m_KeyList: [] + m_ValueList: + m_OutputPortInfos: + expandedPortsById: + m_KeyList: [] + m_ValueList: + m_Collapsed: 0 + m_CurrentModeIndex: 0 + m_ElementColor: + m_Color: {r: 0, g: 0, b: 0, a: 0} + m_HasUserColor: 0 + m_Node: + rid: 4848514747977957852 + - rid: 4848514747977957831 + type: {class: WireModel, ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Guid: + m_Value0: 15565892791566016557 + m_Value1: 10690464463787016215 + m_HashGuid: + serializedVersion: 2 + Hash: 2d201bb5052905d81740f60fca285c94 + m_Version: 2 + m_FromPortReference: + m_NodeModelGuid: + m_Value0: 7586455698718400070 + m_Value1: 8174878562410442217 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: 461e596243814869e92d6e7abd007371 + m_UniqueId: Out + m_PortDirection: 2 + m_PortOrientation: 0 + m_Title: + m_ToPortReference: + m_NodeModelGuid: + m_Value0: 17268841050108353855 + m_Value1: 7519074306148390797 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: 3f5d64da703fa7ef8dd7bd613e1e5968 + m_UniqueId: In + m_PortDirection: 1 + m_PortOrientation: 0 + m_Title: + - rid: 4848514747977957832 type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: 0 - - rid: 4848514365209968941 + - rid: 4848514747977957833 type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: - - rid: 4848514365209968942 + - rid: 4848514747977957834 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957835 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 4848514747977957836 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 4848514747977957837 type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: {fileID: 11400000, guid: ccaea1cd59b6def4e93764f1965fe26f, type: 2} - - rid: 4848514365209968943 + - rid: 4848514747977957838 + type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogShortText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + Value: + - rid: 4848514747977957839 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: ccaea1cd59b6def4e93764f1965fe26f, type: 2} + - rid: 4848514747977957840 type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: - Value: "\uC5B4\uC11C \uB4E4\uC5B4\uAC00\uC790!" - - rid: 4848514365209968944 + Value: "\uC815\uB9D0 \uB108\uBB34 \uC2AC\uD504\uB2E4." + - rid: 4848514747977957841 type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: {fileID: 0} - - rid: 4848514365209968945 + - rid: 4848514747977957842 type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: {fileID: 0} - - rid: 4848514365209968946 + - rid: 4848514747977957843 type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: {fileID: 0} - - rid: 4848514365209968947 + - rid: 4848514747977957844 type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: {fileID: 0} - - rid: 4848514365209968948 + - rid: 4848514747977957845 type: {class: 'Constant`1[[UnityEngine.GameObject, UnityEngine.CoreModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: {fileID: 0} - - rid: 4848514365209968949 + - rid: 4848514747977957846 + type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0.5 + - rid: 4848514747977957847 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957848 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957849 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957850 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957851 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957852 + type: {class: DialogLineNode, ns: DinoLove.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} + data: + - rid: 4848514747977957853 + type: {class: UserNodeModelImp, ns: Unity.GraphToolkit.Editor.Implementation, asm: UnityEditor.GraphToolkitModule} + data: + m_Guid: + m_Value0: 7429343088266201924 + m_Value1: 10472421487330738825 + m_HashGuid: + serializedVersion: 2 + Hash: 444b9c2a2d541a6789428482db835591 + m_Version: 2 + m_Position: {x: 5180.62, y: 491.73996} + m_Title: + m_Tooltip: + m_NodePreviewModel: + rid: -2 + m_State: 0 + m_InputConstantsById: + m_KeyList: + - __option_ChoiceCount + - __option_EventKey + - __option_HasHiddenBranch + - __option_HiddenGestureKey + - __option_HiddenCode + - Speaker + - SpeakerNameOverride + - HudAnchor + - TalkText + - Gesture + - Expression + - Voice + - Bgm + - Vfx + - LineDuration + - LookAtPlayer + - ForcePlayerLook + - WaitForInput + - Affection + - Progress + m_ValueList: + - rid: 4848514747977957855 + - rid: 4848514747977957856 + - rid: 4848514747977957857 + - rid: 4848514747977957858 + - rid: 4848514747977957859 + - rid: 4848514747977957860 + - rid: 4848514747977957861 + - rid: 4848514747977957862 + - rid: 4848514747977957863 + - rid: 4848514747977957864 + - rid: 4848514747977957865 + - rid: 4848514747977957866 + - rid: 4848514747977957867 + - rid: 4848514747977957868 + - rid: 4848514747977957869 + - rid: 4848514747977957870 + - rid: 4848514747977957871 + - rid: 4848514747977957872 + - rid: 4848514747977957873 + - rid: 4848514747977957874 + m_InputPortInfos: + expandedPortsById: + m_KeyList: [] + m_ValueList: + m_OutputPortInfos: + expandedPortsById: + m_KeyList: [] + m_ValueList: + m_Collapsed: 0 + m_CurrentModeIndex: 0 + m_ElementColor: + m_Color: {r: 0, g: 0, b: 0, a: 0} + m_HasUserColor: 0 + m_Node: + rid: 4848514747977957875 + - rid: 4848514747977957854 + type: {class: WireModel, ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Guid: + m_Value0: 10666657801225917205 + m_Value1: 3541211789073379167 + m_HashGuid: + serializedVersion: 2 + Hash: 1553b87ec19407945fef242a5ce92431 + m_Version: 2 + m_FromPortReference: + m_NodeModelGuid: + m_Value0: 17268841050108353855 + m_Value1: 7519074306148390797 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: 3f5d64da703fa7ef8dd7bd613e1e5968 + m_UniqueId: Out + m_PortDirection: 2 + m_PortOrientation: 0 + m_Title: + m_ToPortReference: + m_NodeModelGuid: + m_Value0: 7429343088266201924 + m_Value1: 10472421487330738825 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: 444b9c2a2d541a6789428482db835591 + m_UniqueId: In + m_PortDirection: 1 + m_PortOrientation: 0 + m_Title: + - rid: 4848514747977957855 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957856 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 4848514747977957857 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957858 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 4848514747977957859 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 4848514747977957860 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: ccaea1cd59b6def4e93764f1965fe26f, type: 2} + - rid: 4848514747977957861 + type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogShortText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + Value: + - rid: 4848514747977957862 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: ccaea1cd59b6def4e93764f1965fe26f, type: 2} + - rid: 4848514747977957863 + type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + Value: "\uC794\uB514\uC57C" + - rid: 4848514747977957864 + type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957865 + type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957866 + type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957867 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957868 + type: {class: 'Constant`1[[UnityEngine.GameObject, UnityEngine.CoreModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957869 type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: 3 - - rid: 4848514365209968950 + - rid: 4848514747977957870 type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: 0 - - rid: 4848514365209968951 + - rid: 4848514747977957871 type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: 0 - - rid: 4848514365209968952 + - rid: 4848514747977957872 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957873 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957874 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957875 type: {class: DialogLineNode, ns: DinoLove.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} data: - - rid: 4848514453388656816 + - rid: 4848514747977957876 + type: {class: UserNodeModelImp, ns: Unity.GraphToolkit.Editor.Implementation, asm: UnityEditor.GraphToolkitModule} + data: + m_Guid: + m_Value0: 18009455515538643562 + m_Value1: 13514993144465539571 + m_HashGuid: + serializedVersion: 2 + Hash: 6a5ae1895f70eef9f341b5cda8e68ebb + m_Version: 2 + m_Position: {x: 5617.469, y: 496.20197} + m_Title: + m_Tooltip: + m_NodePreviewModel: + rid: -2 + m_State: 0 + m_InputConstantsById: + m_KeyList: + - __option_ChoiceCount + - __option_EventKey + - __option_HasHiddenBranch + - __option_HiddenGestureKey + - __option_HiddenCode + - Speaker + - SpeakerNameOverride + - HudAnchor + - TalkText + - Gesture + - Expression + - Voice + - Bgm + - Vfx + - LineDuration + - LookAtPlayer + - ForcePlayerLook + - WaitForInput + - Affection + - Progress + m_ValueList: + - rid: 4848514747977957878 + - rid: 4848514747977957879 + - rid: 4848514747977957880 + - rid: 4848514747977957881 + - rid: 4848514747977957882 + - rid: 4848514747977957883 + - rid: 4848514747977957884 + - rid: 4848514747977957885 + - rid: 4848514747977957886 + - rid: 4848514747977957887 + - rid: 4848514747977957888 + - rid: 4848514747977957889 + - rid: 4848514747977957890 + - rid: 4848514747977957891 + - rid: 4848514747977957892 + - rid: 4848514747977957893 + - rid: 4848514747977957894 + - rid: 4848514747977957895 + - rid: 4848514747977957896 + - rid: 4848514747977957897 + m_InputPortInfos: + expandedPortsById: + m_KeyList: [] + m_ValueList: + m_OutputPortInfos: + expandedPortsById: + m_KeyList: [] + m_ValueList: + m_Collapsed: 0 + m_CurrentModeIndex: 0 + m_ElementColor: + m_Color: {r: 0, g: 0, b: 0, a: 0} + m_HasUserColor: 0 + m_Node: + rid: 4848514747977957898 + - rid: 4848514747977957877 + type: {class: WireModel, ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Guid: + m_Value0: 13951113292047392843 + m_Value1: 5215648240221414710 + m_HashGuid: + serializedVersion: 2 + Hash: 4b20b7799f4f9cc136e5c9d770b46148 + m_Version: 2 + m_FromPortReference: + m_NodeModelGuid: + m_Value0: 7429343088266201924 + m_Value1: 10472421487330738825 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: 444b9c2a2d541a6789428482db835591 + m_UniqueId: Out + m_PortDirection: 2 + m_PortOrientation: 0 + m_Title: + m_ToPortReference: + m_NodeModelGuid: + m_Value0: 18009455515538643562 + m_Value1: 13514993144465539571 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: 6a5ae1895f70eef9f341b5cda8e68ebb + m_UniqueId: In + m_PortDirection: 1 + m_PortOrientation: 0 + m_Title: + - rid: 4848514747977957878 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957879 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 4848514747977957880 type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: 0 - - rid: 4848514453388656818 - type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + - rid: 4848514747977957881 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: 0 - - rid: 4848514453388656921 + m_Value: + - rid: 4848514747977957882 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 4848514747977957883 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: ccaea1cd59b6def4e93764f1965fe26f, type: 2} + - rid: 4848514747977957884 type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogShortText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: Value: - - rid: 4848514453388656922 - type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogShortText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + - rid: 4848514747977957885 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: ccaea1cd59b6def4e93764f1965fe26f, type: 2} + - rid: 4848514747977957886 + type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: - Value: - - rid: 4848514455607443608 - type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + Value: "\uC548\uB155." + - rid: 4848514747977957887 + type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: {fileID: 11400000, guid: ccaea1cd59b6def4e93764f1965fe26f, type: 2} - - rid: 4848514455607443609 - type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + m_Value: {fileID: 0} + - rid: 4848514747977957888 + type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: {fileID: 11400000, guid: ccaea1cd59b6def4e93764f1965fe26f, type: 2} + m_Value: {fileID: 0} + - rid: 4848514747977957889 + type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957890 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957891 + type: {class: 'Constant`1[[UnityEngine.GameObject, UnityEngine.CoreModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514747977957892 + type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 4 + - rid: 4848514747977957893 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957894 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957895 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957896 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957897 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514747977957898 + type: {class: DialogLineNode, ns: DinoLove.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} + data: diff --git a/Assets/XR/Settings/OpenXR Package Settings.asset b/Assets/XR/Settings/OpenXR Package Settings.asset index f40d563a..d2937814 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:6bcdde57c13b4de6adb733f0d2005ef0f49ff1748979bb36e0c0f5550f342acb +oid sha256:7811274b3c80fa3a39a8f8485192e3349401b2ac6eea8c4bfa2b8f97fd5c08d1 size 93980 diff --git a/Assets/XRI/Settings/Resources/InteractionLayerSettings.asset b/Assets/XRI/Settings/Resources/InteractionLayerSettings.asset index 38d95746..dd4c2a07 100644 --- a/Assets/XRI/Settings/Resources/InteractionLayerSettings.asset +++ b/Assets/XRI/Settings/Resources/InteractionLayerSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ba55c52c77640f3decc51c917c5ed0269c7019bbc865f03185f75ac303a19924 -size 604 +oid sha256:7332eb875da710bae998fd2ce039a4c52a17148d4867124528394cf0ca7c3619 +size 620 diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index df99cbc7..2b132bd7 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:64c6d27312f6a09fb527f71b6f36c7463998c871b473e3ef6f0cf95744793c31 -size 644 +oid sha256:6cdc97b83a0ed4284cbf0d0d6a0f4dccd9e021466c436d5f0428db6a49e7b2f1 +size 666 From c3a8d1ce2ef1c93a2c846d9f9cc072066e89d1eb Mon Sep 17 00:00:00 2001 From: nakjun Date: Thu, 23 Jul 2026 15:06:05 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=EB=8C=80=ED=99=94=20=EC=8B=9C=EC=9E=91?= =?UTF-8?q?=EC=8B=9C=20=EA=B8=B0=EB=B3=B8=ED=9A=8C=EC=A0=84=20=EB=A7=89?= =?UTF-8?q?=EA=B8=B0=20=EC=98=B5=EC=85=98=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/01_Scenes/Festival_Chapter5.unity | 4 +- .../Communication/Dialog/DialogPlayer.cs | 24 +++++++-- Assets/02_Scripts/Managers/LocalManager.cs | 51 +++++++++++++++++-- .../DialogGraph/Chapter5/Chapter5_Yuna1.dlg | 26 +++++----- Assets/11_Audio/BGM/Etc/Horror.mp3 | 3 ++ Assets/11_Audio/BGM/Etc/Horror.mp3.meta | 23 +++++++++ Assets/11_Audio/BGM/Etc/Mute.mp3 | 3 ++ Assets/11_Audio/BGM/Etc/Mute.mp3.meta | 23 +++++++++ 8 files changed, 134 insertions(+), 23 deletions(-) create mode 100644 Assets/11_Audio/BGM/Etc/Horror.mp3 create mode 100644 Assets/11_Audio/BGM/Etc/Horror.mp3.meta create mode 100644 Assets/11_Audio/BGM/Etc/Mute.mp3 create mode 100644 Assets/11_Audio/BGM/Etc/Mute.mp3.meta diff --git a/Assets/01_Scenes/Festival_Chapter5.unity b/Assets/01_Scenes/Festival_Chapter5.unity index d41671f7..b86cf3cd 100644 --- a/Assets/01_Scenes/Festival_Chapter5.unity +++ b/Assets/01_Scenes/Festival_Chapter5.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dc6508913ab354d604980a3b0ef749c10b8152edb1e91446f5745f991fa41447 -size 1629262 +oid sha256:64d836f31368bb50449f1c1d92cd281af71df172e8153a90d202ad98bc6b0bd7 +size 1631753 diff --git a/Assets/02_Scripts/Communication/Dialog/DialogPlayer.cs b/Assets/02_Scripts/Communication/Dialog/DialogPlayer.cs index d3d5e49c..7c21aa18 100644 --- a/Assets/02_Scripts/Communication/Dialog/DialogPlayer.cs +++ b/Assets/02_Scripts/Communication/Dialog/DialogPlayer.cs @@ -23,6 +23,10 @@ public struct DialogEntry [Tooltip("대화 선택 메뉴에 표시할 이름 (비우면 그룹 이름 사용)")] public string MenuLabel; + + [Tooltip("켜면 이 대화에선 말을 걸어도 플레이어 쪽으로 회전하지 않는다 (기본: 회전함). " + + "정면을 고정한 연출 대화 등에 사용. 단, 선택 메뉴가 뜨는 다중 대화에선 메뉴를 위해 회전할 수 있음")] + public bool DontRotateToPlayer; } // 노드의 EventKey ↔ 그 노드 재생 시 호출할 이벤트. @@ -130,8 +134,15 @@ public async Awaitable Play() // 말을 걸면 NPC가 플레이어 쪽으로 돌아본다 — 대화창(선택 메뉴·첫 대사)이 NPC 회전을 // 따라가므로 창도 플레이어를 향하게 된다. 원래 회전은 아래 finally에서 복원. - _originalRotations.TryAdd(transform, GetOriginalRotation(transform)); - RotateTowardPlayer(transform); + // 단, 대화 항목이 하나이고 그 항목이 DontRotateToPlayer면 회전하지 않는다(정면 고정 연출 등). + // 여러 개(선택 메뉴)일 땐 메뉴가 플레이어를 향하도록 우선 회전한다. + bool singleEntry = playable.Count == 1; + bool rotateToPlayer = !singleEntry || !_dialogs[playable[0]].DontRotateToPlayer; + if (rotateToPlayer) + { + _originalRotations.TryAdd(transform, GetOriginalRotation(transform)); + RotateTowardPlayer(transform); + } // 대화창이 바로 튀어나오지 않도록 잠깐 뜸을 들인다 (선택 메뉴·첫 대사 공통) if (_dialogStartDelay > 0f) @@ -140,7 +151,7 @@ public async Awaitable Play() if (_entryInProgress != null) return; // 기다리는 사이 다른 NPC의 대화가 시작됨 } - int index = playable.Count == 1 ? playable[0] : await SelectDialog(playable); + int index = singleEntry ? playable[0] : await SelectDialog(playable); if (index < 0) return; // 선택 대기 중 취소됨 (다른 NPC와 대화 시작, 씬 전환 등) _entryInProgress = this; // 여기서부터 실제 대사 재생 — 끝날 때까지 다른 NPC 상호작용 무시 @@ -187,8 +198,11 @@ private async Awaitable PlayGroupForced(DialogGroup group) if (entry.Group == null) entry = new DialogEntry { Group = group }; - _originalRotations.TryAdd(transform, GetOriginalRotation(transform)); - RotateTowardPlayer(transform); + if (!entry.DontRotateToPlayer) + { + _originalRotations.TryAdd(transform, GetOriginalRotation(transform)); + RotateTowardPlayer(transform); + } if (_dialogStartDelay > 0f) { diff --git a/Assets/02_Scripts/Managers/LocalManager.cs b/Assets/02_Scripts/Managers/LocalManager.cs index adc7eb58..de636bf5 100644 --- a/Assets/02_Scripts/Managers/LocalManager.cs +++ b/Assets/02_Scripts/Managers/LocalManager.cs @@ -22,6 +22,11 @@ public class LocalManager : MonoBehaviour,ISceneInitializable // 이 씬 전용 스카이박스 (비우면 SceneLoadManager의 기본 스카이박스 사용) [SerializeField] private Material _sceneSkybox; + // FadeToGrayscale 직전의 원래 볼륨 상태 — FadeToColor로 되돌릴 때 복원용 + private VolumeProfile _preGrayscaleProfile; + private float _preGrayscaleWeight; + private bool _grayscaleActive; + public void NextScene(int delay) { _ = Util.RunDelayed((float)delay,()=>SceneLoadManager.Instance.RequestSceneChange(_nextSceneName)); @@ -72,7 +77,8 @@ private static void PauseAllAnimations() // 씬의 글로벌 볼륨 프로파일을 흑백으로 교체하고 weight를 0 → 1로 페이드 (완전 흑백) // 기존 프로파일(그레인/모션블러 포함)이 통째로 빠지므로 정지 화면에서 지글거림도 없다 - private async Awaitable FadeToGrayscale(float duration) + // 같은 씬 어디서든 참조로 호출 가능. 되돌리려면 FadeToColor 사용. + public async Awaitable FadeToGrayscale(float duration) { if (_grayscaleProfile == null || _globalVolume == null) { @@ -80,6 +86,14 @@ private async Awaitable FadeToGrayscale(float duration) return; } + // 원래 볼륨 상태를 기억해 둔다 (FadeToColor 복원용). 이미 흑백이면 덮어쓰지 않는다. + if (!_grayscaleActive) + { + _preGrayscaleProfile = _globalVolume.sharedProfile; + _preGrayscaleWeight = _globalVolume.weight; + _grayscaleActive = true; + } + // sharedProfile로 물려야 에셋이 복제·수정되지 않는다 (페이드는 weight로만) // 씬 오브젝트의 프로퍼티 변경이라 플레이 종료 시 원래대로 돌아온다 _globalVolume.sharedProfile = _grayscaleProfile; @@ -89,14 +103,45 @@ private async Awaitable FadeToGrayscale(float duration) foreach (var cam in FindObjectsByType()) cam.GetUniversalAdditionalCameraData().renderPostProcessing = true; + await FadeVolumeWeight(0f, 1f, duration); + } + + // 흑백 → 원래 컬러로 되돌린다. weight를 0으로 뺀 뒤, FadeToGrayscale가 기억해둔 원래 프로파일/weight로 복원. + // 흑백 상태가 아니면 아무것도 하지 않는다. 같은 씬 어디서든 참조로 호출 가능. + public async Awaitable FadeToColor(float duration) + { + if (_globalVolume == null || !_grayscaleActive) + return; + + await FadeVolumeWeight(_globalVolume.weight, 0f, duration); + + _globalVolume.sharedProfile = _preGrayscaleProfile; + _globalVolume.weight = _preGrayscaleWeight; + _grayscaleActive = false; + } + + // 인스펙터 UnityEvent에서 호출용 void 래퍼. + // (async 메서드는 반환형이 void가 아니라 UnityEvent 드롭다운에 안 뜬다 — 여기서 fire-and-forget으로 감싼다) + public void FadeToGrayscaleEvent(float duration) => _ = FadeToGrayscale(duration); + public void FadeToColorEvent(float duration) => _ = FadeToColor(duration); + + // 글로벌 볼륨 weight를 from → to로 duration 동안 페이드 (duration ≤ 0이면 즉시 to) + private async Awaitable FadeVolumeWeight(float from, float to, float duration) + { + if (duration <= 0f) + { + _globalVolume.weight = to; + return; + } + float timer = 0f; while (timer < duration) { timer += Time.deltaTime; - _globalVolume.weight = Mathf.Clamp01(timer / duration); + _globalVolume.weight = Mathf.Lerp(from, to, Mathf.Clamp01(timer / duration)); await Awaitable.NextFrameAsync(destroyCancellationToken); } - _globalVolume.weight = 1f; + _globalVolume.weight = to; } // 씬 로드 시 이 씬 전용 스카이박스를 적용 diff --git a/Assets/07_Data/DialogGraph/Chapter5/Chapter5_Yuna1.dlg b/Assets/07_Data/DialogGraph/Chapter5/Chapter5_Yuna1.dlg index 7fe8317f..ac9dc34d 100644 --- a/Assets/07_Data/DialogGraph/Chapter5/Chapter5_Yuna1.dlg +++ b/Assets/07_Data/DialogGraph/Chapter5/Chapter5_Yuna1.dlg @@ -663,7 +663,7 @@ MonoBehaviour: - rid: 4848514747977957636 type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: {fileID: 0} + m_Value: {fileID: 8300000, guid: df289b60c0e4b68458f17c07abe9accd, type: 3} - rid: 4848514747977957637 type: {class: 'Constant`1[[UnityEngine.GameObject, UnityEngine.CoreModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -855,7 +855,7 @@ MonoBehaviour: - rid: 4848514747977957659 type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: {fileID: 0} + m_Value: {fileID: 8300000, guid: df289b60c0e4b68458f17c07abe9accd, type: 3} - rid: 4848514747977957660 type: {class: 'Constant`1[[UnityEngine.GameObject, UnityEngine.CoreModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -1047,7 +1047,7 @@ MonoBehaviour: - rid: 4848514747977957682 type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: {fileID: 0} + m_Value: {fileID: 8300000, guid: df289b60c0e4b68458f17c07abe9accd, type: 3} - rid: 4848514747977957683 type: {class: 'Constant`1[[UnityEngine.GameObject, UnityEngine.CoreModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -1239,7 +1239,7 @@ MonoBehaviour: - rid: 4848514747977957705 type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: {fileID: 0} + m_Value: {fileID: 8300000, guid: df289b60c0e4b68458f17c07abe9accd, type: 3} - rid: 4848514747977957706 type: {class: 'Constant`1[[UnityEngine.GameObject, UnityEngine.CoreModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -1430,7 +1430,7 @@ MonoBehaviour: - rid: 4848514747977957728 type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: {fileID: 0} + m_Value: {fileID: 8300000, guid: df289b60c0e4b68458f17c07abe9accd, type: 3} - rid: 4848514747977957729 type: {class: 'Constant`1[[UnityEngine.GameObject, UnityEngine.CoreModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -1622,7 +1622,7 @@ MonoBehaviour: - rid: 4848514747977957751 type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: {fileID: 0} + m_Value: {fileID: 8300000, guid: df289b60c0e4b68458f17c07abe9accd, type: 3} - rid: 4848514747977957752 type: {class: 'Constant`1[[UnityEngine.GameObject, UnityEngine.CoreModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -1813,7 +1813,7 @@ MonoBehaviour: - rid: 4848514747977957774 type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: {fileID: 0} + m_Value: {fileID: 8300000, guid: df289b60c0e4b68458f17c07abe9accd, type: 3} - rid: 4848514747977957775 type: {class: 'Constant`1[[UnityEngine.GameObject, UnityEngine.CoreModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -2004,7 +2004,7 @@ MonoBehaviour: - rid: 4848514747977957797 type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: {fileID: 0} + m_Value: {fileID: 8300000, guid: df289b60c0e4b68458f17c07abe9accd, type: 3} - rid: 4848514747977957798 type: {class: 'Constant`1[[UnityEngine.GameObject, UnityEngine.CoreModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -2149,7 +2149,7 @@ MonoBehaviour: - rid: 4848514747977957809 type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: + m_Value: GrayVolume - rid: 4848514747977957810 type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -2195,7 +2195,7 @@ MonoBehaviour: - rid: 4848514747977957820 type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: {fileID: 0} + m_Value: {fileID: 8300000, guid: fbf0ad532c5e65e4189e65ef2439d507, type: 3} - rid: 4848514747977957821 type: {class: 'Constant`1[[UnityEngine.GameObject, UnityEngine.CoreModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -2418,7 +2418,7 @@ MonoBehaviour: - rid: 4848514747977957844 type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: {fileID: 0} + m_Value: {fileID: 8300000, guid: df289b60c0e4b68458f17c07abe9accd, type: 3} - rid: 4848514747977957845 type: {class: 'Constant`1[[UnityEngine.GameObject, UnityEngine.CoreModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -2609,7 +2609,7 @@ MonoBehaviour: - rid: 4848514747977957867 type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: {fileID: 0} + m_Value: {fileID: 8300000, guid: fbf0ad532c5e65e4189e65ef2439d507, type: 3} - rid: 4848514747977957868 type: {class: 'Constant`1[[UnityEngine.GameObject, UnityEngine.CoreModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -2800,7 +2800,7 @@ MonoBehaviour: - rid: 4848514747977957890 type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: {fileID: 0} + m_Value: {fileID: 8300000, guid: fbf0ad532c5e65e4189e65ef2439d507, type: 3} - rid: 4848514747977957891 type: {class: 'Constant`1[[UnityEngine.GameObject, UnityEngine.CoreModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: diff --git a/Assets/11_Audio/BGM/Etc/Horror.mp3 b/Assets/11_Audio/BGM/Etc/Horror.mp3 new file mode 100644 index 00000000..2ab6b833 --- /dev/null +++ b/Assets/11_Audio/BGM/Etc/Horror.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d49a58cd36b7c5d045cc5ffbc576a1d5539f6d086267817065e83b4fe91a4762 +size 526001 diff --git a/Assets/11_Audio/BGM/Etc/Horror.mp3.meta b/Assets/11_Audio/BGM/Etc/Horror.mp3.meta new file mode 100644 index 00000000..84dd213c --- /dev/null +++ b/Assets/11_Audio/BGM/Etc/Horror.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: df289b60c0e4b68458f17c07abe9accd +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/11_Audio/BGM/Etc/Mute.mp3 b/Assets/11_Audio/BGM/Etc/Mute.mp3 new file mode 100644 index 00000000..a979c4b1 --- /dev/null +++ b/Assets/11_Audio/BGM/Etc/Mute.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:780444a89da5be2436e6fd7e0abc95d0099caa393cf3af815da88a97efeebcc5 +size 1440705 diff --git a/Assets/11_Audio/BGM/Etc/Mute.mp3.meta b/Assets/11_Audio/BGM/Etc/Mute.mp3.meta new file mode 100644 index 00000000..9494f73d --- /dev/null +++ b/Assets/11_Audio/BGM/Etc/Mute.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: fbf0ad532c5e65e4189e65ef2439d507 +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: