Merge branch 'Tencent:master' into master

ArnoChenFx · Feb 20, 2025 · 89d2cb3 · 89d2cb3
2 parents e8f3387 + 246c06e
commit 89d2cb3
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 26 deletions.
diff --git a/.github/workflows/composites/unity-build-plugins/android/action.yml b/.github/workflows/composites/unity-build-plugins/android/action.yml
@@ -33,10 +33,10 @@ runs:
         ANDROID_NDK=~/android-ndk-r21b node ../cli make --platform android --backend ${{ inputs.backend }} --config ${{ inputs.config }} --websocket ${{ inputs.websocket }}
         rm -rf .backends/${{ inputs.backend }}
     - name: Upload
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         path: ./unity/Assets/core/upm/Plugins/**/*
-        name: Unity_Plugins (${{ inputs.backend }}_${{ inputs.config }})
+        name: Unity_Plugins_${{ inputs.backend }}_${{ inputs.config }}_android
     - name: Clean
       shell: bash
       run: rm -rf ./unity/Assets/core/upm/Plugins/**/*
diff --git a/.github/workflows/composites/unity-build-plugins/ios/action.yml b/.github/workflows/composites/unity-build-plugins/ios/action.yml
@@ -32,10 +32,10 @@ runs:
         cd ${{ inputs.build_proj_dir }}
         node ../cli make --platform ios --backend ${{ inputs.backend }} --config ${{ inputs.config }} --websocket ${{ inputs.websocket }}
     - name: Upload
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         path: ./unity/Assets/core/upm/Plugins/**/*
-        name: Unity_Plugins (${{ inputs.backend }}_${{ inputs.config }})
+        name: Unity_Plugins_${{ inputs.backend }}_${{ inputs.config }}_ios
     - name: Clean
       shell: bash
       run: rm -rf ./unity/Assets/core/upm/Plugins/**/*
diff --git a/.github/workflows/composites/unity-build-plugins/linux/action.yml b/.github/workflows/composites/unity-build-plugins/linux/action.yml
@@ -38,10 +38,10 @@ runs:
         cd ${{ inputs.build_proj_dir }}
         node ../cli make --platform linux --arch x64 --backend ${{ inputs.backend }} --config ${{ inputs.config }} --websocket ${{ inputs.websocket }}
     - name: Upload
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         path: ./unity/Assets/core/upm/Plugins/**/*
-        name: Unity_Plugins (${{ inputs.backend }}_${{ inputs.config }})
+        name: Unity_Plugins_${{ inputs.backend }}_${{ inputs.config }}_linux
     - name: Clean
       shell: bash
       run: rm -rf ./unity/Assets/core/upm/Plugins/**/*
diff --git a/.github/workflows/composites/unity-build-plugins/ohos/action.yml b/.github/workflows/composites/unity-build-plugins/ohos/action.yml
@@ -32,10 +32,10 @@ runs:
         cd ${{ inputs.build_proj_dir }}
         OHOS_NDK_HOME=~/ohos-sdk/linux/native node ../cli make --platform ohos --backend ${{ inputs.backend }} --config ${{ inputs.config }} --websocket ${{ inputs.websocket }}
     - name: Upload
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         path: ./unity/Assets/core/upm/Plugins/**/*
-        name: Unity_Plugins (${{ inputs.backend }}_${{ inputs.config }})
+        name: Unity_Plugins_${{ inputs.backend }}_${{ inputs.config }}_harmony
     - name: Clean
       shell: bash
       run: rm -rf ./unity/Assets/core/upm/Plugins/**/*
diff --git a/.github/workflows/composites/unity-build-plugins/osx/action.yml b/.github/workflows/composites/unity-build-plugins/osx/action.yml
@@ -32,10 +32,10 @@ runs:
         cd ${{ inputs.build_proj_dir }}
         node ../cli make --platform osx --backend ${{ inputs.backend }} --config ${{ inputs.config }} --websocket ${{ inputs.websocket }}
     - name: Upload
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         path: ./unity/Assets/core/upm/Plugins/**/*
-        name: Unity_Plugins (${{ inputs.backend }}_${{ inputs.config }})
+        name: Unity_Plugins_${{ inputs.backend }}_${{ inputs.config }}_osx
     - name: Clean
       shell: bash
       run: rm -rf ./unity/Assets/core/upm/Plugins/**/*
diff --git a/.github/workflows/composites/unity-build-plugins/wasm/action.yml b/.github/workflows/composites/unity-build-plugins/wasm/action.yml
@@ -1,4 +1,4 @@
-name: build linux unity plugin
+name: build wasm unity plugin
 
 inputs:
   backend:
