pindo 5.6.3 → 5.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 380db3ee1ad0c4583d215d3186a2481f7daa9c66d1f1c64b4b92cf249a410ecf
-  data.tar.gz: 6051ed21964c7d499718593e24e9f36211f86478109752467fe37673f76e5a9e
+  metadata.gz: 6bea8c2179701b8869f82fa53f1c956bdde75bd26e92a60d07da6e290642ef19
+  data.tar.gz: 85d684d5255bc4bd2e7ae86ad31abd4e271724f1f5a797cace70bdf36eb9b267
 SHA512:
-  metadata.gz: 667ea2d4a16d1b8d5581bf69b920158c1e34711fa29fe8f532074d0e85b34629668b641fa4df7436e830466a100e78506b83107f744980520f1439cb2b6fcff5
-  data.tar.gz: 073d4acec0c92f7592b1ce7a64a1eb0fc2db7858b89a82fd543f9e95da250da5c8eb100b8218b201547a39ab8863d1ece4d57c8ecddbb914bcfae5808464eadd
+  metadata.gz: 36db0639bfe1a0b487dcfef67dd7ccb7d7e51639bfff01e2eca2573214a0ca9feb99dd0b6a941acfd194b49dac16c6ab6276720c956b84cab0e21d85edd4d7b6
+  data.tar.gz: a8aa894eb0683a94a38cbca61def8ee1c7718635ec8d5ff36fb98ae19e8f3bf6dee08f5026190201a74db56f00ba798c082b27dcce4d8c92482aa9a3798509fe

data/lib/pindo/base/pindocontext.rb

@@ -5,6 +5,14 @@ require 'fileutils'
 
 module Pindo
   class PindoContext
+    # 选择键定义
+    module SelectionKey
+      TAG_DECISION = :tag_decision      # 打Tag决定
+      PROJECT_NAME = :project_name      # 项目名称
+      BUNDLE_ID = :bundle_id            # Bundle ID
+      CERT_TYPE = :cert_type            # 证书类型
+    end
+    
     include Singleton
 
     attr_reader :current_command, :current_directory
@@ -17,6 +25,8 @@ module Pindo
       @cache_enabled = false       # 默认禁用缓存
       @command_group = nil         # 命令组名称
       @verbose = false             # 是否输出详细日志
+      @loaded_file_cache = nil     # 已加载但未应用的文件缓存数据
+      @cache_confirmed = false     # 标记缓存确认是否已完成
       ensure_cache_dir
     end
 
@@ -52,10 +62,10 @@ module Pindo
         puts "[PindoContext] options: #{options.inspect}"
       end
 
-      # 仅在启用缓存时加载文件缓存
+      # 仅在启用缓存时加载文件缓存（不确认，只加载到临时变量）
       if @cache_enabled && !@file_cache_loaded
         puts "[PindoContext] 准备加载文件缓存..." if verbose?
-        load_file_cache_with_confirmation
+        load_file_cache
         @file_cache_loaded = true
       else
         if verbose?
@@ -79,6 +89,7 @@ module Pindo
       @file_cache_loaded = false
       @cache_enabled = false
       @command_group = nil
+      @cache_confirmed = false
       # 暂不清理内存缓存，让同一进程内可以复用
     end
 
@@ -143,7 +154,7 @@ module Pindo
     def enable_cache(enabled = true)
       @cache_enabled = enabled
       if enabled && !@file_cache_loaded && @current_command
-        load_file_cache_with_confirmation
+        load_file_cache
         @file_cache_loaded = true
       end
     end
@@ -207,14 +218,6 @@ module Pindo
       end
     end
 
-    # 选择键定义
-    module SelectionKey
-      TAG_DECISION = :tag_decision      # 打Tag决定
-      PROJECT_NAME = :project_name      # 项目名称
-      BUNDLE_ID = :bundle_id            # Bundle ID
-      CERT_TYPE = :cert_type            # 证书类型
-    end
-
     private
 
     # 递归将Hash的键从字符串转换为符号
@@ -243,14 +246,15 @@ module Pindo
       File.join(cache_dir, 'context_selections.json')
     end
 
-    # 加载文件缓存并确认（三级结构）
-    def load_file_cache_with_confirmation
+    # 加载文件缓存（仅加载，不确认）
+    def load_file_cache
       file_path = cache_file_path
 
       puts "[PindoContext] 检查文件缓存: #{file_path}" if verbose?
 
       unless File.exist?(file_path)
         puts "[PindoContext] 文件缓存不存在，跳过加载" if verbose?
+        @loaded_file_cache = nil
         return
       end
 
