pindo 5.13.6 → 5.13.9

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/pgyer/pgyerhelper.rb

@@ -670,7 +670,7 @@ module Pindo
                 args_ipa_file_dir = File.expand_path(File::dirname(ipa_file_upload))
                 ipa_file_upload=File.join(args_ipa_file_dir, File.basename(ipa_file_upload))
                 current_project_dir = Dir.pwd
-                description = get_description_from_git(current_project_dir:current_project_dir)
+                # description = get_description_from_git(current_project_dir:current_project_dir)
                 # get_description_from_git 现在会在失败时抛出异常，成功时返回有效的描述
                 # 所以不需要再检查 nil 或空值
 

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

data/lib/pindo/module/task/model/{jps_upload_task.rb → jps/jps_upload_task.rb}

@@ -1,5 +1,5 @@
-require_relative '../pindo_task'
-require_relative '../task_config'
+require 'pindo/module/task/pindo_task'
+require 'pindo/module/task/task_config'
 require 'pindo/module/pgyer/pgyerhelper'
 
 module Pindo

data/lib/pindo/module/task/model/{ipa_local_resign_task.rb → resign/ipa_local_resign_task.rb}

@@ -1,5 +1,5 @@
-require_relative '../pindo_task'
-require_relative '../task_config'
+require 'pindo/module/task/pindo_task'
+require 'pindo/module/task/task_config'
 
 module Pindo
   module TaskSystem

data/lib/pindo/module/task/model/{jps_resign_task.rb → resign/jps_resign_task.rb}

@@ -1,5 +1,5 @@
-require_relative '../pindo_task'
-require_relative '../task_config'
+require 'pindo/module/task/pindo_task'
+require 'pindo/module/task/task_config'
 require 'pindo/module/pgyer/pgyerhelper'
 
 module Pindo

data/lib/pindo/module/task/model/unity/unity_config_task.rb

@@ -0,0 +1,107 @@
+require 'pindo/module/task/model/unity_task'
+require 'pindo/base/funlog'
+
+module Pindo
+  module TaskSystem
+    # Unity 配置编译模式任务
+    # 用于配置 Unity 项目的编译模式（dev/adhoc/release）
+    class UnityConfigTask < UnityTask
+      attr_reader :deploy_mode
+
+      def self.task_type
+        :unity_config
+      end
+
+      # @param deploy_mode [String] 部署模式 ('dev', 'adhoc', 'release')
+      # @param options [Hash] 额外选项
+      #   - :project_path [String] Unity 项目路径（默认当前目录）
+      def initialize(deploy_mode = 'dev', options = {})
+        @deploy_mode = deploy_mode
+        @unity_exe_path = nil  # 将在 do_work 中自动查找
+
+        # 传递 project_path 给基类
+        project_path = options[:project_path] || Dir.pwd
+        super("Unity 配置编译模式 (#{deploy_mode})", project_path: project_path, options: options)
+      end
+
+      def validate
+        super
+
+        # 验证 Unity 工程是否存在
+        unless unity_helper.unity_project?(@unity_root_path)
+          raise Informative, "当前目录不是 Unity 工程：#{@unity_root_path}"
+        end
+
+        # 验证 deploy_mode 参数
+        valid_modes = ['dev', 'adhoc', 'release']
+        unless valid_modes.include?(@deploy_mode)
+          raise Informative, "无效的编译模式: #{@deploy_mode}，必须是 #{valid_modes.join(', ')}"
+        end
+
+        true
+      end
+
+      protected
+
+      def do_work
+        # 获取 Unity 版本
+        project_unity_version = get_unity_version
+
+        # 查找 Unity 执行路径
+        unless @unity_exe_path
+          @unity_exe_path = unity_helper.find_unity_path(
+            project_unity_version: project_unity_version,
+            force_change_version: false
+          )
+        end
+
+        if @unity_exe_path.nil? || @unity_exe_path.empty?
+          raise Informative, "无法找到 Unity 执行路径"
+        end
+
+        # 显示 Unity 信息
+        puts "项目路径: #{@unity_root_path}"
+        puts "Unity 执行路径: #{@unity_exe_path}"
+        puts "Unity 版本: #{project_unity_version}"
+        puts "编译模式: #{@deploy_mode}\n"
+
+        # 执行编译模式配置
+        result = config_build_mode
+
+        result
+      end
+
+      # 重写清理方法，提供更精确的参数
+      def cleanup_unity_processes
+        Funlog.warning("清理 Unity 进程...")
+        begin
+          Pindo::Unity::UnityProcHelper.cleanup_unity_processes_after_build(
+            unity_exe_full_path: @unity_exe_path,
+            project_path: @unity_root_path
+          )
+        rescue => e
+          Funlog.warning("清理 Unity 进程失败: #{e.message}")
+        end
+      end
+
+      private
+
+      # 配置编译模式
+      def config_build_mode
+        # 调用 UnityHelper 的 config_build_mode 方法
+        result = unity_helper.config_build_mode(
+          unity_exe_full_path: @unity_exe_path,
+          project_path: @unity_root_path,
+          deploy_mode: @deploy_mode
+        )
+
+        # 返回成功结果
+        {
+          success: true,
+          deploy_mode: @deploy_mode,
+          unity_result: result
+        }
+      end
+    end
+  end
+end

