Resolution pb

3 years ago · ccd1d297d8
parent a6a9d5233e
commit ccd1d297d8
8 changed files with 99 additions and 71 deletions
--- a/Library/CurrentLayout-default.dwlt
+++ b/Library/CurrentLayout-default.dwlt
@ -19,9 +19,9 @@ MonoBehaviour:
    width: 1536
    height: 820.8
  m_ShowMode: 4
-  m_Title: Hierarchy
+  m_Title: Project
  m_RootView: {fileID: 2}
-  m_MinSize: {x: 875, y: 300}
+  m_MinSize: {x: 875, y: 542}
  m_MaxSize: {x: 10000, y: 10000}
  m_Maximized: 1
 --- !u!114 &2
@ -45,8 +45,8 @@ MonoBehaviour:
    x: 0
    y: 0
    width: 1536
-    height: 820.8
-  m_MinSize: {x: 875, y: 300}
+    height: 821
+  m_MinSize: {x: 875, y: 542}
  m_MaxSize: {x: 10000, y: 10000}
  m_UseTopView: 1
  m_TopViewHeight: 30
@ -93,7 +93,7 @@ MonoBehaviour:
  m_Position:
    serializedVersion: 2
    x: 0
-    y: 800.8
+    y: 801
    width: 1536
    height: 20
  m_MinSize: {x: 0, y: 0}
@ -119,11 +119,11 @@ MonoBehaviour:
    x: 0
    y: 30
    width: 1536
-    height: 770.8
+    height: 771
  m_MinSize: {x: 709, y: 492}
  m_MaxSize: {x: 18004, y: 14042}
  vertical: 0
-  controlID: 201
+  controlID: 91
 --- !u!114 &6
 MonoBehaviour:
  m_ObjectHideFlags: 52
@ -141,8 +141,8 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 0
-    width: 349.6
-    height: 770.8
+    width: 350
+    height: 771
  m_MinSize: {x: 201, y: 221}
  m_MaxSize: {x: 4001, y: 4021}
  m_ActualView: {fileID: 14}
@ -167,14 +167,14 @@ MonoBehaviour:
  - {fileID: 9}
  m_Position:
    serializedVersion: 2
-    x: 349.6
+    x: 350
    y: 0
    width: 700
-    height: 770.8
+    height: 771
  m_MinSize: {x: 232, y: 492}
  m_MaxSize: {x: 10002, y: 14042}
  vertical: 1
-  controlID: 202
+  controlID: 39
 --- !u!114 &8
 MonoBehaviour:
  m_ObjectHideFlags: 52
@ -193,7 +193,7 @@ MonoBehaviour:
    x: 0
    y: 0
    width: 700
-    height: 447.2
+    height: 447
  m_MinSize: {x: 202, y: 221}
  m_MaxSize: {x: 4002, y: 4021}
  m_ActualView: {fileID: 16}
@ -218,9 +218,9 @@ MonoBehaviour:
  m_Position:
    serializedVersion: 2
    x: 0
-    y: 447.2
+    y: 447
    width: 700
-    height: 323.59998
+    height: 324
  m_MinSize: {x: 232, y: 271}
  m_MaxSize: {x: 10002, y: 10021}
  m_ActualView: {fileID: 18}
@ -247,10 +247,10 @@ MonoBehaviour:
  m_Children: []
  m_Position:
    serializedVersion: 2
-    x: 1049.6
+    x: 1050
    y: 0
-    width: 486.40002
-    height: 770.8
+    width: 486
+    height: 771
  m_MinSize: {x: 276, y: 121}
  m_MaxSize: {x: 4001, y: 4021}
  m_ActualView: {fileID: 20}
@ -275,7 +275,7 @@ MonoBehaviour:
  m_MaxSize: {x: 4000, y: 4000}
  m_TitleContent:
    m_Text: Lighting
-    m_Image: {fileID: -1477008817101679558, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: -1347227620855488341, guid: 0000000000000000d000000000000000, type: 0}
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
@ -300,18 +300,19 @@ MonoBehaviour:
  m_MaxSize: {x: 4000, y: 4000}
  m_TitleContent:
    m_Text: Animator
