Merge branch 'Tencent:master' into master

ArnoChenFx · Dec 12, 2024 · e8aadfc · e8aadfc
2 parents 5d90b81 + 7a853d2
commit e8aadfc
Show file tree

Hide file tree

Showing 13 changed files with 174 additions and 162 deletions.
diff --git a/unity/Assets/core/upm/Editor/Resources/puerts/xil2cpp/Puerts_il2cpp.cpp.txt b/unity/Assets/core/upm/Editor/Resources/puerts/xil2cpp/Puerts_il2cpp.cpp.txt
@@ -563,6 +563,10 @@ static Il2CppGCHandle* FindOrCreateHandleStoreOfValue(struct pesapi_ffi* apis, p
     {
         *out_object = il2cpp::gc::GCHandle::GetTarget(*res);
         //PLog("found existed jsobject:%p", *out_object);
+        if (out_object == nullptr)
+        {
+            value_ref = apis->duplicate_value_ref(value_ref);
+        }
     }
 
     *out_value_ref = value_ref;

diff --git a/unity/Assets/webgl/upm/Javascripts~/PuertsDLLMock/dist/puerts-runtime.js b/unity/Assets/webgl/upm/Javascripts~/PuertsDLLMock/dist/puerts-runtime.js
diff --git a/unity/Assets/webgl/upm/Javascripts~/PuertsDLLMock/index.ts b/unity/Assets/webgl/upm/Javascripts~/PuertsDLLMock/index.ts
@@ -236,6 +236,9 @@ global.PuertsWebGL = {
                 LogicTick: function (isolate: IntPtr) { },
                 SetLogCallback: function (log: IntPtr, logWarning: IntPtr, logError: IntPtr) {
 
+                },
+                GetJSStackTrace: function (isolate: IntPtr) {
+                    return new Error().stack;
                 }
             }
         )

diff --git a/unreal/Puerts/Content/JavaScript/PuertsEditor/CodeAnalyze.js b/unreal/Puerts/Content/JavaScript/PuertsEditor/CodeAnalyze.js
diff --git a/unreal/Puerts/Content/JavaScript/PuertsEditor/CodeAnalyze.js.map b/unreal/Puerts/Content/JavaScript/PuertsEditor/CodeAnalyze.js.map
diff --git a/unreal/Puerts/Content/JavaScript/PuertsEditor/TypeScriptInternal.js b/unreal/Puerts/Content/JavaScript/PuertsEditor/TypeScriptInternal.js
diff --git a/unreal/Puerts/Content/JavaScript/PuertsEditor/TypeScriptInternal.js.map b/unreal/Puerts/Content/JavaScript/PuertsEditor/TypeScriptInternal.js.map