Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
guo450212436
et
提交
6b5c160d
E
et
项目概览
guo450212436
/
et
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
E
et
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
6b5c160d
编写于
12月 18, 2018
作者:
T
tanghai
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修复一个bug, BeginInit不会在序列化时调用,而是在反序列化对象创建之后,反序列化之前调用
上级
f47943ee
变更
5
展开全部
隐藏空白更改
内联
并排
Showing
5 changed file
with
411 addition
and
347 deletion
+411
-347
Unity/Assets/Hotfix/Base/Object/Entity.cs
Unity/Assets/Hotfix/Base/Object/Entity.cs
+39
-16
Unity/Assets/Model/Base/Object/Entity.cs
Unity/Assets/Model/Base/Object/Entity.cs
+39
-16
Unity/ProjectSettings/ProjectSettings.asset
Unity/ProjectSettings/ProjectSettings.asset
+1
-1
Unity/Unity.Model.csproj
Unity/Unity.Model.csproj
+166
-157
Unity/Unity.ThirdParty.csproj
Unity/Unity.ThirdParty.csproj
+166
-157
未找到文件。
Unity/Assets/Hotfix/Base/Object/Entity.cs
浏览文件 @
6b5c160d
...
...
@@ -59,6 +59,12 @@ namespace ETHotfix
component
.
Parent
=
this
;
this
.
componentDict
.
Add
(
type
,
component
);
if
(
component
is
ISerializeToEntity
)
{
this
.
components
.
Add
(
component
);
}
return
component
;
}
...
...
@@ -72,6 +78,12 @@ namespace ETHotfix
Component
component
=
ComponentFactory
.
CreateWithParent
(
type
,
this
,
this
.
IsFromPool
);
this
.
componentDict
.
Add
(
type
,
component
);
if
(
component
is
ISerializeToEntity
)
{
this
.
components
.
Add
(
component
);
}
return
component
;
}
...
...
@@ -86,6 +98,12 @@ namespace ETHotfix
K
component
=
ComponentFactory
.
CreateWithParent
<
K
>(
this
,
this
.
IsFromPool
);
this
.
componentDict
.
Add
(
type
,
component
);
if
(
component
is
ISerializeToEntity
)
{
this
.
components
.
Add
(
component
);
}
return
component
;
}
...
...
@@ -100,6 +118,12 @@ namespace ETHotfix
K
component
=
ComponentFactory
.
CreateWithParent
<
K
,
P1
>(
this
,
p1
,
this
.
IsFromPool
);
this
.
componentDict
.
Add
(
type
,
component
);
if
(
component
is
ISerializeToEntity
)
{
this
.
components
.
Add
(
component
);
}
return
component
;
}
...
...
@@ -114,6 +138,12 @@ namespace ETHotfix
K
component
=
ComponentFactory
.
CreateWithParent
<
K
,
P1
,
P2
>(
this
,
p1
,
p2
,
this
.
IsFromPool
);
this
.
componentDict
.
Add
(
type
,
component
);
if
(
component
is
ISerializeToEntity
)
{
this
.
components
.
Add
(
component
);
}
return
component
;
}
...
...
@@ -128,6 +158,12 @@ namespace ETHotfix
K
component
=
ComponentFactory
.
CreateWithParent
<
K
,
P1
,
P2
,
P3
>(
this
,
p1
,
p2
,
p3
,
this
.
IsFromPool
);
this
.
componentDict
.
Add
(
type
,
component
);
if
(
component
is
ISerializeToEntity
)
{
this
.
components
.
Add
(
component
);
}
return
component
;
}
...
...
@@ -145,6 +181,7 @@ namespace ETHotfix
}
this
.
componentDict
.
Remove
(
type
);
this
.
components
.
Remove
(
component
);
component
.
Dispose
();
}
...
...
@@ -162,6 +199,7 @@ namespace ETHotfix
}
this
.
componentDict
.
Remove
(
type
);
this
.
components
.
Remove
(
component
);
component
.
Dispose
();
}
...
...
@@ -190,22 +228,7 @@ namespace ETHotfix
{
return
this
.
componentDict
.
Values
.
ToArray
();
}
public
override
void
BeginInit
()
{
base
.
BeginInit
();
this
.
components
.
Clear
();
foreach
(
var
kv
in
this
.
componentDict
)
{
if
(
kv
.
Value
is
ISerializeToEntity
)
{
this
.
components
.
Add
(
kv
.
Value
);
}
}
}
public
override
void
EndInit
()
{
try
...
...
Unity/Assets/Model/Base/Object/Entity.cs
浏览文件 @
6b5c160d
...
...
@@ -59,6 +59,12 @@ namespace ETModel
component
.
Parent
=
this
;
this
.
componentDict
.
Add
(
type
,
component
);
if
(
component
is
ISerializeToEntity
)
{
this
.
components
.
Add
(
component
);
}
return
component
;
}
...
...
@@ -72,6 +78,12 @@ namespace ETModel
Component
component
=
ComponentFactory
.
CreateWithParent
(
type
,
this
,
this
.
IsFromPool
);
this
.
componentDict
.
Add
(
type
,
component
);
if
(
component
is
ISerializeToEntity
)
{
this
.
components
.
Add
(
component
);
}
return
component
;
}
...
...
@@ -86,6 +98,12 @@ namespace ETModel
K
component
=
ComponentFactory
.
CreateWithParent
<
K
>(
this
,
this
.
IsFromPool
);
this
.
componentDict
.
Add
(
type
,
component
);
if
(
component
is
ISerializeToEntity
)
{
this
.
components
.
Add
(
component
);
}
return
component
;
}
...
...
@@ -100,6 +118,12 @@ namespace ETModel
K
component
=
ComponentFactory
.
CreateWithParent
<
K
,
P1
>(
this
,
p1
,
this
.
IsFromPool
);
this
.
componentDict
.
Add
(
type
,
component
);
if
(
component
is
ISerializeToEntity
)
{
this
.
components
.
Add
(
component
);
}
return
component
;
}
...
...
@@ -114,6 +138,12 @@ namespace ETModel
K
component
=
ComponentFactory
.
CreateWithParent
<
K
,
P1
,
P2
>(
this
,
p1
,
p2
,
this
.
IsFromPool
);
this
.
componentDict
.
Add
(
type
,
component
);
if
(
component
is
ISerializeToEntity
)
{
this
.
components
.
Add
(
component
);
}
return
component
;
}
...
...
@@ -128,6 +158,12 @@ namespace ETModel
K
component
=
ComponentFactory
.
CreateWithParent
<
K
,
P1
,
P2
,
P3
>(
this
,
p1
,
p2
,
p3
,
this
.
IsFromPool
);
this
.
componentDict
.
Add
(
type
,
component
);
if
(
component
is
ISerializeToEntity
)
{
this
.
components
.
Add
(
component
);
}
return
component
;
}
...
...
@@ -145,6 +181,7 @@ namespace ETModel
}
this
.
componentDict
.
Remove
(
type
);
this
.
components
.
Remove
(
component
);
component
.
Dispose
();
}
...
...
@@ -162,6 +199,7 @@ namespace ETModel
}
this
.
componentDict
.
Remove
(
type
);
this
.
components
.
Remove
(
component
);
component
.
Dispose
();
}
...
...
@@ -190,22 +228,7 @@ namespace ETModel
{
return
this
.
componentDict
.
Values
.
ToArray
();
}
public
override
void
BeginInit
()
{
base
.
BeginInit
();
this
.
components
.
Clear
();
foreach
(
var
kv
in
this
.
componentDict
)
{
if
(
kv
.
Value
is
ISerializeToEntity
)
{
this
.
components
.
Add
(
kv
.
Value
);
}
}
}
public
override
void
EndInit
()
{
try
...
...
Unity/ProjectSettings/ProjectSettings.asset
浏览文件 @
6b5c160d
...
...
@@ -664,7 +664,7 @@ PlayerSettings:
platformArchitecture
:
iOS
:
2
scriptingBackend
:
Android
:
0
Android
:
1
Standalone
:
0
iOS
:
1
il2cppCompilerConfiguration
:
{}
...
...
Unity/Unity.Model.csproj
浏览文件 @
6b5c160d
此差异已折叠。
点击以展开。
Unity/Unity.ThirdParty.csproj
浏览文件 @
6b5c160d
此差异已折叠。
点击以展开。
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录