Add clan and login to web, modify a lot about database#30
Open
SonodaHanami wants to merge 7 commits intozzbslayer:developfrom
Open
Add clan and login to web, modify a lot about database#30SonodaHanami wants to merge 7 commits intozzbslayer:developfrom
SonodaHanami wants to merge 7 commits intozzbslayer:developfrom
Conversation
zzbslayer
force-pushed
the
develop
branch
2 times, most recently
from
dffcbb7 to
cbe1c1e
Compare
zzbslayer
force-pushed
the
develop
branch
19 times, most recently
from
83ee3f0 to
ff545a0
Compare
zzbslayer
reviewed
Sep 14, 2020
| if auth == SUPERUSER: | ||
| member['authority_group'] = 1 | ||
| elif auth == ADMIN: | ||
| member['authority_group'] = 10 |
Owner
There was a problem hiding this comment.
I like it. Get permission when login.
zzbslayer
force-pushed
the
develop
branch
5 times, most recently
from
49b106a to
067e859
Compare
Reinforced clanbattle damage kind; fix boss hp of JP
SonodaHanami
force-pushed
the
master
branch
3 times, most recently
from
c117446 to
81daa0a
Compare
SonodaHanami
commented
Oct 22, 2020
Comment on lines
+906
to
+917
| prm = re.findall("(\d+)([kK千]?)([wW万]?)", remain) | ||
|
|
||
| r, b, hp = bm.get_challenge_progress(1, datetime.now()) | ||
| if len(prm) != 2: | ||
| usage = "【用法/用例】\n!补偿刀计算 伤害1 伤害2" | ||
| await bot.kkr_send(ev, usage, at_sender=True) | ||
| return | ||
|
|
||
| r, b, hp = bm.get_challenge_progress(datetime.now()) | ||
| dmg1 = int(prm[0][0]) | ||
| dmg2 = int(prm[1][0]) | ||
| dmg1 = dmg1 * (1000 if prm[0][1] else 1) * (10000 if prm[0][2] else 1) | ||
| dmg2 = dmg2 * (1000 if prm[1][1] else 1) * (10000 if prm[1][2] else 1) |
Contributor
Author
There was a problem hiding this comment.
Now we can deal with the damage number written in different formats at the same time
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.