Skip to content

Commit 84d9b25

Browse files
authored
Merge pull request #32 from DawnSunshine/finger_game_modified
改进猜拳
2 parents d351e8f + 4cce2f3 commit 84d9b25

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

common/message_replier.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,8 @@ def play_game(self, msg)-> tuple:
177177
:return:
178178
"""
179179
real_msg = msg.text.split()
180-
if real_msg[len(real_msg) - 1] == "石头" or real_msg[len(real_msg) - 1] == "剪刀" \
181-
or real_msg[len(real_msg) - 1] == "布":
180+
if "石头" in real_msg[len(real_msg) - 1] or "剪刀" in real_msg[len(real_msg) - 1] \
181+
or "布" in real_msg[len(real_msg) - 1]:
182182
game = RspGame(1)
183183
game.start(msg.member.name)
184184
cancel, result, pic = game.play(msg)

common/rock_scissors_paper.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ def play(self, msg):
6969
if str.find(valid_msg, "不玩") != -1 or str.find(valid_msg, "退出") != -1:
7070
return 1, '@' + self.player_name + " 虽然半途而废不怎么好听,但有时候放弃也是一种聪明的选择", self.random_img(3)
7171
elif valid_msg != "石头" and valid_msg != "剪刀" and valid_msg != "布":
72-
return 0, '@' + self.player_name + " 不遵守游戏规则,会被我拉人黑名单", self.random_img(3)
72+
return 0, '@' + self.player_name + " 你这是要跟我石头剪刀布吗?", self.random_img(3)
7373
random_num = random.randint(1, 3) - 1
7474
self.log.debug('random_num:{}'.format(random_num))
7575
self.log.debug('msg_code:{}'.format(self.msg_code[valid_msg]))

run.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
# === init ===
1212
# user.name 用户群内备注名称
1313
# user.nick_name 用户微信名称
14-
bot = Bot(console_qr=True) # 控制台二维码
15-
#bot = Bot(cache_path=True) # 短时间内重启无需重新登录
14+
#bot = Bot(console_qr=True) # 控制台二维码
15+
bot = Bot(cache_path=True) # 短时间内重启无需重新登录
1616
bot.enable_puid()
1717
logger = Logger() # 项目logger对象
1818
replier = Replier(bot)

0 commit comments

Comments
 (0)