Merge pull request #1351 from ZalithLauncher/main

merge main

Author: MovTery

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -32,11 +32,22 @@ body:
       description: |
         The crash page of the launcher will have a "Share Logs" button. Please upload the log provided by the launcher here.  
         If your issue is related to a "Launcher Crash", you can find the "Share Launcher Logs" option in the launcher settings. Please upload the log archive provided by the launcher here.  
-        If your issue is related to a "Game Crash", you can use a file manager to navigate to ZL2's public directory and locate the "latest_game.log" file.  
+        If your issue is related to a "Game Crash":  
+        < 2.4.3  
+        You can use a file manager to navigate to ZL2's public directory and locate the "latest_game.log" file.  
+        \>= 2.4.3  
+        You can find the "Running Log" button in the version overview page, click it to open the log menu, and then share it.  
         **Please do not upload the game's own logs here, as the information they record is not comprehensive!**  
+        
+        ---
+        
         启动器的崩溃页面会有“分享日志”按钮，请将启动器给出的日志上传在这里；  
         如果您的问题属于“启动器崩溃”，您可以在启动器设置内找到“分享启动器日志”选项，请将启动器给出的日志压缩包上传在这里；  
-        如果您的问题属于“游戏运行崩溃”，您可以在文件管理器软件内进入 ZL2 的公有目录，找到 “latest_game.log” 文件。  
+        如果您的问题属于“游戏运行崩溃”：  
+        < 2.4.3  
+        您可以在文件管理器软件内进入 ZL2 的公有目录，找到 “latest_game.log” 文件。  
+        \>= 2.4.3  
+        您可以在版本概览中，找到“运行日志”按钮，点击打开日志菜单，即可分享。  
         **请不要在此处上传游戏自己的日志，它记录的信息并不全面！**
     validations:
       required: true

.github/workflows/build.yml

@@ -34,18 +34,18 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           submodules: recursive
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: "temurin"
           java-version: "17"
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
+        uses: gradle/actions/setup-gradle@v5
         with:
           add-job-summary: "on-failure"
 
