hemp/ProjectZ
2
0
Fork 0
Code Issues 18 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Empty light settings for procedural scene;

Browse Source
This commit is contained in:
Nikita Kruglickiy 2024-03-20 15:39:48 +03:00
parent c521722c6f
commit 864f78562e
30 changed files with 872 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Assets/Prefabs/Characters/Player.prefab
View File

@ -2356,14 +2356,8 @@ MonoBehaviour:
m_EditorClassIdentifier:
syncMode: 0
syncInterval: 0.02
health: 100
Alive: 1
_speedMul: 1
_cinemachineTargetPitch: 0
RotationSpeed: 1
BottomClamp: -90
TopClamp: 90
CinemachineCameraTarget: {fileID: 8691963221834896074}
headPosition: {fileID: 1762678065726348224}
floatingInfo: {fileID: 3575501728372586808}
nicknameInput: {fileID: 3502686228214059428}
@ -2390,6 +2384,11 @@ MonoBehaviour:
mainCamera: {fileID: 8591369834395964051}
playerName:
gunColor: {r: 0, g: 0, b: 0, a: 0}
_cinemachineTargetPitch: 0
CinemachineCameraTarget: {fileID: 8691963221834896074}
RotationSpeed: 1
BottomClamp: -90
TopClamp: 90
currentEnergy: 100
shootDepletion: 25
_flashLightDepletion: 0.3

64
Assets/Scenes/Procedural.lighting Normal file
View File

@ -0,0 +1,64 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!850595691 &4890085278179872738
LightingSettings:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Procedural
serializedVersion: 4
m_GIWorkflowMode: 1
m_EnableBakedLightmaps: 1
m_EnableRealtimeLightmaps: 0
m_RealtimeEnvironmentLighting: 1
m_BounceScale: 1
m_AlbedoBoost: 1
m_IndirectOutputScale: 1
m_UsingShadowmask: 1
m_BakeBackend: 2
m_LightmapMaxSize: 1024
m_BakeResolution: 40
m_Padding: 2
m_LightmapCompression: 3
m_AO: 0
m_AOMaxDistance: 1
m_CompAOExponent: 1
m_CompAOExponentDirect: 0
m_ExtractAO: 0
m_MixedBakeMode: 2
m_LightmapsBakeMode: 1
m_FilterMode: 1
m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0}
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_RealtimeResolution: 2
m_ForceWhiteAlbedo: 0
m_ForceUpdates: 0
m_FinalGather: 0
m_FinalGatherRayCount: 256
m_FinalGatherFiltering: 1
m_PVRCulling: 1
m_PVRSampling: 1
m_PVRDirectSampleCount: 32
m_PVRSampleCount: 512
m_PVREnvironmentSampleCount: 256
m_PVREnvironmentReferencePointCount: 2048
m_LightProbeSampleCountMultiplier: 4
m_PVRBounces: 2
m_PVRMinBounces: 1
m_PVREnvironmentMIS: 1
m_PVRFilteringMode: 1
m_PVRDenoiserTypeDirect: 1
m_PVRDenoiserTypeIndirect: 1
m_PVRDenoiserTypeAO: 1
m_PVRFilterTypeDirect: 0
m_PVRFilterTypeIndirect: 0
m_PVRFilterTypeAO: 0
m_PVRFilteringGaussRadiusDirect: 1
m_PVRFilteringGaussRadiusIndirect: 5
m_PVRFilteringGaussRadiusAO: 2
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
m_PVRFilteringAtrousPositionSigmaIndirect: 2
m_PVRFilteringAtrousPositionSigmaAO: 1
m_PVRTiledBaking: 0

8
Assets/Scenes/Procedural.lighting.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 49cca1d38c3581042a44320df3b196f3
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 4890085278179872738
userData:
assetBundleName:
assetBundleVariant:

4
Assets/Scenes/Procedural.unity
View File

@ -97,8 +97,8 @@ LightmapSettings:
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0}
m_LightingSettings: {fileID: 0}
m_LightingDataAsset: {fileID: 112000000, guid: d6e02588841a5c84993d1ffdabeaa5d2, type: 2}
m_LightingSettings: {fileID: 4890085278179872738, guid: 49cca1d38c3581042a44320df3b196f3, type: 2}
--- !u!196 &4
NavMeshSettings:
serializedVersion: 2

