Release beta 1.0.3 Mora wallet updates
This commit is contained in:
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
|
||||
|
||||
[project]
|
||||
name = "jwebot-config"
|
||||
version = "1.0.2b1+1016"
|
||||
version = "1.0.3b1+1016"
|
||||
description = "Profile-based configuration compiler for JWeBot"
|
||||
requires-python = ">=3.9"
|
||||
dependencies = [
|
||||
|
||||
@@ -36,4 +36,4 @@ __all__ = [
|
||||
"write_default_profile",
|
||||
]
|
||||
|
||||
__version__ = "1.0.2b1+1016"
|
||||
__version__ = "1.0.3b1+1016"
|
||||
|
||||
@@ -4,12 +4,12 @@ build-backend = "setuptools.build_meta"
|
||||
|
||||
[project]
|
||||
name = "jwebot-extension-host"
|
||||
version = "1.0.2b1+1016"
|
||||
version = "1.0.3b1+1016"
|
||||
description = "Single-release, single-invocation process host for JWeBot extensions"
|
||||
requires-python = ">=3.9"
|
||||
dependencies = [
|
||||
"jwebot-sdk==1.0.2b1+1016",
|
||||
"jwebot-kernel==1.0.2b1+1016",
|
||||
"jwebot-sdk==1.0.3b1+1016",
|
||||
"jwebot-kernel==1.0.3b1+1016",
|
||||
]
|
||||
|
||||
[project.scripts]
|
||||
|
||||
@@ -16,4 +16,4 @@ __all__ = [
|
||||
"process_request",
|
||||
]
|
||||
|
||||
__version__ = "1.0.2b1+1016"
|
||||
__version__ = "1.0.3b1+1016"
|
||||
|
||||
@@ -4,13 +4,13 @@ build-backend = "setuptools.build_meta"
|
||||
|
||||
[project]
|
||||
name = "jwebot-kernel"
|
||||
version = "1.0.2b1+1016"
|
||||
version = "1.0.3b1+1016"
|
||||
description = "Stable routing and extension authority for JWeBot"
|
||||
requires-python = ">=3.9"
|
||||
dependencies = [
|
||||
"jwebot-config==1.0.2b1+1016",
|
||||
"jwebot-sdk==1.0.2b1+1016",
|
||||
"jwebot-official-extensions==1.0.2b1+1016",
|
||||
"jwebot-config==1.0.3b1+1016",
|
||||
"jwebot-sdk==1.0.3b1+1016",
|
||||
"jwebot-official-extensions==1.0.3b1+1016",
|
||||
"tomli>=2; python_version < '3.11'",
|
||||
]
|
||||
|
||||
|
||||
@@ -107,4 +107,4 @@ __all__ = [
|
||||
"verify_installed_release_signature",
|
||||
]
|
||||
|
||||
__version__ = "1.0.2b1+1016"
|
||||
__version__ = "1.0.3b1+1016"
|
||||
|
||||
@@ -71,6 +71,8 @@ from jwebot_official_extensions.steam import (
|
||||
SteamUnavailable,
|
||||
)
|
||||
from jwebot_official_extensions.player_games import (
|
||||
append_coin_event,
|
||||
append_game_coin_event,
|
||||
append_game_record,
|
||||
hand_value,
|
||||
next_game_index,
|
||||
@@ -98,6 +100,7 @@ EXTENSION_SOCKET_ROOT = Path("/run/jwebot-extension-host")
|
||||
MAX_EVENT_TEXT = 5_000
|
||||
MAX_REPLY_CHARS = 900
|
||||
MAX_CONTEXT_TURNS = 6
|
||||
OCR_EVENT_SOURCES = frozenset({"ocr", "rapidocr-local"})
|
||||
MAX_OUTBOX_ATTEMPTS = 3
|
||||
DIRECT_CHAT_GENERATION_WORKERS = 2
|
||||
DIRECT_API_SOCKET_TIMEOUT_SECONDS = 18.0
|
||||
@@ -354,6 +357,11 @@ def event_question(event: dict[str, Any]) -> str:
|
||||
return bounded_text(match.group(1) if match else text, limit=MAX_EVENT_TEXT)
|
||||
|
||||
|
||||
def is_ocr_event(event: dict[str, Any]) -> bool:
|
||||
source = str(event.get("source", "")).casefold()
|
||||
return source in OCR_EVENT_SOURCES or source.startswith("rapidocr-")
|
||||
|
||||
|
||||
def classify_question(question: str) -> tuple[str, str]:
|
||||
decision = route_question(question)
|
||||
return decision.route.value, decision.reason
|
||||
@@ -1293,6 +1301,43 @@ class Ledger:
|
||||
raise EdgeError("ledger write did not persist")
|
||||
return result, cursor.rowcount == 1
|
||||
|
||||
def recent_semantic_duplicate(
|
||||
self,
|
||||
*,
|
||||
group_fingerprint: str,
|
||||
sender: str,
|
||||
question: str,
|
||||
route: str,
|
||||
route_reason: str,
|
||||
within_seconds: float = 8.0,
|
||||
) -> dict[str, Any] | None:
|
||||
"""Find OCR re-ingestion of the same visible message under a new event id."""
|
||||
group = bounded_text(group_fingerprint, limit=256)
|
||||
actor = bounded_text(sender, limit=256) or "unknown"
|
||||
content = bounded_text(question, limit=2_000)
|
||||
if not group or not actor or not content:
|
||||
return None
|
||||
cutoff = (
|
||||
datetime.now(timezone.utc) - timedelta(seconds=within_seconds)
|
||||
).isoformat(timespec="milliseconds")
|
||||
with self.lock:
|
||||
row = self.connection.execute(
|
||||
"""
|
||||
SELECT *
|
||||
FROM events
|
||||
WHERE group_fingerprint = ?
|
||||
AND sender = ?
|
||||
AND question = ?
|
||||
AND route = ?
|
||||
AND route_reason = ?
|
||||
AND created_at >= ?
|
||||
ORDER BY created_at DESC, event_id DESC
|
||||
LIMIT 1
|
||||
""",
|
||||
(group, actor, content, route, route_reason, cutoff),
|
||||
).fetchone()
|
||||
return dict(row) if row else None
|
||||
|
||||
def set_event(
|
||||
self,
|
||||
event_id: str,
|
||||
@@ -3140,7 +3185,7 @@ class Ledger:
|
||||
|
||||
def _player_identity(self, group: str, sender: str) -> dict[str, str]:
|
||||
if not group or not sender or sender == "unknown":
|
||||
raise LocalCommandError("无法确认本人身份,不能操作金币账户")
|
||||
raise LocalCommandError("无法确认本人身份,不能操作摩拉账户")
|
||||
person = self.resolve_person(group, sender)
|
||||
person["display_name"] = person_display_label(person["display_name"])
|
||||
return person
|
||||
@@ -3178,13 +3223,15 @@ class Ledger:
|
||||
(group, person_key),
|
||||
).fetchone()
|
||||
if stored is None:
|
||||
return normalize_player_account({})
|
||||
account = normalize_player_account({})
|
||||
append_coin_event(account, int(account["balance"]), "首次初始化")
|
||||
return account
|
||||
try:
|
||||
account = json.loads(str(stored["state_json"]))
|
||||
except json.JSONDecodeError as error:
|
||||
raise LocalCommandError("金币账户状态无效") from error
|
||||
raise LocalCommandError("摩拉账户状态无效") from error
|
||||
if not isinstance(account, dict):
|
||||
raise LocalCommandError("金币账户状态无效")
|
||||
raise LocalCommandError("摩拉账户状态无效")
|
||||
return normalize_player_account(account)
|
||||
|
||||
def _save_player_account(
|
||||
@@ -3199,7 +3246,7 @@ class Ledger:
|
||||
type(account["balance"]) is not int
|
||||
or not 0 <= account["balance"] <= 1_000_000_000
|
||||
):
|
||||
raise LocalCommandError("金币结算超出允许范围")
|
||||
raise LocalCommandError("摩拉结算超出允许范围")
|
||||
self.connection.execute(
|
||||
"""
|
||||
INSERT INTO player_accounts VALUES (?, ?, ?, ?)
|
||||
@@ -3555,6 +3602,13 @@ class Ledger:
|
||||
+ " ".join(map(str, drawn_numbers))
|
||||
),
|
||||
)
|
||||
append_game_coin_event(
|
||||
account,
|
||||
kind="lottery",
|
||||
outcome=f"命中{matches}个",
|
||||
stake=stake,
|
||||
payout=payout,
|
||||
)
|
||||
self._save_player_account(
|
||||
group, key, account, timestamp
|
||||
)
|
||||
@@ -3661,6 +3715,13 @@ class Ledger:
|
||||
payout=stake,
|
||||
summary="主持人取消,下注已全额退回",
|
||||
)
|
||||
append_game_coin_event(
|
||||
account,
|
||||
kind="lottery",
|
||||
outcome="本轮取消",
|
||||
stake=stake,
|
||||
payout=stake,
|
||||
)
|
||||
self._save_player_account(
|
||||
group, key, account, timestamp
|
||||
)
|
||||
@@ -3827,6 +3888,13 @@ class Ledger:
|
||||
f"玩家{player_value}点,Taffy{dealer_value}点"
|
||||
),
|
||||
)
|
||||
append_game_coin_event(
|
||||
account,
|
||||
kind="blackjack",
|
||||
outcome=outcome,
|
||||
stake=bet,
|
||||
payout=payout,
|
||||
)
|
||||
self._save_player_account(group, key, account, timestamp)
|
||||
self.connection.execute(
|
||||
"""
|
||||
@@ -4830,9 +4898,9 @@ class Ledger:
|
||||
try:
|
||||
account = json.loads(str(row["state_json"]))
|
||||
except json.JSONDecodeError as error:
|
||||
raise LocalCommandError("金币账户状态无效") from error
|
||||
raise LocalCommandError("摩拉账户状态无效") from error
|
||||
if not isinstance(account, dict):
|
||||
raise LocalCommandError("金币账户状态无效")
|
||||
raise LocalCommandError("摩拉账户状态无效")
|
||||
normalize_player_account(account)
|
||||
loan = account.get("loan")
|
||||
loan_principal = (
|
||||
@@ -4939,9 +5007,9 @@ class Ledger:
|
||||
try:
|
||||
account = json.loads(str(row["state_json"]))
|
||||
except json.JSONDecodeError as error:
|
||||
raise LocalCommandError("金币账户状态无效") from error
|
||||
raise LocalCommandError("摩拉账户状态无效") from error
|
||||
if not isinstance(account, dict):
|
||||
raise LocalCommandError("金币账户状态无效")
|
||||
raise LocalCommandError("摩拉账户状态无效")
|
||||
normalize_player_account(account)
|
||||
stake = 0
|
||||
payout = 0
|
||||
@@ -5052,6 +5120,16 @@ class Ledger:
|
||||
)
|
||||
source_account["balance"] -= amount
|
||||
target_account["balance"] += amount
|
||||
append_coin_event(
|
||||
source_account,
|
||||
-amount,
|
||||
f"转账给 {target_display_name}",
|
||||
)
|
||||
append_coin_event(
|
||||
target_account,
|
||||
amount,
|
||||
f"转账 来自 {source['display_name']}",
|
||||
)
|
||||
timestamp = utc_now()
|
||||
self._save_player_account(
|
||||
group, source_key, source_account, timestamp
|
||||
@@ -6502,6 +6580,34 @@ class EdgeApplication:
|
||||
reason=reason,
|
||||
execution_path=execution_path,
|
||||
)
|
||||
existing_row = self.ledger.row(event_id) if event_id else None
|
||||
semantic_duplicate = None
|
||||
if existing_row is None and is_ocr_event(event):
|
||||
semantic_duplicate = self.ledger.recent_semantic_duplicate(
|
||||
group_fingerprint=group_id,
|
||||
sender=str(event.get("sender", "")),
|
||||
question=question,
|
||||
route=route,
|
||||
route_reason=reason,
|
||||
)
|
||||
if semantic_duplicate is not None:
|
||||
self.telemetry.elapsed(
|
||||
"edge.event.accepted",
|
||||
started,
|
||||
status="semantic_duplicate",
|
||||
event_id=event_id,
|
||||
group_id=group_id,
|
||||
route=route,
|
||||
execution_path=execution_path,
|
||||
duplicate=True,
|
||||
)
|
||||
return {
|
||||
"status": "ignored",
|
||||
"route": route,
|
||||
"execution_path": execution_path,
|
||||
"duplicate": True,
|
||||
"duplicate_event_id": str(semantic_duplicate["event_id"]),
|
||||
}
|
||||
row, created = self.ledger.record_event(
|
||||
event,
|
||||
question=question,
|
||||
|
||||
@@ -4,11 +4,11 @@ build-backend = "setuptools.build_meta"
|
||||
|
||||
[project]
|
||||
name = "jwebot-official-extensions"
|
||||
version = "1.0.2b1+1016"
|
||||
version = "1.0.3b1+1016"
|
||||
description = "Reviewed local command adapters and broker implementation for JWeBot"
|
||||
requires-python = ">=3.9"
|
||||
dependencies = [
|
||||
"jwebot-sdk==1.0.2b1+1016",
|
||||
"jwebot-sdk==1.0.3b1+1016",
|
||||
]
|
||||
|
||||
[tool.setuptools.packages.find]
|
||||
|
||||
@@ -90,4 +90,4 @@ __all__ = [
|
||||
"render_feature_list",
|
||||
]
|
||||
|
||||
__version__ = "1.0.2b1+1016"
|
||||
__version__ = "1.0.3b1+1016"
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@ PROFILE = 'coin-ranking'
|
||||
AUTHOR = 'jwebot'
|
||||
DESCRIPTION = '富榜'
|
||||
HELP_ENTRIES = ('/大富翁榜',)
|
||||
COMMANDS = ('/金币排行', '/金币排行榜', '/大富翁榜', '/richlist')
|
||||
COMMANDS = ('/摩拉排行', '/摩拉排行榜', '/金币排行', '/金币排行榜', '/大富翁榜', '/richlist')
|
||||
|
||||
|
||||
def _handler(context: SingleGroupContext, command: str):
|
||||
|
||||
+3
-3
@@ -5,9 +5,9 @@ from jwebot_sdk import Event, ExtensionResult, ReplyPlan, SingleGroupContext
|
||||
|
||||
PROFILE = 'coin-taffy'
|
||||
AUTHOR = 'jwebot'
|
||||
DESCRIPTION = 'Taffy金币'
|
||||
HELP_ENTRIES = ('/Taffy金币',)
|
||||
COMMANDS = ('/Taffy金币', '/taffycoins')
|
||||
DESCRIPTION = 'Taffy摩拉'
|
||||
HELP_ENTRIES = ('/Taffy摩拉(兼容 /Taffy金币)',)
|
||||
COMMANDS = ('/Taffy摩拉', '/Taffy金币', '/taffycoins')
|
||||
|
||||
|
||||
def _handler(context: SingleGroupContext, command: str):
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@ from jwebot_sdk import Event, ExtensionResult, ReplyPlan, SingleGroupContext
|
||||
|
||||
PROFILE = 'coin-transfer'
|
||||
AUTHOR = 'jwebot'
|
||||
DESCRIPTION = '金币转账'
|
||||
DESCRIPTION = '摩拉转账'
|
||||
HELP_ENTRIES = ('/转账 对方 金额;/transfer',)
|
||||
COMMANDS = ('/转账', '/transfer')
|
||||
|
||||
|
||||
+3
-3
@@ -5,9 +5,9 @@ from jwebot_sdk import Event, ExtensionResult, ReplyPlan, SingleGroupContext
|
||||
|
||||
PROFILE = 'single-player-games'
|
||||
AUTHOR = 'jwebot'
|
||||
DESCRIPTION = '金币游戏'
|
||||
HELP_ENTRIES = ('/金币 /wallet;/游戏记录 /gamehistory', '/抽奖 [金额];/draw', '/彩票 开始|报名|状态|开奖|取消;/lottery', '/21点 单人开始|要牌|停牌|状态;多人启动|加入|开始|放200', '/游戏帮助;/games')
|
||||
COMMANDS = ('/金币', '/wallet', '/抽奖', '/draw', '/彩票', '/买彩票', '/lottery', '/21点', '/二十一点', '/blackjack', '/游戏记录', '/个人记录', '/gamehistory', '/游戏帮助', '/games')
|
||||
DESCRIPTION = '摩拉游戏'
|
||||
HELP_ENTRIES = ('/摩拉(兼容 /金币)/wallet;/游戏记录 /gamehistory', '/抽奖 [金额];/draw', '/彩票 开始|报名|状态|开奖|取消;/lottery', '/21点 单人开始|要牌|停牌|状态;多人启动|加入|开始|放200', '/游戏帮助;/games')
|
||||
COMMANDS = ('/摩拉', '/金币', '/wallet', '/抽奖', '/draw', '/彩票', '/买彩票', '/lottery', '/21点', '/二十一点', '/blackjack', '/游戏记录', '/个人记录', '/gamehistory', '/游戏帮助', '/games')
|
||||
|
||||
|
||||
def _handler(context: SingleGroupContext, command: str):
|
||||
|
||||
+14
-14
@@ -956,7 +956,7 @@ def _shop_text(state: dict[str, Any], player: dict[str, Any]) -> str:
|
||||
lines = [
|
||||
(
|
||||
f"{_player_prefix(state, player)}第 {state['round_number']} 回合"
|
||||
f" {phase_name};金币 {player['gold']};生命 {player['hp']};"
|
||||
f" {phase_name};摩拉 {player['gold']};生命 {player['hp']};"
|
||||
f"教练 {player['coach_level']} 级;战术{player['tactic']};"
|
||||
f"阵容 {power['power']:.1f};商店{lock}"
|
||||
)
|
||||
@@ -1143,7 +1143,7 @@ def _auto_manage_ai(
|
||||
)
|
||||
text = (
|
||||
f"{player['display_name']} 自动运营:{'、'.join(actions)};"
|
||||
f"金币 {player['gold']},五人首发战力 "
|
||||
f"摩拉 {player['gold']},五人首发战力 "
|
||||
f"{lineup_power(player)['power']:.1f}。"
|
||||
)
|
||||
stories.append(
|
||||
@@ -1571,7 +1571,7 @@ def _settle_pve(
|
||||
)
|
||||
text = (
|
||||
f"{player['display_name']} {'完成' if won else '未完成'}"
|
||||
f"{event_name}目标 {adjusted:.1f}/{target},获得 {reward} 金币。"
|
||||
f"{event_name}目标 {adjusted:.1f}/{target},获得 {reward} 摩拉。"
|
||||
)
|
||||
stories.append(_story(state, "pve_result", text, result))
|
||||
lines.append(_host_text(text))
|
||||
@@ -2326,7 +2326,7 @@ def _team_power_line(state: dict[str, Any], key: str) -> str:
|
||||
else f"{player.get('coach_level', 1)}级"
|
||||
)
|
||||
return (
|
||||
f"{player['display_name']} #{state['season_number']}:金币 {player['gold']};"
|
||||
f"{player['display_name']} #{state['season_number']}:摩拉 {player['gold']};"
|
||||
f"生命 {player['hp']};教练 {coach_text};战术{player['tactic']};"
|
||||
f"阵容 {power['power']:.1f};商店{'已锁' if player['shop_locked'] else '未锁'}"
|
||||
)
|
||||
@@ -2417,7 +2417,7 @@ def _training_match_part(
|
||||
f"{_team_name(winner)} 以 {item['score']} 拿下本图。"
|
||||
),
|
||||
(
|
||||
f"金币:{_team_name(winner)} +{TRAINING_WIN_GOLD},"
|
||||
f"摩拉:{_team_name(winner)} +{TRAINING_WIN_GOLD},"
|
||||
f"{_team_name(loser)} +{TRAINING_LOSS_GOLD}。"
|
||||
),
|
||||
]
|
||||
@@ -2433,7 +2433,7 @@ def _training_bye_part(state: dict[str, Any], key: str, round_number: int) -> st
|
||||
)
|
||||
return (
|
||||
f"训练赛第 {round_number} 轮:{_team_name(player)} 与本地陪练队完成热身。\n"
|
||||
f"{hook}\n金币:{_team_name(player)} +{TRAINING_BYE_GOLD}。"
|
||||
f"{hook}\n摩拉:{_team_name(player)} +{TRAINING_BYE_GOLD}。"
|
||||
)
|
||||
|
||||
|
||||
@@ -2461,7 +2461,7 @@ def _settle_training_round(
|
||||
if cursor == 0:
|
||||
intro = (
|
||||
f"欢迎来到{state['event_title']}!你们已经到达酒店宾馆,"
|
||||
f"训练赛共 {len(rounds)} 轮。训练赛不扣生命,只产出运营金币。"
|
||||
f"训练赛共 {len(rounds)} 轮。训练赛不扣生命,只产出运营摩拉。"
|
||||
)
|
||||
parts.append(intro)
|
||||
stories.append(_story(state, "training_open", intro))
|
||||
@@ -2670,7 +2670,7 @@ def _series_report_parts(
|
||||
state["players"][winner_key]["gold"] = int(state["players"][winner_key]["gold"]) + reward
|
||||
final_text = (
|
||||
f"系列赛结束,{_team_name(state['players'][winner_key])} 以 {result['score']} 击败 "
|
||||
f"{_team_name(state['players'][loser_key])},获得 {reward} 金币。"
|
||||
f"{_team_name(state['players'][loser_key])},获得 {reward} 摩拉。"
|
||||
"这笔钱可以马上用于 /刷新、/选1~/选6 或锁店等下一轮运营。"
|
||||
)
|
||||
parts[-1] = parts[-1] + "\n" + final_text
|
||||
@@ -2745,7 +2745,7 @@ def _special_event_parts(
|
||||
)
|
||||
text = (
|
||||
f"{_team_name(player)} {'完成' if won else '勉强应付'}{event_kind}:"
|
||||
f"{hook}获得 {reward} 金币。"
|
||||
f"{hook}获得 {reward} 摩拉。"
|
||||
)
|
||||
parts.append(text)
|
||||
stories.append(_story(state, "special_event", text, {"person_key": key}))
|
||||
@@ -3141,7 +3141,7 @@ class CsMajorAutochess:
|
||||
story = _story(state, "tactic_selected", text, {"person_key": person_key, "tactic": tactic})
|
||||
return respond(state, text, stories=[story])
|
||||
if action == "coach":
|
||||
return respond(state, "教练现在由第一轮选秀决定,本届不能用金币升级教练。")
|
||||
return respond(state, "教练现在由第一轮选秀决定,本届不能用摩拉升级教练。")
|
||||
if action == "buy":
|
||||
values = _parse_indices(arguments)
|
||||
if len(values) != 1 or not 1 <= values[0] <= SHOP_SIZE:
|
||||
@@ -3152,7 +3152,7 @@ class CsMajorAutochess:
|
||||
return respond(state, "这个商店位置已经购买或没有候选")
|
||||
card = CARD_BY_ID[str(card_id)]
|
||||
if int(player["gold"]) < int(card["cost"]):
|
||||
return respond(state, f"金币不足:{card['name']} 需要 {card['cost']},当前 {player['gold']}")
|
||||
return respond(state, f"摩拉不足:{card['name']} 需要 {card['cost']},当前 {player['gold']}")
|
||||
existing = any(
|
||||
unit["card_id"] == card_id
|
||||
for unit in [*player["board"], *player["bench"]]
|
||||
@@ -3166,7 +3166,7 @@ class CsMajorAutochess:
|
||||
star, upgraded = _merge_purchase(player, str(card_id))
|
||||
player["shop"][slot] = None
|
||||
text = (
|
||||
f"{display_name} 签下 {card['name']},花费 {card['cost']} 金币;"
|
||||
f"{display_name} 签下 {card['name']},花费 {card['cost']} 摩拉;"
|
||||
f"当前 {star} 星,余额 {player['gold']}。"
|
||||
)
|
||||
if upgraded:
|
||||
@@ -3175,7 +3175,7 @@ class CsMajorAutochess:
|
||||
return respond(state, text, stories=[story])
|
||||
if action == "refresh":
|
||||
if int(player["gold"]) < REFRESH_COST:
|
||||
return respond(state, f"刷新需要 {REFRESH_COST} 金币,当前 {player['gold']}")
|
||||
return respond(state, f"刷新需要 {REFRESH_COST} 摩拉,当前 {player['gold']}")
|
||||
player["gold"] -= REFRESH_COST
|
||||
player["shop"] = _draw_shop(
|
||||
state,
|
||||
@@ -3222,7 +3222,7 @@ class CsMajorAutochess:
|
||||
refund = int(card["cost"]) * int(unit["copies"])
|
||||
player["gold"] += refund
|
||||
state["pool"][card["id"]] += int(unit["copies"])
|
||||
return respond(state, f"{display_name} 出售 {card['name']},返还 {refund} 金币。")
|
||||
return respond(state, f"{display_name} 出售 {card['name']},返还 {refund} 摩拉。")
|
||||
|
||||
if action == "ready":
|
||||
if person_key not in state.get("ready_keys", []):
|
||||
|
||||
+4
-4
@@ -11,7 +11,7 @@
|
||||
"队伍如果阵容完整,就更容易把这次插曲处理成奖金。",
|
||||
"这次挑战只出现一次,处理完就回到小组赛主线。",
|
||||
"主舞台彩排占用了热身时间,教练的管理能力开始生效。",
|
||||
"赞助商要求展示新战术,选错方向也不会淘汰,只会少拿金币。",
|
||||
"赞助商要求展示新战术,选错方向也不会淘汰,只会少拿摩拉。",
|
||||
"现场采访提到了前一场失利,队员心态需要稳住。",
|
||||
"这类挑战不扣生命,目的只是给运营阶段增加变数。",
|
||||
"处理好这次插曲的队伍,会在下一场前多一点经济余地。"
|
||||
@@ -141,21 +141,21 @@
|
||||
"{team} 这波 {count} 连分让地图气质变了,所有枪位都开始往前压。"
|
||||
],
|
||||
"training_hooks": [
|
||||
"训练赛不计入小组胜负,但会发金币,方便后续刷新商店。",
|
||||
"训练赛不计入小组胜负,但会发摩拉,方便后续刷新商店。",
|
||||
"这轮训练更像实战热身,每队都会遇到同场参赛对手。",
|
||||
"训练赛重点不是淘汰谁,而是检验当前阵容能不能打完整张图。",
|
||||
"这轮结束后可以 D 牌、锁店或调首发,下一轮再检验成果。",
|
||||
"AI 战队也会参与训练,对局结果会写入档案。",
|
||||
"如果阵容缺少指挥,训练赛的中期回合会更容易失控。",
|
||||
"如果你想追羁绊,现在是最适合刷新商店的窗口。",
|
||||
"训练赛的金币很重要,别把每次刷新都当成免费试错。",
|
||||
"训练赛的摩拉很重要,别把每次刷新都当成免费试错。",
|
||||
"这一阶段没有生命扣除,重点是运营和阵容成型。",
|
||||
"训练赛的地图会轮换,不会一直用同一个固定比分模板。",
|
||||
"每轮训练结束后,真人都需要发送 /结束回合 才会进入下一轮。",
|
||||
"训练赛会按轮次播报,避免一次性刷出一大串结果。",
|
||||
"如果出现轮空,会安排本地陪练队补一张 BO1。",
|
||||
"训练阶段适合观察战术克制,火力、稳定、残局都会影响回合走向。",
|
||||
"连胜会带来金币,但失败也有保底,保证测试局能继续运营。",
|
||||
"连胜会带来摩拉,但失败也有保底,保证测试局能继续运营。",
|
||||
"这部分是纯文字自走棋的节奏层,不再是单条目标数值判定。"
|
||||
]
|
||||
},
|
||||
|
||||
@@ -40,12 +40,16 @@ LOCAL_COMMAND_ALIASES = {
|
||||
"steam": "steam_friends",
|
||||
"上下文": "context_summary",
|
||||
"context": "context_summary",
|
||||
"摩拉": "wallet",
|
||||
"金币": "wallet",
|
||||
"wallet": "wallet",
|
||||
"摩拉排行": "coin_ranking",
|
||||
"摩拉排行榜": "coin_ranking",
|
||||
"金币排行": "coin_ranking",
|
||||
"金币排行榜": "coin_ranking",
|
||||
"大富翁榜": "coin_ranking",
|
||||
"richlist": "coin_ranking",
|
||||
"Taffy摩拉": "taffy_coins",
|
||||
"Taffy金币": "taffy_coins",
|
||||
"taffycoins": "taffy_coins",
|
||||
"转账": "transfer",
|
||||
@@ -152,9 +156,9 @@ LOCAL_EXTENSIONS = (
|
||||
LocalExtensionDescriptor(
|
||||
extension_id="single-player-games",
|
||||
author=JWEBOT_AUTHOR,
|
||||
description="金币游戏",
|
||||
description="摩拉游戏",
|
||||
help_entries=(
|
||||
"/金币 /wallet;/游戏记录 /gamehistory",
|
||||
"/摩拉(兼容 /金币)/wallet;/游戏记录 /gamehistory",
|
||||
"/抽奖 [金额];/draw",
|
||||
"/彩票 开始|报名|状态|开奖|取消;/lottery",
|
||||
"/21点 单人开始|要牌|停牌|状态;多人启动|加入|开始|放200",
|
||||
@@ -172,7 +176,7 @@ LOCAL_EXTENSIONS = (
|
||||
LocalExtensionDescriptor(
|
||||
extension_id="coin-transfer",
|
||||
author=JWEBOT_AUTHOR,
|
||||
description="金币转账",
|
||||
description="摩拉转账",
|
||||
help_entries=("/转账 对方 金额;/transfer",),
|
||||
command_kinds=("transfer",),
|
||||
),
|
||||
@@ -186,8 +190,8 @@ LOCAL_EXTENSIONS = (
|
||||
LocalExtensionDescriptor(
|
||||
extension_id="coin-taffy",
|
||||
author=JWEBOT_AUTHOR,
|
||||
description="Taffy金币",
|
||||
help_entries=("/Taffy金币",),
|
||||
description="Taffy摩拉",
|
||||
help_entries=("/Taffy摩拉(兼容 /Taffy金币)",),
|
||||
command_kinds=("taffy_coins",),
|
||||
),
|
||||
LocalExtensionDescriptor(
|
||||
|
||||
+1
-1
@@ -365,7 +365,7 @@ class LocalCommandEngine:
|
||||
return (f"人物:{self.person_display_label(person['display_name'])};"
|
||||
f"群内索引 {person['person_key'][:12]};别名:{aliases or '未配置'}。\n"
|
||||
f"基本属性:{facts or '暂无配置'}。\n"
|
||||
"本人金币 /金币;个人记忆 /我的记忆。身份由本地昵称映射解析,无法读取微信原生账号ID。")
|
||||
"本人摩拉 /摩拉;个人记忆 /我的记忆。身份由本地昵称映射解析,无法读取微信原生账号ID。")
|
||||
|
||||
@staticmethod
|
||||
def service_state(service_name: str) -> str:
|
||||
|
||||
+194
-54
@@ -26,6 +26,8 @@ MAX_LOAN_AMOUNT = 500
|
||||
GAME_TIMEOUT_SECONDS = 600
|
||||
GAME_HISTORY_LIMIT = 50
|
||||
GAME_HISTORY_PAGE_SIZE = 5
|
||||
COIN_EVENT_LIMIT = 50
|
||||
COIN_EVENT_DISPLAY_LIMIT = 10
|
||||
GAME_LABELS = {
|
||||
"prize_draw": "抽奖",
|
||||
"lottery": "彩票",
|
||||
@@ -54,11 +56,48 @@ BLACKJACK_TABLE_BET = re.compile(
|
||||
)
|
||||
TRANSFER_MARKED = re.compile(
|
||||
r"^(?:给|to)?\s*(?P<target>.+?)\s*"
|
||||
r"(?:金额|金币|coin|coins|:|:)\s*(?P<amount>\d{1,6})$",
|
||||
r"(?:金额|摩拉|金币|coin|coins|:|:)\s*(?P<amount>\d{1,6})$",
|
||||
re.IGNORECASE,
|
||||
)
|
||||
|
||||
|
||||
def coin_event_reason(kind: str, outcome: str) -> str:
|
||||
label = GAME_LABELS.get(kind, kind)
|
||||
if kind == "blackjack":
|
||||
if "赢" in outcome or "获胜" in outcome:
|
||||
return f"{label} 获胜"
|
||||
if "输" in outcome or "认输" in outcome or "爆" in outcome:
|
||||
return f"{label} 失败"
|
||||
if "平" in outcome:
|
||||
return f"{label} 平局"
|
||||
return f"{label} {outcome}".strip()
|
||||
|
||||
|
||||
def append_coin_event(
|
||||
account: dict[str, Any],
|
||||
delta: int,
|
||||
reason: str,
|
||||
) -> None:
|
||||
if delta == 0:
|
||||
return
|
||||
events = account.get("coin_events")
|
||||
if not isinstance(events, list):
|
||||
events = []
|
||||
events = [
|
||||
event for event in events
|
||||
if isinstance(event, dict) and type(event.get("delta")) is int
|
||||
]
|
||||
events.append(
|
||||
{
|
||||
"delta": delta,
|
||||
"reason": str(reason)[:120],
|
||||
"balance": int(account.get("balance", 0)),
|
||||
"created_at": time.time(),
|
||||
}
|
||||
)
|
||||
account["coin_events"] = events[-COIN_EVENT_LIMIT:]
|
||||
|
||||
|
||||
def normalize_player_account(account: dict[str, Any]) -> dict[str, Any]:
|
||||
account.setdefault("balance", INITIAL_COINS)
|
||||
account.setdefault("game", None)
|
||||
@@ -90,6 +129,33 @@ def normalize_player_account(account: dict[str, Any]) -> dict[str, Any]:
|
||||
account["game_history"] = [
|
||||
entry for entry in history if isinstance(entry, dict)
|
||||
][-GAME_HISTORY_LIMIT:]
|
||||
events = account.get("coin_events")
|
||||
if not isinstance(events, list):
|
||||
events = []
|
||||
for entry in account["game_history"]:
|
||||
try:
|
||||
stake = int(entry.get("stake", 0))
|
||||
payout = int(entry.get("payout", 0))
|
||||
except (TypeError, ValueError):
|
||||
continue
|
||||
delta = payout - stake
|
||||
if delta == 0:
|
||||
continue
|
||||
events.append(
|
||||
{
|
||||
"delta": delta,
|
||||
"reason": coin_event_reason(
|
||||
str(entry.get("kind", "")),
|
||||
str(entry.get("outcome", "")),
|
||||
),
|
||||
"balance": int(account["balance"]),
|
||||
"created_at": float(entry.get("completed_at", 0) or 0),
|
||||
}
|
||||
)
|
||||
account["coin_events"] = [
|
||||
event for event in events
|
||||
if isinstance(event, dict) and type(event.get("delta")) is int
|
||||
][-COIN_EVENT_LIMIT:]
|
||||
return account
|
||||
|
||||
|
||||
@@ -133,6 +199,40 @@ def append_game_record(
|
||||
account["game_history"] = history[-GAME_HISTORY_LIMIT:]
|
||||
|
||||
|
||||
def append_game_coin_event(
|
||||
account: dict[str, Any],
|
||||
*,
|
||||
kind: str,
|
||||
outcome: str,
|
||||
stake: int,
|
||||
payout: int,
|
||||
) -> None:
|
||||
append_coin_event(
|
||||
account,
|
||||
payout - stake,
|
||||
coin_event_reason(kind, outcome),
|
||||
)
|
||||
|
||||
|
||||
def recent_coin_event_lines(
|
||||
account: dict[str, Any],
|
||||
*,
|
||||
limit: int = COIN_EVENT_DISPLAY_LIMIT,
|
||||
) -> list[str]:
|
||||
normalize_player_account(account)
|
||||
events = sorted(
|
||||
account["coin_events"],
|
||||
key=lambda event: float(event.get("created_at", 0) or 0),
|
||||
reverse=True,
|
||||
)
|
||||
lines: list[str] = []
|
||||
for event in events[:limit]:
|
||||
delta = int(event["delta"])
|
||||
reason = str(event.get("reason", "账户变动")).strip() or "账户变动"
|
||||
lines.append(f"{delta:+d}:{reason}")
|
||||
return lines
|
||||
|
||||
|
||||
def card_label(card: int) -> str:
|
||||
return ("A", "2", "3", "4", "5", "6", "7", "8", "9", "10", "J", "Q", "K")[card % 13]
|
||||
|
||||
@@ -155,10 +255,11 @@ class PlayerGames:
|
||||
@staticmethod
|
||||
def rules() -> str:
|
||||
return (
|
||||
"每人首次使用获 1000 虚拟金币;/金币 查看余额;/游戏记录 查看本人记录。\n"
|
||||
"每人首次使用获 1000 虚拟摩拉;/摩拉 查看余额(兼容 /金币);"
|
||||
"/游戏记录 查看本人记录。\n"
|
||||
"转账:/转账 对方 金额,或 /transfer name amount;"
|
||||
"对方需先用 /金币 初始化账户。\n"
|
||||
"贷款:/贷款 [1~500] 借入金币;/还款 [金额|全部] 归还,"
|
||||
"对方需先用 /摩拉 或 /金币 初始化账户。\n"
|
||||
"贷款:/贷款 [1~500] 借入摩拉;/还款 [金额|全部] 归还,"
|
||||
"同一时间最多一笔未还贷款。\n"
|
||||
"抽奖:/抽奖 [2~100],5%返5倍、20%返2倍,其余无返还。\n"
|
||||
"多人彩票:/彩票 开始;/彩票 报名 3 4 7 [1~500];"
|
||||
@@ -172,7 +273,7 @@ class PlayerGames:
|
||||
"主持人 /21点 多人 开始 后按提示 /21点 放200"
|
||||
"(1~10000);轮到自己 /21点 要牌|停牌。\n"
|
||||
"21点获胜返2倍、平局返下注、自然21点返2.5倍向下取整,庄家软17停牌。"
|
||||
"以上均含本金;虚拟金币不能充值或兑换。"
|
||||
"以上均含本金;虚拟摩拉不能充值或兑换。"
|
||||
)
|
||||
|
||||
def handle(self, row: dict[str, Any], kind: str, arguments: str) -> str:
|
||||
@@ -194,10 +295,10 @@ class PlayerGames:
|
||||
if kind in {"loan", "repay"}:
|
||||
return self.loan_or_repay(row, kind, arguments)
|
||||
if kind == "wallet" and arguments:
|
||||
return "用法:/金币(/wallet),查看本人的虚拟金币;/游戏帮助 查看规则"
|
||||
return "用法:/摩拉(兼容 /金币、/wallet),查看本人的虚拟摩拉;/游戏帮助 查看规则"
|
||||
if kind == "prize_draw":
|
||||
if arguments and not re.fullmatch(r"\d{1,3}", arguments):
|
||||
return "用法:/抽奖 [2~100金币](/draw),默认10金币"
|
||||
return "用法:/抽奖 [2~100摩拉](/draw),默认10摩拉"
|
||||
bet = int(arguments or 10)
|
||||
elif kind == "blackjack":
|
||||
table_command = self.parse_blackjack_table_command(arguments)
|
||||
@@ -255,13 +356,13 @@ class PlayerGames:
|
||||
else:
|
||||
bet = 0
|
||||
if kind == "prize_draw" and not MIN_DRAW_BET <= bet <= MAX_DRAW_BET:
|
||||
return "抽奖下注必须为 2~100 的整数金币"
|
||||
return "抽奖下注必须为 2~100 的整数摩拉"
|
||||
if (
|
||||
kind == "blackjack"
|
||||
and action == "start"
|
||||
and not MIN_BLACKJACK_BET <= bet <= MAX_BLACKJACK_BET
|
||||
):
|
||||
return "21点下注必须为 1~500 的整数金币"
|
||||
return "21点下注必须为 1~500 的整数摩拉"
|
||||
person = self.ledger.resolve_person(
|
||||
str(row["group_fingerprint"]),
|
||||
str(row["sender"]),
|
||||
@@ -291,6 +392,13 @@ class PlayerGames:
|
||||
payout=0,
|
||||
summary="10分钟无有效操作,按认输结束",
|
||||
)
|
||||
append_game_coin_event(
|
||||
account,
|
||||
kind="blackjack",
|
||||
outcome="超时认输",
|
||||
stake=int(game["bet"]),
|
||||
payout=0,
|
||||
)
|
||||
account["game"] = None
|
||||
account["losses"] += 1
|
||||
expired = "上一局已超时,按认输结束;"
|
||||
@@ -298,11 +406,20 @@ class PlayerGames:
|
||||
state = "进行中" if account.get("game") else "无进行中的牌局"
|
||||
loan = account.get("loan")
|
||||
loan_text = f"未还贷款 {loan['principal']};" if loan else "无贷款;"
|
||||
return (
|
||||
f"{expired}金币 {account['balance']};{loan_text}21点 {state};"
|
||||
f"已结算胜 {account['wins']} / 负 {account['losses']} / 平 {account['ties']}。"
|
||||
"首次赠送1000仅发一次;/游戏帮助 查看规则"
|
||||
)
|
||||
total = account["wins"] + account["losses"] + account["ties"]
|
||||
win_rate = (account["wins"] / total * 100) if total else 0.0
|
||||
lines = [
|
||||
f"{player_label}:{expired}当前摩拉 {account['balance']};{loan_text}",
|
||||
(
|
||||
f"21点 {state};已结算胜 {account['wins']} / "
|
||||
f"负 {account['losses']} / 平 {account['ties']},"
|
||||
f"胜率 {win_rate:.2f}%。"
|
||||
),
|
||||
"最近10次账户变动:",
|
||||
]
|
||||
lines.extend(recent_coin_event_lines(account) or ["暂无"])
|
||||
lines.append("/游戏帮助 查看规则")
|
||||
return "\n".join(lines)
|
||||
if kind == "blackjack" and action in {"hit", "stand", "status", "end"}:
|
||||
active = account.get("game")
|
||||
index = int(active["index"]) if active else None
|
||||
@@ -318,7 +435,7 @@ class PlayerGames:
|
||||
else message
|
||||
)
|
||||
if account["balance"] < bet:
|
||||
message = expired + f"金币不足:余额 {account['balance']},本次需要 {bet}"
|
||||
message = expired + f"摩拉不足:余额 {account['balance']},本次需要 {bet}"
|
||||
return player_reply(message) if kind == "blackjack" else message
|
||||
account["balance"] -= bet
|
||||
if kind == "blackjack":
|
||||
@@ -350,10 +467,17 @@ class PlayerGames:
|
||||
payout=payout,
|
||||
summary=f"抽奖结果 {result}",
|
||||
)
|
||||
append_game_coin_event(
|
||||
account,
|
||||
kind="prize_draw",
|
||||
outcome=result,
|
||||
stake=bet,
|
||||
payout=payout,
|
||||
)
|
||||
return player_reply(
|
||||
expired
|
||||
+ f"{result};下注 {bet},返还 {payout},"
|
||||
f"净变化 {payout - bet:+d};金币 {account['balance']}",
|
||||
f"净变化 {payout - bet:+d};摩拉 {account['balance']}",
|
||||
index,
|
||||
)
|
||||
|
||||
@@ -364,22 +488,22 @@ class PlayerGames:
|
||||
def coin_ranking(self, row: dict[str, Any], arguments: str) -> str:
|
||||
value = arguments.strip()
|
||||
if value and not re.fullmatch(r"\d{1,2}", value):
|
||||
return "用法:/大富翁榜 或 /金币排行 [人数]"
|
||||
return "用法:/大富翁榜、/摩拉排行 [人数] 或 /金币排行 [人数]"
|
||||
limit = int(value or 10)
|
||||
if not 1 <= limit <= 20:
|
||||
return "金币排行人数必须为 1~20"
|
||||
return "摩拉排行人数必须为 1~20"
|
||||
records = self.ledger.player_coin_ranking(
|
||||
str(row["group_fingerprint"]),
|
||||
limit=limit,
|
||||
)
|
||||
if not records:
|
||||
return "当前群还没有金币账户;发送 /金币 初始化"
|
||||
return "当前群还没有摩拉账户;发送 /摩拉 或 /金币 初始化"
|
||||
lines = ["大富翁榜:"]
|
||||
for index, record in enumerate(records, start=1):
|
||||
loan = int(record.get("loan", 0))
|
||||
loan_text = f"(未还贷款 {loan})" if loan else ""
|
||||
lines.append(
|
||||
f"{index}. {record['display_name']} {record['balance']} 金币"
|
||||
f"{index}. {record['display_name']} {record['balance']} 摩拉"
|
||||
f"{loan_text}"
|
||||
)
|
||||
return "\n".join(lines)
|
||||
@@ -387,21 +511,21 @@ class PlayerGames:
|
||||
def taffy_coins(self, row: dict[str, Any], arguments: str) -> str:
|
||||
value = arguments.strip()
|
||||
if value and not re.fullmatch(r"\d{1,2}", value):
|
||||
return "用法:/Taffy金币 [人数]"
|
||||
return "用法:/Taffy摩拉 [人数](兼容 /Taffy金币)"
|
||||
limit = int(value or 8)
|
||||
if not 1 <= limit <= 20:
|
||||
return "Taffy金币人数必须为 1~20"
|
||||
return "Taffy摩拉人数必须为 1~20"
|
||||
stats = self.ledger.player_taffy_coin_stats(
|
||||
str(row["group_fingerprint"]),
|
||||
limit=limit,
|
||||
)
|
||||
if int(stats["records"]) == 0:
|
||||
return "Taffy金币:当前群暂无已结算游戏记录"
|
||||
return "Taffy摩拉:当前群暂无已结算游戏记录"
|
||||
net = int(stats["taffy_net"])
|
||||
result = f"Taffy累计赢 {net} 金币" if net >= 0 else f"Taffy累计倒贴 {-net} 金币"
|
||||
result = f"Taffy累计赢 {net} 摩拉" if net >= 0 else f"Taffy累计倒贴 {-net} 摩拉"
|
||||
lines = [
|
||||
(
|
||||
f"Taffy金币:已结算 {stats['records']} 局;"
|
||||
f"Taffy摩拉:已结算 {stats['records']} 局;"
|
||||
f"玩家总下注 {stats['stake']},总返还 {stats['payout']};"
|
||||
f"{result}"
|
||||
)
|
||||
@@ -551,7 +675,7 @@ class PlayerGames:
|
||||
)
|
||||
if action == "bet":
|
||||
if not MIN_BLACKJACK_TABLE_BET <= amount <= MAX_BLACKJACK_TABLE_BET:
|
||||
return "21点多人牌桌筹码必须为 1~10000 的整数金币"
|
||||
return "21点多人牌桌筹码必须为 1~10000 的整数摩拉"
|
||||
deck = list(range(52))
|
||||
self.rng.shuffle(deck)
|
||||
return self.ledger.place_group_blackjack_bet(
|
||||
@@ -710,13 +834,13 @@ class PlayerGames:
|
||||
return self.blackjack_prompt(data["prompt_player"])
|
||||
if status == "insufficient":
|
||||
return (
|
||||
f"{data['display_name']}:金币不足,余额 {data['balance']},"
|
||||
f"{data['display_name']}:摩拉不足,余额 {data['balance']},"
|
||||
f"本次需要 {data['bet']}"
|
||||
)
|
||||
if status == "bet_accepted":
|
||||
return (
|
||||
f"{data['display_name']} 放下 {data['bet']};"
|
||||
f"金币 {data['balance']}\n"
|
||||
f"摩拉 {data['balance']}\n"
|
||||
f"{self.blackjack_prompt(data['prompt_player'])}"
|
||||
)
|
||||
if status == "dealt":
|
||||
@@ -814,7 +938,7 @@ class PlayerGames:
|
||||
f"{player['display_name']} #{player['player_game_index']}:"
|
||||
f"{player['outcome']};牌 {self.blackjack_hand_text(player['hand'])};"
|
||||
f"下注 {bet},返还 {payout},净变化 {payout - bet:+d};"
|
||||
f"金币 {player['balance']}"
|
||||
f"摩拉 {player['balance']}"
|
||||
)
|
||||
return "\n".join(lines)
|
||||
|
||||
@@ -864,11 +988,11 @@ class PlayerGames:
|
||||
return (
|
||||
"用法:/转账 对方 金额,例如 /转账 Bob 100;"
|
||||
"英文 /transfer Bob 100。金额范围 1~100000,"
|
||||
"对方需先发送 /金币 初始化账户"
|
||||
"对方需先发送 /摩拉 或 /金币 初始化账户"
|
||||
)
|
||||
target, amount = parsed
|
||||
if not MIN_TRANSFER_AMOUNT <= amount <= MAX_TRANSFER_AMOUNT:
|
||||
return "转账金额必须为 1~100000 的整数金币"
|
||||
return "转账金额必须为 1~100000 的整数摩拉"
|
||||
|
||||
def render(data: dict[str, Any]) -> str:
|
||||
source = data["source_display_name"]
|
||||
@@ -877,18 +1001,18 @@ class PlayerGames:
|
||||
return f"{source}:不能给自己转账"
|
||||
if data["status"] == "target_missing":
|
||||
return (
|
||||
f"{source}:{target_name} 还没有金币账户,"
|
||||
"请先让对方发送 /金币 初始化"
|
||||
f"{source}:{target_name} 还没有摩拉账户,"
|
||||
"请先让对方发送 /摩拉 或 /金币 初始化"
|
||||
)
|
||||
if data["status"] == "insufficient":
|
||||
return (
|
||||
f"{source}:金币不足,余额 {data['source_balance']},"
|
||||
f"{source}:摩拉不足,余额 {data['source_balance']},"
|
||||
f"本次需要 {data['amount']}"
|
||||
)
|
||||
return (
|
||||
f"{source}:已向 {target_name} 转账 {data['amount']} 金币;"
|
||||
f"本人金币 {data['source_balance']};"
|
||||
f"{target_name} 金币 {data['target_balance']}"
|
||||
f"{source}:已向 {target_name} 转账 {data['amount']} 摩拉;"
|
||||
f"本人摩拉 {data['source_balance']};"
|
||||
f"{target_name} 摩拉 {data['target_balance']}"
|
||||
)
|
||||
|
||||
return self.ledger.transfer_player_coins(
|
||||
@@ -908,7 +1032,7 @@ class PlayerGames:
|
||||
return "用法:/贷款 [1~500];同一时间最多一笔未还贷款"
|
||||
amount = int(value)
|
||||
if not MIN_LOAN_AMOUNT <= amount <= MAX_LOAN_AMOUNT:
|
||||
return "贷款金额必须为 1~500 的整数金币"
|
||||
return "贷款金额必须为 1~500 的整数摩拉"
|
||||
else:
|
||||
amount = 0
|
||||
if value not in {"", "全部", "all"}:
|
||||
@@ -916,7 +1040,7 @@ class PlayerGames:
|
||||
return "用法:/还款 [金额|全部]"
|
||||
amount = int(value)
|
||||
if amount <= 0:
|
||||
return "还款金额必须为正整数金币"
|
||||
return "还款金额必须为正整数摩拉"
|
||||
|
||||
group = str(row["group_fingerprint"])
|
||||
sender = str(row["sender"])
|
||||
@@ -929,7 +1053,7 @@ class PlayerGames:
|
||||
if kind == "loan":
|
||||
if loan:
|
||||
return (
|
||||
f"{player_label}:已有未还贷款 {loan['principal']} 金币;"
|
||||
f"{player_label}:已有未还贷款 {loan['principal']} 摩拉;"
|
||||
"请先 /还款 [金额|全部]"
|
||||
)
|
||||
account["balance"] += amount
|
||||
@@ -937,9 +1061,10 @@ class PlayerGames:
|
||||
"principal": amount,
|
||||
"borrowed_at": time.time(),
|
||||
}
|
||||
append_coin_event(account, amount, "贷款到账")
|
||||
return (
|
||||
f"{player_label}:贷款 {amount} 金币已到账;"
|
||||
f"当前金币 {account['balance']};未还贷款 {amount}"
|
||||
f"{player_label}:贷款 {amount} 摩拉已到账;"
|
||||
f"当前摩拉 {account['balance']};未还贷款 {amount}"
|
||||
)
|
||||
if not loan:
|
||||
return f"{player_label}:当前没有未还贷款"
|
||||
@@ -949,13 +1074,14 @@ class PlayerGames:
|
||||
else:
|
||||
pay = min(amount, debt)
|
||||
if pay <= 0:
|
||||
return f"{player_label}:金币不足,无法还款;未还贷款 {debt}"
|
||||
return f"{player_label}:摩拉不足,无法还款;未还贷款 {debt}"
|
||||
if pay > int(account["balance"]):
|
||||
return (
|
||||
f"{player_label}:金币不足,余额 {account['balance']},"
|
||||
f"{player_label}:摩拉不足,余额 {account['balance']},"
|
||||
f"本次还款需要 {pay}"
|
||||
)
|
||||
account["balance"] -= pay
|
||||
append_coin_event(account, -pay, "还款")
|
||||
debt -= pay
|
||||
if debt:
|
||||
account["loan"] = {
|
||||
@@ -963,13 +1089,13 @@ class PlayerGames:
|
||||
"borrowed_at": float(loan.get("borrowed_at", time.time())),
|
||||
}
|
||||
return (
|
||||
f"{player_label}:已还款 {pay} 金币;"
|
||||
f"剩余贷款 {debt};当前金币 {account['balance']}"
|
||||
f"{player_label}:已还款 {pay} 摩拉;"
|
||||
f"剩余贷款 {debt};当前摩拉 {account['balance']}"
|
||||
)
|
||||
account["loan"] = None
|
||||
return (
|
||||
f"{player_label}:已还清贷款 {pay} 金币;"
|
||||
f"当前金币 {account['balance']}"
|
||||
f"{player_label}:已还清贷款 {pay} 摩拉;"
|
||||
f"当前摩拉 {account['balance']}"
|
||||
)
|
||||
|
||||
return self.ledger.apply_player_action(
|
||||
@@ -1035,7 +1161,7 @@ class PlayerGames:
|
||||
if len(set(digits)) != 3:
|
||||
raise ValueError("彩票的三个数字必须互不重复")
|
||||
if not MIN_LOTTERY_BET <= stake <= MAX_LOTTERY_BET:
|
||||
raise ValueError("彩票下注必须为 1~500 的整数金币")
|
||||
raise ValueError("彩票下注必须为 1~500 的整数摩拉")
|
||||
return tuple(sorted(digits)), stake
|
||||
|
||||
def group_lottery(self, row: dict[str, Any], arguments: str) -> str:
|
||||
@@ -1106,7 +1232,7 @@ class PlayerGames:
|
||||
f"命中 {entry['matches']} 个;下注 {entry['stake']},"
|
||||
f"返还 {entry['payout']},净变化 "
|
||||
f"{entry['payout'] - entry['stake']:+d};"
|
||||
f"金币 {entry['balance']}"
|
||||
f"摩拉 {entry['balance']}"
|
||||
)
|
||||
return "\n".join(lines)
|
||||
|
||||
@@ -1154,7 +1280,7 @@ class PlayerGames:
|
||||
return "当前没有进行中的彩票;先发送 /彩票 开始"
|
||||
if data["status"] == "insufficient":
|
||||
return (
|
||||
f"{data['display_name']}:金币不足,余额 {data['balance']},"
|
||||
f"{data['display_name']}:摩拉不足,余额 {data['balance']},"
|
||||
f"报名需要 {stake}"
|
||||
)
|
||||
action = "报名已更新" if data["status"] == "updated" else "报名成功"
|
||||
@@ -1162,7 +1288,7 @@ class PlayerGames:
|
||||
f"{data['display_name']} #{data['player_game_index']}:"
|
||||
f"彩票第 {data['round_number']} 把{action};号码 "
|
||||
f"{' '.join(map(str, data['numbers']))};下注 {data['stake']};"
|
||||
f"金币 {data['balance']}"
|
||||
f"摩拉 {data['balance']}"
|
||||
)
|
||||
|
||||
return self.ledger.register_group_lottery(
|
||||
@@ -1227,9 +1353,16 @@ class PlayerGames:
|
||||
payout=0,
|
||||
summary="主动结束牌局,不退下注",
|
||||
)
|
||||
append_game_coin_event(
|
||||
account,
|
||||
kind="blackjack",
|
||||
outcome="主动认输",
|
||||
stake=bet,
|
||||
payout=0,
|
||||
)
|
||||
account["game"] = None
|
||||
account["losses"] += 1
|
||||
return f"本人的21点已认输结束,不退下注;金币 {account['balance']}"
|
||||
return f"本人的21点已认输结束,不退下注;摩拉 {account['balance']}"
|
||||
game["updated_at"] = time.time()
|
||||
if action == "hit":
|
||||
game["player"].append(game["deck"].pop())
|
||||
@@ -1269,7 +1402,14 @@ class PlayerGames:
|
||||
f"玩家{player}点,庄家{dealer}点"
|
||||
),
|
||||
)
|
||||
append_game_coin_event(
|
||||
account,
|
||||
kind="blackjack",
|
||||
outcome=outcome,
|
||||
stake=int(bet),
|
||||
payout=int(payout),
|
||||
)
|
||||
account["game"] = None
|
||||
return (f"21点结算:{outcome};你的牌 {' '.join(map(card_label, game['player']))}({player}点),"
|
||||
f"庄家 {' '.join(map(card_label, game['dealer']))}({dealer}点);"
|
||||
f"下注 {bet},返还 {payout},净变化 {payout - bet:+d};金币 {account['balance']}")
|
||||
f"下注 {bet},返还 {payout},净变化 {payout - bet:+d};摩拉 {account['balance']}")
|
||||
|
||||
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
|
||||
|
||||
[project]
|
||||
name = "jwebot-sdk"
|
||||
version = "1.0.2b1+1016"
|
||||
version = "1.0.3b1+1016"
|
||||
description = "Typed, capability-limited extension API for JWeBot plugins"
|
||||
requires-python = ">=3.9"
|
||||
dependencies = []
|
||||
|
||||
@@ -38,4 +38,4 @@ __all__ = [
|
||||
"SingleGroupContext",
|
||||
]
|
||||
|
||||
__version__ = "1.0.2b1+1016"
|
||||
__version__ = "1.0.3b1+1016"
|
||||
|
||||
Reference in New Issue
Block a user