Skip to content

Commit 2237ea8

Browse files
author
yajiwa
committed
fix bug and update
1 parent 13295c5 commit 2237ea8

7 files changed

+70
-158
lines changed

‎TZ21.py

+2-20
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,9 @@
88
from nonebot.permission import SUPERUSER
99
from configs.config import NICKNAME, Config
1010
from nonebot_plugin_apscheduler import scheduler
11-
from models.group_member_info import GroupInfoUser
12-
from utils.utils import get_message_text, is_number, UserBlockLimiter
11+
from utils.utils import is_number, UserBlockLimiter
1312
from nonebot.adapters.onebot.v11 import Bot, GroupMessageEvent, MessageEvent, Message, MessageSegment
14-
15-
16-
async def dl():
17-
await AsyncHttpx.download_file(
18-
"https://raw.githubusercontent.com/po-lan/zhenxun_plugins_TZseries/main/models/TZtreasuryV1.py",
19-
path = path
20-
)
21-
22-
try:
23-
from models.TZtreasury import TZtreasury
24-
except:
25-
from utils.http_utils import AsyncHttpx
26-
from pathlib import Path
27-
path = Path("models") / "TZtreasury.py"
28-
import asyncio
29-
loop = asyncio.get_event_loop()
30-
loop.run_until_complete(dl())
31-
from models.TZtreasury import TZtreasury
13+
from .models.TZtreasuryV1 import TZtreasury
3214

3315

3416
__zx_plugin_name__ = "21点"

‎TZbank.py

+4-23
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,16 @@
22
from nonebot.adapters.onebot.v11.permission import GROUP
33
from nonebot.params import CommandArg
44
from nonebot import on_command
5-
6-
from utils.utils import get_message_text, get_message_at,is_number
5+
from utils.utils import get_message_at,is_number
76
from utils.message_builder import image
87
from utils.data_utils import init_rank
9-
108
from configs.config import NICKNAME
11-
12-
from models.TZtreasury import TZtreasury
9+
from .models.TZtreasuryV1 import TZtreasury
1310
from services.db_context import db
1411
from models.bag_user import BagUser
1512

16-
async def dl():
17-
await AsyncHttpx.download_file(
18-
"https://raw.githubusercontent.com/po-lan/zhenxun_plugins_TZseries/main/models/TZtreasuryV1.py",
19-
path = path
20-
)
21-
22-
try:
23-
from models.TZtreasury import TZtreasury
24-
except:
25-
from utils.http_utils import AsyncHttpx
26-
from pathlib import Path
27-
path = Path("models") / "TZtreasury.py"
28-
import asyncio
29-
loop = asyncio.get_event_loop()
30-
loop.run_until_complete(dl())
31-
from models.TZtreasury import TZtreasury
32-
33-
__zx_plugin_name__ = "堂主银行"
13+
14+
__zx_plugin_name__ = "银行"
3415
__plugin_usage__ = f"""
3516
usage：
3617
{NICKNAME}的银行绝对安全，不会被打劫

‎TZdajie.py

+56-72
Original file line numberDiff line numberDiff line change
@@ -7,30 +7,13 @@
77
from utils.message_builder import image
88
from models.ban_user import BanUser
99
from models.bag_user import BagUser
10-
from models.TZtreasury import TZtreasury
10+
from .models.TZtreasuryV1 import TZtreasury
1111
from basic_plugins.ban.data_source import a_ban
1212
from basic_plugins.shop.shop_handle.data_source import register_goods
1313
import nonebot
1414
import random
1515
import time
1616

17-
async def dl():
18-
await AsyncHttpx.download_file(
19-
"https://raw.githubusercontent.com/po-lan/zhenxun_plugins_TZseries/main/models/TZtreasuryV1.py",
20-
path = path
21-
)
22-
23-
try:
24-
from models.TZtreasury import TZtreasury
25-
except:
26-
from utils.http_utils import AsyncHttpx
27-
from pathlib import Path
28-
path = Path("models") / "TZtreasury.py"
29-
import asyncio
30-
loop = asyncio.get_event_loop()
31-
loop.run_until_complete(dl())
32-
from models.TZtreasury import TZtreasury
33-
3417
__zx_plugin_name__ = "打劫"
3518
__plugin_usage__ = """
3619
usage：
@@ -60,21 +43,21 @@ async def dl():
6043
"rst": None,
6144
}
6245

63-
6446
save = {}
6547
savetime = 1800
6648
enableCD = True
6749

6850
if enableCD:
6951
driver: Driver = nonebot.get_driver()
7052

