AlmostAlmostFinalMap

2021-07-06 19:45:01 +02:00 · 2021-07-06 19:45:01 +02:00 · a913bf7f1e
commit a913bf7f1e
parent 69034cec9a
19 changed files with 50 additions and 35 deletions
--- a/MWS/Library/CurrentLayout-default.dwlt
+++ b/MWS/Library/CurrentLayout-default.dwlt
@ -15,13 +15,13 @@ MonoBehaviour:
  m_PixelRect:
    serializedVersion: 2
    x: 8
-    y: 295
+    y: 51
    width: 1904
    height: 981
  m_ShowMode: 4
-  m_Title: Hierarchy
+  m_Title: Project
  m_RootView: {fileID: 6}
-  m_MinSize: {x: 875, y: 542}
+  m_MinSize: {x: 875, y: 300}
  m_MaxSize: {x: 10000, y: 10000}
  m_Maximized: 0
 --- !u!114 &2
@ -48,7 +48,7 @@ MonoBehaviour:
  m_MinSize: {x: 679, y: 492}
  m_MaxSize: {x: 14002, y: 14042}
  vertical: 0
-  controlID: 75
+  controlID: 105
 --- !u!114 &3
 MonoBehaviour:
  m_ObjectHideFlags: 52
@ -68,8 +68,8 @@ MonoBehaviour:
    y: 0
    width: 549
    height: 931
-  m_MinSize: {x: 276, y: 71}
-  m_MaxSize: {x: 4001, y: 4021}
+  m_MinSize: {x: 275, y: 50}
+  m_MaxSize: {x: 4000, y: 4000}
  m_ActualView: {fileID: 16}
  m_Panes:
  - {fileID: 16}
@ -152,7 +152,7 @@ MonoBehaviour:
    y: 0
    width: 1904
    height: 981
-  m_MinSize: {x: 875, y: 542}
+  m_MinSize: {x: 875, y: 300}
  m_MaxSize: {x: 10000, y: 10000}
  m_UseTopView: 1
  m_TopViewHeight: 30
@ -228,7 +228,7 @@ MonoBehaviour:
  m_MinSize: {x: 403, y: 492}
  m_MaxSize: {x: 10001, y: 14042}
  vertical: 1
-  controlID: 76
+  controlID: 36
 --- !u!114 &10
 MonoBehaviour:
  m_ObjectHideFlags: 52
@ -253,7 +253,7 @@ MonoBehaviour:
  m_MinSize: {x: 403, y: 221}
  m_MaxSize: {x: 8003, y: 4021}
  vertical: 0
-  controlID: 77
+  controlID: 37
 --- !u!114 &11
 MonoBehaviour:
  m_ObjectHideFlags: 52
@ -441,7 +441,7 @@ MonoBehaviour:
  m_Pos:
    serializedVersion: 2
    x: 8
-    y: 880
+    y: 636
    width: 1354
    height: 355
  m_ViewDataDictionary: {fileID: 0}
@ -458,22 +458,22 @@ MonoBehaviour:
    m_SkipHidden: 0
    m_SearchArea: 1
    m_Folders:
-    - Assets/Prefab
+    - Assets/ADG_Textures/ground_vol1
    m_Globs: []
    m_OriginalText: 
  m_ViewMode: 1
  m_StartGridSize: 64
  m_LastFolders:
-  - Assets/Prefab
+  - Assets/ADG_Textures/ground_vol1
  m_LastFoldersGridSize: -1
-  m_LastProjectPath: N:\mws\MWS_2021-cw6-lite\mws_2021\Terrain
+  m_LastProjectPath: N:\UnityProjects\ProjektMWS\Projekt MWS
  m_LockTracker:
    m_IsLocked: 0
  m_FolderTreeState:
-    scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 4e720000
-    m_LastClickedID: 29262
-    m_ExpandedIDs: 00000000c0440000c8440000ca440000ce4400007045000000ca9a3b
+    scrollPos: {x: 0, y: 127}
+    m_SelectedIDs: 284b0000
+    m_LastClickedID: 19240
+    m_ExpandedIDs: 00000000924a0000944a0000964a0000984a00009a4a0000d04a0000d24a000000ca9a3b
    m_RenameOverlay:
      m_UserAcceptedRename: 0
      m_Name: 
@ -501,7 +501,7 @@ MonoBehaviour:
    scrollPos: {x: 0, y: 0}
    m_SelectedIDs: 
    m_LastClickedID: 0
-    m_ExpandedIDs: 00000000c0440000c2440000c4440000c6440000c8440000ca440000cc440000ce440000
+    m_ExpandedIDs: 00000000924a0000944a0000964a0000984a00009a4a0000
    m_RenameOverlay:
      m_UserAcceptedRename: 0
      m_Name: 
