Merge branch 'main' of https://github.com/firez2469/station_obscurum_temp

2023-05-31 12:51:46 -04:00
parent 8dd1b574a7 660805d5c0
commit d804182020
9 changed files with 32 additions and 30 deletions
--- a/Assets/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.sln.meta
+++ b/Assets/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.sln.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 246f31a0e00fea74a93125fec6d80da8
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/FishNet/Runtime/Transporting/Transports/Tugboat/LiteNetLib/LiteNetLib.csproj.meta
+++ b/Assets/FishNet/Runtime/Transporting/Transports/Tugboat/LiteNetLib/LiteNetLib.csproj.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 2ad85b0f43f25f1499c27a4dca23ddd8
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Materials/FlashlightLit.mat
+++ b/Assets/Materials/FlashlightLit.mat
@ -206,7 +206,7 @@ Material:
    - _StencilWriteMask: 6
    - _StencilWriteMaskDepth: 8
    - _StencilWriteMaskGBuffer: 14
-    - _StencilWriteMaskMV: 42
+    - _StencilWriteMaskMV: 40
    - _SubsurfaceMask: 1
    - _SupportDecals: 1
    - _SurfaceType: 0
--- a/Assets/Materials/Levels/Level0/CeilLightMaterial.mat
+++ b/Assets/Materials/Levels/Level0/CeilLightMaterial.mat
@ -206,7 +206,7 @@ Material:
    - _StencilWriteMask: 6
    - _StencilWriteMaskDepth: 8
    - _StencilWriteMaskGBuffer: 14
-    - _StencilWriteMaskMV: 42
+    - _StencilWriteMaskMV: 40
    - _SubsurfaceMask: 1
    - _SupportDecals: 1
    - _SurfaceType: 0
--- a/Assets/VFXGraph/GabrielAguiarProductions/VFXGraph_Muzzle_2020.3_HDRP_v1.0.1.unitypackage.meta
+++ b/Assets/VFXGraph/GabrielAguiarProductions/VFXGraph_Muzzle_2020.3_HDRP_v1.0.1.unitypackage.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 96a44475794fb6445a6f3c4b9ee13966
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/VFXGraph/GabrielAguiarProductions/VFXGraph_Muzzle_2020.3_URP_v1.0.1.unitypackage.meta
+++ b/Assets/VFXGraph/GabrielAguiarProductions/VFXGraph_Muzzle_2020.3_URP_v1.0.1.unitypackage.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 0957b521a08374f4aa508231735153bc
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: