.github/workflows/test.yml

@@ -3,36 +3,34 @@
 #   UNITY_EMAIL: Unity user email to login
 #   UNITY_PASSWORD: Unity user password to login
 name: 🧪 Test
-run-name: 🧪 Test (${{ github.event.pull_request.title || github.ref_name }})
+run-name: 🧪 Test (${{ github.ref_name }})
 
 env:
   # MINIMUM_VERSION: The minimum version of Unity.
   MINIMUM_VERSION: 2019.4
   # EXCLUDE_FILTER: The excluded versions of Unity.
-  EXCLUDE_FILTER: "(2020.2.0|2021.1|2023.3)"
+  EXCLUDE_FILTER: '(2020.2.0|2021.1|2023.3)'
 
 on:
   workflow_dispatch:
     inputs:
       usePeriodVersions:
-        description: "Use the period versions (.0f1, .10f1, 20f1, ...)."
+        description: 'Use the period versions (.0f1, .10f1, 20f1, ...).'
         required: false
-        default: "true"
+        default: 'true'
   push:
     branches:
       - develop
       - develop-preview
+      - develop-4.x
     tags:
       - "!*"
     paths-ignore:
-      - "**.md"
-  pull_request_target:
+      - "*.md"
+  pull_request:
     types:
       - opened
-      - reopened
       - synchronize
-    paths-ignore:
-      - "**.md"
 
 jobs:
   setup:
@@ -45,7 +43,7 @@ jobs:
         id: setup
         run: |
           echo "==== Target Unity Versions ===="
-          LATEST_VERSIONS=`npx unity-changeset@latest list --versions --latest-patch --min ${MINIMUM_VERSION} --json --all`
+          LATEST_VERSIONS=`npx unity-changeset@2.2.3 list --versions --latest-patch --min ${MINIMUM_VERSION} --json --all`
           if [ "${{ inputs.usePeriodVersions }}" = "true" ]; then
             ADDITIONAL_VERSIONS=`npx unity-changeset list --versions --grep '0f' --min ${MINIMUM_VERSION} --json`
           else
@@ -59,6 +57,10 @@ jobs:
   test:
     name: 🧪 Run tests
     runs-on: ubuntu-latest
+    env:
+      UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
+      UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
+      UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
     permissions:
       checks: write
       contents: read
@@ -69,29 +71,14 @@ jobs:
       matrix:
         unityVersion: ${{ fromJson(needs.setup.outputs.unityVersions) }}
     steps:
-      - name: 🚚 Checkout ($${{ github.ref }})
-        if: github.event_name == 'push'
+      - name: 🚚 Checkout
         uses: actions/checkout@v4
 
-      - name: 🚚 Checkout pull request (pull_request_target)
-        if: github.event_name == 'pull_request_target'
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-          fetch-depth: 0
-
-      - name: 🚚 Marge pull request (pull_request_target)
-        if: github.event_name == 'pull_request_target'
-        run: |
-          git config user.name "GitHub Actions"
-          git config user.email "actions@github.com"
-          git merge origin/${{ github.event.pull_request.base.ref }} --no-edit
-
       - name: 📥 Cache library
         uses: actions/cache@v4
         with:
           path: Library
-          key: Library-${{ matrix.unityVersion }}-${{ github.event.pull_request.head.sha || github.sha }}
+          key: Library-${{ matrix.unityVersion }}-${{ github.sha }}
           restore-keys: |
             Library-${{ matrix.unityVersion }}-
             Library-
@@ -104,21 +91,14 @@ jobs:
           targetPlatform: StandaloneLinux64
           allowDirtyBuild: true
           customParameters: -nographics
-        env:
-          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
-          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
-          UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
 
-      - name: 🧪 Run tests
-        uses: game-ci/unity-test-runner@v4
-        timeout-minutes: 45
-        with:
-          customImage: ghcr.io/mob-sakai/unity3d:${{ matrix.unityVersion }}
-          # unityVersion: ${{ matrix.unityVersion }}
-          customParameters: -nographics
-          checkName: ${{ matrix.unityVersion }} Test Results
-          githubToken: ${{ github.token }}
-        env:
-          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
-          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
-          UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
+      # - name: 🧪 Run tests
+      #   uses: game-ci/unity-test-runner@v4
+      #   timeout-minutes: 45
+      #   with:
+      #     customImage: ghcr.io/mob-sakai/unity3d:${{ matrix.unityVersion }}
+      #     # unityVersion: ${{ matrix.unityVersion }}
+      #     customParameters: -nographics
+      #     checkName: ${{ matrix.unityVersion }} Test Results
+      #     githubToken: ${{ github.token }}
+      #     coverageOptions: "dontClear;generateHtmlReport;generateBadgeReport;pathFilters:+**/Packages/src/**;assemblyFilters:+<packages>,-*.Editor,-*.Test"

Packages/src/Runtime/Internal/Extensions/SpriteExtensions.cs

@@ -17,15 +17,11 @@ namespace Coffee.UIParticleInternal
             Type.GetType("UnityEditor.Experimental.U2D.SpriteEditorExtension, UnityEditor")
             ?? Type.GetType("UnityEditor.U2D.SpriteEditorExtension, UnityEditor");
 
-        private static readonly Func<Sprite, Texture2D> s_GetActiveAtlasTextureMethod =
-            (Func<Sprite, Texture2D>)Delegate.CreateDelegate(typeof(Func<Sprite, Texture2D>),
-                s_SpriteEditorExtensionType
-                    .GetMethod("GetActiveAtlasTexture", BindingFlags.Static | BindingFlags.NonPublic));
+        private static readonly MethodInfo s_GetActiveAtlasTextureMethod = s_SpriteEditorExtensionType
+            .GetMethod("GetActiveAtlasTexture", BindingFlags.Static | BindingFlags.NonPublic);
 
-        private static readonly Func<Sprite, SpriteAtlas> s_GetActiveAtlasMethod =
-            (Func<Sprite, SpriteAtlas>)Delegate.CreateDelegate(typeof(Func<Sprite, SpriteAtlas>),
-                s_SpriteEditorExtensionType
-                    .GetMethod("GetActiveAtlas", BindingFlags.Static | BindingFlags.NonPublic));
+        private static readonly MethodInfo s_GetActiveAtlasMethod = s_SpriteEditorExtensionType
+            .GetMethod("GetActiveAtlas", BindingFlags.Static | BindingFlags.NonPublic);
 
         /// <summary>
         /// Get the actual texture of a sprite in play mode or edit mode.
@@ -34,7 +30,9 @@ namespace Coffee.UIParticleInternal
         {
             if (!self) return null;
 
-            var ret = s_GetActiveAtlasTextureMethod(self);
+            if (Application.isPlaying) return self.texture;
+
+            var ret = s_GetActiveAtlasTextureMethod.Invoke(null, new object[] { self }) as Texture2D;
             return ret ? ret : self.texture;
         }
 
@@ -45,7 +43,7 @@ namespace Coffee.UIParticleInternal
         {
             if (!self) return null;
 
-            return s_GetActiveAtlasMethod(self);
+            return s_GetActiveAtlasMethod.Invoke(null, new object[] { self }) as SpriteAtlas;
         }
 #else
         /// <summary>