diff --git a/.obsidian/appearance.json b/.obsidian/appearance.json
index 9e26dfe..c410cc3 100644
--- a/.obsidian/appearance.json
+++ b/.obsidian/appearance.json
@@ -1 +1,4 @@
-{}
\ No newline at end of file
+{
+ "accentColor": "",
+ "baseFontSize": 16
+}
\ No newline at end of file
diff --git a/.obsidian/core-plugins.json b/.obsidian/core-plugins.json
index ab1d511..cc52ccb 100644
--- a/.obsidian/core-plugins.json
+++ b/.obsidian/core-plugins.json
@@ -10,6 +10,5 @@
"editor-status",
"markdown-importer",
"word-count",
- "open-with-default-app",
"file-recovery"
]
\ No newline at end of file
diff --git a/.obsidian/workspace b/.obsidian/workspace
index 00ccf35..e5a5e70 100644
--- a/.obsidian/workspace
+++ b/.obsidian/workspace
@@ -6,22 +6,12 @@
{
"id": "e6e443f6f53ff2ba",
"type": "leaf",
- "dimension": 62.190812720848065,
"state": {
- "type": "kanban",
+ "type": "markdown",
"state": {
- "file": "待办事项/TODO.md"
- }
- }
- },
- {
- "id": "0bdb4fd51866bf2c",
- "type": "leaf",
- "dimension": 37.80918727915194,
- "state": {
- "type": "kanban",
- "state": {
- "file": "待办事项/Work.md"
+ "file": "图集处理.md",
+ "mode": "source",
+ "source": false
}
}
}
@@ -59,7 +49,8 @@
}
}
}
- ]
+ ],
+ "currentTab": 1
}
],
"direction": "horizontal",
@@ -79,7 +70,7 @@
"state": {
"type": "backlink",
"state": {
- "file": "待办事项/TODO.md",
+ "file": "图集处理.md",
"collapseAll": false,
"extraContext": false,
"sortOrder": "alphabetical",
@@ -100,10 +91,13 @@
"active": "e6e443f6f53ff2ba",
"lastOpenFiles": [
"待办事项/TODO.md",
- "待办事项/Work.md",
+ "图集处理.md",
"本地化流程.md",
+ "Pasted image 20220927204017.png",
+ "资源整理.md",
+ "BGM.md",
+ "待办事项/Work.md",
"待办事项/Learn.md",
- "未命名.md",
"2.md"
]
}
\ No newline at end of file
diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json
new file mode 100644
index 0000000..95b981e
--- /dev/null
+++ b/.obsidian/workspace.json
@@ -0,0 +1,151 @@
+{
+ "main": {
+ "id": "c01acc1e0c3642a1",
+ "type": "split",
+ "children": [
+ {
+ "id": "be09fd8b647f425d",
+ "type": "tabs",
+ "children": [
+ {
+ "id": "e6e443f6f53ff2ba",
+ "type": "leaf",
+ "state": {
+ "type": "markdown",
+ "state": {
+ "file": "图集处理.md",
+ "mode": "source",
+ "source": false
+ }
+ }
+ },
+ {
+ "id": "87d4e099e12c8ee4",
+ "type": "leaf",
+ "state": {
+ "type": "markdown",
+ "state": {
+ "file": "Mesh Baker.md",
+ "mode": "source",
+ "source": false
+ }
+ }
+ },
+ {
+ "id": "ace280db2a9b1b05",
+ "type": "leaf",
+ "state": {
+ "type": "markdown",
+ "state": {
+ "file": "Mesh Baker.md",
+ "mode": "source",
+ "source": false
+ }
+ }
+ },
+ {
+ "id": "a01448c801fda431",
+ "type": "leaf",
+ "state": {
+ "type": "markdown",
+ "state": {
+ "file": "SearchFilter UnityEditor筛选器.md",
+ "mode": "source",
+ "source": false
+ }
+ }
+ }
+ ],
+ "currentTab": 2
+ }
+ ],
+ "direction": "vertical"
+ },
+ "left": {
+ "id": "b3f2fe956c600b2b",
+ "type": "split",
+ "children": [
+ {
+ "id": "b892947aee3a10a9",
+ "type": "tabs",
+ "children": [
+ {
+ "id": "b736346aa28b495c",
+ "type": "leaf",
+ "state": {
+ "type": "file-explorer",
+ "state": {
+ "sortOrder": "alphabetical"
+ }
+ }
+ },
+ {
+ "id": "bd33cd6e5600118d",
+ "type": "leaf",
+ "state": {
+ "type": "search",
+ "state": {
+ "query": "",
+ "matchingCase": false,
+ "explainSearch": false,
+ "collapseAll": false,
+ "extraContext": false,
+ "sortOrder": "alphabetical"
+ }
+ }
+ }
+ ]
+ }
+ ],
+ "direction": "horizontal",
+ "width": 249
+ },
+ "right": {
+ "id": "d809b577c235ae94",
+ "type": "split",
+ "children": [
+ {
+ "id": "7cbbb049622f8875",
+ "type": "tabs",
+ "children": [
+ {
+ "id": "fc04db1c3d5f37f2",
+ "type": "leaf",
+ "state": {
+ "type": "backlink",
+ "state": {
+ "file": "Mesh Baker.md",
+ "collapseAll": false,
+ "extraContext": false,
+ "sortOrder": "alphabetical",
+ "showSearch": false,
+ "searchQuery": "",
+ "backlinkCollapsed": false,
+ "unlinkedCollapsed": true
+ }
+ }
+ }
+ ]
+ }
+ ],
+ "direction": "horizontal",
+ "width": 300,
+ "collapsed": true
+ },
+ "ribbon": {
+ "mostRecentAction": ""
+ },
+ "active": "ace280db2a9b1b05",
+ "lastOpenFiles": [
+ "Mesh Renderer 与 Skinned Mesh Renderer.md",
+ "Mesh Baker.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 20221021171015.png",
+ "Pasted image 20221021170958.png"
+ ]
+}
\ No newline at end of file
diff --git a/Mesh Baker.md b/Mesh Baker.md
new file mode 100644
index 0000000..4c56716
--- /dev/null
+++ b/Mesh Baker.md
@@ -0,0 +1,12 @@
+
+## TODO
+### ①Baker Group
+
+
+## Texture Baker
+ 合并多张纹理
+
+## Texture Bake Results
+ 资源文件,记录合并材质球已经生成材质球
+![[Pasted image 20221021171104.png]]
+
diff --git a/Mesh Renderer 与 Skinned Mesh Renderer.md b/Mesh Renderer 与 Skinned Mesh Renderer.md
new file mode 100644
index 0000000..e69de29
diff --git a/Pasted image 20221021171104.png b/Pasted image 20221021171104.png
new file mode 100644
index 0000000..12ed066
Binary files /dev/null and b/Pasted image 20221021171104.png differ
diff --git a/SearchFilter UnityEditor筛选器.md b/SearchFilter UnityEditor筛选器.md
new file mode 100644
index 0000000..e69de29
diff --git a/SerializedObject.md b/SerializedObject.md
new file mode 100644
index 0000000..d210829
--- /dev/null
+++ b/SerializedObject.md
@@ -0,0 +1,30 @@
+### [[Unity编辑器扩展基础总结] 第5章 序列化对象 SerializedObject](链接)
+
+#### 第5章 序列化对象 SerializedObject
+
+###### https://www.cnblogs.com/ppne/p/14752941.html
+
+
+### 笔记
+#### SerializedObject:
+##### 作用:
+ 资源文件的序列化和反序列化
+ 可以链接一个数组,多个对象使用同一个SerializedObject
+##### 运行:
+ 继承Mono,ScriptableObject,Editor,EditorWindow
+ 会为对象生成SerializedObject,生成对象会在内部缓存
+ 所以如果两个不同位置使用同一个对象,应使用Update更新对象,使用ApplyModifiedPropertiyin应用这个对象的更改
+
+创建资源时,会先创建SerializedOject, 这个对象再创建Object和.meta
+
+#### Object
+ 资源文件,一般为二进制或者yaml文件,记录文件序列化信息
+
+#### .meta
+ 记录文件导入相关信息
+
+我们也可以使用UnityEditorInternal命名空间中的**InternalEditorUtility.SaveToSerializedFileAndForget**将UnityEngine.Object另存为资源。
+
+#### Q:
+ AssetDataBase.Load()到底是序列化作用,还是从内存中找到GameObject对应的SerializedObject?
+ 反射命中对象到底是SerializedObject还是GameObject
\ No newline at end of file
diff --git a/图集处理.md b/图集处理.md
new file mode 100644
index 0000000..031a1c6
--- /dev/null
+++ b/图集处理.md
@@ -0,0 +1,2 @@
+
+Bug:Loading_bg_pic01加载不出来
\ No newline at end of file
diff --git a/待办事项/TODO.md b/待办事项/TODO.md
index ea169cf..e54a6a0 100644
--- a/待办事项/TODO.md
+++ b/待办事项/TODO.md
@@ -6,12 +6,8 @@ kanban-plugin: basic
## Work
-- [ ] 好友系统删除
-- [ ] 把配置地球场景重新调整一下位置
-- [ ] 加班申请
-- [ ] 分表分Id注册到Csv监听里面
-- [ ] 用自己的Csv取代插件的Csv
-- [ ] 怎么使用这个接口
+**完成**
+- [x] Csv接口更好适配xml语法,
现在接口用起来太繁琐了
## Learn
@@ -33,11 +29,7 @@ kanban-plugin: basic
- [ ] 重新设计技能数据模块
@{2022-06-23}
- [ ] 技能原子部分测试
-
-
-## 日常琐事
-
-**完成**
+- [ ] 接入数据模块
***
@@ -48,6 +40,14 @@ kanban-plugin: basic
- [ ] [[2]] ^qzixjb
- [x] 拍照
- [x] 核酸
+- [ ] 把配置地球场景重新调整一下位置
+- [ ] 加班申请
+- [ ] 分表分Id注册到Csv监听里面
+- [ ] 用自己的Csv取代插件的Csv
+- [ ] 怎么使用这个接口
+- [x] 繁荣度+{1} 导表关闭
+- [x] 报销车费
+- [x] 图集处理6-1
%% kanban:settings
```
diff --git a/待办事项/Work.md b/待办事项/Work.md
deleted file mode 100644
index 7ff7f5f..0000000
--- a/待办事项/Work.md
+++ /dev/null
@@ -1,31 +0,0 @@
----
-
-kanban-plugin: basic
-
----
-
-## Work
-
-**完成**
-- [x] 好友系统删除
-- [x] [[本地化流程]]
-- [x] 加班申请
-- [x] 多语言排期
-
-
-***
-
-## 归档
-
-- [ ] 1
-- [ ] [[2]] ^qzixjb
-- [ ] 做出地球0°经线让策划配置
-- [ ] 正确旋转pb数据
-- [x] 加班申请
-- [x] 登录选地界面:
添加选中特效和A级城市特效
-
-%% kanban:settings
-```
-{"kanban-plugin":"basic"}
-```
-%%
\ No newline at end of file
diff --git a/本地化流程.md b/本地化流程.md
deleted file mode 100644
index 7533148..0000000
--- a/本地化流程.md
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-# TODO
- 接入打包流程
-
- Text组件回调的时候 \n 的错误
-
- --切换语言,加载界面出现的时候,记录所有界面的状态
-
- 修改目录,分语言包
- 目录:
- 语言->对应Csv翻译表
-
-
-
-