vault backup: 2023-04-19 09:52:40

.obsidian/app.json

@@ -1,11 +1,3 @@
 {
-  "promptDelete": false,
+  "promptDelete": false
-  "attachmentFolderPath": "FGui/图片",
-  "pdfExportSettings": {
-    "includeName": true,
-    "pageSize": "Letter",
-    "landscape": false,
-    "margin": "0",
-    "downscalePercent": 100
-  }
 }

.obsidian/appearance.json

@@ -1,4 +1,3 @@
 {
-  "accentColor": "",
+  "accentColor": ""
-  "baseFontSize": 16
 }

.obsidian/community-plugins.json

@@ -1,5 +1,4 @@
 [
-  "obsidian-kanban",
+  "obsidian-version-history-diff",
-  "obsidian-git",
+  "obsidian-git"
-  "calendar"
 ]

.obsidian/core-plugins-migration.json

@@ -4,26 +4,26 @@
   "switcher": true,
   "graph": true,
   "backlink": true,
-  "outgoing-link": false,
+  "canvas": true,
-  "tag-pane": false,
+  "outgoing-link": true,
+  "tag-pane": true,
   "page-preview": true,
-  "daily-notes": false,
+  "daily-notes": true,
-  "templates": false,
+  "templates": true,
   "note-composer": true,
   "command-palette": true,
   "slash-command": false,
   "editor-status": true,
-  "starred": false,
+  "starred": true,
-  "markdown-importer": true,
+  "markdown-importer": false,
   "zk-prefixer": false,
   "random-note": false,
-  "outline": false,
+  "outline": true,
   "word-count": true,
   "slides": false,
   "audio-recorder": false,
   "workspaces": false,
   "file-recovery": true,
   "publish": false,
-  "sync": false,
+  "sync": false
-  "canvas": true
 }

.obsidian/core-plugins.json

@@ -5,11 +5,16 @@
   "graph",
   "backlink",
   "canvas",
+  "outgoing-link",
+  "tag-pane",
   "page-preview",
+  "daily-notes",
+  "templates",
   "note-composer",
   "command-palette",
   "editor-status",
-  "markdown-importer",
+  "starred",
+  "outline",
   "word-count",
   "file-recovery"
 ]

.obsidian/plugins/obsidian-git/data.json

@@ -1,6 +1,5 @@
 {
   "commitMessage": "vault backup: {{date}}",
-  "autoCommitMessage": "vault backup: {{date}}",
   "commitDateFormat": "YYYY-MM-DD HH:mm:ss",
   "autoSaveInterval": 0,
   "autoPushInterval": 0,
@@ -13,12 +12,19 @@
   "showStatusBar": true,
   "updateSubmodules": false,
   "syncMethod": "merge",
-  "gitPath": "",
   "customMessageOnAutoBackup": false,
   "autoBackupAfterFileChange": false,
-  "treeStructure": false,
+  "treeStructure": true,
   "refreshSourceControl": true,
   "basePath": "",
   "differentIntervalCommitAndPush": false,
-  "changedFilesInStatusBar": false
+  "changedFilesInStatusBar": false,
+  "showedMobileNotice": true,
+  "refreshSourceControlTimer": 7000,
+  "showBranchStatusBar": true,
+  "setLastSaveToLastCommit": false,
+  "submoduleRecurseCheckout": false,
+  "gitDir": "",
+  "showFileMenu": true,
+  "autoCommitMessage": "vault backup: {{date}}"
 }

.obsidian/plugins/obsidian-git/manifest.json

@@ -1,8 +1,9 @@
 {
     "id": "obsidian-git",
     "name": "Obsidian Git",
-    "description": "Backup your vault with git.",
+    "description": "Backup your vault with Git.",
-    "isDesktopOnly": true,
+    "isDesktopOnly": false,
+    "fundingUrl": "https://ko-fi.com/vinzent",
     "js": "main.js",
-    "version": "1.26.1"
+    "version": "2.19.1"
 }

.obsidian/plugins/obsidian-git/styles.css

@@ -2,10 +2,20 @@
     0% {
         transform: rotate(0deg);
     }
+
     100% {
         transform: rotate(360deg);
     }
 }