53+
7154
@driver.on_startup
7255
async def _():
7356
await register_goods(
7457
"菜刀", 500, "进可攻退可守（影响抢劫概率，自动使用）"
7558
)
7659

77-
dj = on_command("#打劫", priority=5, block=True)
60+
dj = on_command("#打劫", priority=5, block=True)
7861

7962

8063
@dj.handle()
@@ -92,18 +75,19 @@ async def _(event: GroupMessageEvent):
9275
save[uid] = 0
9376

9477
if qq in save.keys() and save[qq] > time.time():
95-
await dj.finish(f"""对方刚被打劫过，被警方层层保护，不好下手。\n要不等{'%.2f' % (int(save[qq]-time.time())/60+0.5)}分后回来看看？""", at_sender=True)
78+
await dj.finish(f"""对方刚被打劫过，被警方层层保护，不好下手。\n要不等{'%.2f' % (int(save[qq] - time.time()) / 60 + 0.5)}分后回来看看？""",
79+
at_sender=True)
9680
return
9781

98-
name = await GroupInfoUser.get_member_info(qq , group)
82+
name = await GroupInfoUser.get_member_info(qq, group)
9983
if name == None:
10084
await dj.finish("你找不到打劫的对象，不如叫他先去签到？", at_sender=True)
10185
return
10286

10387
xgold1 = await BagUser.get_gold(qq, group)
10488
xgold2 = await BagUser.get_gold(uid, group)
10589

106-
#没钱不能打劫
90+
# 没钱不能打劫
10791
if xgold1 < 10:
10892
await dj.finish("这人都可以上街乞讨去了，你真的忍心下手吗？", at_sender=True)
10993

@@ -123,41 +107,40 @@ async def _(event: GroupMessageEvent):
123107
d2 = 0
124108

125109
text = ""
126-
#双方菜刀 大概率对砍
110+
# 双方菜刀 大概率对砍
127111
if random.randint(0, 100) > 100 and d1 and d2:
128112
f = random.randint(10, 30)
129113
t = random.randint(1, 7)
130114
text += "\n双方都持有菜刀\n"
131115
if t > 3:
132-
f += int(t**2/2)
133-
text += f"斗争更激烈,掉落量增加{int(t**2/2)}%\n"
116+
f += int(t ** 2 / 2)
117+
text += f"斗争更激烈,掉落量增加{int(t ** 2 / 2)}%\n"
134118
elif t == 3:
135119
text += f"斗争僵持不下，掉落率没有变化\n"
136120
else:
137-
f -= int(t**3/2)
138-
text += f"{name.user_name}更好的保护住了自己的财产，掉落率降低{int(t**3/2)}%\n"
121+
f -= int(t ** 3 / 2)
122+
text += f"{name.user_name}更好的保护住了自己的财产，掉落率降低{int(t ** 3 / 2)}%\n"
139123

140-
cost = int(f * xgold1 /100)
141-
text += f"总掉落量{f}%({ cost })"
124+
cost = int(f * xgold1 / 100)
125+
text += f"总掉落量{f}%({cost})"
142126
await BagUser.spend_gold(qq, group, cost)
143127
await BagUser.add_gold(uid, group, cost)
144128
await dj.finish(text, at_sender=True)
145129
return
146-
130+
147131
check = random.randint(1, 121)
148132
if enableCD:
149-
#d1 被打劫的
133+
# d1 被打劫的
150134
if d1:
151135
check -= random.randint(5, 9)
152136
if d2:
153137
check += random.randint(3, 12)
154-
cost = (min(xgold1,xgold2)*0.75 + max(xgold1,xgold2)*0.75)*0.75
138+
cost = (min(xgold1, xgold2) * 0.75 + max(xgold1, xgold2) * 0.75) * 0.75
155139
if cost > xgold1:
156140
cost = xgold1 * 0.5
157141
cost = int(cost + 10)
158-
159142

160-
if check >120:
143+
if check > 120:
161144
cost = int(0.5 * xgold1)
162145
await BagUser.spend_gold(qq, group, cost)
163146
text = f'\n你把{name.user_name}五花大绑，并在{name.user_name}身上翻出{str(cost)}（50%）枚金币!!!\n'
@@ -169,85 +152,86 @@ async def _(event: GroupMessageEvent):
169152
isMax = True
170153
cost = xgold1
171154