BIN
Assets/Scenes/Procedural/LightingData.asset Normal file
View File

Binary file not shown.

8
Assets/Scenes/Procedural/LightingData.asset.meta Normal file
View File

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

BIN
Assets/Scenes/Procedural/Lightmap-0_comp_dir.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

98
Assets/Scenes/Procedural/Lightmap-0_comp_dir.png.meta Normal file
View File

@ -0,0 +1,98 @@
fileFormatVersion: 2
guid: 03688a0cfdacc8343a8309d180eab25a
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 0
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
isReadable: 0
streamingMipmaps: 1
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 12
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Scenes/Procedural/Lightmap-0_comp_light.exr (Stored with Git LFS) Normal file
View File

Binary file not shown.

98
Assets/Scenes/Procedural/Lightmap-0_comp_light.exr.meta Normal file
View File

@ -0,0 +1,98 @@
fileFormatVersion: 2
guid: 5a90110c19bec1b45bed467b817e2756
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
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
isReadable: 0
streamingMipmaps: 1
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 0
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 6
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Scenes/Procedural/Lightmap-1_comp_dir.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

98
Assets/Scenes/Procedural/Lightmap-1_comp_dir.png.meta Normal file
View File

@ -0,0 +1,98 @@
fileFormatVersion: 2
guid: 293bd8bc7bf48424a9773149d079a2cc
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 0
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
isReadable: 0
streamingMipmaps: 1
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 12
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Scenes/Procedural/Lightmap-1_comp_light.exr (Stored with Git LFS) Normal file
View File

Binary file not shown.

98
Assets/Scenes/Procedural/Lightmap-1_comp_light.exr.meta Normal file
View File

@ -0,0 +1,98 @@
fileFormatVersion: 2
guid: 756e1bcdaf4a0384197d12927664b22b
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
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
isReadable: 0
streamingMipmaps: 1
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 0
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 6
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Scenes/Procedural/Lightmap-2_comp_dir.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

98
Assets/Scenes/Procedural/Lightmap-2_comp_dir.png.meta Normal file
View File

@ -0,0 +1,98 @@
fileFormatVersion: 2
guid: 24f4d71e05317d44f9013c5544bea660
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 0
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
isReadable: 0
streamingMipmaps: 1
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 12
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Scenes/Procedural/Lightmap-2_comp_light.exr (Stored with Git LFS) Normal file
View File

Binary file not shown.

98
Assets/Scenes/Procedural/Lightmap-2_comp_light.exr.meta Normal file
View File

@ -0,0 +1,98 @@
fileFormatVersion: 2
guid: e4d0d9c48f0b94e42968a5e6fe947e74
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
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
isReadable: 0
streamingMipmaps: 1
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 3
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 0
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 6
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 2
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Scenes/Procedural/ReflectionProbe-0.exr (Stored with Git LFS) Normal file
View File

Binary file not shown.

98
Assets/Scenes/Procedural/ReflectionProbe-0.exr.meta Normal file
View File

@ -0,0 +1,98 @@
fileFormatVersion: 2
guid: 020b16955f5283f43b78c87f2faa7f42
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
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
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 1
seamlessCubemap: 1
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 2
aniso: 0
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 2
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 100
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

20
Assets/Scripts/Characters/Enemy/Enemy.cs
View File

