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

# Conflicts:
#	.obsidian/workspace.json
#	待办事项/TODO.md

.obsidian/workspace.json

@@ -19,12 +19,8 @@
             "id": "87d4e099e12c8ee4",
             "type": "leaf",
             "state": {
-              "type": "markdown",
-              "state": {
-                "file": "Mesh Baker.md",
-                "mode": "source",
-                "source": false
-              }
+              "type": "empty",
+              "state": {}
             }
           },
           {
@@ -41,12 +37,8 @@
             "id": "642e4859a39fb16e",
             "type": "leaf",
             "state": {
-              "type": "markdown",
-              "state": {
-                "file": "SerializedObject.md",
-                "mode": "preview",
-                "source": false
-              }
+              "type": "empty",
+              "state": {}
             }
           },
           {
@@ -55,7 +47,7 @@
             "state": {
               "type": "markdown",
               "state": {
-                "file": "待办事项/SkillConfig.md",
+                "file": "编辑器/SerializedObject.md",
                 "mode": "source",
                 "source": false
               }
@@ -75,12 +67,8 @@
             "id": "a01448c801fda431",
             "type": "leaf",
             "state": {
-              "type": "markdown",
-              "state": {
-                "file": "SearchFilter UnityEditor筛选器.md",
-                "mode": "source",
-                "source": false
-              }
+              "type": "empty",
+              "state": {}
             }
           }
         ],
@@ -142,7 +130,7 @@
             "state": {
               "type": "backlink",
               "state": {
-                "file": "待办事项/SkillConfig.md",
+                "file": "编辑器/SerializedObject.md",
                 "collapseAll": false,
                 "extraContext": false,
                 "sortOrder": "alphabetical",
@@ -170,15 +158,15 @@
   },
   "active": "64ec56c300cef99a",
   "lastOpenFiles": [
+    "编辑器/SearchFilter UnityEditor筛选器.md",
     "待办事项/TODO.md",
     "待办事项/SkillConfig.md",
+    "战斗/技能/SkillBase.md",
     "Mesh Baker.md",
     "Mesh Renderer 与 Skinned Mesh Renderer.md",
     "SerializedObject.md",
     "Pasted image 20221021171104.png",
     "SearchFilter UnityEditor筛选器.md",
-    "Pasted image 20221021171018.png",
-    "Pasted image 20221021171057.png",
-    "Pasted image 20221021170958.png.md"
+    "Pasted image 20221021171018.png"
   ]
 }

待办事项/TODO.md

@@ -25,16 +25,11 @@ kanban-plugin: basic
 - [ ] UWA课程
 
 
-## 书籍
+## Demo进度
 
-- [ ] 疗愈
-- [ ] 提高性能力自助手册
-- [ ] 晚安我的不安
-- [ ] 找到创伤之外的生活
-- [ ] 自我关怀的力量
-- [ ] 走出心灵的误区
-- [ ] 跳出头脑·融入生活*
-- [ ] 幸福的陷阱
+- [ ] 重新设计技能数据模块<br>@{2022-06-23}
+- [ ] 技能原子部分测试
+- [ ] 接入数据模块
 
 
 ***

战斗/技能/SkillBase.md

@@ -0,0 +1,17 @@
+
+
+## 技能环节(SkillProcUnit): 
+	负责每个环节要做的事情:
+		例如:0.2s治疗 0.4s根据治疗量上攻击buff 0.6s造成AOE伤害
+		前摇后腰
+
+## 技能流程管理：纳入到Base管理
+	对于环节类，应该有一个管理类来管理时间戳到哪个环节，流传上个环节的数值到下个环节，然后调用场景管理类的实际功能
+
+##  场景管理：
+	实际触发
+
+## 技能信息类：
+	受到技能的级数，技能buff加成等影响，技能元数据的装饰类
+
+## 技能表现

编辑器/SerializedObject.md

@@ -27,4 +27,6 @@
 
 #### Q：
 	AssetDataBase.Load()到底是序列化作用，还是从内存中找到GameObject对应的SerializedObject？
-	反射命中对象到底是SerializedObject还是GameObject
+	反射命中对象到底是SerializedObject还是GameObject
+![[Pasted image 20221025121100.png]]
+	当脚本Load出来的时候会自动反序列化