pyscreeps-arena 0.5.7.6__tar.gz → 0.5.9b1__tar.gz

{pyscreeps_arena-0.5.7.6 → pyscreeps_arena-0.5.9b1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyscreeps-arena
-Version: 0.5.7.6
+Version: 0.5.9b1
 Summary: Python api|interface to play game: Screeps: Arena.
 Author-email: 2229066748@qq.com
 Maintainer: Eagle'sBaby

pyscreeps_arena-0.5.9b1/pyscreeps_arena/afters/__init__.py

@@ -0,0 +1,6 @@
+from pyscreeps_arena.afters.after_empty import ToEmptyAfter
+from pyscreeps_arena.afters.after_prefab import ToPrefabAfter
+from pyscreeps_arena.afters.after_custom import ToCustomAfter
+from pyscreeps_arena.afters.after_config import ToConfigAfter
+
+

pyscreeps_arena-0.5.9b1/pyscreeps_arena/afters/after_config.py

@@ -0,0 +1,84 @@
+import os
+import re
+import sys
+
+def ToConfigAfter(path='.', language='cn', arena='gray', level='basic'):
+    # 验证参数是否在范围内
+    valid_languages = ['cn', 'en']
+    valid_arenas = ['green', 'blue', 'red', 'gray']
+    valid_levels = ['basic', 'advanced']
+
+    if language not in valid_languages:
+        print(f"错误: language 参数必须是 {valid_languages} 中的一个")
+        return False
+
+    if arena not in valid_arenas:
+        print(f"错误: arena 参数必须是 {valid_arenas} 中的一个")
+        return False
+
+    if level not in valid_levels:
+        print(f"错误: level 参数必须是 {valid_levels} 中的一个")
+        return False
+
+    # 检查 build.py 文件是否存在
+    build_py_path = os.path.join(path, 'build.py')
+    if not os.path.exists(build_py_path):
+        print("build.py 文件不存在，跳过修改操作")
+        return False
+
+    # 读取文件内容
+    with open(build_py_path, 'r', encoding='utf-8') as f:
+        content = f.read()
+
+    # 使用正则表达式替换配置语句
+    # 替换 language 配置
+    content = re.sub(
+        r'config\.language\s*=\s*[\'"]([^\'"]*)[\'"]\s*#\s*\'en\'\s+or\s+\'cn\'',
+        f"config.language = '{language}'  # 'en' or 'cn'",
+        content
+    )
+
+    # 替换 arena 配置
+    content = re.sub(
+        r'config\.arena\s*=\s*[\'"]([^\'"]*)[\'"]\s*#\s*\'green\',\s*\'blue\',\s*\'red\',\s*\'gray\'',
+        f"config.arena = '{arena}'   # 'green', 'blue', 'red', 'gray'",
+        content
+    )
+
+    # 替换 level 配置
+    content = re.sub(
+        r'config\.level\s*=\s*[\'"]([^\'"]*)[\'"]\s*#\s*\'basic\',\s*\'advanced\'',
+        f"config.level = '{level}'   # 'basic', 'advanced'",
+        content
+    )
+
+    # 写回文件
+    with open(build_py_path, 'w', encoding='utf-8') as f:
+        f.write(content)
+
+    print(f"已更新 build.py 配置:")
+    print(f"  language = {language}")
+    print(f"  arena = {arena}")
+    print(f"  level = {level}")
+    return True
+
+if __name__ == "__main__":
+    # 解析命令行参数
+    # 默认值
+    path = '.'
+    language = 'cn'
+    arena = 'gray'
+    level = 'basic'
+
+    # 处理命令行参数
+    if len(sys.argv) > 1:
+        path = sys.argv[1]
+    if len(sys.argv) > 2:
+        language = sys.argv[2]
+    if len(sys.argv) > 3:
+        arena = sys.argv[3]
+    if len(sys.argv) > 4:
+        level = sys.argv[4]
+
+    # 执行更新
+    ToConfigAfter(path, language, arena, level)

pyscreeps_arena-0.5.9b1/pyscreeps_arena/afters/after_custom.py

@@ -0,0 +1,87 @@
+import os
+import re
+
+
+def ToCustomAfter(path='.'):
+    # 检查 prefab 目录是否存在
+    prefab_dir = os.path.join(path, 'src', 'prefab')
+    if not os.path.exists(prefab_dir):
+        print("src/prefab 目录不存在，跳过处理")
+        return
+
+    # 创建 src/custom 目录
+    custom_dir = os.path.join(path, 'src', 'custom')
+    if not os.path.exists(custom_dir):
+        os.makedirs(custom_dir)
+        print("已创建 src/custom 目录")
+    else:
+        print("src/custom 目录已存在，跳过创建操作")
+
+    # 遍历 prefab 目录中的非 _ 开头的 .py 文件
+    for file_name in os.listdir(prefab_dir):
+        if file_name.startswith('_') or not file_name.endswith('.py'):
+            continue
+
+        file_path = os.path.join(prefab_dir, file_name)
+        print(f"处理文件: {file_path}")
+
+        # 读取文件内容
+        with open(file_path, 'r', encoding='utf-8') as f:
+            content = f.read()
+
+        # 检查是否存在 """$TEMPLATE...""" 的内容
+        template_match = re.search(r'"""(\$TEMPLATE.*?)"""', content, re.DOTALL)
+        if template_match:
+            template_content = template_match.group(1)
+            # 移除开头的 $TEMPLATE 标记
+            template_content = re.sub(r'^\s*\$TEMPLATE\s*', '', template_content)
+
+            # 在 custom 目录下创建同名文件
+            custom_file_path = os.path.join(custom_dir, file_name)
+            with open(custom_file_path, 'w', encoding='utf-8') as f:
+                f.write(template_content)
+            print(f"已在 custom 目录下创建 {file_name} 文件")
+        else:
+            print(f"{file_name} 中未找到模板内容，跳过")
+
+    # 检查并修改 src/main.py 文件，在导入语句末尾添加 from custom import *
+    main_py_path = os.path.join(path, 'src', 'main.py')
+    if not os.path.exists(main_py_path):
+        print("src/main.py 文件不存在，跳过导入语句添加操作")
+        return
+
+    # 读取文件内容
+    with open(main_py_path, 'r') as f:
+        lines = f.readlines()
+
+    # 检查是否存在 from custom import * 语句
+    has_custom_import = False
+    import_end_line = 0
+
+    for i, line in enumerate(lines):
+        if re.search(r'from\s+custom\s+import\s+\*', line):
+            has_custom_import = True
+            break
+        # 检查是否为导入语句
+        if re.match(r'^(from|import)\s+', line.strip()):
+            import_end_line = i + 1  # 记录导入语句的结束位置（下一行）
+
+    if not has_custom_import:
+        # 在导入语句的末尾插入 from custom import * 语句
+        if import_end_line > 0:
+            # 在导入语句末尾插入
+            lines.insert(import_end_line, '\nfrom custom import *\n')
+        else:
+            # 如果没有导入语句，在文件开头插入
+            lines.insert(0, 'from custom import *\n')
+
+        # 写回文件
+        with open(main_py_path, 'w') as f:
+            f.writelines(lines)
+        print("已在 src/main.py 中导入语句末尾追加 from custom import * 语句")
+    else:
+        print("src/main.py 中已存在 from custom import * 语句，跳过添加操作")
+
+
+if __name__ == "__main__":
+    ToCustomAfter('.')

pyscreeps_arena-0.5.9b1/pyscreeps_arena/afters/after_empty.py

@@ -0,0 +1,34 @@
+import os
+import re
+
+def ToEmptyAfter(path='.'):
+    # 删除 src/basic.py 文件
+    basic_path = os.path.join(path, 'src', 'basic.py')
+    if os.path.exists(basic_path):
+        os.remove(basic_path)
+        print("已删除 src/basic.py")
+    else:
+        print("src/basic.py 不存在，跳过删除操作")
+
+    # 修改 src/main.py 文件，将 from basic import * 改为 from builtin import *
+    main_path = os.path.join(path, 'src', 'main.py')
+    if os.path.exists(main_path):
+        with open(main_path, 'r') as f:
+            content = f.read()
+
+        # 使用正则表达式替换，处理各种可能的空白字符
+        modified_content = re.sub(r'from\s+basic\s+import\s+\*', 'from builtin import *', content)
+
+        # 检查是否发生了替换
+        if modified_content != content:
+            with open(main_path, 'w') as f:
+                f.write(modified_content)
+            print("已修改 src/main.py，将 from basic import * 改为 from builtin import *")
+        else:
+            print("src/main.py 中未找到 from basic import * 语句，跳过修改操作")
+    else:
+        print("src/main.py 不存在，跳过修改操作")
+
+if __name__ == "__main__":
+    ToEmptyAfter('.')
+    

pyscreeps_arena-0.5.9b1/pyscreeps_arena/afters/after_prefab.py

@@ -0,0 +1,67 @@
+import os
+import shutil
+import re
+
+def ToPrefabAfter(path='.'):
+    # 检查 docs/prefab 目录是否存在
+    source_dir = os.path.join(path, 'docs', 'prefab')
+    if not os.path.exists(source_dir):
+        print("docs/prefab 目录不存在，跳过移动操作")
+        return
+
+    # 检查 src 目录是否存在
+    src_dir = os.path.join(path, 'src')
+    if not os.path.exists(src_dir):
+        os.makedirs(src_dir)
+        print("已创建 src 目录")
+
+    # 移动 docs/prefab 到 src/prefab
+    dest_dir = os.path.join(src_dir, 'prefab')
+    if os.path.exists(dest_dir):
+        # 如果目标目录已存在，先删除
+        shutil.rmtree(dest_dir)
+        print("已删除现有 src/prefab 目录")
+
+    shutil.move(source_dir, dest_dir)
+    print("已将 docs/prefab 移动到 src/prefab")
+
+    # 检查并修改 src/main.py 文件
+    main_py_path = os.path.join(src_dir, 'main.py')
+    if not os.path.exists(main_py_path):
+        print("src/main.py 文件不存在，跳过导入语句添加操作")
+        return
+
+    # 读取文件内容
+    with open(main_py_path, 'r') as f:
+        lines = f.readlines()
+
+    # 检查是否存在 from prefab import * 语句
+    has_prefab_import = False
+    import_end_line = 0
+
+    for i, line in enumerate(lines):
+        if re.search(r'from\s+prefab\s+import\s+\*', line):
+            has_prefab_import = True
+            break
+        # 检查是否为导入语句
+        if re.match(r'^(from|import)\s+', line.strip()):
+            import_end_line = i + 1  # 记录导入语句的结束位置（下一行）
+
+    if not has_prefab_import:
+        # 在导入语句的末尾插入 from prefab import * 语句
+        if import_end_line > 0:
+            # 在导入语句末尾插入
+            lines.insert(import_end_line, 'from prefab import *\n')
+        else:
+            # 如果没有导入语句，在文件开头插入
+            lines.insert(0, 'from prefab import *\n')
+        
+        # 写回文件
+        with open(main_py_path, 'w') as f:
+            f.writelines(lines)
+        print("已在 src/main.py 中导入语句末尾追加 from prefab import * 语句")
+    else:
+        print("src/main.py 中已存在 from prefab import * 语句，跳过添加操作")
+
+if __name__ == "__main__":
+    ToPrefabAfter('.')

{pyscreeps_arena-0.5.7.6 → pyscreeps_arena-0.5.9b1}/pyscreeps_arena/compiler.py

@@ -8,6 +8,7 @@ import shutil
 import chardet
 import subprocess
 import pyperclip
+import datetime
 from colorama import Fore
 from typing import List, Optional, Tuple, Union
 
@@ -17,6 +18,10 @@ python_version_info = sys.version_info
 python_version_info = f"{python_version_info.major}.{python_version_info.minor}.{python_version_info.micro}"
 
 
+class MatchCaseError(Exception):
+    pass
+
+
 def replace_src_prefix(file_list):
     """
     将列表中以'./src.'开头的字符串替换为'./'
@@ -28,16 +33,17 @@ def replace_src_prefix(file_list):
         替换后的新列表
     """
     _ = []
-    
+
     for item in file_list:
         if isinstance(item, str) and item.startswith('./src.'):
             _new = item.replace('./src.', './', 1)
             if _new in file_list:
                 continue
         _.append(item)
-    
+
     return _
 
+
 # def InsertPragmaBefore(content:str) -> str:
 #     """
 #     在content的开头插入__pragma__('noalias', 'undefined')等内容 |
@@ -110,7 +116,7 @@ export var loop = function () {
 	if (get._SCH_FLAG) sch.handle();
 	stepCost = get.cpu_us() - timeLine;
 	std.show_usage ();
-	print("knowCost:", knowCost, "monitorCost:", monitorCost, "stepCost:", stepCost);
+    print("knowCost:", knowCost, "monitorCost:", monitorCost, "stepCost:", stepCost);
 	if (know.draw) know.draw();
 };
     """
@@ -160,8 +166,8 @@ class GameConstructionBoost{{
 }};
 import {{ Portal as GamePortal}} from 'arena/season_{config.season}/{const.ARENA_GREEN}/{"advanced" if config.level in ["advance", "advanced"] else "basic"}/prototypes';
         """,
-# import {Portal} from 'arena/season_1/portal_exploration/basic/prototypes';
-        
+        # import {Portal} from 'arena/season_1/portal_exploration/basic/prototypes';
+
         const.ARENA_BLUE: lambda: f"""
 const ARENA_COLOR_TYPE = "BLUE";
 const GameScoreCollector = GameStructureSpawn;
@@ -415,8 +421,7 @@ class Compiler_Utils(Compiler_Const):
                             py_files.append(item)
                         elif os.path.isdir(_path):
                             rel = os.path.relpath(final_dir_path, project_path)
-                            core.warn(f'Compiler.expand_folder_imports', core.lformat(LOC_DIR_UNDER_NONINIT_DIR, [item, rel]), end='', head='\n', ln=config.language )
-                            
+                            core.warn(f'Compiler.expand_folder_imports', core.lformat(LOC_DIR_UNDER_NONINIT_DIR, [item, rel]), end='', head='\n', ln=config.language)
 
                     # 为每个 .py 文件生成导入语句
                     if py_files:
@@ -436,7 +441,6 @@ class Compiler_Utils(Compiler_Const):
             with open(fpath, 'w', encoding='utf-8') as f:
                 f.write(new_content)
 
-
     def find_chain_import(self, fpath: str, search_dirs: list[str], project_path: str = None, records: dict[str, None] = None) -> list[str]:
         r"""
         查找文件中的所有import语句，并返回所有import的文件路径 | find all import statements in a file and return the paths of all imported files
@@ -572,13 +576,13 @@ class Compiler_Utils(Compiler_Const):
         return imps
 
     @staticmethod
-    def relist_pyimports_to_jsimports(base_dir:str, pyimps:list[str]) -> list[str]:
+    def relist_pyimports_to_jsimports(base_dir: str, pyimps: list[str]) -> list[str]:
         """
         将python的imports路径列表转换为js的imports路径列表 | convert a list of python imports paths to a list of js imports paths
         """
         jsimps = []
         for pyimp in pyimps:
-            rel_path_nodes:list[str] = os.path.relpath(pyimp, base_dir).replace('\\', '/').split('/')
+            rel_path_nodes: list[str] = os.path.relpath(pyimp, base_dir).replace('\\', '/').split('/')
             if rel_path_nodes[-1] == '__init__.py':
                 rel_path_nodes.pop()
             else:
@@ -644,7 +648,83 @@ class Compiler_Utils(Compiler_Const):
             result = '\n'.join(calls_to_add) + '\n' + result
 
         return result
-    
+
+    @staticmethod
+    def stage_called_replace(caller_name: str, content: str) -> str:
+        """
+        移除 '@<caller_name>(...)' 装饰器行，并在文末添加对应的 _<caller_name>Login 调用。
+
+        对于类方法: _<caller_name>Login("ClassName", "method_name", a, b, ...)
+        对于普通函数: _<caller_name>Login("", "function_name", a, b, ...)
+        """
+        calls_to_add = []
+        deletions = []
+
+        # 1. 收集所有类定义的位置和缩进
+        class_pattern = re.compile(r'^(\s*)class\s+(\w+)', re.MULTILINE)
+        classes = [(m.start(), len(m.group(1)), m.group(2))
+                   for m in class_pattern.finditer(content)]
+
+        # 2. 查找所有 @<caller_name>(...) 装饰器（支持多行参数）
+        decorator_pattern = re.compile(
+            r'^\s*@\s*' + re.escape(caller_name) + r'\s*\((.*?)\)\s*$\n?', 
+            re.MULTILINE | re.DOTALL
+        )
+
+        for dec_match in decorator_pattern.finditer(content):
+            dec_start = dec_match.start()
+            dec_end = dec_match.end()
+            # 提取装饰器的参数
+            params_str = dec_match.group(1).strip()
+
+            # 查找接下来的函数定义（跳过可能的空行）
+            after_decorator = content[dec_end:]
+            func_match = re.search(r'^(\s*)def\s+([^\s\(]+)', after_decorator, re.MULTILINE)
+
+            if not func_match:
+                continue
+
+            func_indent_len = len(func_match.group(1))
+            func_name = func_match.group(2)
+
+            # 3. 确定类名：查找装饰器前最近的、缩进小于函数缩进的类
+            class_name = ""
+            for cls_pos, cls_indent_len, cls_name in reversed(classes):
+                if cls_pos < dec_match.start() and func_indent_len > cls_indent_len:
+                    class_name = cls_name
+                    break
+
+            # 4. 处理参数，保持参数的格式
+            # 移除参数中的换行和多余空格，保持参数列表的格式
+            params = []
+            if params_str:
+                # 简单处理参数，保持引号内的内容不变
+                # 这里可以根据需要进行更复杂的参数解析
+                params = [p.strip() for p in params_str.split(',') if p.strip()]
+
+            # 构建参数部分的字符串
+            params_part = ""
+            if params:
+                params_part = ", " + ", ".join(params)
+
+            # 5. 记录删除位置和调用信息
+            deletions.append((dec_start, dec_end))
+            calls_to_add.append(f'_{caller_name}Login("{class_name}", "{func_name}"{params_part})')
+
+        # 6. 应用删除（倒序避免位置偏移）
+        if not deletions:
+            return content
+
+        result = content
+        for start, end in sorted(deletions, key=lambda x: x[0], reverse=True):
+            result = result[:start] + result[end:]
+
+        # 7. 在文末添加调用
+        if calls_to_add:
+            result = '\n'.join(calls_to_add) + '\n' + result
+
+        return result
+
     @staticmethod
     def process_mate_code(code):
         # 用于存储匹配到的信息
@@ -678,12 +758,11 @@ class Compiler_Utils(Compiler_Const):
         for variable_name, class_name in mate_assignments:
             output_string = f"# > insert Object.defineProperty ({class_name}, '{variable_name}', property.call ({class_name}, {class_name}.{variable_name}._MateGet_, {class_name}.{variable_name}._MateSet_));"
             output_strings.append(output_string)
-        
-        return code + '\n'.join(output_strings)
 
+        return code + '\n'.join(output_strings)
 
     @staticmethod
-    def remove_long_docstring(content:str) -> str:
+    def remove_long_docstring(content: str) -> str:
         """
         移除长注释 | remove long docstring
         """
@@ -1075,14 +1154,16 @@ class Compiler(CompilerBase):
             with open(fpath, 'w', encoding='utf-8') as f:
                 f.write(new_content)
 
-        # ------------------------------------ 自定义:调用stage_recursive_replace ------------------------------------ #
+        # ------------------------------------ 自定义:调用stage_recursive_replace和stage_called_replace ------------------------------------ #
         for fpath in py_fpath:
             content = self.auto_read(fpath)
             content = self.stage_recursive_replace(content)  # 调用stage_recursive_replace
+            # 调用stage_called_replace处理四个装饰器
+            for caller in ['behavior', 'sequence', 'selector', 'parallel']:
+                content = self.stage_called_replace(caller, content)
             with open(fpath, 'w', encoding='utf-8') as f:
                 f.write(content)
 
-
         core.lprint(GREEN.format('[2/6]'), LOC_DONE, " ", LOC_PREPROCESSING_FINISH, sep="", head="\r", ln=config.language)
         return _imports, _js_imports, _pre_sort_, _pre_define_, _js_replace_
 
@@ -1153,7 +1234,7 @@ class Compiler(CompilerBase):
 
         content = self.auto_read(self.target_js)
         if modules is None: modules = []
-        new_modules, new_content = [],""
+        new_modules, new_content = [], ""
         for line in content.split('\n'):
             m = re.search(self.JS_IMPORT_PAT, line)
             if not m:
@@ -1199,7 +1280,7 @@ class Compiler(CompilerBase):
         """
         return re.sub(r'import[^\n]*\n', '', raw)
 
-    def generate_total_js(self, usr_modules, t_imps: list[str], f_sorts, f_replaces, g_replaces) -> str:
+    def generate_total_js(self, usr_modules, t_imps: list[str], f_sorts, f_replaces, g_replaces, min_js_files=None) -> str:
         """
         生成总的main.js
         按照如下顺序组合:
@@ -1213,12 +1294,30 @@ class Compiler(CompilerBase):
         :param f_sorts: dict{module_name: sort_priority}
         :param f_replaces: dict{module_name: dict{old: new}}
         :param g_replaces: dict{old: new}
+        :param min_js_files: list[str]  # .min.js文件路径列表
         :return: str
         """
-        arena_name = const.ARENA_NAMES.get(config.arena, const.ARENA_NAMES['green'])  # like green -> spawn_and_swamp
+        arena_name = const.ARENA_NAMES.get(config.arena, const.ARENA_NAMES["green"])  # like green -> spawn_and_swamp
         self.TOTAL_INSERT_AT_HEAD += self.ARENA_IMPORTS_GETTER[arena_name]()  # add arena imports
-        total_js = f"const __VERSION__ = '{const.VERSION}';\nconst __PYTHON_VERSION__ = '{python_version_info}';" + self.TOTAL_INSERT_AT_HEAD + f"\nexport var LANGUAGE = '{config.language}';\n"
-        total_js += f"const __AUTHOR__ = '{const.AUTHOR}';\nconst __AUTHOR_CN__ = '{const.BILIBILI_NAME}';"
+        current_time = datetime.datetime.now()
+        timestamp_ms = int(current_time.timestamp() * 1000)
+        timestring = current_time.strftime("%Y-%m-%d %H:%M")
+
+        total_js = f"""const __VERSION__ = '{const.VERSION}';
+const __PYTHON_VERSION__ = '{python_version_info}';""" + self.TOTAL_INSERT_AT_HEAD + f"""
+export var LANGUAGE = '{config.language}';
+"""
+
+        total_js += f"export var TIMESTAMP = {timestamp_ms};\n"
+        total_js += f"export var TIMESTRING = '{timestring}';\n"
+        total_js += f"""const __AUTHOR__ = '{const.AUTHOR}';
+const __AUTHOR_CN__ = '{const.BILIBILI_NAME}';"""
+
+        if min_js_files:
+            for min_js_path in min_js_files:
+                min_js_filename = os.path.basename(min_js_path)
+                total_js += f"\nimport \"./{min_js_filename}\";"
+            total_js += "\n"
 
         core.lprint(WAIT, LOC_GENERATING_TOTAL_MAIN_JS, end="", ln=config.language)
 
@@ -1285,19 +1384,29 @@ class Compiler(CompilerBase):
     def find_add_pure_js_files(self, sorts, modules):
         """
         找到所有的纯js文件，并添加到modules中
+        忽略.min.js文件，这些文件会被单独处理
         :param sorts:
         :param modules:
-        :return:
+        :return: list 返回所有.min.js文件的列表
         """
+        min_js_files = []
         for root, dirs, files in os.walk(self.lib_dir):
             for file in files:
                 if file.endswith('.js') and file not in modules:
-                    fpath = str(os.path.join(root, file))
-                    fname = file.replace('\\', '/')
-                    # copy file to target
-                    shutil.copy(fpath, os.path.join(self.target_dir, fname))
-                    sorts[fname] = self.__parse_js_file_sort(fpath)
-                    modules.append("./" + fname)
+                    # 如果是.min.js文件，不拷贝到target，而是记录到单独列表
+                    if file.endswith('.min.js'):
+                        fpath = str(os.path.join(root, file))
+                        min_js_files.append(fpath)
+                    else:
+                        # 普通js文件，按原逻辑处理
+                        fpath = str(os.path.join(root, file))
+                        fname = file.replace('\\', '/')
+                        # copy file to target
+                        shutil.copy(fpath, os.path.join(self.target_dir, fname))
+                        sorts[fname] = self.__parse_js_file_sort(fpath)
+                        modules.append("./" + fname)
+
+        return min_js_files
 
     def compile(self, paste=False):
         """
@@ -1308,8 +1417,7 @@ class Compiler(CompilerBase):
         imps, jimps, sorts, defs, reps = self.pre_compile()
         self.transcrypt_cmd()
         imports, modules = self.analyze_rebuild_main_js(defs, jimps)
-        self.find_add_pure_js_files(sorts, modules)
-        total_js = imports + "\n" + self.generate_total_js(replace_src_prefix(modules), imps, sorts, self.FILE_STRONG_REPLACE, reps)
+        min_js_files = self.find_add_pure_js_files(sorts, modules)
 
         core.lprint(WAIT, LOC_EXPORTING_TOTAL_MAIN_JS, end="", ln=config.language)
 
@@ -1320,17 +1428,33 @@ class Compiler(CompilerBase):
         if not mjs_path.endswith('js'):
             mjs_path = os.path.join(mjs_path, 'main.mjs')
 
+        # 获取目标目录路径
+        dir_path = os.path.dirname(mjs_path)
+        build_dir_path = os.path.dirname(build_main_mjs)
+
+        # 生成total_js，传入.min.js文件列表
+        total_js = imports + "\n" + self.generate_total_js(
+            replace_src_prefix(modules), imps, sorts, self.FILE_STRONG_REPLACE, reps, min_js_files
+        )
+
         # write main.mjs
         with open(build_main_mjs, 'w', encoding='utf-8') as f:
             f.write(total_js)
 
         # export main.mjs
-        dir_path = os.path.dirname(mjs_path)
         if not os.path.exists(dir_path):
             core.error('Compiler.compile', core.lformat(LOC_EXPORT_DIR_PATH_NOT_EXISTS, [dir_path]), head='\n', ln=config.language)
         with open(mjs_path, 'w', encoding='utf-8') as f:
             f.write(total_js)
 
+        # 复制.min.js文件到目标目录
+        for min_js_path in min_js_files:
+            min_js_filename = os.path.basename(min_js_path)
+            # 复制到build目录
+            shutil.copy(min_js_path, os.path.join(build_dir_path, min_js_filename))
+            # 复制到最终导出目录
+            shutil.copy(min_js_path, os.path.join(dir_path, min_js_filename))
+
         core.lprint(GREEN.format('[6/6]'), LOC_DONE, " ", LOC_EXPORTING_TOTAL_MAIN_JS_FINISH, sep="", head="\r", ln=config.language)
 
         if mjs_path != build_main_mjs:

{pyscreeps_arena-0.5.7.6 → pyscreeps_arena-0.5.9b1}/pyscreeps_arena/core/const.py

@@ -9,7 +9,7 @@
 #
 import re
 
-VERSION = "0.5.7.6"
+VERSION = "0.5.9b"
 AUTHOR = "●ω＜🤍♪"
 STEAM_ID = "1029562896"
 GITHUB_NAME = "EagleBaby"

{pyscreeps_arena-0.5.7.6 → pyscreeps_arena-0.5.9b1}/pyscreeps_arena/ui/project_ui.py

@@ -7,12 +7,14 @@ import os
 from pathlib import Path
 from PyQt6.QtWidgets import (QApplication, QMainWindow, QWidget, QVBoxLayout, 
                              QHBoxLayout, QLabel, QLineEdit, QPushButton, 
-                             QFileDialog, QMessageBox)
+                             QFileDialog, QMessageBox, QComboBox)
 from PyQt6.QtCore import Qt
 from PyQt6.QtGui import QFont
 from PyQt6.QtGui import QIcon
 from pyscreeps_arena.core import const
 from pyscreeps_arena.ui.rs_icon import get_pixmap
+from pyscreeps_arena.afters import ToConfigAfter, ToEmptyAfter, ToPrefabAfter, ToCustomAfter
+from PyQt6.QtWidgets import QRadioButton, QGroupBox
 
 
 
@@ -27,7 +29,7 @@ class ProjectCreatorUI(QMainWindow):
         """初始化UI界面"""
         self.setWindowTitle("PyScreeps Arena - 项目创建器")
         self.setWindowIcon(QIcon(get_pixmap()))
-        self.setFixedSize(500, 350)
+        self.setFixedSize(500, 580)
         
         # 主窗口部件
         central_widget = QWidget()
@@ -85,6 +87,7 @@ class ProjectCreatorUI(QMainWindow):
         self._name_input = QLineEdit()
         self._name_input.setPlaceholderText("输入项目名称...")
         self._name_input.textChanged.connect(self._on_name_changed)
+        self._name_input.returnPressed.connect(self._create_project)
         name_layout.addWidget(name_label)
         name_layout.addWidget(self._name_input)
         input_layout.addLayout(name_layout)
@@ -113,6 +116,86 @@ class ProjectCreatorUI(QMainWindow):
         input_layout.addLayout(path_layout)
         layout.addWidget(input_widget)
         
+        # 分隔线
+        separator2 = QLabel("─" * 50)
+        separator2.setAlignment(Qt.AlignmentFlag.AlignCenter)
+        separator2.setStyleSheet("color: #ccc;")
+        layout.addWidget(separator2)
+        
+        # 配置选项区域（左右布局）
+        config_container = QWidget()
+        config_container_layout = QHBoxLayout(config_container)
+        config_container_layout.setSpacing(20)
+        
+        # 左侧：语言、竞技场、难度配置
+        left_config_widget = QWidget()
+        left_config_layout = QVBoxLayout(left_config_widget)
+        left_config_layout.setSpacing(10)
+        
+        # 语言选择
+        lang_layout = QHBoxLayout()
+        lang_label = QLabel("语 言:")
+        lang_label.setFixedWidth(80)
+        self._lang_combo = QComboBox()
+        self._lang_combo.addItems(["中文 (cn)", "英文 (en)"])
+        self._lang_combo.setCurrentIndex(0)
+        lang_layout.addWidget(lang_label)
+        lang_layout.addWidget(self._lang_combo)
+        left_config_layout.addLayout(lang_layout)
+        
+        # 竞技场选择
+        arena_layout = QHBoxLayout()
+        arena_label = QLabel("竞技场:")
+        arena_label.setFixedWidth(80)
+        self._arena_combo = QComboBox()
+        self._arena_combo.addItems(["灰色 (gray)", "绿色 (green)", "蓝色 (blue)", "红色 (red)"])
+        self._arena_combo.setCurrentIndex(0)
+        arena_layout.addWidget(arena_label)
+        arena_layout.addWidget(self._arena_combo)
+        left_config_layout.addLayout(arena_layout)
+        
+        # 难度级别选择
+        level_layout = QHBoxLayout()
+        level_label = QLabel("难 度:")
+        level_label.setFixedWidth(80)
+        self._level_combo = QComboBox()
+        self._level_combo.addItems(["基础 (basic)", "高级 (advanced)"])
+        self._level_combo.setCurrentIndex(0)
+        level_layout.addWidget(level_label)
+        level_layout.addWidget(self._level_combo)
+        left_config_layout.addLayout(level_layout)
+        
+        config_container_layout.addWidget(left_config_widget)
+        
+        # 右侧：模式选择（单选框）
+        right_config_widget = QWidget()
+        right_config_layout = QVBoxLayout(right_config_widget)
+        right_config_layout.setSpacing(8)
+        
+        # 模式选择标题
+        # mode_title = QLabel("模式选择")
+        # mode_title.setFont(QFont("Arial", 10, QFont.Weight.Bold))
+        # right_config_layout.addWidget(mode_title)
+        
+        # 单选按钮
+        self._empty_radio = QRadioButton("空白 (Empty)")
+        self._basic_radio = QRadioButton("基础 (Basic)")
+        self._prefab_radio = QRadioButton("预设 (Prefab)")
+        self._pi_radio = QRadioButton("预设继承 (P&&I)")
+        
+        # 默认选择基础模式
+        self._basic_radio.setChecked(True)
+        
+        # 添加到布局
+        right_config_layout.addWidget(self._empty_radio)
+        right_config_layout.addWidget(self._basic_radio)
+        right_config_layout.addWidget(self._prefab_radio)
+        right_config_layout.addWidget(self._pi_radio)
+        
+        config_container_layout.addWidget(right_config_widget)
+        
+        layout.addWidget(config_container)
+        
         # 按钮区域
         button_layout = QHBoxLayout()
         button_layout.addStretch()
@@ -122,6 +205,7 @@ class ProjectCreatorUI(QMainWindow):
         self._create_btn.setFixedSize(100, 35)
         self._create_btn.clicked.connect(self._create_project)
         self._create_btn.setEnabled(False)
+        self._create_btn.setDefault(True)
         button_layout.addWidget(self._create_btn)
         
         # 取消按钮
@@ -201,6 +285,35 @@ class ProjectCreatorUI(QMainWindow):
             archive.extractall(path=target_path)
             
         print(f"[DEBUG] 项目模板已解压到: {target_path}")  # 调试输出
+        
+        # 获取用户选择的配置
+        lang_text = self._lang_combo.currentText()
+        lang = lang_text.split('(')[1].strip(')')
+        
+        arena_text = self._arena_combo.currentText()
+        arena = arena_text.split('(')[1].strip(')')
+        
+        level_text = self._level_combo.currentText()
+        level = level_text.split('(')[1].strip(')')
+        
+        # 调用配置方法
+        ToConfigAfter(path=target_path, language=lang, arena=arena, level=level)
+        print(f"[DEBUG] 项目配置已更新: language={lang}, arena={arena}, level={level}")  # 调试输出
+        
+        # 根据选择的模式执行相应的操作
+        if self._empty_radio.isChecked():
+            print(f"[DEBUG] 执行空白模式配置")
+            ToEmptyAfter(path=target_path)
+        elif self._basic_radio.isChecked():
+            print(f"[DEBUG] 执行基础模式配置（不操作）")
+            # 基础模式不执行任何操作
+        elif self._prefab_radio.isChecked():
+            print(f"[DEBUG] 执行预设模式配置")
+            ToPrefabAfter(path=target_path)
+        elif self._pi_radio.isChecked():
+            print(f"[DEBUG] 执行预设继承模式配置")
+            ToPrefabAfter(path=target_path)
+            ToCustomAfter(path=target_path)
 
 
 def run_project_creator():

{pyscreeps_arena-0.5.7.6 → pyscreeps_arena-0.5.9b1}/pyscreeps_arena.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyscreeps-arena
-Version: 0.5.7.6
+Version: 0.5.9b1
 Summary: Python api|interface to play game: Screeps: Arena.
 Author-email: 2229066748@qq.com
 Maintainer: Eagle'sBaby

{pyscreeps_arena-0.5.7.6 → pyscreeps_arena-0.5.9b1}/pyscreeps_arena.egg-info/SOURCES.txt

@@ -10,6 +10,11 @@ pyscreeps_arena.egg-info/dependency_links.txt
 pyscreeps_arena.egg-info/entry_points.txt
 pyscreeps_arena.egg-info/requires.txt
 pyscreeps_arena.egg-info/top_level.txt
+pyscreeps_arena/afters/__init__.py
+pyscreeps_arena/afters/after_config.py
+pyscreeps_arena/afters/after_custom.py
+pyscreeps_arena/afters/after_empty.py
+pyscreeps_arena/afters/after_prefab.py
 pyscreeps_arena/core/__init__.py
 pyscreeps_arena/core/basic.py
 pyscreeps_arena/core/config.py

{pyscreeps_arena-0.5.7.6 → pyscreeps_arena-0.5.9b1}/setup.py

@@ -7,7 +7,7 @@ with open(r"T:\New_PC\Import_Project\uploads\pyscreeps-arena_upload\pyscreeps-ar
     long_description = f.read()
 setup(
     name='pyscreeps-arena',
-    version='0.5.7.6',
+    version='0.5.9b1',
     description='Python api|interface to play game: Screeps: Arena.',
     long_description=long_description,
     long_description_content_type='text/markdown',