pindo 5.13.7 → 5.13.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbf53e39f861e030ec56923a9d913e95a6fabe16f25294ef2062c56d140347f1
-  data.tar.gz: 12005518e7084709a61b87f7be6345181224cd6f1e6f6766200be52982c4f319
+  metadata.gz: f1f5b841b91a7c9548ae422e6b7c73db4104f9d55c1266937c2ca23e1480c30a
+  data.tar.gz: 42e0235ff47d8f1a4a6d3d461a47a2ab30a3b6e0666e2d9dac24811b72cc50c9
 SHA512:
-  metadata.gz: 6ecb9148510a631ede407c1fb78a87eb6cd7c65c64f4ca5b0209da3a6f54f2ad7af067e6b5a7895cee1882fc3208446e635beecb2500fa8dbc1fd47533c91473
-  data.tar.gz: 852957fbaf4834176bf868e78ce613e9f9d147019de3b2fc6cbf24f1bd0a7c31f95bfb776cbcf7d7d730c4b679154ab68c75c83a3759a4ecf39d9f2d0cf766e3
+  metadata.gz: '085884e89d114f0499c38d1c8b879452330023dac6bed14e89d4d5882c866729ea6efa6bef6318d12fea4d72d7626a5f47b41c6a6f5faa03ca06d8c4daa89426'
+  data.tar.gz: be7b3c4603946b117d1d6051556b92870a834cb57f71cbf1a3857b37f97791274e75b2a7bb98258a26a44d60d96b88dc44369397130dc8f290b81264708e262b

data/lib/pindo/command/android/autobuild.rb

@@ -7,9 +7,11 @@ require 'pindo/module/android/android_build_helper'
 require 'pindo/module/android/android_config_helper'
 require 'pindo/module/task/task_manager'
 require 'pindo/module/task/model/git_tag_task'
-require 'pindo/module/task/model/unity_export_task'
+require 'pindo/module/task/model/unity/unity_update_task'
+require 'pindo/module/task/model/unity/unity_yoo_asset_task'
+require 'pindo/module/task/model/unity/unity_export_task'
 require 'pindo/module/task/model/build_task'
-require 'pindo/module/task/model/jps_upload_task'
+require 'pindo/module/task/model/jps/jps_upload_task'
 
 module Pindo
   class Command
@@ -61,7 +63,9 @@ module Pindo
             ['--proj=NAME',   '指定上传到测试平台的项目名称'],
             ['--bundle_name=NAME', '指定Android Package Name（如com.example.app，会拉取对应配置）'],
             ['--upload',      '编译后上传到测试平台（自动发送给自己）'],
-            ['--send',        '发送通知到测试群组（同时发送给自己）']
+            ['--send',        '发送通知到测试群组（同时发送给自己）'],
+            ['--skiplib', '跳过Unity必备库更新（加快构建速度）'],
+            ['--skipyoo', '跳过YooAsset资源打包（加快构建速度）']
           ].concat(super)
         end
 
@@ -71,6 +75,8 @@ module Pindo
           @args_send_flag = argv.flag?('send', false)
           @args_proj_name = argv.option('proj')
           @args_bundle_name = argv.option('bundle_name')
+          @args_skip_lib = argv.flag?('skiplib', false)
+          @args_skip_yoo = argv.flag?('skipyoo', false)
 
 
           if @args_send_flag
@@ -146,24 +152,49 @@ module Pindo
             git_tag_task = Pindo::TaskSystem::GitTagTask.new(config[:project_path])
             tasks << git_tag_task
 
-            # 2. Unity 导出任务（仅 Unity 工程）
+            # 2. Unity 任务链（仅 Unity 工程）
             if is_unity
               # 确定 Android 导出路径
               base_android_path = File.join(config[:project_path], "GoodPlatform", "BaseAndroid")
               android_path = File.join(config[:project_path], "GoodPlatform", "Android")
               android_export_path = File.exist?(base_android_path) ? base_android_path : android_path
 