@@ -261,109 +265,31 @@ module Pindo
         # 清理过期缓存（超过7天）
         file_cache = clean_expired_cache(file_cache)
 
-        # 获取当前项目和命令的缓存
+        # 保存加载的缓存数据，但不应用到内存
+        @loaded_file_cache = file_cache
+
+        # 加载其他项目/命令的缓存到内存（不需要确认的部分）
         project_path = get_project_path
         root_command = @command_group || @current_command
 
-        puts "[PindoContext] 查找缓存: [#{project_path}][#{root_command}]" if verbose?
-
-        # 检查三级结构中是否有当前上下文的缓存
-        cached_selections = file_cache.dig(project_path, root_command)
-
-        if cached_selections && !cached_selections.empty?
-          # 根据命令组显示更友好的描述
-          group_desc = case root_command
-                       when 'ios:autobuild'
-                         'iOS 构建'
-                       when 'and:autobuild', 'android:autobuild'
-                         'Android 构建'
-                       when 'web:autobuild'
-                         'Web 构建'
-                       else
-                         @current_command  # 其他命令显示原始命令名
-                       end
-
-          puts "\n检测到之前的选择 (#{group_desc}):"
-          puts "────────────────────────────────────────"
-
-          cached_selections.each do |key, value|
-            # 跳过内部字段
-            next if key.to_s.start_with?('__')
-
-            case key.to_s
-            when 'bundle_id'
-              puts "  Bundle ID: #{value}"
-            when 'project_name', 'app_key'  # 兼容旧的 app_key
-              puts "  项目名称: #{value}"
-            when 'tag_decision'
-              if value.is_a?(Hash)
-                action_desc = value['description'] || value['action']
-                puts "  Tag决定: #{action_desc}"
-              end
-            when 'cert_type'
-              puts "  证书类型: #{value}"
-            end
-          end
-          puts "────────────────────────────────────────"
-
-          # 检查是否设置了强制编译环境变量
-          force_build = ENV['PINDO_FORCE_BUILD']
-
-          if force_build && !force_build.empty?
-            # 环境变量存在，自动使用缓存
-            puts "\n检测到 PINDO_FORCE_BUILD 环境变量，自动使用缓存的选择"
-            confirm = true
-          else
-            # 询问用户是否使用缓存
-            require 'highline/import'
-            cli = HighLine.new
-            confirm = cli.agree("\n是否使用以上缓存的选择？ (y/n) ")
-          end
+        file_cache.each do |proj_path, commands|
+          @memory_selections[proj_path] ||= {}
+          commands.each do |cmd, selections|
+            # 跳过当前上下文（需要确认）
+            next if proj_path == project_path && cmd == root_command
 
-          if confirm
-            puts "使用缓存的选择\n" unless force_build
-            # 恢复三级结构的文件缓存到内存缓存
-            file_cache.each do |proj_path, commands|
-              @memory_selections[proj_path] ||= {}
-              commands.each do |cmd, selections|
-                @memory_selections[proj_path][cmd] ||= {}
-                selections.each do |key, value|
-                  symbol_key = key.to_sym
-                  @memory_selections[proj_path][cmd][symbol_key] = symbolize_keys(value)
-                end
-              end
-            end
-          else
-            puts "清除缓存，重新选择\n"
-            # 清除当前上下文的文件缓存（三级结构）
-            if file_cache[project_path] && file_cache[project_path][root_command]
-              file_cache[project_path].delete(root_command)
-              # 如果项目路径下没有任何命令缓存了，删除项目路径键
-              file_cache.delete(project_path) if file_cache[project_path].empty?
-            end
-            File.write(file_path, JSON.pretty_generate(file_cache))
-            # 不加载任何缓存到内存
-          end
-        else
-          # 加载整个文件缓存到内存（不需要确认）
-          file_cache.each do |proj_path, commands|
-            @memory_selections[proj_path] ||= {}
-            commands.each do |cmd, selections|
-              # 跳过当前上下文（已经是空的）
-              next if proj_path == project_path && cmd == root_command
-
-              @memory_selections[proj_path][cmd] ||= {}
-              selections.each do |key, value|
-                symbol_key = key.to_sym
-                @memory_selections[proj_path][cmd][symbol_key] = symbolize_keys(value)
-              end
+            @memory_selections[proj_path][cmd] ||= {}
+            selections.each do |key, value|
+              symbol_key = key.to_sym
+              @memory_selections[proj_path][cmd][symbol_key] = symbolize_keys(value)
             end
           end
         end
 