-    m_Image: {fileID: 1711060831702674872, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: -1673928668082335149, guid: 0000000000000000d000000000000000, type: 0}
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
    x: 350.4
-    y: 521.60004
+    y: 520
    width: 698
-    height: 302
+    height: 303
  m_ViewDataDictionary: {fileID: 0}
  m_ViewTransforms:
    m_KeySerializationHelper:
    - {fileID: 1107000011554766834, guid: b5bc5b0b8f28ed54691ddf2ee184bc2e, type: 2}
+    - {fileID: 8752161325861187374, guid: decc17df30b3f944d9afcedbf48a6642, type: 2}
    m_ValueSerializationHelper:
    - e00: 0.89244986
      e01: 0
@ -329,10 +330,26 @@ MonoBehaviour:
      e31: 0
      e32: 0
      e33: 1
+    - e00: 0.5498435
+      e01: 0
+      e02: 0
+      e03: 1.8164529
+      e10: 0
+      e11: 0.5498435
+      e12: 0
+      e13: -11.787884
+      e20: 0
+      e21: 0
+      e22: 1
+      e23: 0
+      e30: 0
+      e31: 0
+      e32: 0
+      e33: 1
  m_PreviewAnimator: {fileID: 0}
-  m_AnimatorController: {fileID: 9100000, guid: b5bc5b0b8f28ed54691ddf2ee184bc2e, type: 2}
+  m_AnimatorController: {fileID: 9100000, guid: decc17df30b3f944d9afcedbf48a6642, type: 2}
  m_BreadCrumbs:
-  - m_Target: {fileID: 1107000011554766834, guid: b5bc5b0b8f28ed54691ddf2ee184bc2e, type: 2}
+  - m_Target: {fileID: 8752161325861187374, guid: decc17df30b3f944d9afcedbf48a6642, type: 2}
    m_ScrollPosition: {x: 0, y: 0}
  stateMachineGraph: {fileID: 0}
  stateMachineGraphGUI: {fileID: 0}
@ -361,7 +378,7 @@ MonoBehaviour:
  m_MaxSize: {x: 4000, y: 4000}
  m_TitleContent:
    m_Text: Audio Mixer
-    m_Image: {fileID: -3283902137440876849, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: 2344599766593239149, guid: 0000000000000000d000000000000000, type: 0}
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
@ -534,32 +551,32 @@ MonoBehaviour:
  m_MaxSize: {x: 4000, y: 4000}
  m_TitleContent:
    m_Text: Hierarchy
-    m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0}
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
    x: 0
    y: 73.6
-    width: 348.6
-    height: 749.8
+    width: 349
+    height: 750
  m_ViewDataDictionary: {fileID: 0}
  m_SceneHierarchy:
    m_TreeViewState:
      scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 
+      m_SelectedIDs: 4a990000
      m_LastClickedID: 0
-      m_ExpandedIDs: de9dffff409effffa89fffff78a1ffffe8a4ffff16a6ffff54a6ffff00a7ffff60cf0000
+      m_ExpandedIDs: 4efbffff50fbffff
      m_RenameOverlay:
        m_UserAcceptedRename: 0
-        m_Name: Player
-        m_OriginalName: Player
+        m_Name: Main Canvas
+        m_OriginalName: Main Canvas
        m_EditFieldRect:
          serializedVersion: 2
          x: 0
          y: 0
          width: 0
          height: 0
-        m_UserData: 54360
+        m_UserData: 33636
        m_IsWaitingForDelay: 0
        m_IsRenaming: 0
        m_OriginalEventType: 0
@ -588,7 +605,7 @@ MonoBehaviour:
  m_MaxSize: {x: 4000, y: 4000}
  m_TitleContent:
    m_Text: Animation
-    m_Image: {fileID: -3237396543322336831, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: -8166618308981325432, guid: 0000000000000000d000000000000000, type: 0}
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
@ -616,14 +633,14 @@ MonoBehaviour:
  m_MaxSize: {x: 4000, y: 4000}
  m_TitleContent:
    m_Text: Scene