+
+.workspace-leaf-content[data-type='git-view'] .view-content {
+    padding: 0;
+}
+
+.workspace-leaf-content[data-type='git-history-view'] .view-content {
+    padding: 0;
+}
+
 .loading>svg {
     animation: 2s linear infinite loading;
     transform-origin: 50% 50%;
@@ -14,9 +24,21 @@
 
 .obsidian-git-center {
     margin: auto;
+    text-align: center;
     width: 50%;
 }
 
+.obsidian-git-textarea {
+    display: block;
+    margin-left: auto;
+    margin-right: auto;
+}
+
+.obsidian-git-center-button {
+    display: block;
+    margin: 20px auto;
+}
+
 .tooltip.mod-left {
     overflow-wrap: break-word;
 }
@@ -24,29 +46,40 @@
 .tooltip.mod-right {
     overflow-wrap: break-word;
 }
-
+.git-tools {
-.obsidian-git-shortcuts {
+    display: flex;
-  margin: 10px;
+    margin-left: auto;
-}
+}
-
+.git-tools .type {
-.diff-err {
+    padding-left: var(--size-2-1);
-  height: 100%;
     display: flex;
-  justify-content: center;
-  flex-direction: column;
     align-items: center;
+    justify-content: center;
+    width: 11px;
 }
 
-.diff-err-sign {
+.git-tools .type[data-type="M"] {
-  font-size: 2em;
+    color: orange;
+}
+.git-tools .type[data-type="D"] {
+    color: red;
+}
+.git-tools .buttons {
+    display: flex;
+}
+.git-tools .buttons > * {
+    padding: 0 0;
+    height: auto;
 }
 
 .workspace-leaf-content[data-type="diff-view"] .d2h-d-none {
     display: none;
 }
+
 .workspace-leaf-content[data-type="diff-view"] .d2h-wrapper {
     text-align: left;
 }
+
 .workspace-leaf-content[data-type="diff-view"] .d2h-file-header {
     background-color: var(--background-primary);
     border-bottom: 1px solid var(--interactive-accent);
@@ -54,16 +87,19 @@
     height: 35px;
     padding: 5px 10px;
 }
+
 .workspace-leaf-content[data-type="diff-view"] .d2h-file-header,
 .workspace-leaf-content[data-type="diff-view"] .d2h-file-stats {
     display: -webkit-box;
     display: -ms-flexbox;
     display: flex;
 }
+
 .workspace-leaf-content[data-type="diff-view"] .d2h-file-stats {
     font-size: 14px;
     margin-left: auto;
 }
+
 .workspace-leaf-content[data-type="diff-view"] .d2h-lines-added {
     border: 1px solid #b4e2b4;
     border-radius: 5px 0 0 5px;
@@ -72,6 +108,7 @@
     text-align: right;
     vertical-align: middle;
 }
+
 .workspace-leaf-content[data-type="diff-view"] .d2h-lines-deleted {
     border: 1px solid #e9aeae;
     border-radius: 0 5px 5px 0;
@@ -81,6 +118,7 @@
     text-align: left;
     vertical-align: middle;
 }
+
 .workspace-leaf-content[data-type="diff-view"] .d2h-file-name-wrapper {
     -webkit-box-align: center;
     -ms-flex-align: center;
@@ -91,16 +129,19 @@
     font-size: 15px;
     width: 100%;
 }
+
 .workspace-leaf-content[data-type="diff-view"] .d2h-file-name {
     overflow-x: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
 }
+
 .workspace-leaf-content[data-type="diff-view"] .d2h-file-wrapper {
     border: 1px solid var(--background-modifier-border);
     border-radius: 3px;
     margin-bottom: 1em;
 }
+
 .workspace-leaf-content[data-type="diff-view"] .d2h-file-collapse {
     -webkit-box-pack: end;
     -ms-flex-pack: end;
@@ -115,24 +156,30 @@
     justify-content: flex-end;
     padding: 4px 8px;
 }
+
 .workspace-leaf-content[data-type="diff-view"] .d2h-file-collapse.d2h-selected {
     background-color: #c8e1ff;
 }
+
 .workspace-leaf-content[data-type="diff-view"] .d2h-file-collapse-input {
     margin: 0 4px 0 0;
 }
+
 .workspace-leaf-content[data-type="diff-view"] .d2h-diff-table {
     border-collapse: collapse;
     font-family: Menlo, Consolas, monospace;
     font-size: 13px;
     width: 100%;
 }
+
 .workspace-leaf-content[data-type="diff-view"] .d2h-files-diff {
     width: 100%;
 }
+
 .workspace-leaf-content[data-type="diff-view"] .d2h-file-diff {
     overflow-y: hidden;
 }
+
 .workspace-leaf-content[data-type="diff-view"] .d2h-file-side-diff {
     display: inline-block;
     margin-bottom: -8px;
@@ -141,9 +188,11 @@
     overflow-y: hidden;
     width: 50%;
 }
+
 .workspace-leaf-content[data-type="diff-view"] .d2h-code-line {
     padding: 0 8em;
 }
+
 .workspace-leaf-content[data-type="diff-view"] .d2h-code-line,
 .workspace-leaf-content[data-type="diff-view"] .d2h-code-side-line {
     display: inline-block;
@@ -154,9 +203,11 @@
     white-space: nowrap;
     width: 100%;
 }
+
 .workspace-leaf-content[data-type="diff-view"] .d2h-code-side-line {
     padding: 0 4.5em;
 }
+
 .workspace-leaf-content[data-type="diff-view"] .d2h-code-line-ctn {
     word-wrap: normal;
     background: none;
@@ -170,20 +221,17 @@
     white-space: pre;
     width: 100%;
 }
+
 .theme-light .workspace-leaf-content[data-type="diff-view"] .d2h-code-line del,
-.theme-light
+.theme-light .workspace-leaf-content[data-type="diff-view"] .d2h-code-side-line del {
-  .workspace-leaf-content[data-type="diff-view"]
-  .d2h-code-side-line
-  del {
     background-color: #ffb6ba;
 }
+
 .theme-dark .workspace-leaf-content[data-type="diff-view"] .d2h-code-line del,
-.theme-dark
+.theme-dark .workspace-leaf-content[data-type="diff-view"] .d2h-code-side-line del {
-  .workspace-leaf-content[data-type="diff-view"]
-  .d2h-code-side-line
-  del {
     background-color: #8d232881;
 }
+
 .workspace-leaf-content[data-type="diff-view"] .d2h-code-line del,
 .workspace-leaf-content[data-type="diff-view"] .d2h-code-line ins,
 .workspace-leaf-content[data-type="diff-view"] .d2h-code-side-line del,
@@ -194,22 +242,19 @@
     text-decoration: none;
     vertical-align: middle;
 }
+
 .theme-light .workspace-leaf-content[data-type="diff-view"] .d2h-code-line ins,
-.theme-light
+.theme-light .workspace-leaf-content[data-type="diff-view"] .d2h-code-side-line ins {
-  .workspace-leaf-content[data-type="diff-view"]
-  .d2h-code-side-line
-  ins {
     background-color: #97f295;
     text-align: left;
 }
+
 .theme-dark .workspace-leaf-content[data-type="diff-view"] .d2h-code-line ins,
-.theme-dark
+.theme-dark .workspace-leaf-content[data-type="diff-view"] .d2h-code-side-line ins {
-  .workspace-leaf-content[data-type="diff-view"]
-  .d2h-code-side-line
-  ins {
     background-color: #1d921996;
     text-align: left;
 }
+
 .workspace-leaf-content[data-type="diff-view"] .d2h-code-line-prefix {
     word-wrap: normal;
     background: none;
@@ -217,9 +262,11 @@
     padding: 0;
     white-space: pre;
 }
+
 .workspace-leaf-content[data-type="diff-view"] .line-num1 {
     float: left;
 }
+
 .workspace-leaf-content[data-type="diff-view"] .line-num1,
 .workspace-leaf-content[data-type="diff-view"] .line-num2 {
     -webkit-box-sizing: border-box;
@@ -229,9 +276,11 @@
     text-overflow: ellipsis;
     width: 3.5em;
 }
+
 .workspace-leaf-content[data-type="diff-view"] .line-num2 {
     float: right;
 }
+
 .workspace-leaf-content[data-type="diff-view"] .d2h-code-linenumber {
     background-color: var(--background-primary);
     border: solid var(--background-modifier-border);
@@ -245,9 +294,11 @@
     text-align: right;
     width: 7.5em;
 }
+
 .workspace-leaf-content[data-type="diff-view"] .d2h-code-linenumber:after {
     content: "\200b";
 }
+
 .workspace-leaf-content[data-type="diff-view"] .d2h-code-side-linenumber {
     background-color: var(--background-primary);
     border: solid var(--background-modifier-border);
@@ -264,14 +315,21 @@
     text-overflow: ellipsis;
     width: 4em;
 }
+
+.workspace-leaf-content[data-type="diff-view"] .d2h-diff-tbody tr {
+    position: relative;
+}
+
 .workspace-leaf-content[data-type="diff-view"] .d2h-code-side-linenumber:after {
     content: "\200b";
 }
+
 .workspace-leaf-content[data-type="diff-view"] .d2h-code-side-emptyplaceholder,
 .workspace-leaf-content[data-type="diff-view"] .d2h-emptyplaceholder {
     background-color: var(--background-primary);
     border-color: var(--background-modifier-border);
 }
+
 .workspace-leaf-content[data-type="diff-view"] .d2h-code-line-prefix,
 .workspace-leaf-content[data-type="diff-view"] .d2h-code-linenumber,
 .workspace-leaf-content[data-type="diff-view"] .d2h-code-side-linenumber,
@@ -281,115 +339,127 @@
     -ms-user-select: none;
     user-select: none;
 }
+
 .workspace-leaf-content[data-type="diff-view"] .d2h-code-linenumber,
 .workspace-leaf-content[data-type="diff-view"] .d2h-code-side-linenumber {
     direction: rtl;
 }
+
 .theme-light .workspace-leaf-content[data-type="diff-view"] .d2h-del {
     background-color: #fee8e9;
     border-color: #e9aeae;
 }
+
 .theme-light .workspace-leaf-content[data-type="diff-view"] .d2h-ins {
     background-color: #dfd;
     border-color: #b4e2b4;
 }
+
 .theme-dark .workspace-leaf-content[data-type="diff-view"] .d2h-del {
     background-color: #521b1d83;
     border-color: #691d1d73;
 }
+
 .theme-dark .workspace-leaf-content[data-type="diff-view"] .d2h-ins {
     background-color: rgba(30, 71, 30, 0.5);
     border-color: #13501381;
 }
+
 .workspace-leaf-content[data-type="diff-view"] .d2h-info {
     background-color: var(--background-primary);
     border-color: var(--background-modifier-border);
     color: var(--text-normal);
 }
-.theme-light
+
-  .workspace-leaf-content[data-type="diff-view"]
+.theme-light .workspace-leaf-content[data-type="diff-view"] .d2h-file-diff .d2h-del.d2h-change {
-  .d2h-file-diff
-  .d2h-del.d2h-change {
     background-color: #fdf2d0;
 }
-.theme-dark
+
-  .workspace-leaf-content[data-type="diff-view"]
+.theme-dark .workspace-leaf-content[data-type="diff-view"] .d2h-file-diff .d2h-del.d2h-change {
-  .d2h-file-diff
-  .d2h-del.d2h-change {
     background-color: #55492480;
 }
-.theme-light
+
-  .workspace-leaf-content[data-type="diff-view"]
+.theme-light .workspace-leaf-content[data-type="diff-view"] .d2h-file-diff .d2h-ins.d2h-change {
-  .d2h-file-diff
-  .d2h-ins.d2h-change {
     background-color: #ded;
 }
-.theme-dark
+
-  .workspace-leaf-content[data-type="diff-view"]
+.theme-dark .workspace-leaf-content[data-type="diff-view"] .d2h-file-diff .d2h-ins.d2h-change {
-  .d2h-file-diff
-  .d2h-ins.d2h-change {
     background-color: rgba(37, 78, 37, 0.418);
 }
+
 .workspace-leaf-content[data-type="diff-view"] .d2h-file-list-wrapper {
     margin-bottom: 10px;
 }
+
 .workspace-leaf-content[data-type="diff-view"] .d2h-file-list-wrapper a {
     color: #3572b0;
     text-decoration: none;
 }
-.workspace-leaf-content[data-type="diff-view"]
+
-  .d2h-file-list-wrapper
+.workspace-leaf-content[data-type="diff-view"] .d2h-file-list-wrapper a:visited {
-  a:visited {
     color: #3572b0;
 }
+
 .workspace-leaf-content[data-type="diff-view"] .d2h-file-list-header {
     text-align: left;
 }
+
 .workspace-leaf-content[data-type="diff-view"] .d2h-file-list-title {
     font-weight: 700;
 }
+
 .workspace-leaf-content[data-type="diff-view"] .d2h-file-list-line {
     display: -webkit-box;
     display: -ms-flexbox;
     display: flex;
     text-align: left;
 }
+
 .workspace-leaf-content[data-type="diff-view"] .d2h-file-list {
     display: block;
     list-style: none;
     margin: 0;
     padding: 0;
 }
+
 .workspace-leaf-content[data-type="diff-view"] .d2h-file-list>li {
     border-bottom: 1px solid var(--background-modifier-border);
     margin: 0;
     padding: 5px 10px;
 }
+
 .workspace-leaf-content[data-type="diff-view"] .d2h-file-list>li:last-child {
     border-bottom: none;
 }
+
 .workspace-leaf-content[data-type="diff-view"] .d2h-file-switch {
     cursor: pointer;
     display: none;
     font-size: 10px;
 }
+
 .workspace-leaf-content[data-type="diff-view"] .d2h-icon {
     fill: currentColor;
     margin-right: 10px;
     vertical-align: middle;
 }
+
 .workspace-leaf-content[data-type="diff-view"] .d2h-deleted {
     color: #c33;
 }
+
 .workspace-leaf-content[data-type="diff-view"] .d2h-added {
     color: #399839;
 }
+
 .workspace-leaf-content[data-type="diff-view"] .d2h-changed {
     color: #d0b44c;
 }
+
 .workspace-leaf-content[data-type="diff-view"] .d2h-moved {
     color: #3572b0;
 }
+
 .workspace-leaf-content[data-type="diff-view"] .d2h-tag {
     background-color: var(--background-primary);
     display: -webkit-box;
@@ -399,15 +469,19 @@
     margin-left: 5px;
     padding: 0 2px;
 }
+
 .workspace-leaf-content[data-type="diff-view"] .d2h-deleted-tag {
     border: 2px solid #c33;
 }
+
 .workspace-leaf-content[data-type="diff-view"] .d2h-added-tag {
     border: 1px solid #399839;
 }
+
 .workspace-leaf-content[data-type="diff-view"] .d2h-changed-tag {
     border: 1px solid #d0b44c;
 }
+
 .workspace-leaf-content[data-type="diff-view"] .d2h-moved-tag {
     border: 1px solid #3572b0;
 }

.obsidian/plugins/obsidian-version-history-diff/data.json

@@ -0,0 +1,5 @@
+{
+  "diffStyle": "word",
+  "matchWordsThreshold": 0.25,
+  "colorBlind": true
+}

.obsidian/plugins/obsidian-version-history-diff/manifest.json

@@ -0,0 +1,10 @@
+{
+	"id": "obsidian-version-history-diff",
+	"name": "Version History Diff",
+	"version": "2.1.0",
+	"minAppVersion": "1.1.7",
+	"description": "Diff the version history of the core Sync and File Recovery plugins and Git. Adds a command to open the core Sync version history as well.",
+	"author": "kometenstaub",
+	"authorUrl": "https://github.com/kometenstaub",
+	"isDesktopOnly": false
+}

.obsidian/workspace

@@ -1,111 +0,0 @@
-{
-  "main": {
-    "id": "c01acc1e0c3642a1",
-    "type": "split",
-    "children": [
-      {
-        "id": "458b5417a938cfb3",
-        "type": "leaf",
-        "state": {
-          "type": "markdown",
-          "state": {
-            "file": "SerializedObject.md",
-            "mode": "source",
-            "source": false
-          }
-        }
-      }
-    ],
-    "direction": "vertical"
-  },
-  "left": {
-    "id": "b3f2fe956c600b2b",
-    "type": "split",
-    "children": [
-      {
-        "id": "b892947aee3a10a9",
-        "type": "tabs",
-        "children": [
-          {
-            "id": "b736346aa28b495c",
-            "type": "leaf",
-            "state": {
-              "type": "file-explorer",
-              "state": {}
-            }
-          },
-          {
-            "id": "bd33cd6e5600118d",
-            "type": "leaf",
-            "state": {
-              "type": "search",
-              "state": {
-                "query": "",
-                "matchingCase": false,
-                "explainSearch": false,
-                "collapseAll": false,
-                "extraContext": false,
-                "sortOrder": "alphabetical"
-              }
-            }
-          }
-        ]
-      }
-    ],
-    "direction": "horizontal",
-    "width": 249
-  },
-  "right": {
-    "id": "d809b577c235ae94",
-    "type": "split",
-    "children": [
-      {
-        "id": "7cbbb049622f8875",
-        "type": "tabs",
-        "children": [
-          {
-            "id": "fc04db1c3d5f37f2",
-            "type": "leaf",
-            "state": {
-              "type": "backlink",
-              "state": {
-                "file": "SerializedObject.md",
-                "collapseAll": false,
-                "extraContext": false,
-                "sortOrder": "alphabetical",
-                "showSearch": false,
-                "searchQuery": "",
-                "backlinkCollapsed": false,
-                "unlinkedCollapsed": true
-              }
-            }
-          },
-          {
-            "id": "d9c52b59dc19017c",
-            "type": "leaf",
-            "state": {
-              "type": "calendar",
-              "state": {}
-            }
-          }
-        ]
-      }
-    ],
-    "direction": "horizontal",
-    "width": 300,
-    "collapsed": true
-  },
-  "active": "b736346aa28b495c",
-  "lastOpenFiles": [
-    "SearchFilter UnityEditor筛选器.md",
-    "Pasted image 20221021171104.png",
-    "Mesh Baker.md",
-    "conflict-files-obsidian-git.md",
-    "图集处理.md",
-    "待办事项/TODO.md",
-    "本地化流程.md",
-    "待办事项/Work.md",
-    "待办事项/Learn.md",
-    "未命名.md"
-  ]
-}

.obsidian/workspace.json

@@ -7,27 +7,14 @@
         "id": "be09fd8b647f425d",
         "type": "tabs",
         "children": [
-          {
-            "id": "81fe1e09c99e234a",
-            "type": "leaf",
-            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "并行计算/CPU/Brust.md",
-                "mode": "source",
-                "source": false
-              }
-            }
-          },
           {
             "id": "6aedfe92a5b29e2f",
             "type": "leaf",
             "state": {
-              "type": "markdown",
+              "type": "diff-view",
               "state": {
-                "file": "并行计算/GPU/Compute Shader.md",
+                "file": "conflict-files-obsidian-git.md",
-                "mode": "source",
+                "staged": false
-                "source": false
               }
             }
           },
@@ -54,21 +41,8 @@
                 "source": false
               }
             }
-          },
-          {
-            "id": "e87e6d863c89589f",
-            "type": "leaf",
-            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "手写渲染器/课程.md",
-                "mode": "source",
-                "source": false
           }
-            }
+        ]
-          }
-        ],
-        "currentTab": 4
       }
     ],
     "direction": "vertical"