-        puts "[PindoContext] 处理文件缓存: #{file_path}" if verbose?
+        puts "[PindoContext] 已加载文件缓存到临时存储" if verbose?
       rescue => e
         puts "[PindoContext] 加载缓存失败: #{e.message}" if verbose?
+        @loaded_file_cache = nil
       end
     end
 
@@ -485,6 +411,160 @@ module Pindo
 
     public
 
+    # 加载 JPSBuildConfig.json 并覆盖项目名称（如果存在）
+    # 应在 confirm_and_apply_cache 之前调用
+    def load_and_apply_jps_config(project_dir = nil)
+      project_dir ||= get_project_path
+
+      # 判断工程类型并确定配置文件路径
+      # Unity 工程：ProjectSettings/JPSBuildConfig.json
+      # iOS/Android 工程：JPSBuildConfig.json
+      config_file = nil
+      project_type = nil
+
+      # 检查是否是 Unity 工程（存在 ProjectSettings 目录）
+      if File.directory?(File.join(project_dir, 'ProjectSettings'))
+        config_file = File.join(project_dir, 'ProjectSettings', 'JPSBuildConfig.json')
+        project_type = 'Unity'
+      else
+        # iOS/Android 工程，直接在根目录
+        config_file = File.join(project_dir, 'JPSBuildConfig.json')
+        project_type = 'iOS/Android'
+      end
+
+      unless File.exist?(config_file)
+        puts "[PindoContext] JPSBuildConfig.json 不存在 (#{project_type} 工程)，跳过" if verbose?
+        return nil
+      end
+
+      begin
+        config_content = File.read(config_file)
+        jps_config = JSON.parse(config_content)
+
+        if jps_config['project_name'] && !jps_config['project_name'].empty?
+          project_name = jps_config['project_name']
+          puts "[PindoContext] 从 JPSBuildConfig.json 加载项目名称 (#{project_type}): #{project_name}" if verbose?
+
+          # 设置到当前上下文的缓存中
+          set_selection(SelectionKey::PROJECT_NAME, project_name)
+
+          puts "使用 JPS 配置的项目名称: #{project_name}"
+          return project_name
+        end
+      rescue => e
+        puts "[PindoContext] 加载 JPSBuildConfig.json 失败: #{e.message}" if verbose?
+      end
+
+      nil
+    end
+
+    # 确认并应用缓存（供命令在 run 函数中调用）
+    # 返回值：true 表示使用缓存，false 表示不使用缓存
+    def confirm_and_apply_cache
+      return false unless @cache_enabled
+      return false unless @loaded_file_cache
+
+      # 如果已经确认过缓存，直接返回（避免嵌套调用时重复询问）
+      if @cache_confirmed
+        puts "[PindoContext] 缓存已确认，跳过重复询问" if verbose?
+        # 检查内存中是否已有缓存数据
+        project_path = get_project_path
+        root_command = @command_group || @current_command
+        return @memory_selections.dig(project_path, root_command) != nil
+      end
+
+      project_path = get_project_path
+      root_command = @command_group || @current_command
+
+      return false unless project_path && root_command
+
+      # 检查三级结构中是否有当前上下文的缓存
+      cached_selections = @loaded_file_cache.dig(project_path, root_command)
+
+      unless cached_selections && !cached_selections.empty?
+        puts "[PindoContext] 当前上下文没有缓存数据" if verbose?
+        return false
+      end
+
+      # 根据命令组显示更友好的描述
+      group_desc = case root_command
+                   when 'ios:autobuild'
+                     'iOS 构建'
+                   when 'and:autobuild', 'android:autobuild'
+                     'Android 构建'
+                   when 'web:autobuild'
+                     'Web 构建'
+                   else
+                     @current_command  # 其他命令显示原始命令名
+                   end
+
+      puts "\n检测到之前的选择 (#{group_desc}):"
+      puts "────────────────────────────────────────"
+
+      cached_selections.each do |key, value|
+        # 跳过内部字段
+        next if key.to_s.start_with?('__')
+
+        case key.to_s
+        when 'bundle_id'
+          puts "  Bundle ID: #{value}"
+        when 'project_name', 'app_key'  # 兼容旧的 app_key
+          puts "  项目名称: #{value}"
+        when 'tag_decision'
+          if value.is_a?(Hash)
+            action_desc = value['description'] || value['action']
+            puts "  Tag决定: #{action_desc}"
+          end
+        when 'cert_type'
+          puts "  证书类型: #{value}"
+        end
+      end
+      puts "────────────────────────────────────────"
+
+      # 检查是否设置了强制编译环境变量
+      force_build = ENV['PINDO_FORCE_BUILD']
+
+      confirm = false
+      if force_build && !force_build.empty?
+        # 环境变量存在，自动使用缓存
+        puts "\n检测到 PINDO_FORCE_BUILD 环境变量，自动使用缓存的选择"
+        confirm = true
+      else
+        # 询问用户是否使用缓存
+        require 'highline/import'
+        cli = HighLine.new
+        confirm = cli.agree("\n是否使用以上缓存的选择？ (y/n) ")
+      end
+
+      if confirm
+        puts "使用缓存的选择\n" unless force_build
+        # 恢复当前上下文的文件缓存到内存缓存
+        @memory_selections[project_path] ||= {}
+        @memory_selections[project_path][root_command] ||= {}
+        cached_selections.each do |key, value|
+          symbol_key = key.to_sym
+          @memory_selections[project_path][root_command][symbol_key] = symbolize_keys(value)
+        end
+        # 标记缓存已确认，避免嵌套调用时重复询问
+        @cache_confirmed = true
+        return true
+      else
+        puts "清除缓存，重新选择\n"
+        # 清除当前上下文的文件缓存（三级结构）
+        file_path = cache_file_path
+        if @loaded_file_cache[project_path] && @loaded_file_cache[project_path][root_command]
+          @loaded_file_cache[project_path].delete(root_command)
+          # 如果项目路径下没有任何命令缓存了，删除项目路径键
+          @loaded_file_cache.delete(project_path) if @loaded_file_cache[project_path].empty?
+          # 保存清理后的缓存到文件
+          save_file_cache
+        end
+        # 标记缓存已确认（用户选择不使用）
+        @cache_confirmed = true
+        return false
+      end
+    end
+
     # 调试信息
     def debug_info
       puts "\n=== PindoContext Debug Info ==="

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