@ -36,6 +36,7 @@ namespace Characters.Enemy
private float _stepCycle;
private AudioClip _footstepClip;
private Vector3 _footstepPrevPosition;
private NavMeshPath _navMeshPath;
private const float StepDelay = 0.12f;
private const float RunSpeed = 4.974f;
@ -46,6 +47,7 @@ namespace Characters.Enemy
_networkManager = NetworkManager.singleton.GetComponent<CustomNetworkManager>();
_networkGameManager = NetworkGameManager.singleton;
_footstepClip = Resources.Load<AudioClip>("Audio/EnemySounds/Steps/monsterStep1");
_navMeshPath = new();
networkAnimator = GetComponent<NetworkAnimator>();
@ -123,14 +125,24 @@ namespace Characters.Enemy
ChangeState(EnemyState.Stunned);
}
[Server]
public void ChangeState(EnemyState newState)
{
state = newState;
RpcChangeState(newState);
}
[ClientRpc]
private void RpcChangeState(EnemyState newState)
{
stateMachine.SetCurrentState(newState);
}
public Transform GetClosestTarget()
{
if (!agent.isOnNavMesh) return null;
var alivePlayers = _networkManager.alive;
if (HasTarget && alivePlayers.Count == 1 && alivePlayers[0].transform == targetTransform)
@ -140,12 +152,14 @@ namespace Characters.Enemy
Transform closestTarget = null;
float sortDistance = float.MaxValue;
var sortDistance = float.MaxValue;
foreach (var player in _networkManager.alive)
{
float distance = Vector3.Distance(player.transform.position, transform.position);
var targetPosition = player.transform.position;
var distance = Vector3.Distance(targetPosition, transform.position);
var canReachTarget = agent.CalculatePath(targetPosition, _navMeshPath) && _navMeshPath.status == NavMeshPathStatus.PathComplete;
if (distance <= aggressionDistance && distance < sortDistance && agent.SetDestination(player.transform.position))
if (distance <= aggressionDistance && distance < sortDistance && canReachTarget)
{
sortDistance = distance;
closestTarget = player.transform;

2
Assets/Scripts/Characters/Enemy/States/ChaseState.cs
View File

@ -53,6 +53,8 @@ namespace Characters.Enemy.States
}
else
{
_enemy.targetTransform = null;
_enemy.ChangeState(EnemyState.Idle);
}
}

2
Assets/Scripts/Characters/Enemy/States/PatrolState.cs
View File

@ -46,6 +46,8 @@ namespace Characters.Enemy.States
[Server]
void SetRandomDestination()
{
if (!_enemy.agent.isOnNavMesh) return;
_enemy.agent.destination = GetRandomLocation();
}

44
Assets/Scripts/Characters/Pawn.cs
View File

@ -8,21 +8,12 @@ namespace Characters
{
public event Action<Pawn> OnDamage;
public event Action<Pawn, bool> OnLiveState;
public int health = 100;
public bool Alive = true;
void Start()
{
RotationSpeed = PlayerPrefs.GetFloat("Sensitivity");
}
[SyncVar]
public float _speedMul = 1f;
public virtual void TakeDamage()
{
OnDamage?.Invoke(this);
}
public virtual void TakeDamage() {}
[Command]
public void CmdDie()
@ -53,38 +44,5 @@ namespace Characters
{
_speedMul = mul;
}
private Vector2 _mouseLook;
[SyncVar]
public float _cinemachineTargetPitch;
private float _rotationVelocity;
public float RotationSpeed = 1f;
public float BottomClamp = -90.0f;
public float TopClamp = 90.0f;
public GameObject CinemachineCameraTarget;
public void CameraRotation()
{
if (Cursor.lockState == CursorLockMode.None) return;
_mouseLook = new Vector2(Input.GetAxis("Mouse X"), -Input.GetAxis("Mouse Y"));
_cinemachineTargetPitch += _mouseLook.y * RotationSpeed;
_rotationVelocity = _mouseLook.x * RotationSpeed;
_cinemachineTargetPitch = ClampAngle(_cinemachineTargetPitch, BottomClamp, TopClamp);
transform.Rotate(Vector3.up * _rotationVelocity);
CinemachineCameraTarget.transform.localRotation = Quaternion.Euler(_cinemachineTargetPitch, 0.0f, 0.0f);
// CmdSetCameraPitch(_cinemachineTargetPitch);
}
private static float ClampAngle(float lfAngle, float lfMin, float lfMax)
{
if (lfAngle < -360f) lfAngle += 360f;
if (lfAngle > 360f) lfAngle -= 360f;
return Mathf.Clamp(lfAngle, lfMin, lfMax);
}
}
}

30
Assets/Scripts/Characters/PersonController/PersonController.cs
View File