data/lib/pindo/module/task/model/{unity_export_task.rb → unity/unity_export_task.rb}

@@ -1,34 +1,27 @@
-require_relative '../pindo_task'
+require 'pindo/module/task/model/unity_task'
 require 'pindo/base/funlog'
 
 module Pindo
   module TaskSystem
-    class UnityExportTask < PindoTask
-      attr_reader :platform, :unity_project_path, :export_path
+    # Unity 导出任务
+    # 用于将 Unity 项目导出为指定平台（iOS/Android/WebGL）
+    class UnityExportTask < UnityTask
+      attr_reader :platform, :export_path, :deploy_mode, :is_library_mode
 
       def self.task_type
         :unity_export
       end
 
-      # 重试配置
-      def self.default_retry_mode
-        RetryMode::DELAYED 
-      end
-
-      def self.default_retry_count
-        2  # 可以重试 2 次
-      end
-
-      def self.default_retry_delay
-        10  # 延迟 10 秒
-      end
-
+      # @param platform [String] 目标平台 ('ios', 'android', 'web')
+      # @param options [Hash] 额外选项
+      #   - :project_path [String] Unity 项目路径（默认当前目录）
+      #   - :export_path [String] 导出路径（nil 表示自动检测）
+      #   - :deploy_mode [String] 部署模式 ('dev', 'adhoc', 'release')，默认 'dev'
+      #   - :context [Hash] 上下文信息（如 index_count）
       def initialize(platform, options = {})
         @platform = platform
-        @unity_project_path = options[:project_path] || Dir.pwd
         @unity_exe_path = nil  # 将在 do_work 中自动查找
-        @unity_helper = nil    # 将在 do_work 中自动初始化
-        @is_library_mode = false  # 不再支持库模式
+        @is_library_mode = false
         @index_count = options[:context] ? options[:context][:index_count] : nil
         @export_path = options[:export_path]  # 可由参数传入，nil 表示自动检测
         @deploy_mode = options[:deploy_mode] || 'dev'  # 部署模式：dev/adhoc/release，默认 dev
@@ -44,18 +37,17 @@ module Pindo
                  "Unity 导出 #{platform.upcase}"
                end
 
-        super(name, options)
+        # 传递 project_path 给基类
+        project_path = options[:project_path] || Dir.pwd
+        super(name, project_path: project_path, options: options)
       end
 
       def validate
-        # 验证 Unity 工程是否存在
-        unless @unity_helper
-          @unity_helper = Pindo::Client::UnityHelper.share_instance
-        end
+        super
 
-        unless @unity_helper.unity_project?(@unity_project_path)
-          @error = "当前目录不是 Unity 工程：#{@unity_project_path}"
-          return false
+        # 验证 Unity 工程是否存在
+        unless unity_helper.unity_project?(@unity_root_path)
+          raise Informative, "当前目录不是 Unity 工程：#{@unity_root_path}"
         end
 
         true
@@ -64,27 +56,26 @@ module Pindo
       protected
 
       def do_work
-        # 确保 Unity helper 已初始化
-        @unity_helper ||= Pindo::Client::UnityHelper.share_instance
-
         # 获取 Unity 版本
-        project_unity_version = @unity_helper.get_unity_version(@unity_project_path)
+        project_unity_version = get_unity_version
 
         # 查找 Unity 执行路径
         unless @unity_exe_path
