Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.obsidian/workspace
This commit is contained in:
zzz
2022-10-26 00:33:20 +08:00
11 changed files with 233 additions and 66 deletions

View File

@@ -1 +1,4 @@
{}
{
"accentColor": "",
"baseFontSize": 16
}

18
.obsidian/workspace vendored
View File

@@ -4,12 +4,12 @@
"type": "split",
"children": [
{
"id": "e6e443f6f53ff2ba",
"id": "458b5417a938cfb3",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "待办事项/TODO.md",
"file": "SerializedObject.md",
"mode": "source",
"source": false
}
@@ -69,7 +69,7 @@
"state": {
"type": "backlink",
"state": {
"file": "待办事项/TODO.md",
"file": "SerializedObject.md",
"collapseAll": false,
"extraContext": false,
"sortOrder": "alphabetical",
@@ -95,13 +95,17 @@
"width": 300,
"collapsed": true
},
"active": "e6e443f6f53ff2ba",
"active": "b736346aa28b495c",
"lastOpenFiles": [
"本地化流程.md",
"SearchFilter UnityEditor筛选器.md",
"Pasted image 20221021171104.png",
"Mesh Baker.md",
"conflict-files-obsidian-git.md",
"图集处理.md",
"待办事项/TODO.md",
"本地化流程.md",
"待办事项/Work.md",
"待办事项/Learn.md",
"未命名.md",
"2.md"
"未命名.md"
]
}

165
.obsidian/workspace.json vendored Normal file
View File

@@ -0,0 +1,165 @@
{
"main": {
"id": "c01acc1e0c3642a1",
"type": "split",
"children": [
{
"id": "be09fd8b647f425d",
"type": "tabs",
"children": [
{
"id": "e6e443f6f53ff2ba",
"type": "leaf",
"state": {
"type": "empty",
"state": {}
}
},
{
"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": "cce25aded02e00af",
"type": "leaf",
"state": {
"type": "release-notes",
"state": {
"currentVersion": "1.0.0"
}
}
},
{
"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
}
}
},
{
"id": "ec84e1f42a06be92",
"type": "leaf",
"state": {
"type": "calendar",
"state": {}
}
}
]
}
],
"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"
]
}

12
Mesh Baker.md Normal file
View File

@@ -0,0 +1,12 @@
## TODO
### ①Baker Group
## Texture Baker
合并多张纹理
## Texture Bake Results
资源文件,记录合并材质球已经生成材质球
![[Pasted image 20221021171104.png]]

Binary file not shown.

After

Width:  |  Height:  |  Size: 71 KiB

View File

30
SerializedObject.md Normal file
View File

@@ -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

View File

@@ -6,9 +6,8 @@ kanban-plugin: basic
## Work
- [ ] 好友系统删除
- [ ] 把配置地球场景重新调整一下位置
- [ ] 加班申请
**完成**
- [x] Csv接口更好适配xml语法<br>现在接口用起来太繁琐了
## Learn
@@ -30,11 +29,7 @@ kanban-plugin: basic
- [ ] 重新设计技能数据模块<br>@{2022-06-23}
- [ ] 技能原子部分测试
## 日常琐事
**完成**
- [ ] 接入数据模块
## 书籍
@@ -57,6 +52,14 @@ kanban-plugin: basic
- [ ] [[2]] ^qzixjb
- [x] 拍照
- [x] 核酸
- [ ] 把配置地球场景重新调整一下位置
- [ ] 加班申请
- [ ] 分表分Id注册到Csv监听里面
- [ ] 用自己的Csv取代插件的Csv
- [ ] 怎么使用这个接口
- [x] 繁荣度+{1} 导表关闭
- [x] 报销车费
- [x] 图集处理6-1
%% kanban:settings
```

View File

@@ -1,29 +0,0 @@
---
kanban-plugin: basic
---
## Work
**完成**
- [ ] 好友系统删除
- [ ] [[本地化流程]]
- [x] 登录选地界面:<br>添加选中特效和A级城市特效
- [x] 加班申请
***
## 归档
- [ ] 1
- [ ] [[2]] ^qzixjb
- [ ] 做出地球0°经线让策划配置
- [ ] 正确旋转pb数据
%% kanban:settings
```
{"kanban-plugin":"basic"}
```
%%

View File

@@ -1,21 +0,0 @@
# TODO
构建UI和翻译表之间的桥梁
全局配置
## 流程
csv文件里面检索出中文字段,将中文字段绘制出一张超大的Excel
这张excel分出多个语言字段通过VB再导成Csv
用这张Csv分出多语言
各个模块有一张对应这个中文的key
给Lua对应的Key值
在Csv转化成Lua