pindo 5.13.7 → 5.13.9

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

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

@@ -0,0 +1,155 @@
+require 'pindo/module/task/model/unity_task'
+require 'pindo/base/funlog'
+
+module Pindo
+  module TaskSystem
+    # Unity YooAsset 资源构建任务
+    # 用于构建 YooAsset 资源包
+    class UnityYooAssetTask < UnityTask
+      attr_reader :platform
+
+      def self.task_type
+        :unity_yoo_asset
+      end
+
+      # @param platform [String] 目标平台 ('ios', 'android', 'web')
+      # @param options [Hash] 额外选项
+      #   - :project_path [String] Unity 项目路径（默认当前目录）
+      def initialize(platform, options = {})
+        @platform = platform
+        @unity_exe_path = nil  # 将在 do_work 中自动查找
+
+        name = case platform
+               when 'ios', 'ipa'
+                 "Unity资源Yoo 打包 iOS"
+               when 'android', 'apk'
+                 "Unity资源Yoo 打包 Android"
+               when 'web', 'html'
+                 "Unity资源Yoo 打包 WebGL"
+               else
+                 "Unity资源Yoo 打包 #{platform.upcase}"
+               end
+
+        # 传递 project_path 给基类
+        project_path = options[:project_path] || Dir.pwd
+        super(name, 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}"
+        puts "目标平台: #{normalize_platform_name(@platform)}\n"
+
+        # 执行 YooAsset 构建
+        result = build_yoo_asset
+
+        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
+
+      # 构建 YooAsset 资源
+      def build_yoo_asset
+        platform_name = normalize_platform_name(@platform)
+
+        # 调用 UnityHelper 的 build_yoo_asset 方法
+        result = unity_helper.build_yoo_asset(
+          unity_exe_full_path: @unity_exe_path,
+          project_path: @unity_root_path,
+          platform: platform_name
+        )
+
+        # 如果跳过（YooAsset 不存在），输出警告并显示命令
+        if result[:skipped]
+          Funlog.warning("项目中未检测到 YooAsset，跳过资源构建")
+          print_unity_command
+
+          return {
+            success: true,
+            skipped: true,
+            platform: @platform,
+            reason: result[:reason]
+          }
+        end
+
+        # 正常完成
+        {
+          success: true,
+          platform: @platform,
+          unity_result: result
+        }
+      end
+
+      # 打印将要执行的 Unity 命令
+      def print_unity_command
+        platform_name = normalize_platform_name(@platform)
+
+        cmd = "#{@unity_exe_path} -batchmode -quit " \
+              "-projectPath #{@unity_root_path} " \
+              "-executeMethod Yoo.Editor.YooCommandHelper.BatchBuild " \
+              "-platform #{platform_name}"
+
+        puts "\n本应执行的 Unity 命令:"
+        puts cmd
+        puts ""
+      end
+
+      # 标准化平台名称
+      def normalize_platform_name(platform)
+        case platform
+        when 'ios', 'ipa'
+          'iOS'
+        when 'android', 'apk'
+          'Android'
+        when 'web', 'html'
+          'WebGL'
+        else
+          platform.to_s
+        end
+      end
+    end
+  end
+end