diff --git a/FindObjectBundleBuilder/Tools/build_package/build_package.py b/FindObjectBundleBuilder/Tools/build_package/build_package.py index e238737..66a3db2 100644 --- a/FindObjectBundleBuilder/Tools/build_package/build_package.py +++ b/FindObjectBundleBuilder/Tools/build_package/build_package.py @@ -246,7 +246,7 @@ if __name__ == '__main__': opts.resversion = "1" opts.buildtype = "BuildBundle" opts.unityexe = "/Applications/Unity/Hub/Editor/2021.3.45f1/Unity.app/Contents/MacOS/Unity" - opts.upload = "false" + opts.upload = "true" opts.log = "log/build.log" opts.assets = "/Volumes/Predator/find-object/find-object-art" opts.resources = "/Volumes/Predator/find-object/find-object-bundle-resource" @@ -322,6 +322,7 @@ if __name__ == '__main__': # if opts.special != "0": # modify_files = opts.special.split(",") # else: + #暂时不用这个方案 # 获取最近6小时内的提交记录,用于解析psd # platform = "android" if opts.platform == "Android" else "ios" # with open(os.path.join(opts.assets, f"git_{platform}_commit_change_files.txt"), "r") as f: @@ -335,7 +336,7 @@ if __name__ == '__main__': # if asset_id not in modify_files: # modify_files.append(asset_id) - #获取git 提交来得到修改的关卡 + #获取git 提交来得到修改的关卡 generateLevelIdListByGitLog() if len(_levelModifiedIdList_) <= 0: config.notification_helper.append_msg('没有需要构建的资源') @@ -435,6 +436,7 @@ if __name__ == '__main__': config.notification_helper.append_msg(f"上传{len(modify_files)}个资源到firebase耗时:{(tmUploadPackage2 - tmUploadPackage1):.0f}s") # 遍历ab包,生成所有关卡表 tmUpdateSheet1 = time.time() + config_gen.update_all_levels_google_sheet(opts.platform) tmUpdateSheet2 = time.time() config.notification_helper.append_msg(f"{opts.platform}平台所有资源表更新完成!") diff --git a/FindObjectBundleBuilder/Tools/google_drive/google_sheet.py b/FindObjectBundleBuilder/Tools/google_drive/google_sheet.py index 45c168d..27de029 100644 --- a/FindObjectBundleBuilder/Tools/google_drive/google_sheet.py +++ b/FindObjectBundleBuilder/Tools/google_drive/google_sheet.py @@ -92,8 +92,8 @@ class GoogleSheetHelper: if __name__ == '__main__': sheet_helper = GoogleSheetHelper() - sheet: Worksheet = sheet_helper.get_sheet_table("关卡资源表(包含未测试完成)", "AllLevels") - # sheet: Worksheet = sheet_helper.get_sheet_table("FindIt.Level.Config", "Test") - # sheet = sheet_helper.get_sheet_table("FindIt.Level.Config", "Test") + # sheet: Worksheet = sheet_helper.get_sheet_table("find_object全关卡资源表", "iOS-AllLevels") + # sheet: Worksheet = sheet_helper.get_sheet_table("find_object验收通过关卡资源表", "main") + # sheet = sheet_helper.get_sheet_table("FindObject.Level.Config", "main资源表") # value_dict = sheet.get_all_values() # print(str(value_dict)) \ No newline at end of file