172-
if check >= random.randint(75,90):
155+
if check >= random.randint(75, 90):
173156
text = f'\n你一蹦而出，大喊打劫！\n{name.user_name}屈服于你淫威之下，拱手奉上{str(cost)}枚金币!!!'
174157
if enableCD:
175158
if d2 and isMax == False:
176-
text += f'\n你晃动着菜刀，淡淡的问道就这？\n{name.user_name}又拱手奉上{str(int(cost/10))}枚金币!!!\n'
177-
cost += int(cost/10)
159+
text += f'\n你晃动着菜刀，淡淡的问道就这？\n{name.user_name}又拱手奉上{str(int(cost / 10))}枚金币!!!\n'
160+
cost += int(cost / 10)
178161
elif d2:
179162
text += f'\n你晃动着菜刀，淡淡的问道就这？\n不过你从{name.user_name}身上一毛都没翻出来\n'
180163
save[qq] = int(time.time() + savetime)
181164
await BagUser.spend_gold(qq, group, cost)
182165
await BagUser.add_gold(uid, group, cost)
183166
else:
184-
num = int((100-check)/100 * cost)
185-
text = f'\n你一蹦而出，大喊打劫！\n{name.user_name}屈服于你淫威之下，拱手奉上{str(cost)}枚金币!!!\n不过逃跑时过于紧张丢掉了其中的{100-check}%({num}金币)\n其中60%（{int(0.6*num)}）已收集到小金库\n'
167+
num = int((100 - check) / 100 * cost)
168+
text = f'\n你一蹦而出，大喊打劫！\n{name.user_name}屈服于你淫威之下，拱手奉上{str(cost)}枚金币!!!\n不过逃跑时过于紧张丢掉了其中的{100 - check}%({num}金币)\n其中60%（{int(0.6 * num)}）已收集到小金库\n'
186169
if enableCD:
187170
if d2:
188-
f = random.randint(15,35)
189-
text += f'不过你又提着刀找回丢失的{f}%（{int(num*f/100)}）\n核算下来也就丢失了{num}'
190-
num -= int(num*f/100)
171+
f = random.randint(15, 35)
172+
text += f'不过你又提着刀找回丢失的{f}%（{int(num * f / 100)}）\n核算下来也就丢失了{num}'
173+
num -= int(num * f / 100)
191174
save[qq] = int(time.time() + savetime)
192-
await TZtreasury.add( group, int(0.6*num))
175+
await TZtreasury.add(group, int(0.6 * num))
193176
await BagUser.spend_gold(qq, group, cost)
194177
await BagUser.add_gold(uid, group, (cost - num))
195178
else:
196-
if check < random.randint(15,20):
197-
l = random.randint(5,15)
198-
m = int((check+l )*xgold2/100)
199-
text = f'\n警察正好路过把你带去做笔录，你为脱身缴纳了{check+l }%最大金额的罚款（{ m }）\n其中90%（{int(0.9*m)}）已纳入小金库'
179+
if check < random.randint(15, 20):
180+
l = random.randint(5, 15)
181+
m = int((check + l) * xgold2 / 100)
182+
text = f'\n警察正好路过把你带去做笔录，你为脱身缴纳了{check + l}%最大金额的罚款（{m}）\n其中90%（{int(0.9 * m)}）已纳入小金库'
200183
if enableCD:
201184
if d2:
202-
l = random.randint(15,25)
203-
m += int(l*xgold2/100)
204-
text += f'\n警察看见你所携带的菜刀，额外加手{l}%最大金额的罚款（{ int(l*xgold2/100) }）\n其中90%（{int(0.9*int(l*xgold2/100))}）已纳入小金库'
205-
await TZtreasury.add( group, int(0.9*m) )
206-
await BagUser.spend_gold(uid, group, m )
185+
l = random.randint(15, 25)
186+
m += int(l * xgold2 / 100)
187+
text += f'\n警察看见你所携带的菜刀，额外加手{l}%最大金额的罚款（{int(l * xgold2 / 100)}）\n其中90%（{int(0.9 * int(l * xgold2 / 100))}）已纳入小金库'
188+
await TZtreasury.add(group, int(0.9 * m))
189+
await BagUser.spend_gold(uid, group, m)
207190

208191
else:
209-
cost = int(cost/random.randint(2,4))
210-
if xgold2 > cost*3:
192+
cost = int(cost / random.randint(2, 4))
193+
if xgold2 > cost * 3:
211194
text = f'\n{name.user_name}一巴掌把你拍倒在地，你打劫失败，鼻青脸肿的奉上{str(cost)}枚金币...\n'
212-
195+
213196
if enableCD:
214197
if d1:
215-
cost2 = int(cost/random.randint(5,8))
198+
cost2 = int(cost / random.randint(5, 8))
216199
text += f'\n{name.user_name}又把刀架在你脖子上，你又交出了{cost2}金币'
217200
cost += cost2
218201
await BagUser.add_gold(qq, group, cost)
219202
await BagUser.spend_gold(uid, group, cost)
220203