+              # 记录上一个任务，用于依赖链
+              last_task = git_tag_task
+
+              # 2.1 Unity 更新必备库任务（可选）
+              unless @args_skip_lib
+                unity_update_task = Pindo::TaskSystem::UnityUpdateTask.new(
+                  project_path: config[:project_path]
+                )
+                unity_update_task.dependencies << last_task.id
+                tasks << unity_update_task
+                last_task = unity_update_task
+              end
+
+              # 2.2 Unity YooAsset 资源构建任务（可选，依赖上一个任务）
+              unless @args_skip_yoo
+                unity_yoo_task = Pindo::TaskSystem::UnityYooAssetTask.new(
+                  'android',
+                  project_path: config[:project_path]
+                )
+                unity_yoo_task.dependencies << last_task.id
+                tasks << unity_yoo_task
+                last_task = unity_yoo_task
+              end
+
+              # 2.3 Unity 导出任务（依赖上一个任务）
               unity_context = {}
               unity_context[:project_name] = @args_proj_name if @args_proj_name
 
-              unity_task = Pindo::TaskSystem::UnityExportTask.new(
+              unity_export_task = Pindo::TaskSystem::UnityExportTask.new(
                 'android',
                 project_path: config[:project_path],
                 export_path: android_export_path,
                 context: unity_context
               )
-              unity_task.dependencies << git_tag_task.id
-              tasks << unity_task
+              unity_export_task.dependencies << last_task.id
+              tasks << unity_export_task
             end
 
             # 3. 构建任务

data/lib/pindo/command/appstore/adhocbuild.rb

@@ -11,9 +11,12 @@ require 'pindo/config/ios_config_parser'
 require 'pindo/config/build_info_manager'
 require 'pindo/base/pindocontext'
 require 'pindo/module/task/task_manager'
-require 'pindo/module/task/model/unity_export_task'
+require 'pindo/module/task/model/unity/unity_config_task'
+require 'pindo/module/task/model/unity/unity_update_task'
+require 'pindo/module/task/model/unity/unity_yoo_asset_task'
+require 'pindo/module/task/model/unity/unity_export_task'
 require 'pindo/module/task/model/build_task'
-require 'pindo/module/task/model/jps_upload_task'
+require 'pindo/module/task/model/jps/jps_upload_task'
 require 'pindo/options/options'
 require 'pindo/options/helpers/bundleid_selector'
 
@@ -96,7 +99,11 @@ module Pindo
         # 命令的选项列表
         def self.options
           # 转换为 CLAide 格式
-          option_items.map { |item| item.to_claide_option }.concat(super)
+          option_items.map { |item| item.to_claide_option }.concat([
+            ['--skipconfig', '跳过Unity编译模式配置（加快构建速度）'],
+            ['--skiplib', '跳过Unity必备库更新（加快构建速度）'],
+            ['--skipyoo', '跳过YooAsset资源打包（加快构建速度）']
+          ]).concat(super)
         end
 
         def initialize(argv)
@@ -114,6 +121,9 @@ module Pindo
           @args_upload_flag = @options[:send] || @options[:upload]
           @args_proj_name = @options[:proj]
           @args_increase_flag = @options[:increase]
+          @args_skip_config = argv.flag?('skipconfig', false)
+          @args_skip_lib = argv.flag?('skiplib', false)
+          @args_skip_yoo = argv.flag?('skipyoo', false)
 
           super
           @additional_args = argv.remainder!
@@ -212,24 +222,60 @@ module Pindo
 
             tasks = []
 
-            # 1. Unity 导出任务（仅 Unity 工程）
+            # 1. Unity 任务链（仅 Unity 工程）
             if is_unity
               # 确定 iOS 导出路径
               base_ios_path = File.join(config[:project_path], "GoodPlatform", "BaseiOS")
               ios_path = File.join(config[:project_path], "GoodPlatform", "iOS")
               ios_export_path = File.exist?(base_ios_path) ? base_ios_path : ios_path
 
+              # 记录上一个任务，用于依赖链
+              last_task = nil
+
+              # 1.1 Unity 配置编译模式任务（可选）
+              unless @args_skip_config
+                unity_config_task = Pindo::TaskSystem::UnityConfigTask.new(
+                  'release',  # AdHoc 也使用 release 模式
+                  project_path: config[:project_path]
+                )
+                tasks << unity_config_task
+                last_task = unity_config_task
+              end
+
+              # 1.2 Unity 更新必备库任务（可选）
+              unless @args_skip_lib
+                unity_update_task = Pindo::TaskSystem::UnityUpdateTask.new(
+                  project_path: config[:project_path]
+                )
+                unity_update_task.dependencies << last_task.id if last_task
+                tasks << unity_update_task
+                last_task = unity_update_task
+              end
+
+              # 1.3 Unity YooAsset 资源构建任务（可选，依赖上一个任务）
+              unless @args_skip_yoo
+                unity_yoo_task = Pindo::TaskSystem::UnityYooAssetTask.new(
+                  'ios',
+                  project_path: config[:project_path]
+                )
+                unity_yoo_task.dependencies << last_task.id if last_task
+                tasks << unity_yoo_task
+                last_task = unity_yoo_task
+              end
+
+              # 1.4 Unity 导出任务（依赖上一个任务）
               unity_context = {}
               unity_context[:project_name] = @args_proj_name if @args_proj_name
 
-              unity_task = Pindo::TaskSystem::UnityExportTask.new(
+              unity_export_task = Pindo::TaskSystem::UnityExportTask.new(
                 'ios',
                 project_path: config[:project_path],
                 export_path: ios_export_path,
                 deploy_mode: 'adhoc',  # AdHoc 使用 adhoc 模式
                 context: unity_context
               )
-              tasks << unity_task
+              unity_export_task.dependencies << last_task.id if last_task
+              tasks << unity_export_task
             end
 
             # 2. 构建任务（AdHoc 模式）

data/lib/pindo/command/appstore/autobuild.rb

@@ -10,7 +10,10 @@ require 'pindo/module/xcode/xcode_build_helper'
 require 'pindo/config/ios_config_parser'
 require 'pindo/config/build_info_manager'
 require 'pindo/module/task/task_manager'
-require 'pindo/module/task/model/unity_export_task'
+require 'pindo/module/task/model/unity/unity_config_task'
+require 'pindo/module/task/model/unity/unity_update_task'
+require 'pindo/module/task/model/unity/unity_yoo_asset_task'
+require 'pindo/module/task/model/unity/unity_export_task'
 require 'pindo/module/task/model/build_task'
 require 'pindo/options/options'
 
@@ -64,7 +67,11 @@ module Pindo
         # 命令的选项列表
         def self.options
           # 转换为 CLAide 格式
-          option_items.map { |item| item.to_claide_option }.concat(super)
+          option_items.map { |item| item.to_claide_option }.concat([
+            ['--skipconfig', '跳过Unity编译模式配置（加快构建速度）'],
+            ['--skiplib', '跳过Unity必备库更新（加快构建速度）'],
+            ['--skipyoo', '跳过YooAsset资源打包（加快构建速度）']
+          ]).concat(super)
         end
 
         def initialize(argv)
@@ -77,6 +84,9 @@ module Pindo
           # 保存参数到实例变量
           # 优先使用选项参数，如果没有则使用位置参数
           @args_bundle_id = @options[:bundleid] || positional_bundleid
+          @args_skip_config = argv.flag?('skipconfig', false)
+          @args_skip_lib = argv.flag?('skiplib', false)
+          @args_skip_yoo = argv.flag?('skipyoo', false)
 
           super(argv)
         end
@@ -166,20 +176,56 @@ module Pindo
 
             tasks = []
 
-            # 1. Unity 导出任务（仅 Unity 工程）
+            # 1. Unity 任务链（仅 Unity 工程）
             if is_unity
               # 确定 iOS 导出路径
               base_ios_path = File.join(project_path, "GoodPlatform", "BaseiOS")
               ios_path = File.join(project_path, "GoodPlatform", "iOS")
               ios_export_path = File.exist?(base_ios_path) ? base_ios_path : ios_path
 
-              unity_task = Pindo::TaskSystem::UnityExportTask.new(
+              # 记录上一个任务，用于依赖链
+              last_task = nil
+
+              # 1.1 Unity 配置编译模式任务（可选）
+              unless @args_skip_config
+                unity_config_task = Pindo::TaskSystem::UnityConfigTask.new(
+                  'release',  # AppStore 使用 release 模式
+                  project_path: project_path
+                )
+                tasks << unity_config_task
+                last_task = unity_config_task
+              end
+
+              # 1.2 Unity 更新必备库任务（可选）
+              unless @args_skip_lib
+                unity_update_task = Pindo::TaskSystem::UnityUpdateTask.new(
+                  project_path: project_path
+                )
+                unity_update_task.dependencies << last_task.id if last_task
+                tasks << unity_update_task
+                last_task = unity_update_task
+              end
+
+              # 1.3 Unity YooAsset 资源构建任务（可选，依赖上一个任务）
+              unless @args_skip_yoo
+                unity_yoo_task = Pindo::TaskSystem::UnityYooAssetTask.new(
+                  'ios',
+                  project_path: project_path
+                )
+                unity_yoo_task.dependencies << last_task.id if last_task
+                tasks << unity_yoo_task
+                last_task = unity_yoo_task
+              end
+
+              # 1.4 Unity 导出任务（依赖上一个任务）
+              unity_export_task = Pindo::TaskSystem::UnityExportTask.new(
                 'ios',
                 project_path: project_path,
                 export_path: ios_export_path,
                 deploy_mode: 'release'  # AppStore 使用 release 模式
               )
-              tasks << unity_task
+              unity_export_task.dependencies << last_task.id if last_task
+              tasks << unity_export_task
             end
 
             # 2. 构建任务

data/lib/pindo/command/appstore/autoresign.rb

@@ -7,8 +7,8 @@ require 'pindo/config/ios_config_parser'
 require 'pindo/config/build_info_manager'
 require 'pindo/base/pindocontext'
 require 'pindo/module/task/task_manager'
-require 'pindo/module/task/model/ipa_local_resign_task'
-require 'pindo/module/task/model/jps_upload_task'
+require 'pindo/module/task/model/resign/ipa_local_resign_task'
+require 'pindo/module/task/model/jps/jps_upload_task'
 require 'pindo/options/options'
 
 module Pindo

data/lib/pindo/command/ios/autobuild.rb

@@ -10,9 +10,11 @@ require 'pindo/module/xcode/xcode_build_helper'
 require 'pindo/base/pindocontext'
 require 'pindo/module/task/task_manager'
 require 'pindo/module/task/model/git_tag_task'
-require 'pindo/module/task/model/unity_export_task'
+require 'pindo/module/task/model/unity/unity_update_task'
+require 'pindo/module/task/model/unity/unity_yoo_asset_task'
+require 'pindo/module/task/model/unity/unity_export_task'
 require 'pindo/module/task/model/build_task'
-require 'pindo/module/task/model/jps_upload_task'
+require 'pindo/module/task/model/jps/jps_upload_task'
 require 'pindo/options/options'
 require 'pindo/options/helpers/bundleid_selector'
 require 'pindo/config/build_info_manager'
@@ -92,23 +94,42 @@ module Pindo
                 # 命令的选项列表
                 def self.options
                     # 转换为 CLAide 格式
-                    option_items.map { |item| item.to_claide_option }.concat(super)
+                    option_items.map { |item| item.to_claide_option }.concat([
+                        ['--skiplib', '跳过Unity必备库更新（加快构建速度）'],
+                        ['--skipyoo', '跳过YooAsset资源打包（加快构建速度）']
+                    ]).concat(super)
                 end
 
                 def initialize(argv)
+                    # 检测是否是 help 请求（避免在 help 模式下执行交互式选择）
+                    # 注意：不能使用 argv.flag?，因为会消费参数，导致父类获取不到
+                    is_help = ARGV.include?('--help') || ARGV.include?('-h')
+
                     # 先提取 build_type（因为 bundleid 的 value_block 需要用到它）
                     @build_type = argv.option('build_type', 'dev')
 
-                    # 一行代码完成参数初始化（自动推导命令名、自动启用缓存）
-                    @options = initialize_options(argv)
+                    # 只有在非 help 模式下才初始化参数（避免触发交互式选择）
+                    if is_help
+                        @options = {}
+                        @args_send_flag = false
+                        @args_upload_flag = false
+                        @args_proj_name = nil
+                        @args_bundle_id = nil
+                    else
+                        # 一行代码完成参数初始化（自动推导命令名、自动启用缓存）
+                        @options = initialize_options(argv)
+
+                        # 保存参数到实例变量
+                        @build_type = @options[:build_type] || @build_type  # 使用 options 中的值，如果没有则用之前提取的
+                        @args_send_flag = @options[:send]
+                        # send 依赖 upload：如果指定了 send，自动启用 upload
+                        @args_upload_flag = @options[:send] || @options[:upload]
+                        @args_proj_name = @options[:proj]
+                        @args_bundle_id = @options[:bundleid]
+                    end
 
-                    # 保存参数到实例变量
-                    @build_type = @options[:build_type] || @build_type  # 使用 options 中的值，如果没有则用之前提取的
-                    @args_send_flag = @options[:send]
-                    # send 依赖 upload：如果指定了 send，自动启用 upload
-                    @args_upload_flag = @options[:send] || @options[:upload]
-                    @args_proj_name = @options[:proj]
-                    @args_bundle_id = @options[:bundleid]
+                    @args_skip_lib = argv.flag?('skiplib', false)
+                    @args_skip_yoo = argv.flag?('skipyoo', false)
 
                     super
                     @additional_args = argv.remainder!
@@ -170,25 +191,50 @@ module Pindo
                         git_tag_task = Pindo::TaskSystem::GitTagTask.new(config[:project_path])
                         tasks << git_tag_task
 
-                        # 2. Unity 导出任务（仅 Unity 工程）
+                        # 2. Unity 任务链（仅 Unity 工程）
                         if is_unity
                             # 确定 iOS 导出路径
                             base_ios_path = File.join(config[:project_path], "GoodPlatform", "BaseiOS")
                             ios_path = File.join(config[:project_path], "GoodPlatform", "iOS")
                             ios_export_path = File.exist?(base_ios_path) ? base_ios_path : ios_path
 
+                            # 记录上一个任务，用于依赖链
+                            last_task = git_tag_task
+
+                            # 2.1 Unity 更新必备库任务（可选）
+                            unless @args_skip_lib
+                                unity_update_task = Pindo::TaskSystem::UnityUpdateTask.new(
+                                    project_path: config[:project_path]
+                                )
+                                unity_update_task.dependencies << last_task.id
+                                tasks << unity_update_task
+                                last_task = unity_update_task
+                            end
+
+                            # 2.2 Unity YooAsset 资源构建任务（可选，依赖上一个任务）
+                            unless @args_skip_yoo
+                                unity_yoo_task = Pindo::TaskSystem::UnityYooAssetTask.new(
+                                    'ios',
+                                    project_path: config[:project_path]
+                                )
+                                unity_yoo_task.dependencies << last_task.id
+                                tasks << unity_yoo_task
+                                last_task = unity_yoo_task
+                            end
+
+                            # 2.3 Unity 导出任务（依赖上一个任务）
                             unity_context = {}
                             unity_context[:project_name] = @args_proj_name if @args_proj_name
 
-                            unity_task = Pindo::TaskSystem::UnityExportTask.new(
+                            unity_export_task = Pindo::TaskSystem::UnityExportTask.new(
                                 'ios',
                                 project_path: config[:project_path],
                                 export_path: ios_export_path,
                                 deploy_mode: @build_type,  # 根据 build_type 传递部署模式
                                 context: unity_context
                             )
-                            unity_task.dependencies << git_tag_task.id
-                            tasks << unity_task
+                            unity_export_task.dependencies << last_task.id
+                            tasks << unity_export_task
                         end
 
                         # 3. 构建任务

data/lib/pindo/command/jps/upload.rb

@@ -6,7 +6,7 @@ require 'pindo/module/pgyer/pgyerhelper'
 require 'pindo/module/build/git_repo_helper'
 require 'pindo/module/build/build_helper'
 require 'pindo/module/task/task_manager'
-require 'pindo/module/task/model/jps_upload_task'
+require 'pindo/module/task/model/jps/jps_upload_task'
 require 'pindo/module/task/model/git_tag_task'
 
 module Pindo

data/lib/pindo/command/unity/autobuild.rb

@@ -9,8 +9,10 @@ require 'pindo/module/build/git_repo_helper'
 require 'pindo/module/task/pindo_task'
 require 'pindo/module/task/task_manager'
 require 'pindo/module/task/model/build_task'
-require 'pindo/module/task/model/unity_export_task'
-require 'pindo/module/task/model/jps_upload_task'
+require 'pindo/module/task/model/unity/unity_update_task'
+require 'pindo/module/task/model/unity/unity_yoo_asset_task'
+require 'pindo/module/task/model/unity/unity_export_task'
+require 'pindo/module/task/model/jps/jps_upload_task'
 require 'pindo/module/task/model/git_tag_task'
 require 'pindo/config/build_info_manager'
 require 'pindo/config/ios_config_parser'
@@ -78,6 +80,8 @@ module Pindo
                         ['--adhoc', '使用AdHoc证书打包iOS（默认使用Dev证书）'],
                         ['--deploy', '使用发布证书打包iOS'],
                         ['--release', '使用Release模式构建Android（默认使用Debug）'],
+                        ['--skiplib', '跳过Unity必备库更新（加快构建速度）'],
+                        ['--skipyoo', '跳过YooAsset资源打包（加快构建速度）']
                     ].concat(super)
                 end
 
@@ -93,6 +97,8 @@ module Pindo
                     @args_bundle_id = argv.option('bundleid')
                     @args_bundle_name = argv.option('bundle_name')
                     @args_types = argv.option('types')
+                    @args_skip_lib = argv.flag?('skiplib', false)
+                    @args_skip_yoo = argv.flag?('skipyoo', false)
 
                     # 如果开启 send，自动开启 upload
                     if @args_send_flag
@@ -137,7 +143,7 @@ module Pindo
                     pindo_project_dir = Dir.pwd
 
                     # 检查是否是Unity工程
-                    unity_helper = Pindo::Client::UnityHelper.share_instance
+                    unity_helper = Pindo::Unity::UnityHelper.share_instance
                     unless unity_helper.unity_project?(pindo_project_dir)
                         raise Informative, "当前目录不是Unity工程，请在Unity工程根目录下执行此命令"
                     end
@@ -173,17 +179,48 @@ module Pindo
                     git_tag_task = Pindo::TaskSystem::GitTagTask.new(Dir.pwd)
                     all_tasks << git_tag_task
 
-                    # 第一步：为每个平台创建导出和构建任务
+                    # 记录依赖任务（用于后续平台任务的依赖链）
+                    common_dependency_task = git_tag_task
+
+                    # 第一步：创建 Unity 更新任务（所有平台共享，可选）
+                    unless @args_skip_lib
+                        unity_update_task = Pindo::TaskSystem::UnityUpdateTask.new(
+                            project_path: Dir.pwd
+                        )
+                        unity_update_task.dependencies << common_dependency_task.id
+                        all_tasks << unity_update_task
+                        common_dependency_task = unity_update_task
+                    end
+
+                    # 存储每个平台的 YooAsset 任务（每个平台有自己的 YooAsset 任务）
+                    platform_yoo_tasks = {}
+
+                    # 第二步：为每个平台创建导出和构建任务
                     selected_platforms.each do |platform|
                         platform_config = all_platform_configs[platform]
 
-                        # 1. 创建 Unity 导出任务（依赖 Git 标签任务）
-                        unity_task = create_unity_export_task(platform, all_platform_configs)
-                        unity_task.dependencies << git_tag_task.id
-                        all_tasks << unity_task
+                        # 记录当前平台的依赖任务
+                        platform_dependency_task = common_dependency_task
+
+                        # 2.1 创建 Unity YooAsset 资源构建任务（可选，依赖共同任务）
+                        unless @args_skip_yoo
+                            unity_yoo_task = Pindo::TaskSystem::UnityYooAssetTask.new(
+                                platform,
+                                project_path: Dir.pwd
+                            )
+                            unity_yoo_task.dependencies << platform_dependency_task.id
+                            all_tasks << unity_yoo_task
+                            platform_yoo_tasks[platform] = unity_yoo_task
+                            platform_dependency_task = unity_yoo_task
+                        end
+
+                        # 2.2 创建 Unity 导出任务（依赖上一个任务）
+                        unity_export_task = create_unity_export_task(platform, all_platform_configs)
+                        unity_export_task.dependencies << platform_dependency_task.id
+                        all_tasks << unity_export_task
 
-                        # 2. 创建构建任务（依赖导出任务）
-                        build_task = create_build_task(platform, platform_config, all_platform_configs, unity_task)
+                        # 2.3 创建构建任务（依赖导出任务）
+                        build_task = create_build_task(platform, platform_config, all_platform_configs, unity_export_task)
                         all_tasks << build_task
                         platform_build_tasks[platform] = build_task
                     end

data/lib/pindo/command/web/autobuild.rb

@@ -7,9 +7,11 @@ require 'pindo/module/unity/unity_helper'
 require 'pindo/module/build/build_helper'
 require 'pindo/module/task/task_manager'
 require 'pindo/module/task/model/git_tag_task'
-require 'pindo/module/task/model/unity_export_task'
+require 'pindo/module/task/model/unity/unity_update_task'
+require 'pindo/module/task/model/unity/unity_yoo_asset_task'
+require 'pindo/module/task/model/unity/unity_export_task'
 require 'pindo/module/task/model/build_task'
-require 'pindo/module/task/model/jps_upload_task'
+require 'pindo/module/task/model/jps/jps_upload_task'
 
 module Pindo
     class Command
@@ -65,19 +67,23 @@ module Pindo
                         # 发送通知
                         ['--send',   '上传成功后发送测试通知'],
                         # 编译完成后再本地打开webgl包
-                        ['--run',   '编译完成后再本地打开webgl包']
+                        ['--run',   '编译完成后再本地打开webgl包'],
+                        ['--skiplib', '跳过Unity必备库更新（加快构建速度）'],
+                        ['--skipyoo', '跳过YooAsset资源打包（加快构建速度）']
                     ].concat(super)
                 end
 
                 def initialize(argv)
 
                     @args_deploy_flag = argv.flag?('deploy', false)
-                    @args_adhoc_flag = argv.flag?('adhoc', false)  
-                    @args_upload_flag = argv.flag?('upload', false)  
-                    @args_send_flag = argv.flag?('send', false)  
-                    @args_proj_name = argv.option('proj')  
+                    @args_adhoc_flag = argv.flag?('adhoc', false)
+                    @args_upload_flag = argv.flag?('upload', false)
+                    @args_send_flag = argv.flag?('send', false)
+                    @args_proj_name = argv.option('proj')
                     @args_bundle_id = argv.option('bundleid')
                     @args_run_flag = argv.flag?('run', false)
+                    @args_skip_lib = argv.flag?('skiplib', false)
+                    @args_skip_yoo = argv.flag?('skipyoo', false)
 
                     if @args_send_flag
                         @args_upload_flag = true
@@ -197,7 +203,31 @@ module Pindo
                       tasks << git_tag_task
                     end
 
-                    # 2. Unity 导出任务
+                    # 记录上一个任务，用于依赖链
+                    last_task = tasks.first
+
+                    # 2. Unity 更新必备库任务（可选）
+                    unless @args_skip_lib
+                      unity_update_task = Pindo::TaskSystem::UnityUpdateTask.new(
+                        project_path: config[:project_path]
+                      )
+                      unity_update_task.dependencies << last_task.id if last_task
+                      tasks << unity_update_task
+                      last_task = unity_update_task
+                    end
+
+                    # 3. Unity YooAsset 资源构建任务（可选，依赖上一个任务）
+                    unless @args_skip_yoo
+                      unity_yoo_task = Pindo::TaskSystem::UnityYooAssetTask.new(
+                        'web',
+                        project_path: config[:project_path]
+                      )
+                      unity_yoo_task.dependencies << last_task.id if last_task
+                      tasks << unity_yoo_task
+                      last_task = unity_yoo_task
+                    end
+
+                    # 4. Unity 导出任务（依赖上一个任务）
                     # Web 平台导出路径
                     web_export_path = File.join(config[:project_path], "GoodPlatform", "WebGL")
 
@@ -205,16 +235,16 @@ module Pindo
                     unity_context[:project_name] = @args_proj_name if @args_proj_name
                     unity_context[:index_count] = config[:index_count]
 
-                    unity_task = Pindo::TaskSystem::UnityExportTask.new(
+                    unity_export_task = Pindo::TaskSystem::UnityExportTask.new(
                       'web',
                       project_path: config[:project_path],
                       export_path: web_export_path,
                       context: unity_context
                     )
-                    unity_task.dependencies << tasks.first.id if tasks.any?
-                    tasks << unity_task
+                    unity_export_task.dependencies << last_task.id if last_task
+                    tasks << unity_export_task
 
-                    # 3. 构建任务（Web 只需要检查输出）
+                    # 5. 构建任务（Web 只需要检查输出）
                     build_task = Pindo::TaskSystem::BuildTask.create_task(
                       platform: :web,
                       mode: :dev,
@@ -227,10 +257,10 @@ module Pindo
                         workflow_info: config[:workflow_info]
                       }
                     )
-                    build_task.dependencies << unity_task.id
+                    build_task.dependencies << unity_export_task.id
                     tasks << build_task
 
-                    # 4. 上传任务（如果需要）
+                    # 6. 上传任务（如果需要）
                     if @args_upload_flag
                       # WebGL 输出路径: GoodPlatform/WebGL/build
                       webgl_build_path = File.join(config[:project_path], 'GoodPlatform', 'WebGL', 'build')

data/lib/pindo/module/task/model/git_tag_task.rb

@@ -31,7 +31,7 @@ module Pindo
       def initialize(project_path, options = {})
         @project_path = project_path
 
-        super("Git 标签检查", options)
+        super("Git仓库打标签", options)
       end
 
       def validate