@ -578,7 +578,7 @@ MonoBehaviour:
  m_Pos:
    serializedVersion: 2
    x: 1363
-    y: 325
+    y: 81
    width: 548
    height: 910
  m_ViewDataDictionary: {fileID: 0}
@ -615,30 +615,30 @@ MonoBehaviour:
  m_Pos:
    serializedVersion: 2
    x: 8
-    y: 325
+    y: 81
    width: 239
    height: 534
  m_ViewDataDictionary: {fileID: 0}
  m_SceneHierarchy:
    m_TreeViewState:
      scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 
+      m_SelectedIDs: 284b0000
      m_LastClickedID: 0
-      m_ExpandedIDs: cc37fcff1e3bfcff4a54feff74bcfefff6cefeff12fbffff
+      m_ExpandedIDs: d6f2ffff0af7ffff0afbffff
      m_RenameOverlay:
        m_UserAcceptedRename: 0
-        m_Name: TerrainGroup_0
-        m_OriginalName: TerrainGroup_0
+        m_Name: 
+        m_OriginalName: 
        m_EditFieldRect:
          serializedVersion: 2
          x: 0
          y: 0
          width: 0
          height: 0
-        m_UserData: 15804
+        m_UserData: 0
        m_IsWaitingForDelay: 0
        m_IsRenaming: 0
-        m_OriginalEventType: 0
+        m_OriginalEventType: 11
        m_IsRenamingFilename: 0
        m_ClientGUIView: {fileID: 4}
      m_SearchString: 
@ -669,7 +669,7 @@ MonoBehaviour:
  m_Pos:
    serializedVersion: 2
    x: 248
-    y: 325
+    y: 81
    width: 1113
    height: 534
  m_ViewDataDictionary: {fileID: 0}
@ -684,9 +684,9 @@ MonoBehaviour:
  m_PlayAudio: 0
  m_AudioPlay: 0
  m_Position:
-    m_Target: {x: 35.58268, y: -4.415542, z: 38.123795}
+    m_Target: {x: 46.971375, y: -4.472104, z: 53.413567}
    speed: 2
-    m_Value: {x: 35.58268, y: -4.415542, z: 38.123795}
+    m_Value: {x: 46.971375, y: -4.472104, z: 53.413567}
  m_RenderMode: 0
  m_CameraMode:
    drawMode: 0
@ -733,13 +733,13 @@ MonoBehaviour:
    m_GridAxis: 1
    m_gridOpacity: 0.5
  m_Rotation:
-    m_Target: {x: 0.046730455, y: -0.9269935, z: 0.12337254, w: 0.3511548}
+    m_Target: {x: 0.09108053, y: -0.86462, z: 0.16970512, w: 0.46407872}
    speed: 2
-    m_Value: {x: 0.04654462, y: -0.9275047, z: 0.12344057, w: 0.34975848}
+    m_Value: {x: 0.09113979, y: -0.862762, z: 0.16799685, w: 0.4680945}
  m_Size:
-    m_Target: 25.890043
+    m_Target: 20.269583
    speed: 2
-    m_Value: 27.109993
+    m_Value: 20.269583
  m_Ortho:
    m_Target: 0
    speed: 2
--- a/MWS/Library/SceneVisibilityState.asset
+++ b/MWS/Library/SceneVisibilityState.asset
--- a/MWS/Library/SourceAssetDB
+++ b/MWS/Library/SourceAssetDB
--- a/MWS/Library/StateCache/MainStageHierarchy/4d/4d2a36d9faf65734f0bbefb3ee623532.json
+++ b/MWS/Library/StateCache/MainStageHierarchy/4d/4d2a36d9faf65734f0bbefb3ee623532.json
@ -1 +1 @@
-{"m_ScrollY":0.0,"m_ExpandedSceneGameObjectInstanceIDs":[-3370,-2294,-1270],"m_LastClickedInstanceID":-2300,"m_OpenSceneGUIDs":["6a85e5eb2a367e84ab25e482b2494aef"]}
+{"m_ScrollY":0.0,"m_ExpandedSceneGameObjectInstanceIDs":[],"m_LastClickedInstanceID":0,"m_OpenSceneGUIDs":[]}
--- a/MWS/Library/StateCache/SceneView/8c/8cd7c613bf844de3b80696e27a479d5e.json
+++ b/MWS/Library/StateCache/SceneView/8c/8cd7c613bf844de3b80696e27a479d5e.json
@ -1 +1 @@
-{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"m_AlwaysRefresh":false,"showFog":true,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true,"showVisualEffectGraphs":true,"m_FxEnabled":true},"in2DMode":false,"pivot":{"x":45.93223190307617,"y":6.7006378173828129,"z":51.4781494140625},"rotation":{"x":0.04673045501112938,"y":-0.9269934892654419,"z":0.12337253987789154,"w":0.35115480422973635},"size":5.655999183654785,"orthographic":false}
+{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"m_AlwaysRefresh":false,"showFog":true,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true,"showVisualEffectGraphs":true,"m_FxEnabled":true},"in2DMode":false,"pivot":{"x":46.97137451171875,"y":-4.472104072570801,"z":53.41356658935547},"rotation":{"x":0.09108053147792816,"y":-0.8646199703216553,"z":0.1697051227092743,"w":0.46407872438430788},"size":20.269582748413087,"orthographic":false}
--- a/MWS/Library/expandedItems
+++ b/MWS/Library/expandedItems
--- a/MWS/Logs/AssetImportWorker0.log
+++ b/MWS/Logs/AssetImportWorker0.log
@ -83,3 +83,4 @@ Received Import Request.
 Start importing Assets/ADG_Textures/ground_vol1 using Guid(feb862146f8ee684c998cb438859dafb) Importer(815301076,1909f56bfc062723c751e8b465ee728b)  -> (artifact id: '8fb7f5f41aa69936894cc9e825098fef') in 0.004589 seconds
  Import took 0.007041 seconds .