@@ -66,6 +66,13 @@ module Pindo
 
         def run
           pindo_project_dir = Dir.pwd
+
+          # 加载 JPS 配置（如果存在）
+          context = Pindo::PindoContext.instance
+          context.load_and_apply_jps_config(pindo_project_dir)
+
+          # 确认并应用缓存（如果有）
+          context.confirm_and_apply_cache
           build_helper = Pindo::BuildHelper.share_instance
           project_type = build_helper.project_type(pindo_project_dir)
 
@@ -93,10 +100,8 @@ module Pindo
           pindo_project_dir = Dir.pwd
           
           app_info_obj = nil
-          if @args_upload_flag
-              proj_name = @args_proj_name
-              app_info_obj = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name:proj_name)
-          end
+          proj_name = @args_proj_name
+          app_info_obj = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name:proj_name)
 
           build_helper = Pindo::BuildHelper.share_instance
           if @args_upload_flag
@@ -107,8 +112,8 @@ module Pindo
           end
           
           scheme_name = @args_proj_name if @args_proj_name
-          if !app_info_obj.nil? && !app_info_obj["projectName"].nil? && !app_info_obj["projectName"].empty?
-              scheme_name = app_info_obj["projectName"]
+          if !app_info_obj.nil? && !app_info_obj["scheme"].nil? && !app_info_obj["scheme"].empty?
+              scheme_name = app_info_obj["scheme"]
           end
           if scheme_name.nil? || scheme_name.empty? && is_git_directory?(local_repo_dir:pindo_project_dir)
               current_git_root_path = git_root_directory(local_repo_dir: pindo_project_dir)
@@ -153,7 +158,7 @@ module Pindo
             apk_path = android_build_helper.auto_build_apk(pindo_project_dir, !@args_release_flag)
             ipa_file_upload = Dir.glob(apk_path).max_by {|f| File.mtime(f)}
 
-            if !ipa_file_upload.nil? && !app_info_obj.nil?
+            if !ipa_file_upload.nil? && !app_info_obj.nil?  && @args_upload_flag
                 description = nil
                 result_data = PgyerHelper.share_instace.start_upload(app_info_obj:app_info_obj, ipa_file_upload:ipa_file_upload, description:description)
                 if !result_data.nil? && !result_data["data"].nil? && !result_data["data"]["id"].nil?

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

@@ -88,6 +88,13 @@ module Pindo
                 def run
                     pindo_project_dir = Dir.pwd
 
+                    # 加载 JPS 配置（如果存在）
+                    context = Pindo::PindoContext.instance
+                    context.load_and_apply_jps_config(pindo_project_dir)
+
+                    # 确认并应用缓存（如果有）
+                    context.confirm_and_apply_cache
+
                     build_helper = Pindo::BuildHelper.share_instance
                     project_type = build_helper.project_type(pindo_project_dir)
 
@@ -139,10 +146,8 @@ module Pindo
                     end
 
                     app_info_obj = nil