@ -3,6 +3,7 @@ using Mirror;
using TMPro;
using Characters;
using Debuffs;
using Koptilnya;
/* Note: animations are called via the controller for both the character and capsule using animator null checks
*/
@ -96,6 +97,16 @@ namespace StarterAssets
private Vector3 _position;
private float _rotationVelocity;
private Vector2 _mouseLook;
[SyncVar]
public float _cinemachineTargetPitch;
public GameObject CinemachineCameraTarget;
public float RotationSpeed = 1f;
public float BottomClamp = -90.0f;
public float TopClamp = 90.0f;
[Command]
public void CmdSetupPlayer(string _name, float r, float g, float b)
{
@ -121,6 +132,7 @@ namespace StarterAssets
private void Start()
{
RotationSpeed = PlayerPrefs.GetFloat("Sensitivity");
_controller = GetComponent<CharacterController>();
this.OnDamage += OnTakeDamage;
@ -153,7 +165,7 @@ namespace StarterAssets
if (!isLocalPlayer)
{
if (netIdentity.isActiveAndEnabled && floatingInfo != null)
if (netIdentity.isActiveAndEnabled && floatingInfo != null && Camera.main)
floatingInfo.transform.LookAt(Camera.main.transform);
return;
}
@ -181,6 +193,22 @@ namespace StarterAssets
SetCamToHeadPos();
}
void CameraRotation()
{
if (Cursor.lockState == CursorLockMode.None) return;
_mouseLook = new Vector2(Input.GetAxis("Mouse X"), -Input.GetAxis("Mouse Y"));
_cinemachineTargetPitch += _mouseLook.y * RotationSpeed;
_rotationVelocity = _mouseLook.x * RotationSpeed;
_cinemachineTargetPitch = _cinemachineTargetPitch.ClampAngle(BottomClamp, TopClamp);
transform.Rotate(Vector3.up * _rotationVelocity);
CinemachineCameraTarget.transform.localRotation = Quaternion.Euler(_cinemachineTargetPitch, 0.0f, 0.0f);
// CmdSetCameraPitch(_cinemachineTargetPitch);
}
private void SetCamToHeadPos()
{
CinemachineCameraTarget.transform.position = headPosition.transform.position;

15
Assets/Scripts/Extensions.cs Normal file
View File

@ -0,0 +1,15 @@
using UnityEngine;
namespace Koptilnya
{
public static class Extensions
{
public static float ClampAngle(this float value, float min, float max)
{
if (value < -360f) value += 360f;
if (value > 360f) value -= 360f;
return Mathf.Clamp(value, min, max);
}
}
}

3
Assets/Scripts/Extensions.cs.meta Normal file
View File

@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 58a54aa31ac945f98b665526ac0849f8
timeCreated: 1710931930

8
Assets/Scripts/Level/BuildModules/ProceduralPrefabs.cs
View File

@ -3,6 +3,7 @@ using System.Collections;
using System.Collections.Generic;
using System.Linq;
using Mirror;
using Unity.AI.Navigation;
using UnityEngine;
using UnityEngine.Serialization;
using Random = UnityEngine.Random;
@ -15,6 +16,7 @@ namespace Level.BuildModules
[FormerlySerializedAs("StartingRoom")] public Room startingRoom;
private Room[,] _spawnedRooms;
private List<Room> _flattenSpawnedRooms = new();
private int _size;
@ -44,6 +46,11 @@ namespace Level.BuildModules
PlaceOneRoom();
}
foreach (var room in _flattenSpawnedRooms)
{
room.GetComponent<NavMeshSurface>().BuildNavMesh();
}
if (enemyList.Count == networkManager.maxMonsters) return;
if (networkManager.players.Count == networkManager.maxConnections)
@ -92,6 +99,7 @@ namespace Level.BuildModules
{
newRoom.transform.position = new Vector3(position.x - _startCellX, 0, position.y - _startCellY) * newRoom.roomSize;
_spawnedRooms[position.x, position.y] = newRoom;
_flattenSpawnedRooms.Add(newRoom);
return;
}
}

7
Assets/Scripts/Level/NavmeshBaker.cs
View File

@ -7,12 +7,7 @@ public class NavmeshBaker : MonoBehaviour
{
public NavMeshSurface Surface;
private void Start()
{
// yield return new WaitForSeconds(1);
Surface.BuildNavMesh();
}
void Update()
void Start()
{
}

1
Assets/Scripts/StateMachine/StateMachine.cs
View File

@ -53,7 +53,6 @@ namespace Koptilnya.StateMachine
if (mCurrentState != null)
{
Debug.Log($"{mCurrentState.ID} -> {state.ID}");
mCurrentState.Exit();
}