sharedacc520k/Dino_Love_Simulation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation

Browse Source 
# Conflicts:
#	Assets/04_Models/Festival/Canopy/swing-sofa/shaded 1.png.meta
#	Assets/04_Models/Festival/Canopy/swing-sofa/texture_diffuse 1.png.meta
#	Assets/04_Models/Festival/Canopy/swing-sofa/texture_metallic 1.png.meta
#	Assets/04_Models/Festival/Canopy/swing-sofa/texture_normal 1.png.meta
#	Assets/04_Models/Festival/Canopy/swing-sofa/texture_roughness 1.png.meta
#	Assets/XR/Settings/OpenXR Package Settings.asset
This commit is contained in:
dldydtn9755-crypto
2026-07-23 15:13:40 +09:00
parent 3274990163 c3a8d1ce2e
commit b14e94e4bc
279 changed files with 11219 additions and 1161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/01_Scenes/Festival_Chapter5.unity LFS
View File

Binary file not shown.

BIN
Assets/01_Scenes/Hischool_Chapter1/Hischool_Chapter1 Baking Set.asset LFS Normal file
View File

Binary file not shown.

8
Assets/01_Scenes/Hischool_Chapter1/Hischool_Chapter1 Baking Set.asset.meta Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: ccec3822d9296c7468aec794007f7c32
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/01_Scenes/Hischool_Chapter1/LightingData.asset LFS
View File

Binary file not shown.

BIN
Assets/01_Scenes/Hischool_Chapter1/Lightmap-0_comp_dir.png LFS
View File

Binary file not shown.

21
Assets/01_Scenes/Hischool_Chapter1/Lightmap-0_comp_dir.png.meta
View File

@@ -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: []

BIN
Assets/01_Scenes/Hischool_Chapter1/Lightmap-0_comp_light.exr LFS
View File

Binary file not shown.

21
Assets/01_Scenes/Hischool_Chapter1/Lightmap-0_comp_light.exr.meta
View File

@@ -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: []

23
Assets/01_Scenes/Hischool_Chapter1/Lightmap-0_comp_shadowmask.png.meta
View File

@@ -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: []

BIN
Assets/01_Scenes/Hischool_Chapter1/Lightmap-1_comp_dir.png LFS
View File

Binary file not shown.

21
Assets/01_Scenes/Hischool_Chapter1/Lightmap-1_comp_dir.png.meta
View File

@@ -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: []

BIN
Assets/01_Scenes/Hischool_Chapter1/Lightmap-1_comp_light.exr LFS
View File

Binary file not shown.

21
Assets/01_Scenes/Hischool_Chapter1/Lightmap-1_comp_light.exr.meta
View File

@@ -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: []

BIN
Assets/01_Scenes/Hischool_Chapter1/Lightmap-1_comp_shadowmask.png LFS
View File

Binary file not shown.

23
Assets/01_Scenes/Hischool_Chapter1/Lightmap-1_comp_shadowmask.png.meta
View File

@@ -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: []

BIN
Assets/01_Scenes/Hischool_Chapter1/Lightmap-2_comp_dir.png LFS
View File

Binary file not shown.

21
Assets/01_Scenes/Hischool_Chapter1/Lightmap-2_comp_dir.png.meta
View File

@@ -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: []

BIN
Assets/01_Scenes/Hischool_Chapter1/Lightmap-2_comp_light.exr LFS
View File

Binary file not shown.

21
Assets/01_Scenes/Hischool_Chapter1/Lightmap-2_comp_light.exr.meta
View File

@@ -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: []

BIN
Assets/01_Scenes/Hischool_Chapter1/Lightmap-2_comp_shadowmask.png LFS
View File

Binary file not shown.

23
Assets/01_Scenes/Hischool_Chapter1/Lightmap-2_comp_shadowmask.png.meta
View File

@@ -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: []