221-
if random.randint(0,15) < 5:
222-
cost = int(cost / random.randint(4,10)) + 2
223-
gold = await TZtreasury.get( group )
204+
if random.randint(0, 15) < 5:
205+
cost = int(cost / random.randint(4, 10)) + 2
206+
gold = await TZtreasury.get(group)
224207

225208
if gold > 1000:
226209
while cost > gold:
227-
cost = int(cost / random.randint(4,10)) + 2
228-
229-
text += f"\n你在回家路上又捡到了一点（{ cost }）金币\n"
230-
await TZtreasury.spend( group, cost )
210+
cost = int(cost / random.randint(4, 10)) + 2
211+
212+
text += f"\n你在回家路上又捡到了一点（{cost}）金币\n"
213+
await TZtreasury.spend(group, cost)
231214
await BagUser.add_gold(uid, group, cost)
232215

233216
else:
234217
text = f"{name.user_name}看你太穷就没收你的金币，不过给你送监狱去了\n\n"
235-
#text += await a_ban(uid,3600,event.user_name,"你")
218+
# text += await a_ban(uid,3600,event.user_name,"你")
236219
if await BanUser.ban(uid, 4, 1800):
237220
text += "你将在这里被关30分钟"
238-
239-
#await dj.finish(text, at_sender=True)
221+
222+
# await dj.finish(text, at_sender=True)
240223
await dj.finish(image(b64=(await text2image(text, color="#f9f6f2", padding=10)).pic2bs4()), at_sender=True)
241224

242225

243-
xz = on_command("#负数修正", priority=5, block=True)
226+
xz = on_command("#负数修正", priority=5, block=True)
227+
228+
244229
@xz.handle()
245230
async def _(event: GroupMessageEvent):
246231
uid = event.user_id
247232
group = event.group_id
248233
xgold2 = await BagUser.get_gold(uid, group)
249-
if xgold2<0:
250-
await BagUser.add_gold(uid, group,abs(xgold2*1.25))
234+
if xgold2 < 0:
235+
await BagUser.add_gold(uid, group, abs(xgold2 * 1.25))
251236
else:
252-
xz.finish("你修复个锤子。你余额又不是负数")
253-
237+
await xz.finish("你修复个锤子。你余额又不是负数")

‎TZfulijin.py

+4-23
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,8 @@
77
from cn2an import cn2an
88
from nonebot import on_command
99
from nonebot.rule import to_me
10-
11-
async def dl():
12-
await AsyncHttpx.download_file(
13-
"https://raw.githubusercontent.com/po-lan/zhenxun_plugins_TZseries/main/models/TZtreasuryV1.py",
14-
path = path
15-
)
16-
17-
try:
18-
from models.TZtreasury import TZtreasury
19-
except:
20-
from utils.http_utils import AsyncHttpx
21-
from pathlib import Path
22-
path = Path("models") / "TZtreasury.py"
23-
import asyncio
24-
loop = asyncio.get_event_loop()
25-
loop.run_until_complete(dl())
26-
from models.TZtreasury import TZtreasury
27-
28-
10+
from .models.TZtreasuryV1 import TZtreasury
2911
import random
30-
from models.TZtreasury import TZtreasury
3112
from models.sign_group_user import SignGroupUser
3213

3314
__zx_plugin_name__ = "乞讨福利金"
@@ -71,7 +52,7 @@ async def _(event: GroupMessageEvent):
7152
#获取基础数据
7253
golds = await TZtreasury.get(group_id=group)
7354
if golds < 10:
74-
charity.finish(f"{NICKNAME}的金库里也没钱了\n快去交税吧")
55+
await charity.finish(f"{NICKNAME}的金库里也没钱了\n快去交税吧")
7556

7657
user_qq_list, impression_list , user_group = await SignGroupUser.get_all_impression(group_id=group)
7758

@@ -120,12 +101,12 @@ async def _( event: GroupMessageEvent,arg: Message = CommandArg()):
120101
except ValueError:
121102
num = 1000
122103
if 500 > num:
123-
upa.finish("少于500金币就不要捐了吧")
104+
await upa.finish("少于500金币就不要捐了吧")
124105
return
125106

126107
user =await BagUser.get_gold(uid, group)
127108
if user < num:
128-
upa.finish("你并没有这些钱")
109+
await upa.finish("你并没有这些钱")
129110
return
130111

131112
await BagUser.spend_gold(uid, group , num)

0 commit comments

Comments
 (0)