Skip to content

fixed several of bugs #440

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 1, 2022
Merged

fixed several of bugs #440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d82453
fixed protobuf-net issues
JasonXuDeveloper Nov 30, 2022
05b2cbd
fixed #436
JasonXuDeveloper Dec 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 94 additions & 1 deletion UnityProject/Assets/Dependencies/JEngine/Core/ILRuntimeHelper/RegisterMethodRedirection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#if INIT_JE
using System;
using System.Collections;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
Expand Down Expand Up @@ -181,8 +183,19 @@ public unsafe void Register(AppDomain appdomain)
var printErrorMethod = printType.GetMethod("PrintError", new[] {typeof(object)});
appdomain.RegisterCLRMethodRedirection(printErrorMethod, PrintError);

//注册Invoke
//注册StartCoroutine
Type monoType = typeof(MonoBehaviour);
args = new Type[]{typeof(System.String)};
var startMethod = monoType.GetMethod("StartCoroutine", flag, null, args, null);
appdomain.RegisterCLRMethodRedirection(startMethod, StartCoroutine_6);
args = new Type[]{typeof(System.String), typeof(System.Object)};
startMethod = monoType.GetMethod("StartCoroutine", flag, null, args, null);
appdomain.RegisterCLRMethodRedirection(startMethod, StartCoroutine_7);
args = new Type[]{typeof(System.String)};
var stopMethod = monoType.GetMethod("StopCoroutine", flag, null, args, null);
appdomain.RegisterCLRMethodRedirection(stopMethod, StopCoroutine_8);

//注册Invoke
args = new[] {typeof(String), typeof(Single)};
var invokeMethod = monoType.GetMethod("Invoke", flag, null, args, null);
appdomain.RegisterCLRMethodRedirection(invokeMethod, Invoke_1);
Expand Down Expand Up @@ -359,6 +372,86 @@ public unsafe void Register(AppDomain appdomain)

}

/// <summary>
/// 执行过的迭代器
/// </summary>
private static ConcurrentDictionary<(int, string), Coroutine> _coroutineMap = new ConcurrentDictionary<(int, string), Coroutine>();

private static unsafe StackObject* StartCoroutine_6(ILIntepreter __intp, StackObject* __esp, AutoList __mStack, CLRMethod __method, bool isNewObj)
{
ILRuntime.Runtime.Enviorment.AppDomain __domain = __intp.AppDomain;
StackObject* ptr_of_this_method;
StackObject* __ret = ILIntepreter.Minus(__esp, 2);

ptr_of_this_method = ILIntepreter.Minus(__esp, 1);
System.String @methodName = (System.String)typeof(System.String).CheckCLRTypes(StackObject.ToObject(ptr_of_this_method, __domain, __mStack), (Extensions.TypeFlags)0);
__intp.Free(ptr_of_this_method);

ptr_of_this_method = ILIntepreter.Minus(__esp, 2);
ILTypeInstance val = (ILTypeInstance) (StackObject.ToObject(ptr_of_this_method, __domain, __mStack));
MonoBehaviour adapter = (MonoBehaviour) typeof(MonoBehaviour).CheckCLRTypes(val);
__intp.Free(ptr_of_this_method);

//反射获取迭代器对象
var method = val.Type.ReflectionType.GetMethod(methodName, BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public);
if (method == null) throw new Exception("找不到方法:" + methodName);
var iterator = (IEnumerator)method.Invoke(val, null);
var result_of_this_method = adapter.StartCoroutine(iterator);
_coroutineMap[(adapter.GetInstanceID(), methodName)] = result_of_this_method;

return ILIntepreter.PushObject(__ret, __mStack, result_of_this_method);
}

