:recycle: 重构log.py

6 files changed, 23 insertions, 5 deletions

diff --git a/src/hydrorollcore/__init__.py b/src/hydrorollcore/__init__.py
index 12d44f21..2aca9dd7 100644
--- a/src/hydrorollcore/__init__.py
+++ b/src/hydrorollcore/__init__.py
@@ -1,8 +1,6 @@
 from HydroRollCore.cli import Cli
-from HydroRollCore.config import Config
 from HydroRollCore.rule import Rule, Result, Dice
-from HydroRollCore.core import Core
 from HydroRollCore.typing import Config as ConfigTyping
 from HydroRollCore.event import Event
 
-__all__ = ["Core", "Rule", "Config", "Cli", "Result", "Dice", "Event", "ConfigTyping"]
+__all__ = ["Rule", "Cli", "Result", "Dice", "Event", "ConfigTyping"]
diff --git a/src/hydrorollcore/cli.py b/src/hydrorollcore/cli.py
index 0b906f25..51d8d983 100644
--- a/src/hydrorollcore/cli.py
+++ b/src/hydrorollcore/cli.py
@@ -1,6 +1,6 @@
 from pathlib import Path
 from .consts import templates
-from .log import logger
+from .logging import logger
 
 import argparse
 import os
diff --git a/src/hydrorollcore/event.py b/src/hydrorollcore/event.py
index bec0399e..4e9c6611 100644
--- a/src/hydrorollcore/event.py
+++ b/src/hydrorollcore/event.py
@@ -1,5 +1,5 @@
 from .typing import Dict
-from .log import logger
+from .logging import logger
 
 import re
 
diff --git a/src/hydrorollcore/log.py b/src/hydrorollcore/logging.py
index a559561f..a559561f 100644
--- a/src/hydrorollcore/log.py
+++ b/src/hydrorollcore/logging.py
diff --git a/src/hydrorollcore/manager.py b/src/hydrorollcore/manager.py
new file mode 100644
index 00000000..83db77ce
--- /dev/null
+++ b/src/hydrorollcore/manager.py
@@ -0,0 +1,18 @@
+from .event import Events, events
+from .logging import logger
+from .typing import Dict
+
+
+class Manager:
+    """事件处理单元"""
+
+    events: Events
+
+    def __init__(self, _events: Events = None) -> None:
+        self.events = _events if _events else events
+
+    def roll(roll_string: str):
+        ...
+
+
+manager = Manager()
diff --git a/src/hydrorollcore/rule.py b/src/hydrorollcore/rule.py
index 127ed805..a1f04151 100644
--- a/src/hydrorollcore/rule.py
+++ b/src/hydrorollcore/rule.py
@@ -1,6 +1,7 @@
 from abc import ABCMeta, abstractmethod
 from enum import Enum
 from .exceptions import HydroError
+from .typing import Dict
 
 __all__ = ["RuleLoadType", "Result", "Dice", "Rule"]
 
@@ -62,6 +63,7 @@ class Rule(metaclass=ABCMeta):
     """规则基类"""
 
     name: str
+    dices: Dict[str, str] = {}
     priority: int = 0
 
     @abstractmethod