Compare commits
7 Commits
ba23cf7489
...
feature/wo
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
76473d2c6a | ||
|
|
7def018443 | ||
|
|
662a86ca2f | ||
|
|
7c6891e26c | ||
|
|
fd3bcde7dc | ||
|
|
8a527201d8 | ||
|
|
de1c2bfb49 |
@@ -20,12 +20,12 @@ MonoBehaviour:
|
||||
- {r: 0.6886792, g: 0.65442336, b: 0.57498217, a: 1}
|
||||
- {r: 0.5283019, g: 0.50888515, b: 0.48593807, a: 1}
|
||||
- {r: 0.9150943, g: 0.70547265, b: 0.375534, a: 1}
|
||||
- {r: 1, g: 0.863, b: 0, a: 1}
|
||||
- {r: 0.9339623, g: 0.8922398, b: 0.629984, a: 1}
|
||||
- {r: 1, g: 0.522, b: 0.106, a: 1}
|
||||
- {r: 1, g: 0.255, b: 0.212, a: 1}
|
||||
- {r: 0.522, g: 0.078, b: 0.294, a: 1}
|
||||
- {r: 0.941, g: 0.071, b: 0.745, a: 1}
|
||||
- {r: 0.694, g: 0.051, b: 0.788, a: 1}
|
||||
- {r: 0.067, g: 0.067, b: 0.067, a: 1}
|
||||
- {r: 0.8584906, g: 0.5061855, b: 0.5809581, a: 1}
|
||||
- {r: 0.7924528, g: 0.73581594, b: 0.66162336, a: 1}
|
||||
- {r: 0.5660378, g: 0.5625123, b: 0.509968, a: 1}
|
||||
- {r: 0.4093453, g: 0.3700605, b: 0.41509432, a: 1}
|
||||
- {r: 0.21242543, g: 0.21039516, b: 0.2264151, a: 1}
|
||||
- {r: 0.667, g: 0.667, b: 0.667, a: 1}
|
||||
- {r: 0.867, g: 0.867, b: 0.867, a: 1}
|
||||
|
||||
@@ -16,7 +16,7 @@ MonoBehaviour:
|
||||
- {fileID: 2100000, guid: c22777d6e868e4f2fb421913386b154e, type: 2}
|
||||
- {fileID: 2100000, guid: 0b54b63be52c4f94ba30ff0d1ddb6cc8, type: 2}
|
||||
- {fileID: 2100000, guid: 9e9846162c23b624d8334dbfd2726184, type: 2}
|
||||
- {fileID: 0}
|
||||
- {fileID: 2100000, guid: 4005e5f0044ff9e4e943eda4aeb744d8, type: 2}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
|
||||
138
Assets/Map/Materials/WindowWarmLightMat.mat
Normal file
138
Assets/Map/Materials/WindowWarmLightMat.mat
Normal file
@@ -0,0 +1,138 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!21 &2100000
|
||||
Material:
|
||||
serializedVersion: 8
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: WindowWarmLightMat
|
||||
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
|
||||
m_Parent: {fileID: 0}
|
||||
m_ModifiedSerializedProperties: 0
|
||||
m_ValidKeywords:
|
||||
- _EMISSION
|
||||
m_InvalidKeywords: []
|
||||
m_LightmapFlags: 2
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: -1
|
||||
stringTagMap:
|
||||
RenderType: Opaque
|
||||
disabledShaderPasses:
|
||||
- MOTIONVECTORS
|
||||
m_LockedProperties:
|
||||
m_SavedProperties:
|
||||
serializedVersion: 3
|
||||
m_TexEnvs:
|
||||
- _BaseMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _BumpMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _DetailAlbedoMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _DetailMask:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _DetailNormalMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _EmissionMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _MainTex:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _MetallicGlossMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _OcclusionMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _ParallaxMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _SpecGlossMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- unity_Lightmaps:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- unity_LightmapsInd:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- unity_ShadowMasks:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_Ints: []
|
||||
m_Floats:
|
||||
- _AddPrecomputedVelocity: 0
|
||||
- _AlphaClip: 0
|
||||
- _AlphaToMask: 0
|
||||
- _Blend: 0
|
||||
- _BlendModePreserveSpecular: 1
|
||||
- _BumpScale: 1
|
||||
- _ClearCoatMask: 0
|
||||
- _ClearCoatSmoothness: 0
|
||||
- _Cull: 2
|
||||
- _Cutoff: 0.5
|
||||
- _DetailAlbedoMapScale: 1
|
||||
- _DetailNormalMapScale: 1
|
||||
- _DstBlend: 0
|
||||
- _DstBlendAlpha: 0
|
||||
- _EnvironmentReflections: 1
|
||||
- _GlossMapScale: 0
|
||||
- _Glossiness: 0
|
||||
- _GlossyReflections: 0
|
||||
- _Metallic: 0
|
||||
- _OcclusionStrength: 1
|
||||
- _Parallax: 0.005
|
||||
- _QueueOffset: 0
|
||||
- _ReceiveShadows: 1
|
||||
- _Smoothness: 0.5
|
||||
- _SmoothnessTextureChannel: 0
|
||||
- _SpecularHighlights: 1
|
||||
- _SrcBlend: 1
|
||||
- _SrcBlendAlpha: 1
|
||||
- _Surface: 0
|
||||
- _WorkflowMode: 1
|
||||
- _XRMotionVectorsPass: 1
|
||||
- _ZWrite: 1
|
||||
m_Colors:
|
||||
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _EmissionColor: {r: 0.49416867, g: 0.44177076, b: 0.36130255, a: 1}
|
||||
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
m_AllowLocking: 1
|
||||
--- !u!114 &2683191447336228708
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 11
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
version: 10
|
||||
8
Assets/Map/Materials/WindowWarmLightMat.mat.meta
Normal file
8
Assets/Map/Materials/WindowWarmLightMat.mat.meta
Normal file
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 4005e5f0044ff9e4e943eda4aeb744d8
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
8
Assets/Map/Structures/Pieces.meta
Normal file
8
Assets/Map/Structures/Pieces.meta
Normal file
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 4b75c4363b486204fb15653c8ec169f6
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
39548
Assets/Map/Structures/Pieces/PipeSmall1.prefab
Normal file
39548
Assets/Map/Structures/Pieces/PipeSmall1.prefab
Normal file
File diff suppressed because it is too large
Load Diff
7
Assets/Map/Structures/Pieces/PipeSmall1.prefab.meta
Normal file
7
Assets/Map/Structures/Pieces/PipeSmall1.prefab.meta
Normal file
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 3e85a558ff3c33e40b9a020059605b03
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
39548
Assets/Map/Structures/Pieces/PipeSmall2.prefab
Normal file
39548
Assets/Map/Structures/Pieces/PipeSmall2.prefab
Normal file
File diff suppressed because it is too large
Load Diff
7
Assets/Map/Structures/Pieces/PipeSmall2.prefab.meta
Normal file
7
Assets/Map/Structures/Pieces/PipeSmall2.prefab.meta
Normal file
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 0f6687cf01fb57c44b9fc152970c510e
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
1909
Assets/Map/Structures/Pieces/WindowMedium1.prefab
Normal file
1909
Assets/Map/Structures/Pieces/WindowMedium1.prefab
Normal file
File diff suppressed because it is too large
Load Diff
7
Assets/Map/Structures/Pieces/WindowMedium1.prefab.meta
Normal file
7
Assets/Map/Structures/Pieces/WindowMedium1.prefab.meta
Normal file
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 73d4266f5cb27b943b3993e3c4173425
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
3049
Assets/Map/Structures/Pieces/WindowPanes1.prefab
Normal file
3049
Assets/Map/Structures/Pieces/WindowPanes1.prefab
Normal file
File diff suppressed because it is too large
Load Diff
7
Assets/Map/Structures/Pieces/WindowPanes1.prefab.meta
Normal file
7
Assets/Map/Structures/Pieces/WindowPanes1.prefab.meta
Normal file
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 44e7f68dfe097664d8d2536fe7e9c96a
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
1933
Assets/Map/Structures/Pieces/WindowSmall1.prefab
Normal file
1933
Assets/Map/Structures/Pieces/WindowSmall1.prefab
Normal file
File diff suppressed because it is too large
Load Diff
7
Assets/Map/Structures/Pieces/WindowSmall1.prefab.meta
Normal file
7
Assets/Map/Structures/Pieces/WindowSmall1.prefab.meta
Normal file
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 287cf11ee8667a348a683fd01e8ea4fe
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -509,7 +509,7 @@ MonoBehaviour:
|
||||
hitTextSize: 0
|
||||
hitLocationOffset: {x: 0, y: 0, z: 0}
|
||||
hitRotationOffset: {x: 0, y: 0, z: 0}
|
||||
gizmoDrawingCondition: 0
|
||||
gizmoDrawingCondition: 2
|
||||
children: []
|
||||
- label: player
|
||||
castType: 4
|
||||
@@ -536,7 +536,7 @@ MonoBehaviour:
|
||||
hitTextSize: 0
|
||||
hitLocationOffset: {x: 0, y: 0, z: 0}
|
||||
hitRotationOffset: {x: 0, y: 0, z: 0}
|
||||
gizmoDrawingCondition: 0
|
||||
gizmoDrawingCondition: 2
|
||||
children: []
|
||||
references:
|
||||
version: 2
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -13,32 +13,27 @@ MonoBehaviour:
|
||||
m_Name: PC_Renderer
|
||||
m_EditorClassIdentifier:
|
||||
debugShaders:
|
||||
debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7,
|
||||
type: 3}
|
||||
debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, type: 3}
|
||||
hdrDebugViewPS: {fileID: 4800000, guid: 573620ae32aec764abd4d728906d2587, type: 3}
|
||||
probeVolumeSamplingDebugComputeShader: {fileID: 7200000, guid: 53626a513ea68ce47b59dc1299fe3959,
|
||||
type: 3}
|
||||
probeVolumeSamplingDebugComputeShader: {fileID: 7200000, guid: 53626a513ea68ce47b59dc1299fe3959, type: 3}
|
||||
probeVolumeResources:
|
||||
probeVolumeDebugShader: {fileID: 4800000, guid: e5c6678ed2aaa91408dd3df699057aae,
|
||||
type: 3}
|
||||
probeVolumeFragmentationDebugShader: {fileID: 4800000, guid: 03cfc4915c15d504a9ed85ecc404e607,
|
||||
type: 3}
|
||||
probeVolumeOffsetDebugShader: {fileID: 4800000, guid: 53a11f4ebaebf4049b3638ef78dc9664,
|
||||
type: 3}
|
||||
probeVolumeSamplingDebugShader: {fileID: 4800000, guid: 8f96cd657dc40064aa21efcc7e50a2e7,
|
||||
type: 3}
|
||||
probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 57d7c4c16e2765b47a4d2069b311bffe,
|
||||
type: 3}
|
||||
probeSamplingDebugTexture: {fileID: 2800000, guid: 24ec0e140fb444a44ab96ee80844e18e,
|
||||
type: 3}
|
||||
probeVolumeBlendStatesCS: {fileID: 7200000, guid: b9a23f869c4fd45f19c5ada54dd82176,
|
||||
type: 3}
|
||||
probeVolumeDebugShader: {fileID: 4800000, guid: e5c6678ed2aaa91408dd3df699057aae, type: 3}
|
||||
probeVolumeFragmentationDebugShader: {fileID: 4800000, guid: 03cfc4915c15d504a9ed85ecc404e607, type: 3}
|
||||
probeVolumeOffsetDebugShader: {fileID: 4800000, guid: 53a11f4ebaebf4049b3638ef78dc9664, type: 3}
|
||||
probeVolumeSamplingDebugShader: {fileID: 4800000, guid: 8f96cd657dc40064aa21efcc7e50a2e7, type: 3}
|
||||
probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 57d7c4c16e2765b47a4d2069b311bffe, type: 3}
|
||||
probeSamplingDebugTexture: {fileID: 2800000, guid: 24ec0e140fb444a44ab96ee80844e18e, type: 3}
|
||||
probeVolumeBlendStatesCS: {fileID: 7200000, guid: b9a23f869c4fd45f19c5ada54dd82176, type: 3}
|
||||
m_RendererFeatures:
|
||||
- {fileID: 7833122117494664109}
|
||||
m_RendererFeatureMap: ad6b866f10d7b46c
|
||||
m_UseNativeRenderPass: 1
|
||||
xrSystemData: {fileID: 0}
|
||||
postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2}
|
||||
m_AssetVersion: 2
|
||||
m_AssetVersion: 3
|
||||
m_PrepassLayerMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
m_OpaqueLayerMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
@@ -56,6 +51,8 @@ MonoBehaviour:
|
||||
m_RenderingMode: 2
|
||||
m_DepthPrimingMode: 0
|
||||
m_CopyDepthMode: 0
|
||||
m_DepthAttachmentFormat: 0
|
||||
m_DepthTextureFormat: 0
|
||||
m_AccurateGbufferNormals: 0
|
||||
m_IntermediateTextureMode: 0
|
||||
--- !u!114 &7833122117494664109
|
||||
@@ -84,12 +81,3 @@ MonoBehaviour:
|
||||
BlurQuality: 0
|
||||
Falloff: 100
|
||||
SampleCount: -1
|
||||
m_BlueNoise256Textures:
|
||||
- {fileID: 2800000, guid: 36f118343fc974119bee3d09e2111500, type: 3}
|
||||
- {fileID: 2800000, guid: 4b7b083e6b6734e8bb2838b0b50a0bc8, type: 3}
|
||||
- {fileID: 2800000, guid: c06cc21c692f94f5fb5206247191eeee, type: 3}
|
||||
- {fileID: 2800000, guid: cb76dd40fa7654f9587f6a344f125c9a, type: 3}
|
||||
- {fileID: 2800000, guid: e32226222ff144b24bf3a5a451de54bc, type: 3}
|
||||
- {fileID: 2800000, guid: 3302065f671a8450b82c9ddf07426f3a, type: 3}
|
||||
- {fileID: 2800000, guid: 56a77a3e8d64f47b6afe9e3c95cb57d5, type: 3}
|
||||
m_Shader: {fileID: 4800000, guid: 0849e84e3d62649e8882e9d6f056a017, type: 3}
|
||||
|
||||
@@ -6,7 +6,7 @@ QualitySettings:
|
||||
serializedVersion: 5
|
||||
m_CurrentQuality: 1
|
||||
m_QualitySettings:
|
||||
- serializedVersion: 4
|
||||
- serializedVersion: 5
|
||||
name: Mobile
|
||||
pixelLightCount: 2
|
||||
shadows: 2
|
||||
@@ -34,6 +34,7 @@ QualitySettings:
|
||||
adaptiveVsyncExtraA: 0
|
||||
adaptiveVsyncExtraB: 0
|
||||
lodBias: 1
|
||||
meshLodThreshold: 1
|
||||
maximumLODLevel: 0
|
||||
enableLODCrossFade: 1
|
||||
streamingMipmapsActive: 0
|
||||
@@ -59,7 +60,7 @@ QualitySettings:
|
||||
terrainMaxTrees: 50
|
||||
excludedTargetPlatforms:
|
||||
- Standalone
|
||||
- serializedVersion: 4
|
||||
- serializedVersion: 5
|
||||
name: PC
|
||||
pixelLightCount: 2
|
||||
shadows: 2
|
||||
@@ -87,6 +88,7 @@ QualitySettings:
|
||||
adaptiveVsyncExtraA: 0
|
||||
adaptiveVsyncExtraB: 0
|
||||
lodBias: 2
|
||||
meshLodThreshold: 1
|
||||
maximumLODLevel: 0
|
||||
enableLODCrossFade: 1
|
||||
streamingMipmapsActive: 0
|
||||
|
||||
Reference in New Issue
Block a user