diff --git a/2D Animation Techniques/Library/ArtifactDB b/2D Animation Techniques/Library/ArtifactDB index af879bad6..a8d712f2e 100644 Binary files a/2D Animation Techniques/Library/ArtifactDB and b/2D Animation Techniques/Library/ArtifactDB differ diff --git a/2D Animation Techniques/Library/CurrentLayout-default.dwlt b/2D Animation Techniques/Library/CurrentLayout-default.dwlt index 5e2d0335f..72c886bbb 100644 --- a/2D Animation Techniques/Library/CurrentLayout-default.dwlt +++ b/2D Animation Techniques/Library/CurrentLayout-default.dwlt @@ -112,10 +112,10 @@ MonoBehaviour: y: 30 width: 1920 height: 947 - m_MinSize: {x: 579, y: 492} + m_MinSize: {x: 679, y: 492} m_MaxSize: {x: 14002, y: 14042} vertical: 0 - controlID: 129 + controlID: 62 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -137,10 +137,10 @@ MonoBehaviour: y: 0 width: 1530 height: 947 - m_MinSize: {x: 303, y: 492} + m_MinSize: {x: 403, y: 492} m_MaxSize: {x: 10001, y: 14042} vertical: 1 - controlID: 130 + controlID: 113 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -161,11 +161,11 @@ MonoBehaviour: x: 0 y: 0 width: 1530 - height: 543 - m_MinSize: {x: 303, y: 221} + height: 544 + m_MinSize: {x: 403, y: 221} m_MaxSize: {x: 8003, y: 4021} vertical: 0 - controlID: 131 + controlID: 114 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -176,23 +176,23 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ConsoleWindow + m_Name: SceneHierarchyWindow m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 y: 0 - width: 180 - height: 543 - m_MinSize: {x: 101, y: 121} + width: 349 + height: 544 + m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 14} + m_ActualView: {fileID: 13} m_Panes: - {fileID: 13} - {fileID: 14} - m_Selected: 1 - m_LastSelected: 0 + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -203,24 +203,24 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: SceneView + m_Name: GameView m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 180 + x: 349 y: 0 - width: 1350 - height: 543 + width: 1181 + height: 544 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 15} + m_ActualView: {fileID: 16} m_Panes: - {fileID: 15} - {fileID: 16} - {fileID: 17} - {fileID: 12} - m_Selected: 0 + m_Selected: 1 m_LastSelected: 3 --- !u!114 &10 MonoBehaviour: @@ -238,9 +238,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 543 + y: 544 width: 1530 - height: 404 + height: 403 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} m_ActualView: {fileID: 18} @@ -295,10 +295,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 330 + x: 349 y: 966.6 - width: 1198 - height: 522 + width: 1179 + height: 523 m_ViewDataDictionary: {fileID: 0} m_ViewTransforms: m_KeySerializationHelper: @@ -411,15 +411,15 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 966.6 - width: 329 - height: 522 + width: 348 + height: 523 m_ViewDataDictionary: {fileID: 0} m_SceneHierarchy: m_TreeViewState: - scrollPos: {x: 0, y: 987} - m_SelectedIDs: ba4b0000 + scrollPos: {x: 0, y: 0} + m_SelectedIDs: d8570000 m_LastClickedID: 0 - m_ExpandedIDs: 2efbffff36430000a8440000 + m_ExpandedIDs: 7ef1ffff2efbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -490,10 +490,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 180 + x: 349 y: 966.6 - width: 1348 - height: 522 + width: 1179 + height: 523 m_ViewDataDictionary: {fileID: 0} m_ShowContextualTools: 0 m_WindowGUID: e2b096a4c96f79a4f8f5fc502f3b967f @@ -505,9 +505,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -104.09665, y: -2.2119803, z: -210.79482} + m_Target: {x: -80.423096, y: -8.18487, z: -44.862305} speed: 2 - m_Value: {x: -105.98152, y: -1.9371705, z: -210.63347} + m_Value: {x: -80.423096, y: -8.18487, z: -44.862305} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -557,9 +557,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 37.46431 + m_Target: 7.900015 speed: 2 - m_Value: 35.851013 + m_Value: 7.900015 m_Ortho: m_Target: 1 speed: 2 @@ -605,10 +605,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 330 + x: 349 y: 966.6 - width: 1198 - height: 522 + width: 1179 + height: 523 m_ViewDataDictionary: {fileID: 0} m_SerializedViewNames: [] m_SerializedViewValues: [] @@ -618,7 +618,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1198, y: 501} + m_TargetSize: {x: 1179, y: 502} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -633,10 +633,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -599 - m_HBaseRangeMax: 599 - m_VBaseRangeMin: -261 - m_VBaseRangeMax: 261 + m_HBaseRangeMin: -589.5 + m_HBaseRangeMax: 589.5 + m_VBaseRangeMin: -251 + m_VBaseRangeMax: 251 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -645,7 +645,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 0 + m_EnableMouseInput: 1 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -653,24 +653,24 @@ MonoBehaviour: m_DrawArea: serializedVersion: 2 x: 0 - y: 0 - width: 1198 - height: 522 + y: 21 + width: 1179 + height: 502 m_Scale: {x: 1, y: 1} - m_Translation: {x: 599, y: 261} + m_Translation: {x: 589.5, y: 251} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -599 - y: -261 - width: 1198 - height: 522 + x: -589.5 + y: -251 + width: 1179 + height: 502 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1198, y: 522} + m_LastWindowPixelSize: {x: 1179, y: 523} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 00000000000000000000 @@ -724,9 +724,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 1509.6 + y: 1510.6 width: 1529 - height: 383 + height: 382 m_ViewDataDictionary: {fileID: 0} m_SearchFilter: m_NameFilter: @@ -741,21 +741,21 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/_Textures/CorgiEngine/Demos/SuperHipsterBros/Animations + - Assets/_Animations m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/_Textures/CorgiEngine/Demos/SuperHipsterBros/Animations + - Assets/_Animations m_LastFoldersGridSize: -1 m_LastProjectPath: C:\Users\hsbag\Documents\GitHub\CorgiEngineTutorialTests\2D Animation Techniques m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 180} - m_SelectedIDs: 744c0000 - m_LastClickedID: 19572 - m_ExpandedIDs: 000000004e4c0000504c0000524c0000544c0000564c0000584c00005a4c00005c4c00005e4c0000604c0000624c0000644c00006c4c000000ca9a3b + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 1e580000 + m_LastClickedID: 22558 + m_ExpandedIDs: 000000000458000006580000085800000a5800000c5800000e58000010580000125800001458000016580000185800001a58000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -783,7 +783,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000004e4c0000504c0000524c0000544c0000564c0000584c00005a4c00005c4c00005e4c0000604c0000624c0000644c0000 + m_ExpandedIDs: 000000000458000006580000085800000a5800000c5800000e58000010580000125800001458000016580000185800001a580000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: diff --git a/2D Animation Techniques/Library/InspectorExpandedItems.asset b/2D Animation Techniques/Library/InspectorExpandedItems.asset index 986b634c3..36bc94ffd 100644 Binary files a/2D Animation Techniques/Library/InspectorExpandedItems.asset and b/2D Animation Techniques/Library/InspectorExpandedItems.asset differ diff --git a/2D Animation Techniques/Library/LastSceneManagerSetup.txt b/2D Animation Techniques/Library/LastSceneManagerSetup.txt index 1e25956ec..6a5704fe9 100644 --- a/2D Animation Techniques/Library/LastSceneManagerSetup.txt +++ b/2D Animation Techniques/Library/LastSceneManagerSetup.txt @@ -1,5 +1,5 @@ sceneSetups: -- path: Assets/_Textures/CorgiEngine/Demos/SuperHipsterBros/HipsterLevel.unity +- path: Assets/Scenes/SampleScene.unity isLoaded: 1 isActive: 1 isSubScene: 0 diff --git a/2D Animation Techniques/Library/SourceAssetDB b/2D Animation Techniques/Library/SourceAssetDB index c382b2105..1043ce11f 100644 Binary files a/2D Animation Techniques/Library/SourceAssetDB and b/2D Animation Techniques/Library/SourceAssetDB differ diff --git a/2D Animation Techniques/Library/StateCache/SceneView/e2b096-mainStage.json b/2D Animation Techniques/Library/StateCache/SceneView/e2b096-mainStage.json index e45b219ad..f6913e9b7 100644 --- a/2D Animation Techniques/Library/StateCache/SceneView/e2b096-mainStage.json +++ b/2D Animation Techniques/Library/StateCache/SceneView/e2b096-mainStage.json @@ -1 +1 @@ -{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":true,"pivot":{"x":-104.09664916992188,"y":-2.2119803428649904,"z":-210.79481506347657},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":37.46430969238281,"orthographic":true} \ No newline at end of file +{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":true,"pivot":{"x":-80.423095703125,"y":-8.184869766235352,"z":-44.8623046875},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":7.900014877319336,"orthographic":true} \ No newline at end of file diff --git a/2D Animation Techniques/Library/shadercompiler-UnityShaderCompiler.exe6.log b/2D Animation Techniques/Library/shadercompiler-UnityShaderCompiler.exe6.log index 07d60e41c..e0a61f77c 100644 --- a/2D Animation Techniques/Library/shadercompiler-UnityShaderCompiler.exe6.log +++ b/2D Animation Techniques/Library/shadercompiler-UnityShaderCompiler.exe6.log @@ -1,2 +1,4 @@ Base path: 'C:/Program Files/Unity/Hub/Editor/2019.4.18f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2019.4.18f1/Editor/Data/PlaybackEngines' Cmd: initializeCompiler + +Quitting shader compiler process