@@ -97,7 +71,7 @@
             "state": {
               "type": "search",
               "state": {
-                "query": "",
+                "query": "workspace",
                 "matchingCase": false,
                 "explainSearch": false,
                 "collapseAll": false,
@@ -105,6 +79,14 @@
                 "sortOrder": "alphabetical"
               }
             }
+          },
+          {
+            "id": "8f2786b27c7d1630",
+            "type": "leaf",
+            "state": {
+              "type": "starred",
+              "state": {}
+            }
           }
         ]
       }
@@ -126,7 +108,6 @@
             "state": {
               "type": "backlink",
               "state": {
-                "file": "手写渲染器/课程.md",
                 "collapseAll": false,
                 "extraContext": false,
                 "sortOrder": "alphabetical",
@@ -144,34 +125,81 @@
               "type": "calendar",
               "state": {}
             }
+          },
+          {
+            "id": "9132b294d54e83ca",
+            "type": "leaf",
+            "state": {
+              "type": "outgoing-link",
+              "state": {
+                "linksCollapsed": false,
+                "unlinkedCollapsed": true
               }
-        ]
+            }
+          },
+          {
+            "id": "a94ba3bbe0f00555",
+            "type": "leaf",
+            "state": {
+              "type": "tag",
+              "state": {
+                "sortOrder": "frequency",
+                "useHierarchy": true
+              }
+            }
+          },
+          {
+            "id": "e28ebb851b5264ee",
+            "type": "leaf",
+            "state": {
+              "type": "outline",
+              "state": {}
+            }
+          },
+          {
+            "id": "e0e6db501790a40e",
+            "type": "leaf",
+            "state": {
+              "type": "git-view",
+              "state": {}
+            }
+          }
+        ],
+        "currentTab": 5
       }
     ],
     "direction": "horizontal",
