feat: add {gift_count} variable to gift/blind box default rules
- New variable {gift_count} (gift quantity) alongside existing {gift_num}
- Default templates: 感谢由{viewer_name}投喂的{gift_count}个{gift_name}
- danmaku_handler passes gift_count=message.num
- README variable table and examples updated
- Rebuild portable zip (83.9 MB)
This commit is contained in:
@@ -96,8 +96,8 @@ python main.py --room-id ROOM_ID [--voice VOICE] [--speed SPEED]
|
|||||||
| 事件 | 变量 |
|
| 事件 | 变量 |
|
||||||
|------|------|
|
|------|------|
|
||||||
| `danmaku` 弹幕 | `{uname}` `{msg}` |
|
| `danmaku` 弹幕 | `{uname}` `{msg}` |
|
||||||
| `gift` 普通礼物 | `{viewer_name}` `{gift_name}` `{gift_num}` `{gift_price}` `{gift_coin_type}` |
|
| `gift` 普通礼物 | `{viewer_name}` `{gift_name}` `{gift_count}` `{gift_price}` `{gift_coin_type}` |
|
||||||
| `blind_box` 盲盒礼物 | `{viewer_name}` `{gift_name}` `{gift_num}` `{blind_box_gift}` |
|
| `blind_box` 盲盒礼物 | `{viewer_name}` `{gift_name}` `{gift_count}` `{blind_box_gift}` |
|
||||||
| `enter_room` 进房 | `{viewer_name}` `{user_uid}` |
|
| `enter_room` 进房 | `{viewer_name}` `{user_uid}` |
|
||||||
| `follow` 关注 | `{viewer_name}` `{user_uid}` |
|
| `follow` 关注 | `{viewer_name}` `{user_uid}` |
|
||||||
| `interact_other` 其他互动 | `{viewer_name}` `{user_uid}` `{interact_type}`(分享/特别关注/互粉) |
|
| `interact_other` 其他互动 | `{viewer_name}` `{user_uid}` `{interact_type}`(分享/特别关注/互粉) |
|
||||||
@@ -110,8 +110,8 @@ python main.py --room-id ROOM_ID [--voice VOICE] [--speed SPEED]
|
|||||||
```json
|
```json
|
||||||
{
|
{
|
||||||
"templates": {
|
"templates": {
|
||||||
"gift": "感谢由{viewer_name}投喂的{gift_name}",
|
"gift": "感谢由{viewer_name}投喂的{gift_count}个{gift_name}",
|
||||||
"blind_box": "感谢由{viewer_name}投喂的{gift_name}爆出了{blind_box_gift}",
|
"blind_box": "感谢由{viewer_name}投喂的{gift_count}个{gift_name}爆出了{blind_box_gift}",
|
||||||
"enter_room": "欢迎{viewer_name}进入直播间",
|
"enter_room": "欢迎{viewer_name}进入直播间",
|
||||||
"buy_guard": "恭喜{ships_viewer_name}成为尊贵的{ships_level}",
|
"buy_guard": "恭喜{ships_viewer_name}成为尊贵的{ships_level}",
|
||||||
"super_chat": "{viewer_name}的醒目留言:{super_chat_content}"
|
"super_chat": "{viewer_name}的醒目留言:{super_chat_content}"
|
||||||
|
|||||||
@@ -84,12 +84,14 @@ class DanmakuHandler(blivedm.BaseHandler):
|
|||||||
viewer_name=message.uname,
|
viewer_name=message.uname,
|
||||||
gift_name=message.gift_name,
|
gift_name=message.gift_name,
|
||||||
gift_num=message.num,
|
gift_num=message.num,
|
||||||
|
gift_count=message.num,
|
||||||
blind_box_gift=blind_box_gift)
|
blind_box_gift=blind_box_gift)
|
||||||
else:
|
else:
|
||||||
text = event_text(self._rules, "gift",
|
text = event_text(self._rules, "gift",
|
||||||
viewer_name=message.uname,
|
viewer_name=message.uname,
|
||||||
gift_name=message.gift_name,
|
gift_name=message.gift_name,
|
||||||
gift_num=message.num,
|
gift_num=message.num,
|
||||||
|
gift_count=message.num,
|
||||||
gift_price=message.price,
|
gift_price=message.price,
|
||||||
gift_coin_type=message.coin_type)
|
gift_coin_type=message.coin_type)
|
||||||
logger.info("Gift: %s x%d from %s (blind=%s)",
|
logger.info("Gift: %s x%d from %s (blind=%s)",
|
||||||
|
|||||||
+3
-3
@@ -11,9 +11,9 @@
|
|||||||
"super_chat": true
|
"super_chat": true
|
||||||
},
|
},
|
||||||
"templates": {
|
"templates": {
|
||||||
"danmaku": "卧槽!、是{uname}!、他说、 {msg}",
|
"danmaku": "{uname}说、 {msg}",
|
||||||
"gift": "感谢由{viewer_name}投喂的{gift_name}",
|
"gift": "感谢由{viewer_name}投喂的{gift_count}个{gift_name}",
|
||||||
"blind_box": "感谢由{viewer_name}投喂的{gift_name}爆出了{blind_box_gift}",
|
"blind_box": "感谢由{viewer_name}投喂的{gift_count}个{gift_name}爆出了{blind_box_gift}",
|
||||||
"enter_room": "欢迎{viewer_name}进入直播间",
|
"enter_room": "欢迎{viewer_name}进入直播间",
|
||||||
"follow": "",
|
"follow": "",
|
||||||
"interact_other": "",
|
"interact_other": "",
|
||||||
|
|||||||
+2
-2
@@ -27,8 +27,8 @@ DEFAULT_RULES = {
|
|||||||
},
|
},
|
||||||
"templates": {
|
"templates": {
|
||||||
"danmaku": "{uname}\u8bf4\u3001 {msg}",
|
"danmaku": "{uname}\u8bf4\u3001 {msg}",
|
||||||
"gift": "\u611f\u8c22\u7531{viewer_name}\u6295\u5582\u7684{gift_name}",
|
"gift": "\u611f\u8c22\u7531{viewer_name}\u6295\u5582\u7684{gift_count}\u4e2a{gift_name}",
|
||||||
"blind_box": "\u611f\u8c22\u7531{viewer_name}\u6295\u5582\u7684{gift_name}\u7206\u51fa\u4e86{blind_box_gift}",
|
"blind_box": "\u611f\u8c22\u7531{viewer_name}\u6295\u5582\u7684{gift_count}\u4e2a{gift_name}\u7206\u51fa\u4e86{blind_box_gift}",
|
||||||
"enter_room": "\u6b22\u8fce{viewer_name}\u8fdb\u5165\u76f4\u64ad\u95f4",
|
"enter_room": "\u6b22\u8fce{viewer_name}\u8fdb\u5165\u76f4\u64ad\u95f4",
|
||||||
"follow": "",
|
"follow": "",
|
||||||
"interact_other": "",
|
"interact_other": "",
|
||||||
|
|||||||
Reference in New Issue
Block a user