-    m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0}
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
-    x: 349.6
+    x: 350.4
    y: 73.6
    width: 698
-    height: 426.2
+    height: 426
  m_ViewDataDictionary: {fileID: 0}
  m_ShowContextualTools: 0
  m_WindowGUID: cc27987af1a868c49b0894db9c0f5429
@ -638,7 +655,7 @@ MonoBehaviour:
  m_Position:
    m_Target: {x: -1.0999999, y: 2.727, z: 35.0999}
    speed: 2
-    m_Value: {x: -1.1040051, y: 2.7265074, z: 35.100925}
+    m_Value: {x: -1.1000075, y: 2.7271824, z: 35.099987}
  m_RenderMode: 0
  m_CameraMode:
    drawMode: 0
@ -685,13 +702,13 @@ MonoBehaviour:
    m_GridAxis: 1
    m_gridOpacity: 0.5
  m_Rotation:
-    m_Target: {x: 0.056735925, y: -0.9425252, z: 0.21215323, w: 0.25204274}
+    m_Target: {x: 0.019456265, y: -0.9805009, z: 0.13108137, w: 0.14547949}
    speed: 2
-    m_Value: {x: 0.05635485, y: -0.94279176, z: 0.21072787, w: 0.25211403}
+    m_Value: {x: 0.019651813, y: -0.98022914, z: 0.13104503, w: 0.14694221}
  m_Size:
-    m_Target: 4.9548416
+    m_Target: 6.0603333
    speed: 2
-    m_Value: 4.5457263
+    m_Value: 6.0605516
  m_Ortho:
    m_Target: 0
    speed: 2
@ -732,7 +749,7 @@ MonoBehaviour:
  m_MaxSize: {x: 4000, y: 4000}
  m_TitleContent:
    m_Text: Game
-    m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0}
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
@ -762,10 +779,10 @@ MonoBehaviour:
    m_VRangeLocked: 0
    hZoomLockedByDefault: 0
    vZoomLockedByDefault: 0
-    m_HBaseRangeMin: -768
-    m_HBaseRangeMax: 768
-    m_VBaseRangeMin: -432
-    m_VBaseRangeMax: 432
+    m_HBaseRangeMin: -960
+    m_HBaseRangeMax: 960
+    m_VBaseRangeMin: -540
+    m_VBaseRangeMax: 540
    m_HAllowExceedBaseRangeMin: 1
    m_HAllowExceedBaseRangeMax: 1
    m_VAllowExceedBaseRangeMin: 1
@ -782,24 +799,24 @@ MonoBehaviour:
    m_DrawArea:
      serializedVersion: 2
      x: 0
-      y: 21
+      y: 0
      width: 698
-      height: 405.2
-    m_Scale: {x: 0.4544271, y: 0.4544271}
-    m_Translation: {x: 349, y: 202.6}
+      height: 426.2
+    m_Scale: {x: 0.36354166, y: 0.36354166}
+    m_Translation: {x: 349, y: 213.1}
    m_MarginLeft: 0
    m_MarginRight: 0
    m_MarginTop: 0
    m_MarginBottom: 0
    m_LastShownAreaInsideMargins:
      serializedVersion: 2
-      x: -768
-      y: -445.83612
-      width: 1536
-      height: 891.67224
+      x: -960
+      y: -586.1777
+      width: 1920
+      height: 1172.3553
    m_MinimalGUI: 1
-  m_defaultScale: 0.4544271
-  m_LastWindowPixelSize: {x: 872.5, y: 532.75}
+  m_defaultScale: 0.36354166
+  m_LastWindowPixelSize: {x: 698, y: 426.2}
  m_ClearInEditMode: 1
  m_NoCameraWarning: 1
  m_LowResolutionForAspectRatios: 01000000000000000000
@ -821,14 +838,14 @@ MonoBehaviour:
  m_MaxSize: {x: 10000, y: 10000}
  m_TitleContent:
    m_Text: Project
-    m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0}
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
-    x: 349.6
-    y: 520.8
+    x: 350.4
+    y: 520
    width: 698