-          @unity_exe_path = @unity_helper.find_unity_path(
+          @unity_exe_path = unity_helper.find_unity_path(
             project_unity_version: project_unity_version,
             force_change_version: false
           )
         end
 
         if @unity_exe_path.nil? || @unity_exe_path.empty?
-          raise "无法找到 Unity 执行路径"
+          raise Informative, "无法找到 Unity 执行路径"
         end
 
         # 显示 Unity 信息
-        Funlog.info("Unity 版本: #{project_unity_version}")
-        Funlog.info("Unity 路径: #{@unity_exe_path}")
+        puts "项目路径: #{@unity_root_path}"
+        puts "Unity 执行路径: #{@unity_exe_path}"
+        puts "Unity 版本: #{project_unity_version}"
+        puts "部署模式: #{@deploy_mode}\n"
 
         # 执行 Unity 导出
         case @platform
@@ -95,20 +86,34 @@ module Pindo
         when 'web', 'html'
           export_web
         else
-          raise "Unsupported platform: #{@platform}"
+          raise Informative, "不支持的平台: #{@platform}"
+        end
+      end
+
+      # 重写清理方法，提供更精确的参数
+      def cleanup_unity_processes
+        Funlog.warning("清理 Unity 进程...")
+        begin
+          Pindo::Unity::UnityProcHelper.cleanup_unity_processes_after_build(
+            unity_exe_full_path: @unity_exe_path,
+            project_path: @unity_root_path
+          )
+        rescue => e
+          Funlog.warning("清理 Unity 进程失败: #{e.message}")
         end
       end
 
       private
 
+      # 导出 iOS
       def export_ios
         platform = 'iOS'
 
         # 设置导出路径（如果未指定）
         if @export_path.nil?
           # 优先使用 BaseiOS，如果不存在则使用 iOS
-          base_ios_path = File.join(@unity_project_path, "GoodPlatform", "BaseiOS")
-          ios_path = File.join(@unity_project_path, "GoodPlatform", "iOS")
+          base_ios_path = File.join(@unity_root_path, "GoodPlatform", "BaseiOS")
+          ios_path = File.join(@unity_root_path, "GoodPlatform", "iOS")
 
           @export_path = if File.exist?(base_ios_path)
                            base_ios_path
@@ -120,6 +125,10 @@ module Pindo
         # 根据导出路径判断是否为库模式
         @is_library_mode = @export_path.include?("BaseiOS")
 
+        puts "导出路径: #{@export_path}"
+        puts "导出平台: iOS"
+        puts "库模式: #{@is_library_mode ? '是' : '否'}\n"
+
         result = execute_unity_build(platform)
 
         {
@@ -130,14 +139,15 @@ module Pindo
         }
       end
 
+      # 导出 Android
       def export_android
         platform = 'Android'
 
         # 设置导出路径（如果未指定）
         if @export_path.nil?
           # 优先使用 BaseAndroid，如果不存在则使用 Android
-          base_android_path = File.join(@unity_project_path, "GoodPlatform", "BaseAndroid")
-          android_path = File.join(@unity_project_path, "GoodPlatform", "Android")
+          base_android_path = File.join(@unity_root_path, "GoodPlatform", "BaseAndroid")
+          android_path = File.join(@unity_root_path, "GoodPlatform", "Android")
 
           @export_path = if File.exist?(base_android_path)
                            base_android_path
@@ -149,6 +159,10 @@ module Pindo
         # 根据导出路径判断是否为库模式
         @is_library_mode = @export_path.include?("BaseAndroid")
 
+        puts "导出路径: #{@export_path}"
+        puts "导出平台: Android"
+        puts "库模式: #{@is_library_mode ? '是' : '否'}\n"
+
         result = execute_unity_build(platform)
 
         {
@@ -159,13 +173,18 @@ module Pindo
         }
       end
 
+      # 导出 WebGL
       def export_web
         platform = 'WebGL'
-        result = execute_unity_build(platform)
 
         # 设置导出路径（如果未指定）
         # Web 平台只有一个目录
-        @export_path ||= File.join(@unity_project_path, "GoodPlatform", "WebGL")
+        @export_path ||= File.join(@unity_root_path, "GoodPlatform", "WebGL")
+
+        puts "导出路径: #{@export_path}"
+        puts "导出平台: WebGL\n"
+
+        result = execute_unity_build(platform)
 
         {
           success: true,
@@ -175,41 +194,19 @@ module Pindo
         }
       end
 
+      # 执行 Unity 导出
+      # Unity 进程管理（检查和清理）已封装在 UnityHelper.export_project 中
       def execute_unity_build(platform)
-        # 检查 Unity 进程
-        @unity_helper.check_unity_processes(
+        # 执行导出
+        unity_helper.export_project(
           unity_exe_full_path: @unity_exe_path,
-          project_path: @unity_project_path
+          project_path: @unity_root_path,
+          platform: platform,
+          isLibrary: @is_library_mode,
+          indexNo: @index_count,
+          deployMode: @deploy_mode
         )
-
-        # 执行构建
-        begin
-          result = @unity_helper.build_project(
-            unity_exe_full_path: @unity_exe_path,
-            project_path: @unity_project_path,
-            platform: platform,
-            isLibrary: @is_library_mode,
-            indexNo: @index_count,
-            deployMode: @deploy_mode
-          )
-
-          # 清理 Unity 进程
-          @unity_helper.cleanup_unity_processes_after_build(
-            unity_exe_full_path: @unity_exe_path,
-            project_path: @unity_project_path
-          )
-
-          result
-        rescue => e
-          # 确保清理进程
-          @unity_helper.cleanup_unity_processes_after_build(
-            unity_exe_full_path: @unity_exe_path,
-            project_path: @unity_project_path
-          ) rescue nil
-
-          raise e
-        end
       end
     end
   end
-end
+end

data/lib/pindo/module/task/model/unity/unity_update_task.rb

@@ -0,0 +1,94 @@
+require 'pindo/module/task/model/unity_task'
+require 'pindo/base/funlog'
+
+module Pindo
+  module TaskSystem
+    # Unity 更新必备库任务
+    # 用于强制更新 Unity 项目的必备库（NugetForUnity）
+    class UnityUpdateTask < UnityTask
+      def self.task_type
+        :unity_update
+      end
+
+      # @param options [Hash] 额外选项
+      #   - :project_path [String] Unity 项目路径（默认当前目录）
+      def initialize(options = {})
+        @unity_exe_path = nil  # 将在 do_work 中自动查找
+
+        # 传递 project_path 给基类
+        project_path = options[:project_path] || Dir.pwd
+        super("Unity工具库更新", project_path: project_path, options: options)
+      end
+
+      def validate
+        super
+
+        # 验证 Unity 工程是否存在
+        unless unity_helper.unity_project?(@unity_root_path)
+          raise Informative, "当前目录不是 Unity 工程：#{@unity_root_path}"
+        end
+
+        true
+      end
+
+      protected
+
+      def do_work
+        # 获取 Unity 版本
+        project_unity_version = get_unity_version
+
+        # 查找 Unity 执行路径
+        unless @unity_exe_path
+          @unity_exe_path = unity_helper.find_unity_path(
+            project_unity_version: project_unity_version,
+            force_change_version: false
+          )
+        end
+
+        if @unity_exe_path.nil? || @unity_exe_path.empty?
+          raise Informative, "无法找到 Unity 执行路径"
+        end
+
+        # 显示 Unity 信息
+        puts "项目路径: #{@unity_root_path}"
+        puts "Unity 执行路径: #{@unity_exe_path}"
+        puts "Unity 版本: #{project_unity_version}\n"
+
+        # 执行必备库更新
+        result = force_update_libraries
+
+        result
+      end
+
+      # 重写清理方法，提供更精确的参数
+      def cleanup_unity_processes
+        Funlog.warning("清理 Unity 进程...")
+        begin
+          Pindo::Unity::UnityProcHelper.cleanup_unity_processes_after_build(
+            unity_exe_full_path: @unity_exe_path,
+            project_path: @unity_root_path
+          )
+        rescue => e
+          Funlog.warning("清理 Unity 进程失败: #{e.message}")
+        end
+      end
+
+      private
+
+      # 强制更新必备库
+      def force_update_libraries
+        # 调用 UnityHelper 的 force_update_libraries 方法
+        result = unity_helper.force_update_libraries(
+          unity_exe_full_path: @unity_exe_path,
+          project_path: @unity_root_path
+        )
+
+        # 返回成功结果
+        {
+          success: true,
+          unity_result: result
+        }
+      end
+    end
+  end
+end