@@ -43,10 +43,10 @@ runs:
         cd ../${{ inputs.build_proj_dir }}
         node ../cli make --platform wasm --arch wasm32 --backend quickjs --config ${{ inputs.config }}
     - name: Upload
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         path: ./unity/Assets/core/upm/Plugins/**/*
-        name: Unity_Plugins (${{ inputs.backend }}_${{ inputs.config }})
+        name: Unity_Plugins_${{ inputs.backend }}_${{ inputs.config }}_wasm
     - name: Clean
       shell: bash
       run: rm -rf ./unity/Assets/core/upm/Plugins/**/*
diff --git a/.github/workflows/composites/unity-build-plugins/windows/action.yml b/.github/workflows/composites/unity-build-plugins/windows/action.yml
@@ -40,10 +40,10 @@ runs:
         cd ${{ inputs.build_proj_dir }}
         node ../cli make --platform win --backend ${{ inputs.backend }} --config ${{ inputs.config }} --arch ${{ inputs.arch }} --websocket ${{ inputs.websocket }}
     - name: Upload
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         path: ./unity/Assets/core/upm/Plugins/**/*
-        name: Unity_Plugins (${{ inputs.backend }}_${{ inputs.config }})
+        name: Unity_Plugins_${{ inputs.backend }}_${{ inputs.config }}_window
     - name: Clean
       shell: bash
       run: rm -rf ./unity/Assets/core/upm/Plugins/**/*
diff --git a/.github/workflows/unity_build_plugins.yml b/.github/workflows/unity_build_plugins.yml
@@ -21,6 +21,7 @@ on:
       - unreal/Puerts/Source/JsEnv/Private/PromiseRejectCallback.hpp
       - unreal/Puerts/ThirdParty/**
       - .github/workflows/unity_build_plugins.yml
+      - .github/workflows/composites/unity-build-plugins/**
 
 env:
   RUNID: 613573412

diff --git a/.github/workflows/unity_publish.yml b/.github/workflows/unity_publish.yml
@@ -345,30 +345,35 @@ jobs:
           echo "API_LEVEL=$(cat unity/native_src/Src/Puerts.cpp | grep -Po '(?<=API_LEVEL\s)(\d+)')" >> $GITHUB_ENV
           node -e "const pjson = JSON.parse(fs.readFileSync('$GITHUB_WORKSPACE/unity/Assets/core/upm/package.json', 'utf-8')); pjson.version = '${{ github.event.inputs.tag_name }}' ; fs.writeFileSync('$GITHUB_WORKSPACE/unity/Assets/core/upm/package.json', JSON.stringify(pjson))"
             
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
-          name: Unity_Plugins (v8_9.4_Release)
+          pattern: Unity_Plugins_v8_9.4_Release_*
           path: V8/upm/Plugins/
+          merge-multiple: true
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
-          name: Unity_Plugins (v8_10.6.194_Release)
+          pattern: Unity_Plugins_v8_10.6.194_Release_*
           path: V8_10/upm/Plugins/
+          merge-multiple: true
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
-          name: Unity_Plugins (quickjs_Release)
+          pattern: Unity_Plugins_quickjs_Release_*
           path: Quickjs/upm/Plugins/
+          merge-multiple: true
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
-          name: Unity_Plugins (nodejs_16_Release)
+          pattern: Unity_Plugins_nodejs_16_Release_*
           path: Nodejs/upm/Plugins/
+          merge-multiple: true
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
-          name: Unity_Plugins (mult_Release)
+          pattern: Unity_Plugins_mult_Release_*
           path: Mult/upm/Plugins/
+          merge-multiple: true
 
       - name: Create Release Asset
         run: |

diff --git a/unreal/Puerts/Source/JsEnv/Private/JsEnvImpl.cpp b/unreal/Puerts/Source/JsEnv/Private/JsEnvImpl.cpp
@@ -4405,7 +4405,7 @@ void FJsEnvImpl::Mixin(const v8::FunctionCallbackInfo<v8::Value>& Info)
         New->Bind();
         New->StaticLink(true);
 
-        (void) (New->GetDefaultObject());
+        auto CDO = New->GetDefaultObject();
         if (auto AnimClass = Cast<UAnimBlueprintGeneratedClass>(New))
         {
             AnimClass->UpdateCustomPropertyListForPostConstruction();
@@ -4419,6 +4419,14 @@ void FJsEnvImpl::Mixin(const v8::FunctionCallbackInfo<v8::Value>& Info)
             BPClass->UpdateCustomPropertyListForPostConstruction();
         }
 
+        if (CDO->IsA<AActor>())
+        {
+            if (UBlueprintGeneratedClass* BPGClass = Cast<UBlueprintGeneratedClass>(New))
+            {
+                BPGClass->bCooked = true;
+            }
+        }
+
 #if ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION > 12
         // 拷贝创建的Class需要手动重新创建ReferenceTokenStream
         New->AssembleReferenceTokenStream(true);