private static unsafe StackObject* StartCoroutine_7(ILIntepreter __intp, StackObject* __esp, AutoList __mStack, CLRMethod __method, bool isNewObj)
{
ILRuntime.Runtime.Enviorment.AppDomain __domain = __intp.AppDomain;
StackObject* ptr_of_this_method;
StackObject* __ret = ILIntepreter.Minus(__esp, 3);

ptr_of_this_method = ILIntepreter.Minus(__esp, 1);
System.Object @value = (System.Object)typeof(System.Object).CheckCLRTypes(StackObject.ToObject(ptr_of_this_method, __domain, __mStack), (Extensions.TypeFlags)0);
__intp.Free(ptr_of_this_method);

ptr_of_this_method = ILIntepreter.Minus(__esp, 2);
System.String @methodName = (System.String)typeof(System.String).CheckCLRTypes(StackObject.ToObject(ptr_of_this_method, __domain, __mStack), (Extensions.TypeFlags)0);
__intp.Free(ptr_of_this_method);

ptr_of_this_method = ILIntepreter.Minus(__esp, 3);
ILTypeInstance val = (ILTypeInstance) (StackObject.ToObject(ptr_of_this_method, __domain, __mStack));
MonoBehaviour adapter = (MonoBehaviour) typeof(MonoBehaviour).CheckCLRTypes(val);
__intp.Free(ptr_of_this_method);

//反射获取迭代器对象
var method = val.Type.ReflectionType.GetMethod(methodName, BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public);
if (method == null) throw new Exception("找不到方法:" + methodName);
var iterator =
(IEnumerator)method.Invoke(val, value == null ? null : new object[] { value });
var result_of_this_method = adapter.StartCoroutine(iterator);
_coroutineMap[(adapter.GetInstanceID(), methodName)] = result_of_this_method;

return ILIntepreter.PushObject(__ret, __mStack, result_of_this_method);
}

private static unsafe StackObject* StopCoroutine_8(ILIntepreter __intp, StackObject* __esp, AutoList __mStack, CLRMethod __method, bool isNewObj)
{
ILRuntime.Runtime.Enviorment.AppDomain __domain = __intp.AppDomain;
StackObject* ptr_of_this_method;
StackObject* __ret = ILIntepreter.Minus(__esp, 2);

ptr_of_this_method = ILIntepreter.Minus(__esp, 1);
System.String @methodName = (System.String)typeof(System.String).CheckCLRTypes(StackObject.ToObject(ptr_of_this_method, __domain, __mStack), (Extensions.TypeFlags)0);
__intp.Free(ptr_of_this_method);

ptr_of_this_method = ILIntepreter.Minus(__esp, 2);
ILTypeInstance val = (ILTypeInstance) (StackObject.ToObject(ptr_of_this_method, __domain, __mStack));
MonoBehaviour adapter = (MonoBehaviour) typeof(MonoBehaviour).CheckCLRTypes(val);
__intp.Free(ptr_of_this_method);
if (!_coroutineMap.TryGetValue((adapter.GetInstanceID(), methodName), out var coroutine)) return __ret;
adapter.StopCoroutine(coroutine);

return __ret;
}

private static unsafe void WriteBackInstance(ILRuntime.Runtime.Enviorment.AppDomain __domain, StackObject* ptr_of_this_method, AutoList __mStack, ref System.Nullable<System.UInt64> instance_of_this_method)
{
ptr_of_this_method = ILIntepreter.GetObjectAndResolveReference(ptr_of_this_method);
Expand Down
2 changes: 1 addition & 1 deletion UnityProject/Assets/Dependencies/protobuf-net-v2-for-ILRuntime
Open in desktop
Submodule protobuf-net-v2-for-ILRuntime updated 1 files
+4 −1 protobuf-net/PType.cs
Binary file modified UnityProject/Assets/Dependencies/protobuf-net-v2-for-ILRuntime.zip
View file
Open in desktop
Binary file not shown.
Binary file modified UnityProject/Assets/HotUpdateResources/Dll/Hidden~/HotUpdateScripts.dll
View file
Open in desktop
Binary file not shown.
Binary file modified UnityProject/Assets/HotUpdateResources/Dll/Hidden~/HotUpdateScripts.pdb
View file
Open in desktop
Binary file not shown.
17 changes: 17 additions & 0 deletions UnityProject/HotUpdateScripts/JEngine/Examples/Core/ClassBindDemo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,23 @@ private void Start()
{
Debug.Log(gameObject.GetJBehaviour<ClassBindDemo1>() == null);
Log.Print("[ClassBindDemo2] ClassBindDemo2::Start");
StartCoroutine(CoroutineDemo(1f));
StartCoroutine(nameof(CoroutineDemo2));
StartCoroutine(nameof(CoroutineDemo), 3f);
StopCoroutine(nameof(CoroutineDemo2));
}

public System.Collections.IEnumerator CoroutineDemo(float time)
{
yield return new WaitForSeconds(time);
Log.Print($"[ClassBindDemo2] Coroutine Demo, waited for {time} sec");
}

public System.Collections.IEnumerator CoroutineDemo2()
{
var time = 2;
yield return new WaitForSeconds(time);
Log.Print($"[ClassBindDemo2] Coroutine Demo, waited for {time} sec");
}

//太多log看着头大，先关了
Expand Down