Compare commits

..

2 Commits

Author SHA1 Message Date
cyy_mac
2f48fbc072 vault backup: 2026-04-10 05:44:51 2026-04-10 05:44:51 +08:00
cyy_mac
e2b934d39e vault backup: 2026-04-10 05:44:39 2026-04-10 05:44:39 +08:00
10 changed files with 299 additions and 14 deletions

2
.obsidian/app.json vendored
View File

@@ -1,3 +1,3 @@
{
"attachmentFolderPath": "./附件"
"attachmentFolderPath": "./file_other"
}

View File

@@ -263,8 +263,8 @@
"newFileTemplatePath": "",
"newPDFLocation": "current",
"newPDFFolderPath": "",
"rectEmbedStaticImage": false,
"rectImageFormat": "data-url",
"rectEmbedStaticImage": true,
"rectImageFormat": "file",
"rectImageExtension": "webp",
"zoomToFitRect": false,
"rectFollowAdaptToTheme": true,

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

@@ -0,0 +1,270 @@
{
"main": {
"id": "a3e106b31d1f6389",
"type": "split",
"children": [
{
"id": "9e798c20fcdda0d5",
"type": "tabs",
"children": [
{
"id": "454bdf5c2a52e348",
"type": "leaf",
"state": {
"type": "pdf",
"state": {
"file": "考研/math/27张宇基础30讲高数.pdf",
"page": 21,
"left": 50,
"top": 8,
"zoom": 1.58
},
"icon": "lucide-file-text",
"title": "27张宇基础30讲高数"
}
}
]
},
{
"id": "bfb010d934f3da16",
"type": "tabs",
"children": [
{
"id": "ee6712e4bb96f904",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "超级备忘/机器学习/机器视觉.md",
"mode": "source",
"source": false
},
"icon": "lucide-file",
"title": "机器视觉"
}
},
{
"id": "a40c5e0deff9b339",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "conflict-files-obsidian-git.md",
"mode": "source",
"source": false
},
"icon": "lucide-file",
"title": "conflict-files-obsidian-git"
}
}
],
"currentTab": 1
}
],
"direction": "vertical"
},
"left": {
"id": "f773b158d86aff62",
"type": "split",
"children": [
{
"id": "b0ebe2b5e21fa881",
"type": "tabs",
"children": [
{
"id": "56eebd16a547bbff",
"type": "leaf",
"state": {
"type": "file-explorer",
"state": {
"sortOrder": "alphabetical",
"autoReveal": false
},
"icon": "lucide-folder-closed",
"title": "文件列表"
}
},
{
"id": "3a285e81a23285d7",
"type": "leaf",
"state": {
"type": "search",
"state": {
"query": "",
"matchingCase": false,
"explainSearch": false,
"collapseAll": false,
"extraContext": false,
"sortOrder": "alphabetical"
},
"icon": "lucide-search",
"title": "搜索"
}
},
{
"id": "e2ff76d624c81851",
"type": "leaf",
"state": {
"type": "bookmarks",
"state": {},
"icon": "lucide-bookmark",
"title": "书签"
}
}
]
}
],
"direction": "horizontal",
"width": 215.5
},
"right": {
"id": "6885019000198f8c",
"type": "split",
"children": [
{
"id": "55c7f3ef5fef319d",
"type": "tabs",
"children": [
{
"id": "28309c37e4096893",
"type": "leaf",
"state": {
"type": "backlink",
"state": {
"file": "零碎的知识/嵌入式实验室设备使用指南.md",
"collapseAll": false,
"extraContext": false,
"sortOrder": "alphabetical",
"showSearch": false,
"searchQuery": "",
"backlinkCollapsed": false,
"unlinkedCollapsed": true
},
"icon": "links-coming-in",
"title": "嵌入式实验室设备使用指南 的反向链接列表"
}
},
{
"id": "3f525cf18f87e3cd",
"type": "leaf",
"state": {
"type": "outgoing-link",
"state": {
"linksCollapsed": false,
"unlinkedCollapsed": true
},
"icon": "links-going-out",
"title": "出链"
}
},
{
"id": "6b06b5c219b6c11b",
"type": "leaf",
"state": {
"type": "tag",
"state": {
"sortOrder": "frequency",
"useHierarchy": true,
"showSearch": false,
"searchQuery": ""
},
"icon": "lucide-tags",
"title": "标签"
}
},
{
"id": "46b3498093121e31",
"type": "leaf",
"state": {
"type": "outline",
"state": {
"followCursor": false,
"showSearch": false,
"searchQuery": ""
},
"icon": "lucide-list",
"title": "大纲"
}
},
{
"id": "8e9bf87d81cab358",
"type": "leaf",
"state": {
"type": "git-view",
"state": {},
"icon": "git-pull-request",
"title": "Source Control"
}
}
],
"currentTab": 4
}
],
"direction": "horizontal",
"width": 200
},
"left-ribbon": {
"hiddenItems": {
"bases:新建数据库": false,
"switcher:打开快速切换": false,
"graph:查看关系图谱": false,
"canvas:新建白板": false,
"daily-notes:打开/创建今天的日记": false,
"templates:插入模板": false,
"command-palette:打开命令面板": false,
"obsidian-git:Open Git source control": false,
"pdf-plus:PDF++: Toggle auto-copy": false,
"pdf-plus:PDF++: Toggle auto-focus": false,
"pdf-plus:PDF++: Toggle auto-paste": false
}
},
"active": "a40c5e0deff9b339",
"lastOpenFiles": [
"超级备忘/机器学习/机器视觉.md",
"conflict-files-obsidian-git.md",
"考研/math/002_第1讲.md",
"考研/math/27张宇基础30讲高数.pdf",
"考研/math/file_other/27张宇基础30讲高数.webp",
"考研/math/file_other",
"考研/math/001_前言.md",
"考研/math/003_第2讲.md",
"考研/math/009_第8讲.md",
"考研/math/012_第11讲.md",
"考研/math/014_第13讲.md",
"考研/math/018_第17讲.md",
"考研/math/020_第18讲.md",
"27张宇基础30讲高数.webp",
"27张宇基础30讲高数 2.webp",
"27张宇基础30讲高数 1.webp",
"考研/math/002_## 第1讲.md",
"考研/math/019_第17讲.md",
"考研/math/017_第15讲.md",
"考研/math/016_第14讲.md",
"考研/math/015_第13讲.md",
"考研/math/013_第12讲.md",
"考研/math/011_第10讲.md",
"考研/math/010_第9讲.md",
"考研/math/008_第7讲.md",
"考研/math/007_第6讲.md",
"考研/math/006_第5讲.md",
"考研/math/005_第4讲.md",
"考研/math/004_第3讲.md",
"个人总纲和进度监督/DEADLINE.md",
"考研/math/images/ffe49e27b1b256b4ec3b2fbedea04d2fb03456e81ba1014de7f0487742a5d215.jpg",
"考研/math/images/ff7f771402b6f05b26429dd7004f8b6a8d08a57870152dcfb1266bd6164d296a.jpg",
"考研/math/images/ff51cc6f212b981a350e11dd61fb39549e36ca80e7ce382b60ca72240426c184.jpg",
"考研/math/images/ff30646567ff171a759b541db3d620391a31a7f553d1f72a844382521d6690ea.jpg",
"考研/math/images/ff2dd438eb3d4bec3a1caaf1dfaaa2b98b4e5ec9e763729a8b2525866aa40064.jpg",
"考研/math/images/ff2cdb08edd1a682a2ef230390725aeee27b501af98d5b27e2f4e0a57e3f2fd2.jpg",
"考研/math/images",
"考研/math/020_## 第18讲.md",
"考研/math/019_## 第17讲.md",
"考研/math",
"考研",
"未命名.base",
"未命名 3.base",
"未命名 2.base",
"未命名 1.base",
"超级备忘/激光原理"
]
}

View File

@@ -0,0 +1,17 @@
# Conflicts
Please resolve them and commit them using the commands `Git: Commit all changes` followed by `Git: Push`
(This file will automatically be deleted before commit)
[[#Additional Instructions]] available below file list
- Not a file: .obsidian/workspace.json
# Additional Instructions
I strongly recommend to use "Source mode" for viewing the conflicted files. For simple conflicts, in each file listed above replace every occurrence of the following text blocks with the desired text.
```diff
<<<<<<< HEAD
File changes in local repository
=======
File changes in remote repository
>>>>>>> origin/main
```

BIN
考研/.DS_Store vendored

Binary file not shown.

File diff suppressed because one or more lines are too long

View File

@@ -1,4 +1,5 @@
## 第2讲
[[27张宇基础30讲高数.pdf#page=84|27张宇基础30讲高数, p.84]]
## 第2讲】
## 数列极限

Binary file not shown.

After

Width:  |  Height:  |  Size: 152 KiB

View File

@@ -6,3 +6,5 @@
偏振片消光
灰度函数
直方图均衡化