BIN
Assets/01_Scenes/Hischool_Chapter1/Lightmap-3_comp_dir.png LFS
View File

Binary file not shown.

21
Assets/01_Scenes/Hischool_Chapter1/Lightmap-3_comp_dir.png.meta
View File

@@ -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: []

BIN
Assets/01_Scenes/Hischool_Chapter1/Lightmap-3_comp_light.exr LFS
View File

Binary file not shown.

21
Assets/01_Scenes/Hischool_Chapter1/Lightmap-3_comp_light.exr.meta
View File

@@ -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: []

BIN
Assets/01_Scenes/Hischool_Chapter1/Lightmap-3_comp_shadowmask.png LFS
View File

Binary file not shown.

23
Assets/01_Scenes/Hischool_Chapter1/Lightmap-3_comp_shadowmask.png.meta
View File

@@ -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: []

BIN
Assets/01_Scenes/Hischool_Chapter1/Lightmap-4_comp_dir.png LFS
View File

Binary file not shown.

21
Assets/01_Scenes/Hischool_Chapter1/Lightmap-4_comp_dir.png.meta
View File

@@ -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: []

BIN
Assets/01_Scenes/Hischool_Chapter1/Lightmap-4_comp_light.exr LFS
View File

Binary file not shown.

21
Assets/01_Scenes/Hischool_Chapter1/Lightmap-4_comp_light.exr.meta
View File

@@ -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: []

BIN
Assets/01_Scenes/Hischool_Chapter1/Lightmap-4_comp_shadowmask.png LFS
View File

Binary file not shown.

23
Assets/01_Scenes/Hischool_Chapter1/Lightmap-4_comp_shadowmask.png.meta
View File

@@ -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: []

BIN
Assets/01_Scenes/Hischool_Chapter1/Lightmap-5_comp_dir.png LFS
View File

Binary file not shown.

21
Assets/01_Scenes/Hischool_Chapter1/Lightmap-5_comp_dir.png.meta
View File

@@ -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: []

BIN
Assets/01_Scenes/Hischool_Chapter1/Lightmap-5_comp_light.exr LFS
View File

Binary file not shown.

21
Assets/01_Scenes/Hischool_Chapter1/Lightmap-5_comp_light.exr.meta
View File

@@ -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: []

BIN
Assets/01_Scenes/Hischool_Chapter1/Lightmap-5_comp_shadowmask.png LFS
View File

Binary file not shown.

23
Assets/01_Scenes/Hischool_Chapter1/Lightmap-5_comp_shadowmask.png.meta
View File

@@ -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: []

BIN
Assets/01_Scenes/Hischool_Chapter1/Lightmap-6_comp_dir.png LFS
View File

Binary file not shown.

21
Assets/01_Scenes/Hischool_Chapter1/Lightmap-6_comp_dir.png.meta
View File

@@ -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: []

BIN
Assets/01_Scenes/Hischool_Chapter1/Lightmap-6_comp_light.exr LFS
View File

Binary file not shown.

21
Assets/01_Scenes/Hischool_Chapter1/Lightmap-6_comp_light.exr.meta
View File

@@ -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: []

BIN
Assets/01_Scenes/Hischool_Chapter1/Lightmap-6_comp_shadowmask.png LFS
View File

Binary file not shown.

23
Assets/01_Scenes/Hischool_Chapter1/Lightmap-6_comp_shadowmask.png.meta
View File

@@ -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: []

BIN
Assets/01_Scenes/Hischool_Chapter1/Lightmap-7_comp_dir.png LFS
View File

Binary file not shown.

21
Assets/01_Scenes/Hischool_Chapter1/Lightmap-7_comp_dir.png.meta
View File

@@ -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: []

BIN
Assets/01_Scenes/Hischool_Chapter1/Lightmap-7_comp_light.exr LFS
View File

Binary file not shown.

21
Assets/01_Scenes/Hischool_Chapter1/Lightmap-7_comp_light.exr.meta
View File

