diff --git a/.obsidian/app.json b/.obsidian/app.json index 4b92b73..e609a07 100644 --- a/.obsidian/app.json +++ b/.obsidian/app.json @@ -1,11 +1,3 @@ { - "attachmentFolderPath": "FGui/图片", - "pdfExportSettings": { - "includeName": true, - "pageSize": "Letter", - "landscape": false, - "margin": "0", - "downscalePercent": 100 - }, "promptDelete": false } \ No newline at end of file diff --git a/.obsidian/appearance.json b/.obsidian/appearance.json index c410cc3..c8c365d 100644 --- a/.obsidian/appearance.json +++ b/.obsidian/appearance.json @@ -1,4 +1,3 @@ { - "accentColor": "", - "baseFontSize": 16 + "accentColor": "" } \ No newline at end of file diff --git a/.obsidian/community-plugins.json b/.obsidian/community-plugins.json index 6b1fa5d..0637a08 100644 --- a/.obsidian/community-plugins.json +++ b/.obsidian/community-plugins.json @@ -1,5 +1 @@ -[ - "obsidian-kanban", - "obsidian-git", - "calendar" -] \ No newline at end of file +[] \ No newline at end of file diff --git a/.obsidian/core-plugins-migration.json b/.obsidian/core-plugins-migration.json new file mode 100644 index 0000000..3106ebd --- /dev/null +++ b/.obsidian/core-plugins-migration.json @@ -0,0 +1,29 @@ +{ + "file-explorer": true, + "global-search": true, + "switcher": true, + "graph": true, + "backlink": true, + "canvas": true, + "outgoing-link": true, + "tag-pane": true, + "page-preview": true, + "daily-notes": true, + "templates": true, + "note-composer": true, + "command-palette": true, + "slash-command": false, + "editor-status": true, + "starred": true, + "markdown-importer": false, + "zk-prefixer": false, + "random-note": false, + "outline": true, + "word-count": true, + "slides": false, + "audio-recorder": false, + "workspaces": false, + "file-recovery": true, + "publish": false, + "sync": false +} \ No newline at end of file diff --git a/.obsidian/core-plugins.json b/.obsidian/core-plugins.json index cc52ccb..086a8e4 100644 --- a/.obsidian/core-plugins.json +++ b/.obsidian/core-plugins.json @@ -4,11 +4,17 @@ "switcher", "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" ] \ No newline at end of file diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json index 4b9df47..b1671f8 100644 --- a/.obsidian/workspace.json +++ b/.obsidian/workspace.json @@ -57,7 +57,7 @@ "state": { "type": "markdown", "state": { - "file": "FGui/FGui规范及常用模板.md", + "file": "log_learn/shader入门精要.md", "mode": "source", "source": false } @@ -119,6 +119,14 @@ "sortOrder": "alphabetical" } } + }, + { + "id": "29d5ab84b58f63a6", + "type": "leaf", + "state": { + "type": "starred", + "state": {} + } } ] } @@ -140,7 +148,7 @@ "state": { "type": "backlink", "state": { - "file": "FGui/FGui规范及常用模板.md", + "file": "log_learn/shader入门精要.md", "collapseAll": false, "extraContext": false, "sortOrder": "alphabetical", @@ -158,6 +166,39 @@ "type": "calendar", "state": {} } + }, + { + "id": "2f99709965efdfa8", + "type": "leaf", + "state": { + "type": "outgoing-link", + "state": { + "file": "log_learn/shader入门精要.md", + "linksCollapsed": false, + "unlinkedCollapsed": true + } + } + }, + { + "id": "e94ba1c68f225fc6", + "type": "leaf", + "state": { + "type": "tag", + "state": { + "sortOrder": "frequency", + "useHierarchy": true + } + } + }, + { + "id": "311f320938cad49b", + "type": "leaf", + "state": { + "type": "outline", + "state": { + "file": "log_learn/shader入门精要.md" + } + } } ] } @@ -166,11 +207,23 @@ "width": 300, "collapsed": true }, + "left-ribbon": { + "hiddenItems": { + "daily-notes:打开/创建今天的日记": false, + "templates:插入模板": false, + "switcher:打开快速切换": false, + "graph:查看关系图谱": false, + "canvas:新建白板": false, + "command-palette:打开命令面板": false + } + }, "active": "1a6234b1c364beb9", "lastOpenFiles": [ + "log_learn/SkillConfig.md", + "log_learn/shader入门精要.md", + "FGui/FGui规范及常用模板.md", "FGui/图片/Pasted image 20221114121030.png", "FGui/图片/Pasted image 20221114121249.png", - "FGui/FGui规范及常用模板.md", "未命名.md", "待办事项/TODO.md", "战斗/技能/SkillBase.md", diff --git a/FGui/FGui规范及常用模板.md b/FGui/FGui规范及常用模板.md deleted file mode 100644 index c10f6aa..0000000 --- a/FGui/FGui规范及常用模板.md +++ /dev/null @@ -1,52 +0,0 @@ - -# 理解概念 -包=对应系统 组件=里边可复用的一些模板 - -# 规范 - -## 命名规范 -1、组件 + ”_“ + 命名 - 例如： -![[Pasted image 20221114121704.png]] - 一些比较复杂的组件就用Com作前缀,，Com=Component - - -## 流程规范 - -1、目录结构 - 一般来说每个系统一个包，左上角点击新建包，什么系统就命名什么就好 -![[Pasted image 20221114122742.png]] - -但是像较多地方都用到同一个资源比如说通用按钮，那么这个按钮就要放在Common这个公用的包里面， -如图中的背包的一个图标： -![[Pasted image 20221114123133.png]] - -大图还是放Image这个包下 -![[Pasted image 20221114141112.png]] - -2、资源放置 - 对应的组件和图片放在同一个包里就好 -![[Pasted image 20221114123441.png - -3、上传资源 -整个文件夹提交SVN -![[Pasted image 20221114141243.png]] - - -# 一些常用模板 -## 页签：三个单选按钮 + 一个控制器完成 -![[Pasted image 20221114142309.png]] -![[Pasted image 20221114142738.png]] -找到刚刚做好的控制器，每个按钮链接一个状态 -![[Pasted image 20221114142906.png]]![[Pasted image 20221114143146.png]] -随意点击按钮可以切换效果 -![[Pasted image 20221114143202.png]] - -## 列表： -![[Pasted image 20221114144948.png]] -拖进素材 -![[Pasted image 20221114145009.png]] -编辑数据，一般只是预览，发布时自动清空的选项要勾上 -![[Pasted image 20221114145058.png]]![[Pasted image 20221114145138.png]]![[Pasted image 20221114145205.png]] -预览上下滑动 -![[Pasted image 20221114145254.png]] \ No newline at end of file diff --git a/FGui/图片/Pasted image 20221114121704.png b/FGui/图片/Pasted image 20221114121704.png deleted file mode 100644 index 0507974..0000000 Binary files a/FGui/图片/Pasted image 20221114121704.png and /dev/null differ diff --git a/FGui/图片/Pasted image 20221114122742.png b/FGui/图片/Pasted image 20221114122742.png deleted file mode 100644 index 8e3fa4e..0000000 Binary files a/FGui/图片/Pasted image 20221114122742.png and /dev/null differ diff --git a/FGui/图片/Pasted image 20221114123117.png b/FGui/图片/Pasted image 20221114123117.png deleted file mode 100644 index db4dfba..0000000 Binary files a/FGui/图片/Pasted image 20221114123117.png and /dev/null differ diff --git a/FGui/图片/Pasted image 20221114123133.png b/FGui/图片/Pasted image 20221114123133.png deleted file mode 100644 index db4dfba..0000000 Binary files a/FGui/图片/Pasted image 20221114123133.png and /dev/null differ diff --git a/FGui/图片/Pasted image 20221114123441.png b/FGui/图片/Pasted image 20221114123441.png deleted file mode 100644 index bec867d..0000000 Binary files a/FGui/图片/Pasted image 20221114123441.png and /dev/null differ diff --git a/FGui/图片/Pasted image 20221114141112.png b/FGui/图片/Pasted image 20221114141112.png deleted file mode 100644 index d5a4bb3..0000000 Binary files a/FGui/图片/Pasted image 20221114141112.png and /dev/null differ diff --git a/FGui/图片/Pasted image 20221114141243.png b/FGui/图片/Pasted image 20221114141243.png deleted file mode 100644 index 5d502a4..0000000 Binary files a/FGui/图片/Pasted image 20221114141243.png and /dev/null differ diff --git a/FGui/图片/Pasted image 20221114142141.png b/FGui/图片/Pasted image 20221114142141.png deleted file mode 100644 index a226a8f..0000000 Binary files a/FGui/图片/Pasted image 20221114142141.png and /dev/null differ diff --git a/FGui/图片/Pasted image 20221114142309.png b/FGui/图片/Pasted image 20221114142309.png deleted file mode 100644 index 984b359..0000000 Binary files a/FGui/图片/Pasted image 20221114142309.png and /dev/null differ diff --git a/FGui/图片/Pasted image 20221114142738.png b/FGui/图片/Pasted image 20221114142738.png deleted file mode 100644 index a94d9ab..0000000 Binary files a/FGui/图片/Pasted image 20221114142738.png and /dev/null differ diff --git a/FGui/图片/Pasted image 20221114142855.png b/FGui/图片/Pasted image 20221114142855.png deleted file mode 100644 index 1fde035..0000000 Binary files a/FGui/图片/Pasted image 20221114142855.png and /dev/null differ diff --git a/FGui/图片/Pasted image 20221114142906.png b/FGui/图片/Pasted image 20221114142906.png deleted file mode 100644 index 1fde035..0000000 Binary files a/FGui/图片/Pasted image 20221114142906.png and /dev/null differ diff --git a/FGui/图片/Pasted image 20221114143146.png b/FGui/图片/Pasted image 20221114143146.png deleted file mode 100644 index fd0c5bf..0000000 Binary files a/FGui/图片/Pasted image 20221114143146.png and /dev/null differ diff --git a/FGui/图片/Pasted image 20221114143202.png b/FGui/图片/Pasted image 20221114143202.png deleted file mode 100644 index 5ebea84..0000000 Binary files a/FGui/图片/Pasted image 20221114143202.png and /dev/null differ diff --git a/FGui/图片/Pasted image 20221114144948.png b/FGui/图片/Pasted image 20221114144948.png deleted file mode 100644 index 2843097..0000000 Binary files a/FGui/图片/Pasted image 20221114144948.png and /dev/null differ diff --git a/FGui/图片/Pasted image 20221114145009.png b/FGui/图片/Pasted image 20221114145009.png deleted file mode 100644 index ab5e41f..0000000 Binary files a/FGui/图片/Pasted image 20221114145009.png and /dev/null differ diff --git a/FGui/图片/Pasted image 20221114145058.png b/FGui/图片/Pasted image 20221114145058.png deleted file mode 100644 index e09a1b6..0000000 Binary files a/FGui/图片/Pasted image 20221114145058.png and /dev/null differ diff --git a/FGui/图片/Pasted image 20221114145138.png b/FGui/图片/Pasted image 20221114145138.png deleted file mode 100644 index 9c27b1c..0000000 Binary files a/FGui/图片/Pasted image 20221114145138.png and /dev/null differ diff --git a/FGui/图片/Pasted image 20221114145205.png b/FGui/图片/Pasted image 20221114145205.png deleted file mode 100644 index 11f5162..0000000 Binary files a/FGui/图片/Pasted image 20221114145205.png and /dev/null differ diff --git a/FGui/图片/Pasted image 20221114145254.png b/FGui/图片/Pasted image 20221114145254.png deleted file mode 100644 index fd8fec3..0000000 Binary files a/FGui/图片/Pasted image 20221114145254.png and /dev/null differ diff --git a/FairyGui/工作流.md b/FairyGui/工作流.md deleted file mode 100644 index 9f3089c..0000000 --- a/FairyGui/工作流.md +++ /dev/null @@ -1,12 +0,0 @@ - -## 发布流程 - 美术导入资源到包->检查图片依赖，公用图片放公用图集（）->拿到美术文件->点击发布(批处理) - ->生成图集及.bytes文件到工程 - -## 工程手脚架 - 接入启动流程 - UI层级管理框架 - FGui C#基类 lua基类 - 自动生成lua代码 - 通用组件 - 教会策划美术拼图 \ No newline at end of file diff --git a/log_learn/SkillConfig.md b/log_learn/SkillConfig.md new file mode 100644 index 0000000..139597f --- /dev/null +++ b/log_learn/SkillConfig.md @@ -0,0 +1,2 @@ + + diff --git a/log_learn/shader入门精要.md b/log_learn/shader入门精要.md new file mode 100644 index 0000000..aaf09f9 --- /dev/null +++ b/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 + +