Merge branch 'master' of https://github.com/TomAndJerry14/Daily

# Conflicts:
#	.obsidian/app.json
#	.obsidian/workspace.json

.obsidian/app.json

@@ -1,11 +1,3 @@
 {
-  "alwaysUpdateLinks": true,
+  "attachmentFolderPath": "FGui/图片"
-  "promptDelete": false,
-  "pdfExportSettings": {
-    "includeName": true,
-    "pageSize": "Letter",
-    "landscape": false,
-    "margin": "0",
-    "downscalePercent": 100
-  }
 }

.obsidian/workspace.json

@@ -69,7 +69,43 @@
             "state": {
               "type": "release-notes",
               "state": {
-                "currentVersion": "1.0.0"
+                "file": "编辑器/SearchFilter UnityEditor筛选器.md",
+                "mode": "source",
+                "source": false
+              }
+            }
+          },
+          {
+            "id": "d1a18d7c71581b29",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "编辑器/SerializedObject.md",
+                "mode": "source",
+                "source": false
+              }
+            }
+          },
+          {
+            "id": "7e7e296e22babc71",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "OS/多级缓存队列.md",
+                "mode": "source",
+                "source": false
+              }
+            }
+          },
+          {
+            "id": "7c26718ad1c1bcd1",
+            "type": "leaf",
+            "state": {
+              "type": "kanban",
+              "state": {
+                "file": "待办事项/TODO.md"
               }
             }
           },
@@ -77,12 +113,26 @@
             "id": "a01448c801fda431",
             "type": "leaf",
             "state": {
-              "type": "empty",
+              "type": "kanban",
-              "state": {}
+              "state": {
+                "file": "待办事项/TODO.md"
+              }
+            }
+          },
+          {
+            "id": "802567368bde2f52",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "FairyGui/工作流.md",
+                "mode": "source",
+                "source": false
+              }
             }
           }
         ],
-        "currentTab": 5
+        "currentTab": 8
       }
     ],
     "direction": "vertical"
@@ -140,7 +190,7 @@
             "state": {
               "type": "backlink",
               "state": {
-                "file": "FGui/FGui规范及常用模板.md",
+                "file": "FairyGui/工作流.md",
                 "collapseAll": false,
                 "extraContext": false,
                 "sortOrder": "alphabetical",
@@ -166,17 +216,17 @@
     "width": 300,
     "collapsed": true
   },
-  "active": "1a6234b1c364beb9",
+  "active": "802567368bde2f52",
   "lastOpenFiles": [
-    "未命名.md",
     "待办事项/TODO.md",
-    "战斗/技能/SkillBase.md",
+    "编辑器/图片/Pasted image 20221025121100.png",
-    "待办事项/SkillConfig.md",
-    "编辑器/SerializedObject.md",
     "编辑器/SearchFilter UnityEditor筛选器.md",
-    "Mesh Baker.md",
+    "战斗/技能/SkillBase.md",
-    "Mesh Renderer 与 Skinned Mesh Renderer.md",
+    "OS/多级缓存队列.md",
-    "SerializedObject.md",
+    "编辑器/SerializedObject.md",
-    "Pasted image 20221021171104.png"
+    "Mesh/Mesh Baker.md",
+    "Mesh/Mesh Renderer 与 Skinned Mesh Renderer.md",
+    "Mesh/图片/Pasted image 20221021171104.png",
+    "图集/TODO.md"
   ]
 }

FGui/FGui规范及常用模板.md

@@ -2,5 +2,8 @@
 # 规范
 
 ## 命名规范
+	1、组件 + ”_“ + 命名
+		例如：
 
 
+## 流程规范

FairyGui/工作流.md

@@ -0,0 +1,12 @@
+
+## 发布流程
+	美术导入资源到包->检查图片依赖，公用图片放公用图集（）->拿到美术文件->点击发布(批处理)
+	->生成图集及.bytes文件到工程
+
+## 工程手脚架
+	接入启动流程
+	UI层级管理框架
+	FGui C#基类 lua基类
+	自动生成lua代码
+	通用组件
+	教会策划美术拼图

待办事项/TODO.md

@@ -7,22 +7,20 @@ kanban-plugin: basic
 ## Work
 
 **完成**
-- [x] Csv接口更好适配xml语法，<br>现在接口用起来太繁琐了
 
 
 ## Learn
 
+- [ ] Task
 - [ ] Game104
+- [ ] 算法4
 - [ ] Obsidian插件
 - [ ] 微积分
 - [ ] shader入门精要
-- [ ] 算法4
 - [ ] 协程与异步
-- [ ] Task
 - [ ] 猫刀刀战斗
 - [ ] 行为树
 - [ ] 时间轴 slate和flux
-- [ ] UWA课程
 
 
 ## Demo进度
@@ -48,6 +46,7 @@ kanban-plugin: basic
 - [x] 繁荣度+{1} 导表关闭
 - [x] 报销车费
 - [x] 图集处理6-1
+- [x] Csv接口更好适配xml语法，<br>现在接口用起来太繁琐了
 
 %% kanban:settings
 ```