+AssetImportWorkerClient::OnTransportError - code=2 error=End of file
--- a/MWS/Logs/shadercompiler-AssetImportWorker0.log
+++ b/MWS/Logs/shadercompiler-AssetImportWorker0.log
@ -1,3 +1,6 @@
 Base path: 'N:/2020.3.0f1/Editor/Data', plugins path 'N:/2020.3.0f1/Editor/Data/PlaybackEngines'
 Cmd: initializeCompiler

+Unhandled exception: Protocol error - failed to read magic number (error -2147483644, transferred 0/4)
+
+Quitting shader compiler process
--- a/MWS/Logs/shadercompiler-UnityShaderCompiler.exe0.log
+++ b/MWS/Logs/shadercompiler-UnityShaderCompiler.exe0.log
@ -1,3 +1,4 @@
 Base path: 'N:/2020.3.0f1/Editor/Data', plugins path 'N:/2020.3.0f1/Editor/Data/PlaybackEngines'
 Cmd: initializeCompiler

+Cmd: shutdown
--- a/MWS/Logs/shadercompiler-UnityShaderCompiler.exe1.log
+++ b/MWS/Logs/shadercompiler-UnityShaderCompiler.exe1.log
@ -4,3 +4,4 @@ Cmd: initializeCompiler
 Cmd: compileSnippet
  insize=7034 path=Assets/DefaultResourcesExtra/TerrainShaders/Details cachingPP=1 ppOnly=0 stripLineD=0 buildPlatform=19 rsLen=0 pKW=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR UNITY_PASS_SHADOWCASTER uKW=SHADOWS_DEPTH dKW=INSTANCING_ON SHADOWS_CUBE UNITY_NO_DXT5nm UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_DLDR_ENCODING UNITY_LIGHTMAP_RGBM_ENCODING UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 flags=0 lang=0 type=Fragment platform=d3d11 reqs=33 mask=6 start=204 ok=1 outsize=502

+Cmd: shutdown
--- a/MWS/Logs/shadercompiler-UnityShaderCompiler.exe10.log
+++ b/MWS/Logs/shadercompiler-UnityShaderCompiler.exe10.log
@ -4,3 +4,4 @@ Cmd: initializeCompiler
 Cmd: compileSnippet
  insize=19186 path=Assets/DefaultResourcesExtra/TerrainShaders/Details cachingPP=1 ppOnly=0 stripLineD=0 buildPlatform=19 rsLen=0 pKW=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR UNITY_PASS_FORWARDBASE uKW=DIRECTIONAL SHADOWS_SCREEN LIGHTPROBE_SH VERTEXLIGHT_ON dKW=INSTANCING_ON FOG_LINEAR FOG_EXP FOG_EXP2 SHADOWS_SHADOWMASK DYNAMICLIGHTMAP_ON LIGHTMAP_ON LIGHTMAP_SHADOW_MIXING DIRLIGHTMAP_COMBINED UNITY_NO_DXT5nm UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_DLDR_ENCODING UNITY_LIGHTMAP_RGBM_ENCODING UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 flags=0 lang=0 type=Vertex platform=d3d11 reqs=227 mask=6 start=55 ok=1 outsize=3866