-                    if @args_upload_flag 
-                        proj_name = @args_proj_name
-                        app_info_obj = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name:proj_name)
-                    end
+                    proj_name = @args_proj_name
+                    app_info_obj = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name:proj_name)
 
 
                     args_temp = []
@@ -153,8 +158,8 @@ module Pindo
                     config_json_file = File.join(pindo_project_dir,"config.json")
                     
                     scheme_name = @args_proj_name if @args_proj_name
-                    if !app_info_obj.nil? && !app_info_obj["projectName"].nil? && !app_info_obj["projectName"].empty?
-                        scheme_name = app_info_obj["projectName"]
+                    if !app_info_obj.nil? && !app_info_obj["scheme"].nil? && !app_info_obj["scheme"].empty?
+                        scheme_name = app_info_obj["scheme"]
                     end
                     if scheme_name.nil? || scheme_name.empty? && is_git_directory?(local_repo_dir:pindo_project_dir)
                         current_git_root_path = git_root_directory(local_repo_dir: pindo_project_dir)
@@ -246,7 +251,7 @@ module Pindo
                     build_path = File.join(pindo_project_dir, "build", "*.{ipa,app}")
                     ipa_file_upload = Dir.glob(build_path).max_by {|f| File.mtime(f)}
                     
-                    if !ipa_file_upload.nil? && !app_info_obj.nil? 
+                    if !ipa_file_upload.nil? && !app_info_obj.nil?  && @args_upload_flag
                         description = nil
                         result_data = PgyerHelper.share_instace.start_upload(app_info_obj:app_info_obj, ipa_file_upload:ipa_file_upload, description:description)
                         if !result_data.nil? && !result_data["data"].nil? && !result_data["data"]["id"].nil?

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

@@ -73,6 +73,13 @@ DESC
                 def run
                     pindo_project_dir = Dir.pwd
 
+                    # 加载 JPS 配置（如果存在）
+                    context = Pindo::PindoContext.instance
+                    context.load_and_apply_jps_config(pindo_project_dir)
+
+                    # 确认并应用缓存（如果有）
+                    context.confirm_and_apply_cache
+
                     # 检查是否是Unity工程
                     unity_helper = Pindo::Client::UnityHelper.share_instance
                     unless unity_helper.unity_project?(pindo_project_dir)
@@ -94,10 +101,8 @@ DESC
                     puts
 
                     app_info_obj = nil
-                    if @args_upload_flag
-                        proj_name = @args_proj_name
-                        app_info_obj = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name:proj_name)
-                    end
+                    proj_name = @args_proj_name
+                    app_info_obj = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name:proj_name)
 
                     isLibrary = @args_base_flag
 
@@ -110,14 +115,18 @@ DESC
                     if isLibrary
                         pindo_android_project_dir = android_export_lib_dir
                     end
-                    
+
+                    # 获取 apkCount 用于传递给 Unity 构建
+                    apk_count = app_info_obj&.dig("apkCount") || -1
+
                     puts "开始构建Unity项目..."
 
                     unity_helper.build_project(
                         unity_exe_full_path: unity_exe_path,
                         project_path: pindo_project_dir,
                         platform: 'Android',
-                        isLibrary: isLibrary
+                        isLibrary: isLibrary,
+                        indexNo: apk_count
                     )
 
                     puts "Unity项目构建完成，准备处理Android项目..."

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

@@ -91,13 +91,8 @@ DESC
                     puts "选择的Unity路径: #{unity_exe_path}"
                     puts
 
-
-                    app_info_obj = nil
-                    if @args_upload_flag 
-                        proj_name = @args_proj_name
-                        app_info_obj = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name:proj_name)
-                    end
-
+                    proj_name = @args_proj_name
+                    app_info_obj = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name:proj_name)
                     pindo_project_dir = Dir.pwd
 
                     ios_autobuild(unity_helper:unity_helper, unity_exe_path:unity_exe_path)
@@ -115,8 +110,12 @@ DESC
                     pindo_project_dir = Dir.pwd
 
                     web_export_dir = File.join(pindo_project_dir, "GoodPlatform/WebGL")
-                    unity_helper.build_project(unity_exe_full_path:unity_exe_path, project_path:pindo_project_dir, platform:'WebGL')
-                    
+
+                    # 获取 zipCount 用于传递给 Unity 构建
+                    zip_count = app_info_obj&.dig("zipCount") || -1
+
+                    unity_helper.build_project(unity_exe_full_path:unity_exe_path, project_path:pindo_project_dir, platform:'WebGL', indexNo:zip_count)
+
                     system "open #{pindo_project_dir}"
 
 
