Skip to content

Commit 6f5c35d

Browse files
Merge pull request #470 from JasonXuDeveloper/development
v0.8.0f5
2 parents 93e4b43 + 1f29a9d commit 6f5c35d

File tree

14 files changed

+171
-148
lines changed

14 files changed

+171
-148
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232

3333

34-
# JENGINE v0.8.0f4
34+
# JENGINE v0.8.0f5
3535

3636
**JEngine is an out-of-the-box framework designed for Unity developers. It encapsulates powerful functions. Beginners can also get started quickly and easily create games that can be updated in runtime.**
3737

README_zh_cn.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131

3232

33-
# JENGINE v0.8.0f4
33+
# JENGINE v0.8.0f5
3434

3535
JEngine是针对Unity开发者设计的**开箱即用**的框架,封装了强大的功能,小白也能**快速上手****轻松制作**可以**热更新的游戏**
3636

UnityProject/Assets/Dependencies/JEngine/Core/Manager/ClassBindMgr.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,8 @@ public static void DoBind(ICollection<ClassBind> cbs)
125125

126126
cb.Active(data);
127127
}
128+
129+
Object.Destroy(cb);
128130
}
129131

130132
//确保任务全执行了

UnityProject/Assets/Dependencies/JEngine/Core/Util/ClassBind.cs

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -496,22 +496,8 @@ public void Active(ClassData classData)
496496
{
497497
((MonoBehaviour)clrInstance).enabled = true;
498498
classData.Activated = true;
499-
Remove();
500499
});
501500
}
502-
else
503-
{
504-
Remove();
505-
}
506-
}
507-
508-
/// <summary>
509-
/// Remove cb
510-
/// </summary>
511-
private void Remove()
512-
{
513-
//添加后删除
514-
Destroy(this);
515501
}
516502

517503

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

UnityProject/HotUpdateScripts/HotUpdateScripts.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
<Compile Include="JEngine\Core\JValidation.cs" />
6969
<Compile Include="JEngine\Examples\Core\ValidationDemo.cs" />
7070
<Compile Include="JEngine\Examples\Core\AddOnDemo.cs" />
71+
<Compile Include="JEngine\Examples\Core\Test.cs" />
7172
</ItemGroup>
7273
<ItemGroup>
7374
<Reference Include="UnityEngine.UIModule">

UnityProject/HotUpdateScripts/JEngine/Core/JBehaviour.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,9 @@ private static string AddClassBind(GameObject gameObject, bool activeAfter, Type
221221
activeAfter = activeAfter,
222222
};
223223
var id = ((JBehaviour)cb.AddClass(cd))._instanceID;
224-
cb.BindSelf();
224+
cb.Active(cd);
225+
UnityEngine.Object.Destroy(cb);
226+
LifeCycleMgr.Instance.ExecuteOnceTask();
225227
return id;
226228
}
227229

0 commit comments

Comments
 (0)