zaletovfyodor
/
PO
3
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
PO/Logs/shadercompiler-UnityShaderC...

47 lines
12 KiB
Plaintext
Raw Normal View History

okey, really first commit
2022-01-12 10:06:03 +03:00
Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines'
Cmd: initializeCompiler
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
<<<<<<< HEAD
=======
test
2022-01-13 15:58:33 +03:00
Cmd: preprocess
insize=7883 file=Assets/TextMesh Pro/Shaders/TMP_SDF-Mobile Overlay.shader surfaceOnly=0 cachingPP=1 buildPlatform=13 pKW=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING dKW=UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF2 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 ok=1 outsize=2542
Cmd: preprocess
insize=3642 file=Assets/TextMesh Pro/Shaders/TMP_Bitmap.shader surfaceOnly=0 cachingPP=1 buildPlatform=13 pKW=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING dKW=UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF2 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 ok=1 outsize=1299
Cmd: preprocess
insize=12310 file=Assets/TextMesh Pro/Shaders/TMP_SDF SSD.shader surfaceOnly=0 cachingPP=1 buildPlatform=13 pKW=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING dKW=UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF2 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 ok=1 outsize=4702
Cmd: preprocess
insize=3662 file=Assets/TextMesh Pro/Shaders/TMP_SDF-Surface-Mobile.shader surfaceOnly=0 cachingPP=1 buildPlatform=13 pKW=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING dKW=UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF2 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 ok=1 outsize=2718
Cmd: preprocess
insize=4513 file=Assets/TextMesh Pro/Shaders/TMP_SDF-Surface.shader surfaceOnly=0 cachingPP=1 buildPlatform=13 pKW=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING dKW=UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF2 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 ok=1 outsize=3751
Cmd: preprocess
insize=3640 file=Assets/TextMesh Pro/Shaders/TMP_Bitmap-Custom-Atlas.shader surfaceOnly=0 cachingPP=1 buildPlatform=13 pKW=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING dKW=UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF2 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 ok=1 outsize=1347
Cmd: preprocess
insize=10917 file=Assets/TextMesh Pro/Shaders/TMP_SDF.shader surfaceOnly=0 cachingPP=1 buildPlatform=13 pKW=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING dKW=UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF2 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 ok=1 outsize=4057
Cmd: preprocess
insize=3177 file=Assets/TextMesh Pro/Shaders/TMP_SDF-Mobile SSD.shader surfaceOnly=0 cachingPP=1 buildPlatform=13 pKW=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING dKW=UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF2 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 ok=1 outsize=2815
Cmd: preprocess
insize=8069 file=Assets/TextMesh Pro/Shaders/TMP_SDF-Mobile Masking.shader surfaceOnly=0 cachingPP=1 buildPlatform=13 pKW=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING dKW=UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF2 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 ok=1 outsize=2811
Cmd: preprocess
insize=10902 file=Assets/TextMesh Pro/Shaders/TMP_SDF Overlay.shader surfaceOnly=0 cachingPP=1 buildPlatform=13 pKW=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING dKW=UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF2 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 ok=1 outsize=4047
Cmd: preprocess
insize=3694 file=Assets/TextMesh Pro/Shaders/TMP_Bitmap-Mobile.shader surfaceOnly=0 cachingPP=1 buildPlatform=13 pKW=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING dKW=UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF2 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 ok=1 outsize=1723
Cmd: preprocess
insize=7914 file=Assets/TextMesh Pro/Shaders/TMP_SDF-Mobile.shader surfaceOnly=0 cachingPP=1 buildPlatform=13 pKW=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING dKW=UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF2 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 ok=1 outsize=2554
Cmd: preprocess
insize=2468 file=Assets/TextMesh Pro/Shaders/TMP_Sprite.shader surfaceOnly=0 cachingPP=1 buildPlatform=13 pKW=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING dKW=UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF2 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 ok=1 outsize=1177
enemy prefab
2022-01-13 12:07:16 +03:00
Cmd: shutdown
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO # Conflicts: # Library/ArtifactDB # Library/Artifacts/07/075865a943086604a762d95a5807cdaa # Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906 # Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e # Library/Artifacts/21/212997b24db34583c86cdb63cde56cda # Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590 # Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8 # Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4 # Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06 # Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf # Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde # Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9 # Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a # Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2 # Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160 # Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691 # Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39 # Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e # Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3 # Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/SourceAssetDB # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log # Logs/shadercompiler-UnityShaderCompiler.exe5.log # Logs/shadercompiler-UnityShaderCompiler.exe6.log # Logs/shadercompiler-UnityShaderCompiler.exe7.log
2022-01-13 16:17:34 +03:00
>>>>>>> f40b9c3824b3dc0c23f55e77dcc5a951712e02e8