@@ -144,7 +143,11 @@ DESC
                     if isLibrary
                         pindo_ios_project_dir = ios_export_lib_dir
                     end
-                    unity_helper.build_project(unity_exe_full_path:unity_exe_path, project_path:pindo_project_dir, platform:'iOS', isLibrary:isLibrary)
+
+                    # 获取 ipaCount 用于传递给 Unity 构建
+                    ipa_count = app_info_obj&.dig("ipaCount") || -1
+
+                    unity_helper.build_project(unity_exe_full_path:unity_exe_path, project_path:pindo_project_dir, platform:'iOS', isLibrary:isLibrary, indexNo:ipa_count)
                     
                     
                     args_temp = []
@@ -175,14 +178,13 @@ DESC
                     if isLibrary
                         pindo_android_project_dir = android_export_lib_dir
                     end
+
+                    # 获取 apkCount 用于传递给 Unity 构建
+                    apk_count = app_info_obj&.dig("apkCount") || -1
+
                     puts "开始构建Unity项目..."
 
-                    unity_helper.build_project(
-                        unity_exe_full_path: unity_exe_path,
-                        project_path: pindo_project_dir,
-                        platform: 'Android',
-                        isLibrary: isLibrary
-                    )
+                    unity_helper.build_project(unity_exe_full_path: unity_exe_path, project_path: pindo_project_dir, platform: 'Android', isLibrary: isLibrary, indexNo: apk_count)
 
                     puts "Unity项目构建完成，准备处理Android项目..."
                     args_temp = []

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

@@ -90,9 +90,15 @@ DESC
                 
 
                 def run
-
                     pindo_project_dir = Dir.pwd
 
+                    # 加载 JPS 配置（如果存在）
+                    context = Pindo::PindoContext.instance
+                    context.load_and_apply_jps_config(pindo_project_dir)
+
+                    # 确认并应用缓存（如果有）
+                    context.confirm_and_apply_cache
+
                     # 检查是否是Unity工程
                     unity_helper = Pindo::Client::UnityHelper.share_instance
                     unless unity_helper.unity_project?(pindo_project_dir)
@@ -115,10 +121,8 @@ DESC
                     puts
 
                     app_info_obj = nil
-                    if @args_upload_flag 
-                        proj_name = @args_proj_name
-                        app_info_obj = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name:proj_name)
-                    end
+                    proj_name = @args_proj_name
+                    app_info_obj = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name:proj_name)
 
                     mainapp_bundleid= nil
                     if @args_bundle_id
@@ -142,8 +146,11 @@ DESC
                     if isLibrary
                         pindo_ios_project_dir = ios_export_lib_dir
                     end
-                    
-                    unity_helper.build_project(unity_exe_full_path:unity_exe_path, project_path:pindo_project_dir, platform:'iOS', isLibrary:isLibrary)
+
+                    # 获取 ipaCount 用于传递给 Unity 构建
+                    ipa_count = app_info_obj&.dig("ipaCount") || -1
+
+                    unity_helper.build_project(unity_exe_full_path:unity_exe_path, project_path:pindo_project_dir, platform:'iOS', isLibrary:isLibrary, indexNo:ipa_count)
                     
                     
                     args_temp = []

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

@@ -81,9 +81,15 @@ DESC
                 
 
                 def run
-
                     pindo_project_dir = Dir.pwd
 
+                    # 加载 JPS 配置（如果存在）
+                    context = Pindo::PindoContext.instance
+                    context.load_and_apply_jps_config(pindo_project_dir)
+
+                    # 确认并应用缓存（如果有）
+                    context.confirm_and_apply_cache
+
                     # 检查是否是Unity工程
                     unity_helper = Pindo::Client::UnityHelper.share_instance
                     unless unity_helper.unity_project?(pindo_project_dir)
@@ -106,10 +112,8 @@ DESC
                     puts
 
                     app_info_obj = nil
-                    if @args_upload_flag 
-                        proj_name = @args_proj_name
-                        app_info_obj = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name:proj_name)
-                    end
+                    proj_name = @args_proj_name
+                    app_info_obj = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name:proj_name)
 
                     mainapp_bundleid= nil
                     if @args_deploy_flag
@@ -129,7 +133,11 @@ DESC
                     if isLibrary
                         pindo_ios_project_dir = ios_export_lib_dir
                     end