-    height: 302.59998
+    height: 303
  m_ViewDataDictionary: {fileID: 0}
  m_SearchFilter:
    m_NameFilter: 
@ -843,22 +860,22 @@ MonoBehaviour:
    m_SkipHidden: 1
    m_SearchArea: 1
    m_Folders:
-    - Assets/PolygonHorrorMansion/Scenes
+    - Assets
    m_Globs: []
    m_OriginalText: 
  m_ViewMode: 1
  m_StartGridSize: 46
  m_LastFolders:
-  - Assets/PolygonHorrorMansion/Scenes
+  - Assets
  m_LastFoldersGridSize: 46
  m_LastProjectPath: D:\Unity\SAE1.01
  m_LockTracker:
    m_IsLocked: 1
  m_FolderTreeState:
    scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 703f0000
-    m_LastClickedID: 16240
-    m_ExpandedIDs: 00000000483f00004e3f0000583f0000
+    m_SelectedIDs: 24960000
+    m_LastClickedID: 38436
+    m_ExpandedIDs: 000000002896000040960000
    m_RenameOverlay:
      m_UserAcceptedRename: 0
      m_Name: 
@ -958,7 +975,7 @@ MonoBehaviour:
  m_MaxSize: {x: 4000, y: 4000}
  m_TitleContent:
    m_Text: Console
-    m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0}
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
@ -987,10 +1004,10 @@ MonoBehaviour:
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
-    x: 1049.6
+    x: 1050.4
    y: 73.6
-    width: 485.40002
-    height: 749.8
+    width: 485
+    height: 750
  m_ViewDataDictionary: {fileID: 0}
  m_ObjectsLockedBeforeSerialization: []
  m_InstanceIDsLockedBeforeSerialization: 
--- a/Library/InspectorExpandedItems.asset
+++ b/Library/InspectorExpandedItems.asset
--- a/Library/SceneVisibilityState.asset
+++ b/Library/SceneVisibilityState.asset
--- a/Library/SourceAssetDB
+++ b/Library/SourceAssetDB
--- a/Library/StateCache/SceneView/8c/8cd7c613bf844de3b80696e27a479d5e.json
+++ b/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":-1.0999999046325684,"y":2.7269999980926515,"z":35.09989929199219},"rotation":{"x":0.05673592537641525,"y":-0.9425252079963684,"z":0.21215322613716126,"w":0.2520427405834198},"size":4.954841613769531,"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":-1.0999999046325684,"y":2.7269999980926515,"z":35.09989929199219},"rotation":{"x":0.01945626549422741,"y":-0.9805008769035339,"z":0.13108137249946595,"w":0.1454794853925705},"size":6.060333251953125,"orthographic":false}
--- a/Library/expandedItems
+++ b/Library/expandedItems
--- a/Logs/shadercompiler-UnityShaderCompiler.exe4.log
+++ b/Logs/shadercompiler-UnityShaderCompiler.exe4.log
@ -0,0 +1,4 @@
+Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.20f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.20f1/Editor/Data/PlaybackEngines'
+Cmd: initializeCompiler
+
+Cmd: shutdown
--- a/Logs/shadercompiler-UnityShaderCompiler.exe5.log
+++ b/Logs/shadercompiler-UnityShaderCompiler.exe5.log
@ -0,0 +1,7 @@
+Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.20f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.20f1/Editor/Data/PlaybackEngines'
+Cmd: initializeCompiler
+
+Cmd: compileSnippet
+  insize=30567 file=Assets/PolygonHorrorMansion/Materials/Shaders/SyntyStudios/GrungeTriplanar pass=FORWARD 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_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR UNITY_PASS_FORWARDBASE uKW=DIRECTIONAL LIGHTPROBE_SH FOG_EXP dKW=INSTANCING_ON FOG_LINEAR FOG_EXP2 SHADOWS_SHADOWMASK DYNAMICLIGHTMAP_ON LIGHTMAP_ON LIGHTMAP_SHADOW_MIXING DIRLIGHTMAP_COMBINED SHADOWS_SCREEN VERTEXLIGHT_ON 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_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=158 ok=1 outsize=2282
+
+Cmd: shutdown