+Cmd: shutdown
--- a/MWS/Logs/shadercompiler-UnityShaderCompiler.exe2.log
+++ b/MWS/Logs/shadercompiler-UnityShaderCompiler.exe2.log
@ -4,3 +4,4 @@ Cmd: initializeCompiler
 Cmd: compileSnippet
  insize=7034 path=Assets/DefaultResourcesExtra/TerrainShaders/Details cachingPP=1 ppOnly=0 stripLineD=0 buildPlatform=19 rsLen=0 pKW=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR UNITY_PASS_SHADOWCASTER uKW=SHADOWS_DEPTH dKW=INSTANCING_ON SHADOWS_CUBE UNITY_NO_DXT5nm UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_DLDR_ENCODING UNITY_LIGHTMAP_RGBM_ENCODING UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 flags=0 lang=0 type=Vertex platform=d3d11 reqs=33 mask=6 start=204 ok=1 outsize=3066

+Cmd: shutdown
--- a/MWS/Logs/shadercompiler-UnityShaderCompiler.exe3.log
+++ b/MWS/Logs/shadercompiler-UnityShaderCompiler.exe3.log
@ -1,3 +1,4 @@
 Base path: 'N:/2020.3.0f1/Editor/Data', plugins path 'N:/2020.3.0f1/Editor/Data/PlaybackEngines'
 Cmd: initializeCompiler

+Cmd: shutdown
--- a/MWS/Logs/shadercompiler-UnityShaderCompiler.exe4.log
+++ b/MWS/Logs/shadercompiler-UnityShaderCompiler.exe4.log
@ -1,3 +1,4 @@
 Base path: 'N:/2020.3.0f1/Editor/Data', plugins path 'N:/2020.3.0f1/Editor/Data/PlaybackEngines'
 Cmd: initializeCompiler

+Cmd: shutdown
--- a/MWS/Logs/shadercompiler-UnityShaderCompiler.exe5.log
+++ b/MWS/Logs/shadercompiler-UnityShaderCompiler.exe5.log
@ -1,3 +1,4 @@
 Base path: 'N:/2020.3.0f1/Editor/Data', plugins path 'N:/2020.3.0f1/Editor/Data/PlaybackEngines'
 Cmd: initializeCompiler

+Cmd: shutdown
--- a/MWS/Logs/shadercompiler-UnityShaderCompiler.exe6.log
+++ b/MWS/Logs/shadercompiler-UnityShaderCompiler.exe6.log
@ -1,3 +1,4 @@
 Base path: 'N:/2020.3.0f1/Editor/Data', plugins path 'N:/2020.3.0f1/Editor/Data/PlaybackEngines'
 Cmd: initializeCompiler

+Cmd: shutdown
--- a/MWS/Logs/shadercompiler-UnityShaderCompiler.exe7.log
+++ b/MWS/Logs/shadercompiler-UnityShaderCompiler.exe7.log
@ -1,3 +1,4 @@
 Base path: 'N:/2020.3.0f1/Editor/Data', plugins path 'N:/2020.3.0f1/Editor/Data/PlaybackEngines'
 Cmd: initializeCompiler

+Cmd: shutdown
--- a/MWS/Logs/shadercompiler-UnityShaderCompiler.exe8.log
+++ b/MWS/Logs/shadercompiler-UnityShaderCompiler.exe8.log
@ -4,3 +4,4 @@ Cmd: initializeCompiler
 Cmd: compileSnippet
  insize=18118 path=Assets/DefaultResourcesExtra/Mobile cachingPP=1 ppOnly=0 stripLineD=0 buildPlatform=19 rsLen=0 pKW=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR UNITY_PASS_FORWARDBASE uKW=DIRECTIONAL LIGHTPROBE_SH VERTEXLIGHT_ON dKW=INSTANCING_ON FOG_LINEAR FOG_EXP FOG_EXP2 SHADOWS_SHADOWMASK DYNAMICLIGHTMAP_ON LIGHTMAP_ON LIGHTMAP_SHADOW_MIXING DIRLIGHTMAP_COMBINED SHADOWS_SCREEN UNITY_NO_DXT5nm UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_DLDR_ENCODING UNITY_LIGHTMAP_RGBM_ENCODING UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 flags=0 lang=0 type=Vertex platform=d3d11 reqs=33 mask=6 start=26 ok=1 outsize=3026

+Cmd: shutdown
--- a/MWS/Logs/shadercompiler-UnityShaderCompiler.exe9.log
+++ b/MWS/Logs/shadercompiler-UnityShaderCompiler.exe9.log
@ -1,3 +1,4 @@
 Base path: 'N:/2020.3.0f1/Editor/Data', plugins path 'N:/2020.3.0f1/Editor/Data/PlaybackEngines'
 Cmd: initializeCompiler

+Cmd: shutdown