-    "width": 300,
+    "width": 300
-    "collapsed": true
   },
   "left-ribbon": {
     "hiddenItems": {
+      "daily-notes:打开/创建今天的日记": false,
+      "templates:插入模板": false,
       "canvas:新建白板": false,
       "switcher:打开快速切换": false,
       "graph:查看关系图谱": false,
-      "command-palette:打开命令面板": false,
+      "command-palette:打开命令面板": false
-      "markdown-importer:打开 Markdown 格式转换器": false
     }
   },
-  "active": "e87e6d863c89589f",
+  "active": "e0e6db501790a40e",
   "lastOpenFiles": [
-    "网络同步.md",
+    "FairyGui/工作流.md",
-    "手写渲染器/课程.md",
+    "FairyGui",
-    "手写渲染器",
+    "并行计算/GPU/Compute Shader.md",
+    "未命名.canvas",
+    "未命名 1.canvas",
+    "log_learn/shader入门精要.md",
     "程序集.md",
+    "conflict-files-obsidian-git.md",
+    "Pasted image 20230413163234.png",
+    "手写渲染器/课程.md",
+    "log_learn/SkillConfig.md",
+    "log_learn",
+    "网络同步.md",
+    "手写渲染器",
     "GPU/GPU渲染流程.md",
     "并行计算/GPU/SIMT.md",
-    "并行计算/GPU/Compute Shader.md",
     "操作系统/多级缓存队列.md",
-    "Pasted image 20230413163234.png",
     "GPU",
     "并行计算/CPU/SIMD(单指令多数据).md",
     "并行计算/CPU/Brust.md",
@@ -181,14 +209,11 @@
     "并行计算/CPU.canvas",
     "并行计算/未命名看板.md",
     "未命名 2.canvas",
-    "未命名 1.canvas",
-    "未命名.canvas",
     "并行计算/未命名看板 1.md",
     "Issue/超出ScrollView的特效渲染层级不对.md",
     "并行计算",
     "Issue",
     "待办事项/TODO.md",
-    "FairyGui/工作流.md",
     "编辑器/图片/Pasted image 20221025121100.png",
     "编辑器/SerializedObject.md",
     "编辑器/SearchFilter UnityEditor筛选器.md",

log_learn/SkillConfig.md

@@ -0,0 +1,2 @@
+
+

log_learn/shader入门精要.md

@@ -0,0 +1,17 @@
+
+1、模型空间到切线空间的推导
+精要：如果一个变换中仅存在平移和旋转，那么这个变换的逆矩阵就等于它的转置矩阵M = (M^-1)^T
+https://www.jianshu.com/p/4d742fec15ca
+
+2、切线空间的优势
+--todo
+
+3、渲染队列
+在Background通道渲染背景 、 Geometry里渲染不透明 、 AlphaTest中渲染需要透明测试的，
+这三个通道都开启了深度测试和深度写入
+建议Transparent中写关闭深度写入，开启了透明混合的shader，该通道还会按从后往前顺序渲染
+Overlay渲染后处理
+
+4、pass
+
+