Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.obsidian/workspace
This commit is contained in:
zzz
2022-10-26 00:33:20 +08:00
11 changed files with 233 additions and 66 deletions

View File

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

18
.obsidian/workspace vendored
View File

@@ -4,12 +4,12 @@
"type": "split",
"children": [
{
"id": "e6e443f6f53ff2ba",
"id": "458b5417a938cfb3",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "待办事项/TODO.md",
"file": "SerializedObject.md",
"mode": "source",
"source": false
}
@@ -69,7 +69,7 @@
"state": {
"type": "backlink",
"state": {
"file": "待办事项/TODO.md",
"file": "SerializedObject.md",
"collapseAll": false,
"extraContext": false,
"sortOrder": "alphabetical",
@@ -95,13 +95,17 @@
"width": 300,
"collapsed": true
},
"active": "e6e443f6f53ff2ba",
"active": "b736346aa28b495c",
"lastOpenFiles": [
"本地化流程.md",
"SearchFilter UnityEditor筛选器.md",
"Pasted image 20221021171104.png",
"Mesh Baker.md",
"conflict-files-obsidian-git.md",
"图集处理.md",
"待办事项/TODO.md",
"本地化流程.md",
"待办事项/Work.md",
"待办事项/Learn.md",
"未命名.md",
"2.md"
"未命名.md"
]
}

165
.obsidian/workspace.json vendored Normal file
View File

@@ -0,0 +1,165 @@
{
"main": {
"id": "c01acc1e0c3642a1",
"type": "split",
"children": [
{
"id": "be09fd8b647f425d",
"type": "tabs",
"children": [
{
"id": "e6e443f6f53ff2ba",
"type": "leaf",
"state": {
"type": "empty",
"state": {}
}
},
{
"id": "87d4e099e12c8ee4",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "Mesh Baker.md",
"mode": "source",
"source": false
}
}
},
{
"id": "ace280db2a9b1b05",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "Mesh Baker.md",
"mode": "source",
"source": false
}
}
},
{
"id": "cce25aded02e00af",
"type": "leaf",
"state": {
"type": "release-notes",
"state": {
"currentVersion": "1.0.0"
}
}
},
{
"id": "a01448c801fda431",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "SearchFilter UnityEditor筛选器.md",
"mode": "source",
"source": false
}
}
}
],
"currentTab": 2
}
],
"direction": "vertical"
},
"left": {
"id": "b3f2fe956c600b2b",
"type": "split",
"children": [
{
"id": "b892947aee3a10a9",
"type": "tabs",
"children": [
{
"id": "b736346aa28b495c",
"type": "leaf",
"state": {
"type": "file-explorer",
"state": {
"sortOrder": "alphabetical"
}
}
},
{
"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": "Mesh Baker.md",
"collapseAll": false,
"extraContext": false,
"sortOrder": "alphabetical",
"showSearch": false,
"searchQuery": "",
"backlinkCollapsed": false,
"unlinkedCollapsed": true
}
}
},
{
"id": "ec84e1f42a06be92",
"type": "leaf",
"state": {
"type": "calendar",
"state": {}
}
}
]
}
],
"direction": "horizontal",
"width": 300,
"collapsed": true
},
"ribbon": {
"mostRecentAction": ""
},
"active": "ace280db2a9b1b05",
"lastOpenFiles": [
"Mesh Renderer 与 Skinned Mesh Renderer.md",
"Mesh Baker.md",
"SerializedObject.md",
"Pasted image 20221021171104.png",
"SearchFilter UnityEditor筛选器.md",
"Pasted image 20221021171018.png",
"Pasted image 20221021171057.png",
"Pasted image 20221021170958.png.md",
"Pasted image 20221021171015.png",
"Pasted image 20221021170958.png"
]
}