@@ -57,15 +57,23 @@ jobs:
       - name: Upload Release APK for ${{ matrix.arch }}
         if: inputs.variant == 'Release'
         continue-on-error: true
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: release apk (${{ matrix.arch }})
           path: ZalithLauncher/build/outputs/apk/release/*.apk
 
+      - name: Upload Release Mapping for ${{ matrix.arch }}
+        if: inputs.variant == 'Release'
+        continue-on-error: true
+        uses: actions/upload-artifact@v7
+        with:
+          name: mapping (${{ matrix.arch }})
+          path: ZalithLauncher/build/outputs/mapping/release/mapping.txt
+
       - name: Upload Debug APK for ${{ matrix.arch }}
         if: inputs.variant == 'Debug'
         continue-on-error: true
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: debug apk (${{ matrix.arch }})
           path: ZalithLauncher/build/outputs/apk/debug/*.apk

.github/workflows/release_ci.yml

@@ -26,13 +26,14 @@ jobs:
 
     steps:
       - name: Download Files
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           path: ./artifacts
 
       - name: Organize Artifacts
         run: |
           mkdir -p ./apks
+          mkdir -p ./mappings
           
           find ./artifacts -name "*.apk" -type f -exec cp {} ./apks/ \;
           
@@ -42,11 +43,23 @@ jobs:
             exit 1
           fi
           
+          # 处理映射文件 区分架构
+          for mapping_dir in ./artifacts/mapping\ \(*\)/; do
+            if [ -d "$mapping_dir" ] && [ -f "${mapping_dir}mapping.txt" ]; then
+              dirname=$(basename "$mapping_dir")
+              cp "${mapping_dir}mapping.txt" "./mappings/${dirname}.txt"
+              echo "Copied: ${dirname}.txt"
+            fi
+          done
+          
           echo "Found $(ls ./apks/ | wc -l) APK file(s)"
+          echo "Found $(ls ./mappings/ | wc -l) Mapping file(s)"
 
       - name: Upload To Release
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v3
         with:
           tag_name: ${{ github.event.release.tag_name }}
-          files: ./apks/*.apk
-          fail_on_unmatched_files: true
+          files: |
+            ./apks/*.apk
+            ./mappings/*.txt
+          fail_on_unmatched_files: true

ColorPicker/build.gradle.kts

@@ -2,13 +2,12 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.compose)
 }
 
 android {
     namespace = "com.movtery.colorpicker"
-    compileSdk = 36
+    compileSdk = 37
 
     defaultConfig {
         minSdk = 26

LWJGL/build.gradle.kts

@@ -4,7 +4,10 @@ plugins {
 
 group = "org.lwjgl.glfw"
 
-configurations.getByName("default").isCanBeResolved = true
+val fatJarDeps by configurations.creating {
+    isCanBeResolved = true
+    extendsFrom(configurations.runtimeClasspath.get())
+}
 
 tasks.jar {
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE
@@ -16,7 +19,7 @@ tasks.jar {
         versionFile.writeText(System.currentTimeMillis().toString())
     }
     from({
-        configurations.getByName("default").map {
+        fatJarDeps.map {
             println(it.name)
             if (it.isDirectory) it else zipTree(it)
         }

LWJGL/libs/lwjgl-lwjglx.jar

@@ -1278,6 +1278,16 @@ public static void glfwSetCursor(@NativeType("GLFWwindow *") long window, @Nativ
         CallbackBridge.nativeSetCursorShape(CursorRegistry.getShape(cursor));
     }
 
+    /** {@code void glfwGetPreeditCursorRectangle(GLFWwindow * window, int * x, int * y, int * w, int * h)} */
+    public static void glfwGetPreeditCursorRectangle(@NativeType("GLFWwindow *") long window, @NativeType("int *") @Nullable IntBuffer x, @NativeType("int *") @Nullable IntBuffer y, @NativeType("int *") @Nullable IntBuffer w, @NativeType("int *") @Nullable IntBuffer h) {
+
+    }
+
+    /** {@code void glfwSetPreeditCursorRectangle(GLFWwindow * window, int x, int y, int w, int h)} */
+    public static void glfwSetPreeditCursorRectangle(@NativeType("GLFWwindow *") long window, int x, int y, int w, int h) {
+
+    }
+
     public static boolean glfwRawMouseMotionSupported() {
         // Should be not supported?
         return false;
@@ -1421,6 +1431,12 @@ public static void glfwGetMonitorContentScale(@NativeType("GLFWmonitor *") long
         yscale.put(0, 1);
     }
 
+    /** {@code char const * glfwGetMonitorName(GLFWmonitor * monitor)} */
+    @NativeType("char const *")
+    public static String glfwGetMonitorName(@NativeType("GLFWwindow *") long window) {
+        return "Monitor";
+    }
+
     /** Array version of: {@link #glfwGetWindowPos GetWindowPos} */
     public static void glfwGetWindowPos(@NativeType("GLFWwindow *") long window, @Nullable @NativeType("int *") int[] xpos, @Nullable @NativeType("int *") int[] ypos) {
         if (CHECKS) {

LWJGL/src/main/java/org/lwjgl/glfw/GLFW.java

@@ -2,14 +2,13 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.compose)
     id("kotlinx-serialization")
 }
 
 android {
     namespace = "com.movtery.layer_controller"
-    compileSdk = 36
+    compileSdk = 37
 
     defaultConfig {
         minSdk = 26

LayerController/build.gradle.kts

@@ -170,6 +170,15 @@ private fun BoxWithConstraintsScope.BaseControlBoxLayout(
                             val pointerId = change.id
                             val isPressed = change.pressed
 
+                            //抬起时，总是尝试释放该指针下活跃的按钮
+                            //避免子级占用了指针后，导致按钮状态无法被释放
+                            if (!isPressed) {
+                                allActiveWidgets.remove(pointerId)?.forEach { widget ->
+                                    widget.onReleaseEvent(eventHandler, reversedLayers)
+                                }
+                                return@forEach
+                            }
+
                             if (
                                 change.isConsumed ||
                                 //不处理被子级占用的指针
@@ -227,68 +236,69 @@ private fun BoxWithConstraintsScope.BaseControlBoxLayout(
                                     }
                                 }
 
-                            val activeWidgets = allActiveWidgets[pointerId] ?: emptyList()
-
-                            if (isPressed) {
-                                //检查是否移出边界
-                                if (activeWidgets.isNotEmpty()) {
-                                    val backInBounds = mutableListOf<ObservableWidget>()
-                                    for (widget in activeWidgets) {
-                                        //检查组件是否可以响应移除边界即松开
-                                        if (!widget.isReleaseOnOutOfBounds()) continue
-
-                                        val size = widget.internalRenderSize
-                                        val offset = getWidgetPosition(widget, size, screenSize)
-                                        val isOutOfBounds = position.x !in offset.x..(offset.x + size.width) ||
-                                                position.y !in offset.y..(offset.y + size.height)
-
-                                        if (isOutOfBounds) {
-                                            widget.onReleaseEvent(eventHandler, reversedLayers)
-                                        } else {
-                                            backInBounds.add(widget)
-                                        }
+                            var activeWidgets = allActiveWidgets[pointerId] ?: emptyList()
+
+                            //检查是否移出边界
+                            if (activeWidgets.isNotEmpty()) {
+                                val backInBounds = mutableListOf<ObservableWidget>()
+                                val releasedWidgets = mutableListOf<ObservableWidget>()
+                                for (widget in activeWidgets) {
+                                    //检查组件是否可以响应移除边界即松开
+                                    if (!widget.isReleaseOnOutOfBounds()) continue
+
+                                    val size = widget.internalRenderSize
+                                    val offset = getWidgetPosition(widget, size, screenSize)
+                                    val isOutOfBounds = position.x !in offset.x..(offset.x + size.width) ||
+                                            position.y !in offset.y..(offset.y + size.height)
+
+                                    if (isOutOfBounds) {
+                                        widget.onReleaseEvent(eventHandler, reversedLayers)
+                                        releasedWidgets.add(widget)
+                                    } else {
+                                        backInBounds.add(widget)
                                     }
-                                    //fix: 应该在抬起事件全部处理完成后再处理 #941
-                                    if (backInBounds.isNotEmpty()) {
-                                        for (widget in backInBounds) {
-                                            widget.onPointerBackInBounds(eventHandler, reversedLayers)
-                                        }
+                                }
+                                //fix: 移出边界时应移出组，否则滑动回已释放的按钮无法再次触发
+                                if (releasedWidgets.isNotEmpty()) {
+                                    activeWidgets = activeWidgets - releasedWidgets
+                                    allActiveWidgets[pointerId] = activeWidgets
+                                }
+                                //fix: 应该在抬起事件全部处理完成后再处理 #941
+                                if (backInBounds.isNotEmpty()) {
+                                    for (widget in backInBounds) {
+                                        widget.onPointerBackInBounds(eventHandler, reversedLayers)
                                     }
                                 }
+                            }
 
-                                when {
-                                    targetWidgets.isEmpty() -> {}
-                                    else -> {
-                                        for (targetWidget in targetWidgets) {
-                                            if (targetWidget.canProcess()) {
-                                                return@forEach //拒绝处理该事件
-                                            }
+                            when {
+                                targetWidgets.isEmpty() -> {}
+                                else -> {
+                                    for (targetWidget in targetWidgets) {
+                                        if (targetWidget.canProcess()) {
+                                            return@forEach //拒绝处理该事件
+                                        }
 
-                                            targetWidget.onTouchEvent(
-                                                eventHandler = eventHandler,
-                                                allLayers = reversedLayers,
-                                                change = change,
-                                                activeWidgets = activeWidgets,
-                                                addThis = {
-                                                    allActiveWidgets[pointerId] = activeWidgets + listOf(targetWidget)
-                                                },
-                                                consumeEvent = { value ->
-                                                    if (value) {
-                                                        change.consume()
-                                                    } else {
-                                                        //将指针标记为仅接受滑动处理
-                                                        //期望子级不对点击事件等进行处理
-                                                        markPointerAsMoveOnly(pointerId)
-                                                    }
+                                        targetWidget.onTouchEvent(
+                                            eventHandler = eventHandler,
+                                            allLayers = reversedLayers,
+                                            change = change,
+                                            activeWidgets = activeWidgets,
+                                            addThis = {
+                                                allActiveWidgets[pointerId] = activeWidgets + listOf(targetWidget)
+                                            },
+                                            consumeEvent = { value ->
+                                                if (value) {
+                                                    change.consume()
+                                                } else {
+                                                    //将指针标记为仅接受滑动处理
+                                                    //期望子级不对点击事件等进行处理
+                                                    markPointerAsMoveOnly(pointerId)
                                                 }
-                                            )
-                                        }
+                                            }
+                                        )
                                     }
                                 }
-                            } else {
-                                allActiveWidgets.remove(pointerId)?.forEach { widget ->
-                                    widget.onReleaseEvent(eventHandler, reversedLayers)
-                                }
                             }
                         }
                     }