-                    unity_helper.build_project(unity_exe_full_path:unity_exe_path, project_path:pindo_project_dir, platform:'iOS', isLibrary:isLibrary)
+
+                    # 获取 ipaCount 用于传递给 Unity 构建
+                    ipa_count = app_info_obj&.dig("ipaCount") || -1
+
+                    unity_helper.build_project(unity_exe_full_path:unity_exe_path, project_path:pindo_project_dir, platform:'iOS', isLibrary:isLibrary, indexNo:ipa_count)
                     
                     
                     args_temp = []

data/lib/pindo/command/unity.rb

@@ -2,6 +2,7 @@
 
 require 'pindo/command/unity/ipa'
 require 'pindo/command/unity/apk'
+require 'pindo/command/unity/web'
 require 'pindo/command/unity/autobuild'
 require 'pindo/command/unity/initpack'
 require 'pindo/command/unity/pack'

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

@@ -90,6 +90,13 @@ module Pindo
                 def run
                     pindo_project_dir = Dir.pwd
 
+                    # 加载 JPS 配置（如果存在）
+                    context = Pindo::PindoContext.instance
+                    context.load_and_apply_jps_config(pindo_project_dir)
+
+                    # 确认并应用缓存（如果有）
+                    context.confirm_and_apply_cache
+
                     build_helper = Pindo::BuildHelper.share_instance
                     project_type = build_helper.project_type(pindo_project_dir)
 
@@ -130,13 +137,15 @@ module Pindo
                     puts
 
                     app_info_obj = nil
-                    if @args_upload_flag 
-                        proj_name = @args_proj_name
-                        app_info_obj = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name:proj_name)
-                    end
+                    proj_name = @args_proj_name
+                    app_info_obj = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name:proj_name)
 
                     web_export_dir = File.join(pindo_project_dir, "GoodPlatform/WebGL")
-                    unity_helper.build_project(unity_exe_full_path:unity_exe_path, project_path:pindo_project_dir, platform:'WebGL')
+
+                    # 获取 zipCount 用于传递给 Unity 构建
+                    zip_count = app_info_obj&.dig("zipCount") || -1
+
+                    unity_helper.build_project(unity_exe_full_path:unity_exe_path, project_path:pindo_project_dir, platform:'WebGL', indexNo:zip_count)
                     
                     build_path = File.join(web_export_dir, "build", "index.{html}")
                     html_file_upload = Dir.glob(build_path).max_by {|f| File.mtime(f)}
@@ -144,7 +153,7 @@ module Pindo
                     # puts "html_file_upload: #{html_file_upload}"
                     # puts "app_info_obj: #{app_info_obj}"
 
-                    if !html_file_upload.nil? && !app_info_obj.nil? 
+                    if !html_file_upload.nil? && !app_info_obj.nil? && @args_upload_flag
                         description = nil
                         result_data = PgyerHelper.share_instace.start_upload(app_info_obj:app_info_obj, ipa_file_upload:html_file_upload, description:description)
                         if !result_data.nil? && !result_data["data"].nil? && !result_data["data"]["id"].nil?

data/lib/pindo/module/build/unityhelper.rb

@@ -458,7 +458,7 @@ module Pindo
         nil
       end
 
-      def build_project(unity_exe_full_path:nil, project_path:nil, platform: nil, isLibrary: false)
+      def build_project(unity_exe_full_path:nil, project_path:nil, platform: nil, isLibrary: false, indexNo: nil)
 
         # 检查是否有Unity进程在运行，传入Unity路径和项目路径以精确匹配
         check_unity_processes(unity_exe_full_path: unity_exe_full_path, project_path: project_path)
@@ -469,6 +469,7 @@ module Pindo
         additional_args = {}
         additional_args[:platform] = platform if platform
         additional_args[:buildtype] = 'library' if isLibrary
+        additional_args[:indexno] = indexNo if indexNo
 
         # 使用GoodUnityBuild.BuildManager.BatchBuild进行构建
         result = execute_unity_command(unity_exe_full_path, project_path, additional_args)

data/lib/pindo/module/pgyer/pgyerhelper.rb

@@ -136,6 +136,8 @@ module Pindo
                         upload_proj_name = cached_app_key
                         # 直接使用缓存的选择，跳过后续选择逻辑
                     end
+
+                    
                 end
 
                 # 只有在没有缓存或缓存无效，且没有环境变量时才显示选择菜单
@@ -175,6 +177,9 @@ module Pindo
                 else
                     # 记录上次上传的项目
                     PindoUserLocalConfig.instance.write_last_work_project(proj_name:app_info_obj["projectName"])
+
+                    # 保存项目信息到 JPSBuildConfig.json
+                    save_jps_build_config(working_directory: working_directory, app_info_obj: app_info_obj)
                 end
 
 
