pyscreeps-arena 0.5.3.2__py3-none-any.whl → 0.5.4.0__py3-none-any.whl

pyscreeps_arena/__init__.py

@@ -24,9 +24,28 @@ def CMD_NewProject():
     extract_7z(os.path.join(this_path, 'project.7z'), project_path)
     print("Project created at", project_path)
 
+def CMD_OpenUI():
+    """
+    cmd:
+        psaui
+
+    * 打开UI界面
+
+    Returns:
+
+    """
+    try:
+        from pyscreeps_arena.ui.project_ui import run_project_creator
+        run_project_creator()
+    except ImportError as e:
+        print(f"错误: 无法导入UI模块 - {e}")
+        print("请确保已安装PyQt6: pip install PyQt6")
+    except Exception as e:
+        print(f"错误: 打开UI界面失败 - {e}")
 
 def extract_7z(file_path, output_dir):
     with py7zr.SevenZipFile(file_path, mode='r') as archive:
         archive.extractall(path=output_dir)
 
-
+if __name__ == '__main__':
+    CMD_OpenUI()

pyscreeps_arena/compiler.py

@@ -16,6 +16,27 @@ python_version_info = sys.version_info
 python_version_info = f"{python_version_info.major}.{python_version_info.minor}.{python_version_info.micro}"
 
 
+def replace_src_prefix(file_list):
+    """
+    将列表中以'./src.'开头的字符串替换为'./'
+
+    参数:
+        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')等内容 |
@@ -85,7 +106,7 @@ export var loop = function () {
     }
 	step (know);
     timeLine = get.cpu_us();
-	sch.handle();
+	if (get._SCH_FLAG) sch.handle();
 	stepCost = get.cpu_us() - timeLine;
 	std.show_usage ();
 	print("knowCost:", knowCost, "monitorCost:", monitorCost, "stepCost:", stepCost);
@@ -178,11 +199,6 @@ class GameConstructionBoost{{
     constructor(){{ 
     }}
 }};
-let GameFlag = GameStructureSpawn;
-import * as GAME_PROTO_MODULE from 'game/prototypes';
-if (GAME_PROTO_MODULE.Flag){{
-    GameFlag = GAME_PROTO_MODULE.Flag;
-}}
         """,
     }
 
@@ -318,6 +334,102 @@ class Compiler_Utils(Compiler_Const):
 
         return '\n'.join(result)  # 将处理后的所有代码行连接成一个字符串，并返回最终结果 | join all processed lines into a string and return
 
+    def expand_folder_imports(self, fpath: str, project_path: str = None):
+        """
+        扩展文件夹导入语句：将 `from folder import *` 替换为 `from folder.module import *`
+        仅在文件夹没有 __init__.py 时执行此操作
+
+        :param fpath: 要处理的文件路径
+        :param project_path: 项目根路径，用于解析相对导入，默认为 None（使用文件所在目录）
+        """
+        if not os.path.exists(fpath):
+            return
+
+        content = self.auto_read(fpath)
+        lines = content.split('\n')
+        new_lines = []
+        changed = False
+
+        for line in lines:
+            m = self.PY_IMPORT_PAT.match(line)
+            if not m:
+                new_lines.append(line)
+                continue
+
+            original_target = m.group(1)
+            target = original_target
+            target_path = project_path or os.path.dirname(fpath)
+
+            # 处理相对路径（向前定位）
+            if target.startswith('.'):
+                target_path = os.path.dirname(fpath)
+                count = 0
+                for c in target:
+                    if c == '.':
+                        count += 1
+                    else:
+                        break
+
+                # 向上移动目录
+                if count > 1:
+                    for _ in range(count - 1):
+                        target_path = os.path.dirname(target_path)
+
+                # 移除开头的点
+                target = target[count:]
+
+            # 如果 target 为空，跳过
+            if not target:
+                new_lines.append(line)
+                continue
+
+            # 向后定位，构建完整路径
+            temp_target = target
+            while (_idx := temp_target.find('.')) != -1:
+                part = temp_target[:_idx]
+                target_path = os.path.join(target_path, part)
+                temp_target = temp_target[_idx + 1:]
+
+            # 最终的文件夹路径
+            final_dir_path = os.path.join(target_path, temp_target) if temp_target else target_path
+
+            # 检查是否是文件夹且没有 __init__.py
+            if os.path.isdir(final_dir_path):
+                init_path = os.path.join(final_dir_path, '__init__.py')
+                if not os.path.exists(init_path):
+                    # 找到所有 .py 文件（排除 __init__.py）| 如果包含子目录，产生一个警告
+                    # try:
+                    #     py_files = [f for f in os.listdir(final_dir_path) if f.endswith('.py') and f != '__init__.py']
+                    # except (FileNotFoundError, PermissionError):
+                    py_files = []
+                    for item in os.listdir(final_dir_path):
+                        _path = os.path.join(final_dir_path, item)
+                        if os.path.isfile(_path) and item.endswith('.py') and item != '__init__.py':
+                            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 )
+                            
+
+                    # 为每个 .py 文件生成导入语句
+                    if py_files:
+                        for py_file in py_files:
+                            module_name = py_file[:-3]
+                            new_import = f"from {original_target}.{module_name} import *"
+                            new_lines.append(new_import)
+                        changed = True
+                        continue
+
+            # 保留原行
+            new_lines.append(line)
+
+        # 如果文件有修改，写回
+        if changed:
+            new_content = '\n'.join(new_lines)
+            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
@@ -468,15 +580,63 @@ class Compiler_Utils(Compiler_Const):
         return jsimps
 
     # ---------- 自定义函数 ---------- #
+
     @staticmethod
-    def stage_recursive_replace(content:str) -> str:
-        r"""
-        替换'@recursive'为'@recursive(<fname>)', 其中<fname>为被装饰器标记的函数名 |
-            Replace '@recursive' with '@recursive(<fname>)', where <fname> is the name of the decorated function.
+    def stage_recursive_replace(content: str) -> str:
+        """
+        移除 '@recursive' 装饰器行，并在文末添加对应的 _recursiveLogin 调用。
 
-        @\s*recursive\s+def\s+([^\s\(]+)
+        对于类方法: _recursiveLogin("ClassName", "method_name")
+        对于普通函数: _recursiveLogin("", "function_name")
         """
-        return re.sub(r'@\s*recursive(\s+def\s+)([^\s\(]+)', r'@recursive("\2")\1\2', content)
+        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. 查找所有 @recursive 装饰器
+        decorator_pattern = re.compile(r'^\s*@\s*recursive\s*$\n?', re.MULTILINE)
+
+        for dec_match in decorator_pattern.finditer(content):
+            dec_end = dec_match.end()
+
+            # 查找接下来的函数定义（跳过可能的空行）
+            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. 记录删除位置和调用信息
+            deletions.append((dec_match.start(), dec_end))
+            calls_to_add.append(f'_recursiveLogin("{class_name}", "{func_name}")')
+
+        # 5. 应用删除（倒序避免位置偏移）
+        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:]
+
+        # 6. 在文末添加调用
+        if calls_to_add:
+            result = '\n'.join(calls_to_add) + '\n' + result
+
+        return result
     
     @staticmethod
     def process_mate_code(code):
@@ -626,6 +786,8 @@ class Compiler(CompilerBase):
                 if m and (not m.group(2) or m.group(2)[0] != '*'):
                     core.error('Compiler.pre_compile', core.lformat(LOC_IMPORT_STAR2_ERROR, [m.group(1), m.group(2), m.group(1)]), head='\n', ln=config.language)
 
+            self.expand_folder_imports(fpath, self.build_dir)
+
         # -------------------------------- EXPAND IMPORT * -------------------------------- #
         _imports = self.find_chain_import(self.target_py, [os.path.dirname(self.src_dir), self.src_dir])
         _js_imports = self.relist_pyimports_to_jsimports(self.build_dir, _imports)
@@ -978,7 +1140,7 @@ class Compiler(CompilerBase):
         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(modules, imps, sorts, self.FILE_STRONG_REPLACE, reps)
+        total_js = imports + "\n" + self.generate_total_js(replace_src_prefix(modules), imps, sorts, self.FILE_STRONG_REPLACE, reps)
 
         core.lprint(WAIT, LOC_EXPORTING_TOTAL_MAIN_JS, end="", ln=config.language)
 

pyscreeps_arena/core/const.py

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

pyscreeps_arena/localization.py

@@ -135,6 +135,12 @@ LOC_NOT_SUPPORT_PYFILE_INIT = {
     'cn': '不支持 __init__.py！请删除它(初始化文件)并使用 from directory.xxx import xxxx 代替之。',
 }
 
+# V0.5.4
+LOC_DIR_UNDER_NONINIT_DIR = {
+    'en': "Directory [{}] is located under [{}] without __init__.py, therefore it is ignored.",
+    'cn': "目录 [{}] 位于 `无__init__.py`的目录[{}]下，因此被忽略。",
+}
+
 if __name__ == '__main__':
     lprint(TEMPLATE)
 

pyscreeps_arena/ui/P2PY.py

@@ -0,0 +1,108 @@
+# png_to_py.py - 将PNG图片转换为Python模块（最终验证版）
+import base64
+import sys
+from pathlib import Path
+import re
+
+
+def png_to_py(png_path, py_path=None, var_name=None):
+    """
+    将PNG图片转换为Python模块文件
+
+    :param png_path: PNG图片路径
+    :param py_path: 输出的.py文件路径（默认为图片同名.py）
+    :param var_name: 变量名（默认为文件名的大写形式）
+    """
+    png_file = Path(png_path)
+
+    if not png_file.exists():
+        raise FileNotFoundError(f"文件 '{png_path}' 不存在")
+
+    if png_file.suffix.lower() != '.png':
+        print(f"[警告] 文件 '{png_path}' 不是PNG格式")
+        return False
+
+    # 自动生成输出路径
+    if py_path is None:
+        py_path = png_file.with_suffix('.py')
+    else:
+        py_path = Path(py_path)
+
+    # 自动生成变量名
+    if var_name is None:
+        base_name = png_file.stem.replace('-', '_').replace(' ', '_')
+        base_name = re.sub(r'[^0-9a-zA-Z_]', '', base_name)
+        if base_name and base_name[0].isdigit():
+            base_name = f'ICON_{base_name}'
+        var_name = base_name.upper()
+
+    try:
+        # 读取PNG文件并转换为base64
+        with open(png_file, 'rb') as f:
+            png_data = f.read()
+            base64_data = base64.b64encode(png_data).decode('utf-8')
+
+        print(f"[DEBUG] 读取PNG文件: {len(png_data)} 字节")
+        print(f"[DEBUG] Base64编码长度: {len(base64_data)} 字符")
+
+        # 生成Python代码（关键修复：使用 len({var_name})）
+        py_content = f'''# -*- coding: utf-8 -*-
+"""
+PyQt6资源模块: {png_file.name}
+由 png_to_py.py 自动生成
+"""
+
+# Base64编码的PNG数据（单行，无换行符）
+{var_name} = b"{base64_data}"
+
+def get_pixmap():
+    \"\"\"返回QPixmap对象\"\"\"
+    from PyQt6.QtGui import QPixmap
+    from PyQt6.QtCore import QByteArray
+
+    byte_array = QByteArray.fromBase64({var_name})
+    pixmap = QPixmap()
+    pixmap.loadFromData(byte_array)
+    return pixmap
+
+def get_icon():
+    \"\"\"返回QIcon对象\"\"\"
+    from PyQt6.QtGui import QIcon
+    return QIcon(get_pixmap())
+
+if __name__ == '__main__':
+    import sys
+    from PyQt6.QtWidgets import QApplication
+
+    app = QApplication.instance() or QApplication(sys.argv)
+
+    print(f"资源模块 {var_name} 已加载")
+    print(f"字节数据长度: {{len({var_name})}} 字节")  # ✅ 修复：使用 {var_name}
+
+    # 验证能否正确加载
+    pixmap = get_pixmap()
+    print(f"QPixmap加载成功: 尺寸 {{pixmap.width()}}x{{pixmap.height()}}")
+'''
+
+        # 写入Python文件
+        with open(py_path, 'w', encoding='utf-8') as f:
+            f.write(py_content)
+
+        print(f"✓ 成功: {png_path} -> {py_path}")
+        print(f"  变量名: {var_name}")
+        return True
+
+    except Exception as e:
+        print(f"错误: 转换失败 - {e}")
+        import traceback
+        traceback.print_exc()
+        return False
+
+
+if __name__ == '__main__':
+    if len(sys.argv) > 1:
+        target = sys.argv[1]
+    else:
+        target = "icon.png"
+
+    png_to_py(target, "rs_icon.py")

pyscreeps_arena/ui/__init__.py

@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+"""
+PyScreeps Arena UI模块
+"""
+
+from .rs_icon import get_icon, get_pixmap
+from .project_ui import ProjectCreatorUI, run_project_creator
+from .P2PY import png_to_py
+
+__all__ = ['get_icon', 'get_pixmap', 'ProjectCreatorUI', 'run_project_creator', 'png_to_py']

pyscreeps_arena/ui/project_ui.py

@@ -0,0 +1,214 @@
+# -*- coding: utf-8 -*-
+"""
+项目创建UI界面
+"""
+import sys
+import os
+from pathlib import Path
+from PyQt6.QtWidgets import (QApplication, QMainWindow, QWidget, QVBoxLayout, 
+                             QHBoxLayout, QLabel, QLineEdit, QPushButton, 
+                             QFileDialog, QMessageBox)
+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
+
+
+class ProjectCreatorUI(QMainWindow):
+    def __init__(self):
+        super().__init__()
+        self._proj_name = ""
+        self._proj_path = ""
+        self._init_ui()
+        
+    def _init_ui(self):
+        """初始化UI界面"""
+        self.setWindowTitle("PyScreeps Arena - 项目创建器")
+        self.setWindowIcon(QIcon(get_pixmap()))
+        self.setFixedSize(500, 350)
+        
+        # 主窗口部件
+        central_widget = QWidget()
+        self.setCentralWidget(central_widget)
+        layout = QVBoxLayout(central_widget)
+        layout.setSpacing(15)
+        layout.setContentsMargins(30, 30, 30, 30)
+        
+        # 标题
+        title = QLabel("PyScreeps Arena")
+        title.setAlignment(Qt.AlignmentFlag.AlignCenter)
+        title_font = QFont()
+        title_font.setPointSize(18)
+        title_font.setBold(True)
+        title.setFont(title_font)
+        layout.addWidget(title)
+        
+        # 项目信息
+        info_widget = QWidget()
+        info_layout = QVBoxLayout(info_widget)
+        info_layout.setSpacing(8)
+        
+        # 版本信息
+        version_label = QLabel(f"版本: {const.VERSION}")
+        version_label.setAlignment(Qt.AlignmentFlag.AlignCenter)
+        info_layout.addWidget(version_label)
+        
+        # 作者信息
+        author_label = QLabel(f"作者: {const.AUTHOR}")
+        author_label.setAlignment(Qt.AlignmentFlag.AlignCenter)
+        info_layout.addWidget(author_label)
+        
+        # GitHub信息
+        github_label = QLabel(f"GitHub: {const.GITHUB_NAME}")
+        github_label.setAlignment(Qt.AlignmentFlag.AlignCenter)
+        info_layout.addWidget(github_label)
+        
+        layout.addWidget(info_widget)
+        
+        # 分隔线
+        separator = QLabel("─" * 50)
+        separator.setAlignment(Qt.AlignmentFlag.AlignCenter)
+        separator.setStyleSheet("color: #ccc;")
+        layout.addWidget(separator)
+        
+        # 项目输入区域
+        input_widget = QWidget()
+        input_layout = QVBoxLayout(input_widget)
+        input_layout.setSpacing(12)
+        
+        # 项目名称输入
+        name_layout = QHBoxLayout()
+        name_label = QLabel("项目名称:")
+        name_label.setFixedWidth(80)
+        self._name_input = QLineEdit()
+        self._name_input.setPlaceholderText("输入项目名称...")
+        self._name_input.textChanged.connect(self._on_name_changed)
+        name_layout.addWidget(name_label)
+        name_layout.addWidget(self._name_input)
+        input_layout.addLayout(name_layout)
+        
+        # 项目路径输入
+        path_layout = QHBoxLayout()
+        path_label = QLabel("保存位置:")
+        path_label.setFixedWidth(80)
+        self._path_input = QLineEdit()
+        self._path_input.setPlaceholderText("选择项目保存位置...")
+        self._path_input.setReadOnly(True)
+        # 默认桌面路径
+        desktop_path = os.path.join(os.path.expanduser("~"), "Desktop")
+        if os.path.exists(desktop_path):
+            self._path_input.setText(desktop_path)
+            self._proj_path = desktop_path
+        path_layout.addWidget(path_label)
+        path_layout.addWidget(self._path_input)
+        
+        # 浏览按钮
+        browse_btn = QPushButton("浏览...")
+        browse_btn.setFixedWidth(60)
+        browse_btn.clicked.connect(self._browse_path)
+        path_layout.addWidget(browse_btn)
+        
+        input_layout.addLayout(path_layout)
+        layout.addWidget(input_widget)
+        
+        # 按钮区域
+        button_layout = QHBoxLayout()
+        button_layout.addStretch()
+        
+        # 创建按钮
+        self._create_btn = QPushButton("创建项目")
+        self._create_btn.setFixedSize(100, 35)
+        self._create_btn.clicked.connect(self._create_project)
+        self._create_btn.setEnabled(False)
+        button_layout.addWidget(self._create_btn)
+        
+        # 取消按钮
+        cancel_btn = QPushButton("取消")
+        cancel_btn.setFixedSize(80, 35)
+        cancel_btn.clicked.connect(self.close)
+        button_layout.addWidget(cancel_btn)
+        
+        layout.addLayout(button_layout)
+        layout.addStretch()
+        
+    def _on_name_changed(self, text):
+        """项目名称改变时的处理"""
+        self._proj_name = text.strip()
+        self._create_btn.setEnabled(bool(self._proj_name and self._proj_path))
+        
+    def _browse_path(self):
+        """浏览选择路径"""
+        current_path = self._path_input.text() or os.path.expanduser("~")
+        path = QFileDialog.getExistingDirectory(
+            self, "选择项目保存位置", current_path
+        )
+        if path:
+            self._path_input.setText(path)
+            self._proj_path = path
+            self._create_btn.setEnabled(bool(self._proj_name and self._proj_path))
+            
+    def _create_project(self):
+        """创建项目"""
+        if not self._proj_name or not self._proj_path:
+            return
+            
+        # 构建完整路径
+        full_path = os.path.join(self._proj_path, self._proj_name)
+        
+        # 检查路径是否已存在
+        if os.path.exists(full_path):
+            reply = QMessageBox.question(
+                self, "路径已存在",
+                f"路径 '{full_path}' 已存在。\n是否继续？",
+                QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No
+            )
+            if reply != QMessageBox.StandardButton.Yes:
+                return
+        
+        try:
+            # 创建项目
+            self._extract_project_template(full_path)
+            
+            QMessageBox.information(
+                self, "成功",
+                f"项目 '{self._proj_name}' 创建成功！\n路径: {full_path}"
+            )
+            self.close()
+            
+        except Exception as e:
+            QMessageBox.critical(
+                self, "错误",
+                f"项目创建失败:\n{str(e)}"
+            )
+            
+    def _extract_project_template(self, target_path):
+        """提取项目模板"""
+        # 获取当前包路径
+        this_path = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+        project_7z_path = os.path.join(this_path, 'project.7z')
+        
+        if not os.path.exists(project_7z_path):
+            raise FileNotFoundError(f"项目模板文件不存在: {project_7z_path}")
+            
+        # 创建目标目录
+        os.makedirs(target_path, exist_ok=True)
+        
+        # 解压项目模板
+        import py7zr
+        with py7zr.SevenZipFile(project_7z_path, mode='r') as archive:
+            archive.extractall(path=target_path)
+            
+        print(f"[DEBUG] 项目模板已解压到: {target_path}")  # 调试输出
+
+
+def run_project_creator():
+    """运行项目创建器UI"""
+    app = QApplication(sys.argv)
+    window = ProjectCreatorUI()
+    window.show()
+    sys.exit(app.exec())
+
+
+if __name__ == '__main__':
+    run_project_creator()

pyscreeps_arena/ui/rs_icon.py

@@ -0,0 +1,43 @@
+# -*- coding: utf-8 -*-
+"""
+PyQt6资源模块: icon.png
+由 png_to_py.py 自动生成
+"""
+
+# Base64编码的PNG数据（单行，无换行符）
+ICON = b"iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAACXBIWXMAAAsTAAALEwEAmpwYAAA57GlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4KPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNS42LWMxMzggNzkuMTU5ODI0LCAyMDE2LzA5LzE0LTAxOjA5OjAxICAgICAgICAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgICAgICAgICB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iCiAgICAgICAgICAgIHhtbG5zOnhtcE1NPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvbW0vIgogICAgICAgICAgICB4bWxuczpzdEV2dD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3NUeXBlL1Jlc291cmNlRXZlbnQjIgogICAgICAgICAgICB4bWxuczpkYz0iaHR0cDovL3B1cmwub3JnL2RjL2VsZW1lbnRzLzEuMS8iCiAgICAgICAgICAgIHhtbG5zOnBob3Rvc2hvcD0iaHR0cDovL25zLmFkb2JlLmNvbS9waG90b3Nob3AvMS4wLyIKICAgICAgICAgICAgeG1sbnM6dGlmZj0iaHR0cDovL25zLmFkb2JlLmNvbS90aWZmLzEuMC8iCiAgICAgICAgICAgIHhtbG5zOmV4aWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20vZXhpZi8xLjAvIj4KICAgICAgICAgPHhtcDpDcmVhdG9yVG9vbD5BZG9iZSBQaG90b3Nob3AgQ0MgMjAxNyAoV2luZG93cyk8L3htcDpDcmVhdG9yVG9vbD4KICAgICAgICAgPHhtcDpDcmVhdGVEYXRlPjIwMjUtMTEtMjFUMjM6MDE6MjUrMDg6MDA8L3htcDpDcmVhdGVEYXRlPgogICAgICAgICA8eG1wOk1ldGFkYXRhRGF0ZT4yMDI1LTExLTIxVDIzOjAxOjI1KzA4OjAwPC94bXA6TWV0YWRhdGFEYXRlPgogICAgICAgICA8eG1wOk1vZGlmeURhdGU+MjAyNS0xMS0yMVQyMzowMToyNSswODowMDwveG1wOk1vZGlmeURhdGU+CiAgICAgICAgIDx4bXBNTTpJbnN0YW5jZUlEPnhtcC5paWQ6NTJmOTM2Y2QtOTY1MC01YjQ0LTgzMjMtYjBjMjgwZDM0MGI3PC94bXBNTTpJbnN0YW5jZUlEPgogICAgICAgICA8eG1wTU06RG9jdW1lbnRJRD5hZG9iZTpkb2NpZDpwaG90b3Nob3A6ZWQzNTEwMjMtYzZlYS0xMWYwLTk2YjktZmM2NTg2ZGU4Mzc1PC94bXBNTTpEb2N1bWVudElEPgogICAgICAgICA8eG1wTU06T3JpZ2luYWxEb2N1bWVudElEPnhtcC5kaWQ6MGU2N2I1ZTItOTllOS1jMTQyLWIxYjYtMWUwNWY4MzAyYjdiPC94bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ+CiAgICAgICAgIDx4bXBNTTpIaXN0b3J5PgogICAgICAgICAgICA8cmRmOlNlcT4KICAgICAgICAgICAgICAgPHJkZjpsaSByZGY6cGFyc2VUeXBlPSJSZXNvdXJjZSI+CiAgICAgICAgICAgICAgICAgIDxzdEV2dDphY3Rpb24+Y3JlYXRlZDwvc3RFdnQ6YWN0aW9uPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6aW5zdGFuY2VJRD54bXAuaWlkOjBlNjdiNWUyLTk5ZTktYzE0Mi1iMWI2LTFlMDVmODMwMmI3Yjwvc3RFdnQ6aW5zdGFuY2VJRD4KICAgICAgICAgICAgICAgICAgPHN0RXZ0OndoZW4+MjAyNS0xMS0yMVQyMzowMToyNSswODowMDwvc3RFdnQ6d2hlbj4KICAgICAgICAgICAgICAgICAgPHN0RXZ0OnNvZnR3YXJlQWdlbnQ+QWRvYmUgUGhvdG9zaG9wIENDIDIwMTcgKFdpbmRvd3MpPC9zdEV2dDpzb2Z0d2FyZUFnZW50PgogICAgICAgICAgICAgICA8L3JkZjpsaT4KICAgICAgICAgICAgICAgPHJkZjpsaSByZGY6cGFyc2VUeXBlPSJSZXNvdXJjZSI+CiAgICAgICAgICAgICAgICAgIDxzdEV2dDphY3Rpb24+c2F2ZWQ8L3N0RXZ0OmFjdGlvbj4KICAgICAgICAgICAgICAgICAgPHN0RXZ0Omluc3RhbmNlSUQ+eG1wLmlpZDo1MmY5MzZjZC05NjUwLTViNDQtODMyMy1iMGMyODBkMzQwYjc8L3N0RXZ0Omluc3RhbmNlSUQ+CiAgICAgICAgICAgICAgICAgIDxzdEV2dDp3aGVuPjIwMjUtMTEtMjFUMjM6MDE6MjUrMDg6MDA8L3N0RXZ0OndoZW4+CiAgICAgICAgICAgICAgICAgIDxzdEV2dDpzb2Z0d2FyZUFnZW50PkFkb2JlIFBob3Rvc2hvcCBDQyAyMDE3IChXaW5kb3dzKTwvc3RFdnQ6c29mdHdhcmVBZ2VudD4KICAgICAgICAgICAgICAgICAgPHN0RXZ0OmNoYW5nZWQ+Lzwvc3RFdnQ6Y2hhbmdlZD4KICAgICAgICAgICAgICAgPC9yZGY6bGk+CiAgICAgICAgICAgIDwvcmRmOlNlcT4KICAgICAgICAgPC94bXBNTTpIaXN0b3J5PgogICAgICAgICA8ZGM6Zm9ybWF0PmltYWdlL3BuZzwvZGM6Zm9ybWF0PgogICAgICAgICA8cGhvdG9zaG9wOkNvbG9yTW9kZT4zPC9waG90b3Nob3A6Q29sb3JNb2RlPgogICAgICAgICA8dGlmZjpPcmllbnRhdGlvbj4xPC90aWZmOk9yaWVudGF0aW9uPgogICAgICAgICA8dGlmZjpYUmVzb2x1dGlvbj43MjAwMDAvMTAwMDA8L3RpZmY6WFJlc29sdXRpb24+CiAgICAgICAgIDx0aWZmOllSZXNvbHV0aW9uPjcyMDAwMC8xMDAwMDwvdGlmZjpZUmVzb2x1dGlvbj4KICAgICAgICAgPHRpZmY6UmVzb2x1dGlvblVuaXQ+MjwvdGlmZjpSZXNvbHV0aW9uVW5pdD4KICAgICAgICAgPGV4aWY6Q29sb3JTcGFjZT42NTUzNTwvZXhpZjpDb2xvclNwYWNlPgogICAgICAgICA8ZXhpZjpQaXhlbFhEaW1lbnNpb24+MjA8L2V4aWY6UGl4ZWxYRGltZW5zaW9uPgogICAgICAgICA8ZXhpZjpQaXhlbFlEaW1lbnNpb24+MjA8L2V4aWY6UGl4ZWxZRGltZW5zaW9uPgogICAgICA8L3JkZjpEZXNjcmlwdGlvbj4KICAgPC9yZGY6UkRGPgo8L3g6eG1wbWV0YT4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/Pud2StQAAAAgY0hSTQAAeiUAAICDAAD5/wAAgOkAAHUwAADqYAAAOpgAABdvkl/FRgAABA5JREFUeNpklE2IntUVx3/n3Hufed+Zd74yZjLR+DUxfqXFYkIaiC0iLa22W923IAi6UFy4DbhxqQiiCF2Jq27daWlRoU2VptVSqE1CwaSTxGTCzLwfz3PvPaeLZ8SF564unPPnnv/985Mnf/X01c8/O7cemoSZISIYBg4iAiKAAaAGASHXChGEiLujqtQu+4mTpy7J+qG7fW44pMtdL5YLTZwjW0ZjwEpFXTEJaDS8GOaGSINbi6ZetEkN7XTaqaZIO5sBgDuaIsUMV6hUNKX9V1bMKh4KISlQ0RTBHYB2NkNjbBQgNQ0AVg3LBY8gZkiXwQtVHQkVq457gxn9PRes9nakpgEBBcht2/vljsYAVlkIyuaB21hURcQBZThcZ7R4D9gC7tL3uiMi5LbtfXYcjRE8kCRgWhCMO0cbvHlmgxVSP+RCl4Y8cuZ1RmsP4aa4VTTO4RQkCeAotWFQoMiEEg26JY6PVvn9zze5d2mZLEO8dNQyI6YJw+U1Hn3qdVbXjoILQQrUitRF3EEdY9xMmK8jyANOH668+7NjLM9X3jl/iWvjbSQlUlQmO9e58Nn7LISDHH/8bVY2TjMrhRhWcL0FAmFltHTWo5EL3H9wyLs//SF3xBGv/uUib1z8hqWlJZoDPybOH8Xr1+z974/kXFk79guOHDzD5e1P6cZbSBVUh4SF5dWznhc4dajhncce5sj8gNe++A+/+9dlsMrwwGkee+It1h/4Nd9c/JhJ2eXG9fPE2YTVo7/knkNPcP3aF3TtFdwykf1yviszQxAkCDl3eB9RVApmjjD4Nn7fK7lj414vTYe1DQ8cHPHe48c5rENe+8cl3rjwNcvNEF3+EZQhs/Ffkb0b3PWDF7jr9MuEW1f406e/pb3+FVodjfOE4eL6WdeWoS9wbWz8/cZVfnLnCk9tLuGTMecu7zGZXsKn/2Zqxuax53nwzPO0u1f42yevsLN1nrmwiMkMF0cFZaGbZxL2IM04dzXw7IdfcXNXeO7R+zi8dABKIefEcHQ7myd/w7jb5cs/vMitrT8ziJFSbyG2Ag5K6JhFiD5PLArNDl/ubfPMRxf4794u5DGSGkIIlJxpd67y+QcvcXP7nyBO9Qgh4GEXEZCNI0fdckFTxHLpCSMwXyu3L6+yPZtys+1AlSatkQbLjHe3QHYQ36fRt7Mp9oJBA6UWvFr/nSmiGF4yhAgSESpWAVUwQ6NjnYMIEpQYItUqEYfcdUhQNGjf4IIBnhqSJmpXcIQQwTwDipeApj5PTq+hMaBWis8NBvsh6gEbKuj+ybMZggCKSkSq4iZAwnLZZyXMDQb92idOnrrcTqeuqj3OUyRHo9aKmyGDOUooEDO1tsQQUBXQ72itqrTTKSdOntr6/wB5xwkK8omfuAAAAABJRU5ErkJggg=="
+
+def get_pixmap():
+    """返回QPixmap对象"""
+    from PyQt6.QtGui import QPixmap
+    from PyQt6.QtCore import QByteArray
+
+    byte_array = QByteArray.fromBase64(ICON)
+    pixmap = QPixmap()
+    pixmap.loadFromData(byte_array)
+    return pixmap
+
+def get_icon():
+    """返回QIcon对象"""
+    from PyQt6.QtGui import QIcon
+    return QIcon(get_pixmap())
+
+if __name__ == '__main__':
+    import sys
+    from PyQt6.QtWidgets import QApplication, QMainWindow
+
+    app = QApplication.instance() or QApplication(sys.argv)
+
+    print(f"资源模块 ICON 已加载")
+    print(f"字节数据长度: {len(ICON)} 字节")  # ✅ 修复：使用 ICON
+
+    # 验证能否正确加载
+    pixmap = get_pixmap()
+    print(f"QPixmap加载成功: 尺寸 {pixmap.width()}x{pixmap.height()}")
+    
+    win = QMainWindow()
+    win.setWindowIcon(get_icon())
+    win.setGeometry(100, 100, 300, 200)
+    win.setWindowTitle("测试图标")
+    win.show()
+    sys.exit(app.exec())

{pyscreeps_arena-0.5.3.2.dist-info → pyscreeps_arena-0.5.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyscreeps-arena
-Version: 0.5.3.2
+Version: 0.5.4.0
 Summary: Python api|interface to play game: Screeps: Arena.
 Author-email: 2229066748@qq.com
 Maintainer: Eagle'sBaby
@@ -16,6 +16,7 @@ Requires-Dist: colorama
 Requires-Dist: py7zr
 Requires-Dist: chardet
 Requires-Dist: Transcrypt==3.9.1
+Requires-Dist: PyQt6
 Requires-Dist: mkdocs
 Requires-Dist: mkdocstrings[python]
 Requires-Dist: mkdocs-material

pyscreeps_arena-0.5.4.0.dist-info/RECORD

@@ -0,0 +1,21 @@
+pyscreeps_arena/__init__.py,sha256=xCj4Oy7VYpNNbxBHyVxCT4ZhJS2G4Mo_JKJS5sIXDpE,1349
+pyscreeps_arena/build.py,sha256=DQeGLnID2FjpsWTbnqwt2cOp28olWK68U67bfbFJSOU,177
+pyscreeps_arena/compiler.py,sha256=4Mo69T2EfAS9YOtd9p2zRSAun7uPihzdQMUipsLvbv0,57401
+pyscreeps_arena/localization.py,sha256=5GYoegky1y63Ae7Z4YjHLeQp6L87ek73MndERuFC3M4,5886
+pyscreeps_arena/project.7z,sha256=eHZuv31R4PnUSDlh5qwW2bL82he94vHV1E_q61sa9Xo,291806
+pyscreeps_arena/core/__init__.py,sha256=qoP_rx1TpbDLJoTm5via4XPwEPaV1FXr1SYvoVoHGms,41
+pyscreeps_arena/core/basic.py,sha256=DFvyDTsTXf2bQtnS9s254TrkshvRwajaHcvTyVvJyqw,2790
+pyscreeps_arena/core/config.py,sha256=x_JhVHlVZqB3qA7UyACVnwZjg2gZU-BIs49UxZzwCoE,637
+pyscreeps_arena/core/const.py,sha256=It1ROduI6euyKiiiSyt9gsv6fY1yhHf6pC24bbRjYC8,590
+pyscreeps_arena/core/core.py,sha256=3Nty8eLKPNgwnYk_sVNBPrWuKxBXI2od8nfEezsEAZQ,5157
+pyscreeps_arena/core/main.py,sha256=-FNSOEjksNlDfCbUqsjtPSUW8vT3qxEdfzXqT5Tdsik,170
+pyscreeps_arena/core/utils.py,sha256=N9OOkORvrqnJakayaFp9qyS0apWhB9lBK4xyyYkhFdo,215
+pyscreeps_arena/ui/P2PY.py,sha256=c_zLFkp_M83bSJRnQggt_yQL_2xSPtKWp4kh-TuqM2k,3220
+pyscreeps_arena/ui/__init__.py,sha256=9iW-DFRkBWm-2VtOrFqYyp1nuyt4apX0DJxFxjyKCOM,283
+pyscreeps_arena/ui/project_ui.py,sha256=1C0Liz4OeApuxanI0Vvrgh_r7f8JpLTDDTpYj0b1GI4,7667
+pyscreeps_arena/ui/rs_icon.py,sha256=5v8YdTv2dds4iAp9x3MXpqB_5XIOYd0uPqaq83ZNySM,22496
+pyscreeps_arena-0.5.4.0.dist-info/METADATA,sha256=b86psaIF11WN1lpzKRYUjWunu2E_mIyooPb3mP7Yx6A,2356
+pyscreeps_arena-0.5.4.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pyscreeps_arena-0.5.4.0.dist-info/entry_points.txt,sha256=pnpuPPadwQsxQPaR1rXzUo0fUvhOcC7HTHlf7TYXr7M,141
+pyscreeps_arena-0.5.4.0.dist-info/top_level.txt,sha256=l4uLyMR2NOy41ngBMh795jOHTFk3tgYKy64-9cgjVng,16
+pyscreeps_arena-0.5.4.0.dist-info/RECORD,,

{pyscreeps_arena-0.5.3.2.dist-info → pyscreeps_arena-0.5.4.0.dist-info}/entry_points.txt

@@ -1,3 +1,4 @@
 [console_scripts]
 arena = pyscreeps_arena:CMD_NewProject
+psaui = pyscreeps_arena:CMD_OpenUI
 pyscreeps-arena = pyscreeps_arena:CMD_NewProject

pyscreeps_arena-0.5.3.2.dist-info/RECORD

@@ -1,17 +0,0 @@
-pyscreeps_arena/__init__.py,sha256=aQvVULggzXzf3INx0Rrlozdk8Aoxe01lU7b5xytK678,862
-pyscreeps_arena/build.py,sha256=DQeGLnID2FjpsWTbnqwt2cOp28olWK68U67bfbFJSOU,177
-pyscreeps_arena/compiler.py,sha256=4K3bSV6Ej8orOmtmTAOlpFE0AtJvoIuNdeWNvsSD7A0,51145
-pyscreeps_arena/localization.py,sha256=gBbrNybIJAHlkzeD6maF-ie6RKSwPBbnCNzg_1ge8-c,5656
-pyscreeps_arena/project.7z,sha256=X5F7fjFQi9Umsm4UxetrjaAXgWAIfWLXFX_PR0mj9LE,288280
-pyscreeps_arena/core/__init__.py,sha256=qoP_rx1TpbDLJoTm5via4XPwEPaV1FXr1SYvoVoHGms,41
-pyscreeps_arena/core/basic.py,sha256=DFvyDTsTXf2bQtnS9s254TrkshvRwajaHcvTyVvJyqw,2790
-pyscreeps_arena/core/config.py,sha256=x_JhVHlVZqB3qA7UyACVnwZjg2gZU-BIs49UxZzwCoE,637
-pyscreeps_arena/core/const.py,sha256=2DgDkT9qvjCAbaGJbh7qEK8asXdwl1Um-6l8mZfooek,590
-pyscreeps_arena/core/core.py,sha256=3Nty8eLKPNgwnYk_sVNBPrWuKxBXI2od8nfEezsEAZQ,5157
-pyscreeps_arena/core/main.py,sha256=-FNSOEjksNlDfCbUqsjtPSUW8vT3qxEdfzXqT5Tdsik,170
-pyscreeps_arena/core/utils.py,sha256=N9OOkORvrqnJakayaFp9qyS0apWhB9lBK4xyyYkhFdo,215
-pyscreeps_arena-0.5.3.2.dist-info/METADATA,sha256=GVIGZNgCHR0m0UjI0v6Ca0O8t_dnYomuhetWKNmQ4PQ,2334
-pyscreeps_arena-0.5.3.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pyscreeps_arena-0.5.3.2.dist-info/entry_points.txt,sha256=mLTkJAsgPBEmFkrxNoo3dvb0_dAzSn9jf4Wh09PjdVU,106
-pyscreeps_arena-0.5.3.2.dist-info/top_level.txt,sha256=l4uLyMR2NOy41ngBMh795jOHTFk3tgYKy64-9cgjVng,16
-pyscreeps_arena-0.5.3.2.dist-info/RECORD,,