@@ -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: []

BIN
Assets/01_Scenes/Hischool_Chapter1/Lightmap-7_comp_shadowmask.png LFS
View File

Binary file not shown.

23
Assets/01_Scenes/Hischool_Chapter1/Lightmap-7_comp_shadowmask.png.meta
View File

@@ -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: []

BIN
Assets/01_Scenes/Hischool_Chapter1/Lightmap-8_comp_dir.png LFS
View File

Binary file not shown.

21
Assets/01_Scenes/Hischool_Chapter1/Lightmap-8_comp_dir.png.meta
View File

@@ -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: []

BIN
Assets/01_Scenes/Hischool_Chapter1/Lightmap-8_comp_light.exr LFS
View File

Binary file not shown.

21
Assets/01_Scenes/Hischool_Chapter1/Lightmap-8_comp_light.exr.meta
View File

@@ -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: []

BIN
Assets/01_Scenes/Hischool_Chapter1/Lightmap-8_comp_shadowmask.png LFS
View File

Binary file not shown.

23
Assets/01_Scenes/Hischool_Chapter1/Lightmap-8_comp_shadowmask.png.meta
View File

@@ -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: []

BIN
Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-0.exr LFS
View File

Binary file not shown.

25
Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-0.exr.meta
View File

@@ -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: []

BIN
Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-1.exr LFS
View File

Binary file not shown.

25
Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-1.exr.meta
View File

@@ -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: []

BIN
Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-10.exr LFS
View File

Binary file not shown.

25
Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-10.exr.meta
View File

@@ -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: []

BIN
Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-11.exr LFS
View File

Binary file not shown.

25
Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-11.exr.meta
View File

@@ -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: []

BIN
Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-12.exr LFS
View File

Binary file not shown.

25
Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-12.exr.meta
View File

@@ -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: []

BIN
Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-13.exr LFS
View File

Binary file not shown.

25
Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-13.exr.meta
View File

@@ -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: []

BIN
Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-14.exr LFS
View File

Binary file not shown.

25
Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-14.exr.meta
View File

@@ -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: []

BIN
Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-15.exr LFS
View File

Binary file not shown.

25
Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-15.exr.meta
View File

@@ -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: []

BIN
Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-16.exr LFS
View File

Binary file not shown.

25
Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-16.exr.meta
View File

@@ -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: []

BIN
Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-17.exr LFS
View File

Binary file not shown.

25
Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-17.exr.meta
View File

@@ -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: []

BIN
Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-18.exr LFS
View File

Binary file not shown.

25
Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-18.exr.meta
View File

@@ -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: []

BIN
Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-19.exr LFS
View File

Binary file not shown.

25
Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-19.exr.meta
View File

@@ -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: []

BIN
Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-2.exr LFS
View File

Binary file not shown.

25
Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-2.exr.meta
View File

@@ -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: []

BIN
Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-20.exr LFS
View File

Binary file not shown.

25
Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-20.exr.meta
View File

@@ -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: []

BIN
Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-21.exr LFS
View File

Binary file not shown.

25
Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-21.exr.meta
View File

@@ -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: []

BIN
Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-22.exr LFS
View File

Binary file not shown.

25
Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-22.exr.meta
View File

@@ -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: []

BIN
Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-23.exr LFS
View File

Binary file not shown.

25
Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-23.exr.meta
View File

@@ -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: []

BIN
Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-24.exr LFS
View File

Binary file not shown.

25
Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-24.exr.meta
View File

@@ -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: []

BIN
Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-25.exr LFS
View File

Binary file not shown.

25
Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-25.exr.meta
View File

@@ -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: []

BIN
Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-26.exr LFS
View File

Binary file not shown.

25
Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-26.exr.meta
View File

@@ -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: []

25
Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-27.exr.meta
View File

@@ -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: []

BIN
Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-3.exr LFS
View File

Binary file not shown.

25
Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-3.exr.meta
View File

@@ -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: []

Some files were not shown because too many files have changed in this diff Show More