@@ -861,6 +866,80 @@ module Pindo
             end
 
         end
+
+        private
+
+        # 保存项目信息到 JPSBuildConfig.json
+        # Unity 工程：保存到仓库根目录的 ProjectSettings/JPSBuildConfig.json
+        # 其他工程：保存到仓库根目录的 JPSBuildConfig.json
+        def save_jps_build_config(working_directory: nil, app_info_obj: nil)
+            return if working_directory.nil? || app_info_obj.nil?
+
+            # 获取 Git 仓库根目录
+            repo_root_dir = nil
+            if is_git_directory?(local_repo_dir: working_directory)
+                repo_root_dir = git_root_directory(local_repo_dir: working_directory)
+            end
+
+            # 如果不是 Git 仓库，使用 working_directory
+            repo_root_dir ||= working_directory
+
+            # 判断工程类型并确定配置文件路径
+            # Unity 工程：仓库根目录/ProjectSettings/JPSBuildConfig.json
+            # iOS/Android 工程：仓库根目录/JPSBuildConfig.json
+            config_file = nil
+            project_type = nil
+
+            # 检查是否是 Unity 工程（仓库根目录存在 ProjectSettings 目录）
+            if File.directory?(File.join(repo_root_dir, 'ProjectSettings'))
+                config_file = File.join(repo_root_dir, 'ProjectSettings', 'JPSBuildConfig.json')
+                project_type = 'Unity'
+            else
+                # iOS/Android 工程，保存到仓库根目录
+                config_file = File.join(repo_root_dir, 'JPSBuildConfig.json')
+                project_type = 'iOS/Android'
+            end
+
+            # 准备要保存的数据
+            new_config = {
+                "project_name" => app_info_obj["projectName"],
+                "project_scheme" => app_info_obj["scheme"] || app_info_obj["projectName"].to_s.downcase.strip.gsub(/[\s\-_]/, ''),
+                "project_id" => app_info_obj["id"]
+            }
+
+            # 检查文件是否已存在
+            if File.exist?(config_file)
+                begin
+                    # 读取现有配置
+                    existing_content = File.read(config_file)
+                    existing_config = JSON.parse(existing_content)
+
+                    # 如果 project_name 一样，则不需要重新保存
+                    if existing_config['project_name'] == new_config['project_name']
+                        puts "[PgyerHelper] JPSBuildConfig.json 项目名称未变化，跳过保存 (#{project_type})" if ENV['DEBUG']
+                        return
+                    end
+                rescue => e
+                    puts "[PgyerHelper] 读取现有 JPSBuildConfig.json 失败: #{e.message}" if ENV['DEBUG']
+                    # 继续保存新配置
+                end
+            else
+                # 文件不存在，需要创建目录（如果是 Unity 工程）
+                if project_type == 'Unity'
+                    project_settings_dir = File.join(working_directory, 'ProjectSettings')
+                    FileUtils.mkdir_p(project_settings_dir) unless File.directory?(project_settings_dir)
+                end
+            end
+
+            # 保存配置到文件
+            begin
+                File.write(config_file, JSON.pretty_generate(new_config))
+                puts "[PgyerHelper] 已保存项目信息到 JPSBuildConfig.json (#{project_type})" if ENV['DEBUG']
+                puts "项目信息已保存: #{new_config['project_name']}"
+            rescue => e
+                puts "[PgyerHelper] 保存 JPSBuildConfig.json 失败: #{e.message}"
+            end
+        end
     end
 
 end

data/lib/pindo/module/unity/nugethelper.rb

@@ -599,7 +599,8 @@ module Pindo
           metadata.add_child(new_node)
         end
 
-        File.write(nuspec_file, doc.to_xml)
+        # 使用 save_with 选项来保持 UTF-8 编码,不转义非 ASCII 字符
+        File.write(nuspec_file, doc.to_xml(encoding: 'UTF-8', save_with: Nokogiri::XML::Node::SaveOptions::NO_DECLARATION | Nokogiri::XML::Node::SaveOptions::AS_XML))
       end
 
     end

data/lib/pindo/version.rb

@@ -6,7 +6,7 @@ require 'time'
 
 module Pindo
 
-  VERSION = "5.6.3"
+  VERSION = "5.6.5"
 
   class VersionCheck
     RUBYGEMS_API = 'https://rubygems.org/api/v1/gems/pindo.json'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: pindo
 version: !ruby/object:Gem::Version
-  version: 5.6.3
+  version: 5.6.5
 platform: ruby
 authors:
 - wade
 bindir: bin
 cert_chain: []
-date: 2025-10-10 00:00:00.000000000 Z
+date: 2025-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide