Zane/obsidian-notes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vault backup: 2023-07-26 15:26:38

Browse Source
This commit is contained in:
zzz
2023-07-26 15:26:38 +08:00
parent faaab6dda4 963d2bc4ce
commit 7ec2d49b73
8 changed files with 1597 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.obsidian/community-plugins.json vendored
View File

@@ -1,3 +1,7 @@
<<<<<<< HEAD
[
"obsidian-git"
]
]
=======
[]
>>>>>>> origin/master

14
.obsidian/plugins/obsidian-git/data.json vendored
View File

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

1547
.obsidian/plugins/obsidian-git/main.js vendored
View File

File diff suppressed because it is too large Load Diff

9
.obsidian/plugins/obsidian-git/manifest.json vendored
View File

@@ -1,9 +1,12 @@
{
"id": "obsidian-git",
"name": "Obsidian Git",
"description": "Backup your vault with Git.",
"isDesktopOnly": false,
"fundingUrl": "https://ko-fi.com/vinzent",
"description": "Backup your vault with git.",
"isDesktopOnly": true,
"js": "main.js",
<<<<<<< HEAD
"version": "2.20.6"
=======
"version": "1.26.1"
>>>>>>> origin/master
}

91
.obsidian/plugins/obsidian-git/styles.css vendored
View File

@@ -46,30 +46,21 @@
.tooltip.mod-right {
overflow-wrap: break-word;
}
.git-tools {
display: flex;
margin-left: auto;
}
.git-tools .type {
padding-left: var(--size-2-1);
display: flex;
align-items: center;
justify-content: center;
width: 11px;
.obsidian-git-shortcuts {
margin: 10px;
}
.git-tools .type[data-type="M"] {
color: orange;
}
.git-tools .type[data-type="D"] {
color: red;
}
.git-tools .buttons {
.diff-err {
height: 100%;
display: flex;
justify-content: center;
flex-direction: column;
align-items: center;
}
.git-tools .buttons > * {
padding: 0 0;
height: auto;
.diff-err-sign {
font-size: 2em;
}
.workspace-leaf-content[data-type="diff-view"] .d2h-d-none {
@@ -221,17 +212,20 @@
white-space: pre;
width: 100%;
}
.theme-light .workspace-leaf-content[data-type="diff-view"] .d2h-code-line del,
.theme-light .workspace-leaf-content[data-type="diff-view"] .d2h-code-side-line del {
.theme-light
.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 .workspace-leaf-content[data-type="diff-view"] .d2h-code-side-line del {
.theme-dark
.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,
@@ -242,19 +236,22 @@
text-decoration: none;
vertical-align: middle;
}
.theme-light .workspace-leaf-content[data-type="diff-view"] .d2h-code-line ins,
.theme-light .workspace-leaf-content[data-type="diff-view"] .d2h-code-side-line ins {
.theme-light
.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 .workspace-leaf-content[data-type="diff-view"] .d2h-code-side-line ins {
.theme-dark
.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;
@@ -370,44 +367,48 @@
border-color: var(--background-modifier-border);
color: var(--text-normal);
}
.theme-light .workspace-leaf-content[data-type="diff-view"] .d2h-file-diff .d2h-del.d2h-change {
.theme-light
.workspace-leaf-content[data-type="diff-view"]
.d2h-file-diff
.d2h-del.d2h-change {
background-color: #fdf2d0;
}
.theme-dark .workspace-leaf-content[data-type="diff-view"] .d2h-file-diff .d2h-del.d2h-change {
.theme-dark
.workspace-leaf-content[data-type="diff-view"]
.d2h-file-diff
.d2h-del.d2h-change {
background-color: #55492480;
}
.theme-light .workspace-leaf-content[data-type="diff-view"] .d2h-file-diff .d2h-ins.d2h-change {
.theme-light
.workspace-leaf-content[data-type="diff-view"]
.d2h-file-diff
.d2h-ins.d2h-change {
background-color: #ded;
}
.theme-dark .workspace-leaf-content[data-type="diff-view"] .d2h-file-diff .d2h-ins.d2h-change {
.theme-dark
.workspace-leaf-content[data-type="diff-view"]
.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 a:visited {
.workspace-leaf-content[data-type="diff-view"]
.d2h-file-list-wrapper
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;

28
.obsidian/workspace.json vendored
View File

@@ -17,6 +17,18 @@
"pinned": true
}
},
{
"id": "9eb92d3d81ca81e4",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "conflict-files-obsidian-git.md",
"mode": "source",
"source": false
}
}
},
{
"id": "6431c3ab63928f12",
"type": "leaf",
@@ -29,7 +41,8 @@
}
}
}
]
],
"currentTab": 1
}
],
"direction": "vertical"
@@ -95,6 +108,7 @@
"state": {
"type": "backlink",
"state": {
"file": "conflict-files-obsidian-git.md",
"collapseAll": false,
"extraContext": false,
"sortOrder": "alphabetical",
@@ -119,6 +133,7 @@
"state": {
"type": "outgoing-link",
"state": {
"file": "conflict-files-obsidian-git.md",
"linksCollapsed": false,
"unlinkedCollapsed": true
}
@@ -140,7 +155,9 @@
"type": "leaf",
"state": {
"type": "outline",
"state": {}
"state": {
"file": "conflict-files-obsidian-git.md"
}
}
},
{
@@ -177,14 +194,16 @@
"command-palette:打开命令面板": false
}
},
"active": "f2ac97a7addb8678",
"active": "9eb92d3d81ca81e4",
"lastOpenFiles": [
"Batch & DrawCall.md",
"网络同步.md",
"conflict-files-obsidian-git.md",
"渲染/软渲染/冯 高光.md",
"渲染/软渲染",
"渲染/软渲染/还未实现.md",
"待办事项/TODO.md",
"程序集.md",
"网络同步.md",
"Mesh/Mesh Renderer 与 Skinned Mesh Renderer.md",
"Mesh/Mesh Baker.md",
"Mesh/图片/Pasted image 20221021171104.png",
@@ -205,7 +224,6 @@
"并行计算/CPU/Brust.md",
"并行计算/CPU/SIMD(单指令多数据).md",
"Issue/超出ScrollView的特效渲染层级不对.md",
"conflict-files-obsidian-git.md",
"FairyGui/工作流.md",
"FairyGui",
"并行计算/GPU/Compute Shader.md",

7
Batch & DrawCall.md Normal file
View File

@@ -0,0 +1,7 @@
https://zhuanlan.zhihu.com/p/68530142 Batch的前世今生
一个Batch即为同一批材质的游戏对象
但是因为Pass不同
透明度不同，可能需要半透明混合而另外一个不需要，就会形成两次DC
渲染层级不同等等原因

7
待办事项/SkillConfig.md
View File

@@ -1,7 +0,0 @@
###### 没必要在一些小细节上继续纠结，重点是技能系统及其手脚架！！！
### 设计技能模块：
##### Q：
考虑技能数据流怎么往下传递
BUFF与Unit有何不同 A：BUFF为Unit的一个子类