diff --git a/.obsidian/app.json b/.obsidian/app.json index 4fe60c4..cf6d460 100644 --- a/.obsidian/app.json +++ b/.obsidian/app.json @@ -1,5 +1,11 @@ { - "alwaysUpdateLinks": true, "promptDelete": false, - "attachmentFolderPath": "编辑器/图片" + "attachmentFolderPath": "FGui/图片", + "pdfExportSettings": { + "includeName": true, + "pageSize": "Letter", + "landscape": false, + "margin": "0", + "downscalePercent": 100 + } } \ No newline at end of file diff --git a/.obsidian/community-plugins.json b/.obsidian/community-plugins.json index ea344c7..6b1fa5d 100644 --- a/.obsidian/community-plugins.json +++ b/.obsidian/community-plugins.json @@ -1,4 +1,5 @@ [ "obsidian-kanban", - "obsidian-git" + "obsidian-git", + "calendar" ] \ 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..f28f80c --- /dev/null +++ b/.obsidian/core-plugins-migration.json @@ -0,0 +1,29 @@ +{ + "file-explorer": true, + "global-search": true, + "switcher": true, + "graph": true, + "backlink": true, + "outgoing-link": false, + "tag-pane": false, + "page-preview": true, + "daily-notes": false, + "templates": false, + "note-composer": true, + "command-palette": true, + "slash-command": false, + "editor-status": true, + "starred": false, + "markdown-importer": true, + "zk-prefixer": false, + "random-note": false, + "outline": false, + "word-count": true, + "slides": false, + "audio-recorder": false, + "workspaces": false, + "file-recovery": true, + "publish": false, + "sync": false, + "canvas": true +} \ No newline at end of file diff --git a/.obsidian/core-plugins.json b/.obsidian/core-plugins.json index cc52ccb..ff200c8 100644 --- a/.obsidian/core-plugins.json +++ b/.obsidian/core-plugins.json @@ -4,6 +4,7 @@ "switcher", "graph", "backlink", + "canvas", "page-preview", "note-composer", "command-palette", diff --git a/.obsidian/hotkeys.json b/.obsidian/hotkeys.json index 9e26dfe..c866a5b 100644 --- a/.obsidian/hotkeys.json +++ b/.obsidian/hotkeys.json @@ -1 +1,11 @@ -{} \ No newline at end of file +{ + "editor:insert-callout": [ + { + "modifiers": [ + "Alt", + "Mod" + ], + "key": "I" + } + ] +} \ No newline at end of file diff --git a/.obsidian/plugins/calendar/data.json b/.obsidian/plugins/calendar/data.json new file mode 100644 index 0000000..b03e21d --- /dev/null +++ b/.obsidian/plugins/calendar/data.json @@ -0,0 +1,10 @@ +{ + "shouldConfirmBeforeCreate": true, + "weekStart": "locale", + "wordsPerDot": 250, + "showWeeklyNote": false, + "weeklyNoteFormat": "", + "weeklyNoteTemplate": "", + "weeklyNoteFolder": "", + "localeOverride": "system-default" +} \ No newline at end of file diff --git a/.obsidian/workspace b/.obsidian/workspace index e5a5e70..4ec7b8b 100644 --- a/.obsidian/workspace +++ b/.obsidian/workspace @@ -4,12 +4,12 @@ "type": "split", "children": [ { - "id": "e6e443f6f53ff2ba", + "id": "458b5417a938cfb3", "type": "leaf", "state": { "type": "markdown", "state": { - "file": "图集处理.md", + "file": "SerializedObject.md", "mode": "source", "source": false } @@ -49,8 +49,7 @@ } } } - ], - "currentTab": 1 + ] } ], "direction": "horizontal", @@ -70,7 +69,7 @@ "state": { "type": "backlink", "state": { - "file": "图集处理.md", + "file": "SerializedObject.md", "collapseAll": false, "extraContext": false, "sortOrder": "alphabetical", @@ -80,6 +79,14 @@ "unlinkedCollapsed": true } } + }, + { + "id": "d9c52b59dc19017c", + "type": "leaf", + "state": { + "type": "calendar", + "state": {} + } } ] } @@ -88,16 +95,17 @@ "width": 300, "collapsed": true }, - "active": "e6e443f6f53ff2ba", + "active": "b736346aa28b495c", "lastOpenFiles": [ - "待办事项/TODO.md", + "SearchFilter UnityEditor筛选器.md", + "Pasted image 20221021171104.png", + "Mesh Baker.md", + "conflict-files-obsidian-git.md", "图集处理.md", + "待办事项/TODO.md", "本地化流程.md", - "Pasted image 20220927204017.png", - "资源整理.md", - "BGM.md", "待办事项/Work.md", "待办事项/Learn.md", - "2.md" + "未命名.md" ] } \ No newline at end of file diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json index b04e585..9d43236 100644 --- a/.obsidian/workspace.json +++ b/.obsidian/workspace.json @@ -7,50 +7,6 @@ "id": "be09fd8b647f425d", "type": "tabs", "children": [ - { - "id": "e6e443f6f53ff2ba", - "type": "leaf", - "state": { - "type": "empty", - "state": {} - } - }, - { - "id": "87d4e099e12c8ee4", - "type": "leaf", - "state": { - "type": "markdown", - "state": { - "file": "Mesh/Mesh Baker.md", - "mode": "source", - "source": false - } - } - }, - { - "id": "ace280db2a9b1b05", - "type": "leaf", - "state": { - "type": "markdown", - "state": { - "file": "Mesh/Mesh Baker.md", - "mode": "source", - "source": false - } - } - }, - { - "id": "20853ce5023bb7e2", - "type": "leaf", - "state": { - "type": "markdown", - "state": { - "file": "编辑器/SearchFilter UnityEditor筛选器.md", - "mode": "source", - "source": false - } - } - }, { "id": "d1a18d7c71581b29", "type": "leaf", @@ -106,9 +62,32 @@ "source": false } } + }, + { + "id": "a4a604f45783e7aa", + "type": "leaf", + "state": { + "type": "empty", + "state": {} + } + }, + { + "id": "2c43938ae0940228", + "type": "leaf", + "state": { + "type": "empty", + "state": {} + } + }, + { + "id": "d0c9e570fcb52a51", + "type": "leaf", + "state": { + "type": "empty", + "state": {} + } } - ], - "currentTab": 8 + ] } ], "direction": "vertical" @@ -166,7 +145,7 @@ "state": { "type": "backlink", "state": { - "file": "FairyGui/工作流.md", + "file": "编辑器/SerializedObject.md", "collapseAll": false, "extraContext": false, "sortOrder": "alphabetical", @@ -176,6 +155,14 @@ "unlinkedCollapsed": true } } + }, + { + "id": "02bb49a0e123a922", + "type": "leaf", + "state": { + "type": "calendar", + "state": {} + } } ] } @@ -184,17 +171,26 @@ "width": 300, "collapsed": true }, - "active": "802567368bde2f52", + "left-ribbon": { + "hiddenItems": { + "switcher:打开快速切换": false, + "graph:查看关系图谱": false, + "canvas:Create new canvas": false, + "command-palette:打开命令面板": false, + "markdown-importer:打开 Markdown 格式转换器": false + } + }, + "active": "d1a18d7c71581b29", "lastOpenFiles": [ - "战斗/技能/SkillBase.md", - "FairyGui/工作流.md", - "待办事项/TODO.md", - "编辑器/图片/Pasted image 20221025121100.png", + "未命名.canvas", "编辑器/SearchFilter UnityEditor筛选器.md", - "OS/多级缓存队列.md", - "编辑器/SerializedObject.md", + "待办事项/TODO.md", + "().md", "Mesh/Mesh Baker.md", - "Mesh/Mesh Renderer 与 Skinned Mesh Renderer.md", - "Mesh/图片/Pasted image 20221021171104.png" + "FairyGui/工作流.md", + "FGui/Login界面.md", + "FGui/FGUI程序文档.md", + "OS/多级缓存队列.md", + "编辑器/SerializedObject.md" ] } \ No newline at end of file diff --git a/FairyGui/工作流.md b/FairyGui/工作流.md index 9f3089c..61d1f11 100644 --- a/FairyGui/工作流.md +++ b/FairyGui/工作流.md @@ -1,12 +1 @@ - -## 发布流程 - 美术导入资源到包->检查图片依赖，公用图片放公用图集（）->拿到美术文件->点击发布(批处理) - ->生成图集及.bytes文件到工程 - -## 工程手脚架 - 接入启动流程 - UI层级管理框架 - FGui C#基类 lua基类 - 自动生成lua代码 - 通用组件 - 教会策划美术拼图 \ No newline at end of file +[www.baidu.com]() diff --git a/待办事项/SkillConfig.md b/待办事项/SkillConfig.md new file mode 100644 index 0000000..ed1ab6c --- /dev/null +++ b/待办事项/SkillConfig.md @@ -0,0 +1,7 @@ + +###### 没必要在一些小细节上继续纠结，重点是技能系统及其手脚架！！！ + +### 设计技能模块： +##### Q： +考虑技能数据流怎么往下传递 +BUFF与Unit有何不同 A：BUFF为Unit的一个子类 \ No newline at end of file diff --git a/待办事项/TODO.md b/待办事项/TODO.md index f21122e..aba9676 100644 --- a/待办事项/TODO.md +++ b/待办事项/TODO.md @@ -7,6 +7,16 @@ kanban-plugin: basic ## Work **完成** +- [x] 共同组件 +- [x] 第二次启动才报错 +- [x] 字体发布清除 +- [x] 弱表管理在衣柜界面还是会移除模型 +- [x] 聊天气泡背景 +- [x] 中文字体添加白名单 +- [x] 3D UI 销毁管理 +- [x] 多语言字体 +- [x] 游戏开始 有空引用报错 +- [x] CurrentParams是否可行 ## Learn @@ -47,6 +57,30 @@ kanban-plugin: basic - [x] 报销车费 - [x] 图集处理6-1 - [x] Csv接口更好适配xml语法，
现在接口用起来太繁琐了 +- [x] 依赖包有bug +- [x] 创角界面 镜头和还原 页签还原 +- [x] LayerUIGroup的调试 +- [x] dispose的时候没把uistack里边的界面清掉,导致回退的时候重新弹了出来 +- [x] 新弱表调试 +- [ ] +- [x] 弱表管理 +- [x] Main界面无法穿透 +- [x] 依赖包里的等待列表 +- [x] 创角验收 UI闪一下 +- [x] 创角 Icon +- [x] 字体多语言管理 +- [x] 图片半透明问题 +- [x] 聊天界面 +- [x] 创角 半蹲 +- [x] 3DUI +- [x] 动作发抖 +- [x] 地球模型 +- [x] 回退界面层级不对 +- [x] Group：Show接口 调整层级 +- [x] 多语言切换不彻底设置界面 +- [x] 测试配置表 拼UI +- [x] Logic改写成类 +- [x] 重登流程有问题 %% kanban:settings ``` diff --git a/战斗/技能/SkillBase.md b/战斗/技能/SkillBase.md index aab418a..4e0f188 100644 --- a/战斗/技能/SkillBase.md +++ b/战斗/技能/SkillBase.md @@ -3,7 +3,7 @@ ## 技能环节(SkillProcUnit): 负责每个环节要做的事情: 例如:0.2s治疗 0.4s根据治疗量上攻击buff 0.6s造成AOE伤害 - 前摇后腰 + 前摇后摇 ## 技能流程管理：纳入到Base管理 对于环节类，应该有一个管理类来管理时间戳到哪个环节，流传上个环节的数值到下个环节，然后调用场景管理类的实际功能 @@ -14,4 +14,5 @@ ## 技能信息类： 受到技能的级数，技能buff加成等影响，技能元数据的装饰类 -## 技能表现 \ No newline at end of file +## 技能表现： + 由SKillBase通信动画组件与特效组件干活 \ No newline at end of file