Skip to content

Commit

Permalink
一处bug
Browse files Browse the repository at this point in the history
  • Loading branch information
fffonion committed Dec 23, 2013
1 parent 877c4ff commit d64173b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MAClient是一个可以用来装B的百万亚瑟王客户端,用于解放你的双手和智商。目前支持台服、国服全区和韩服。

[更新历史](https://github.com/fffonion/MAlient/wiki/HISTORY)
[更新历史](https://github.com/fffonion/MAClient/wiki/HISTORY)

[插件制作文档](PLUGIN_DOCUMENT.md)

Expand Down
4 changes: 2 additions & 2 deletions maclient.py
Original file line number Diff line number Diff line change
Expand Up @@ -519,14 +519,14 @@ def initplayer(self, xmldict):
@plugin.func_hook
def auto_check(self, doingwhat):
if doingwhat in ['exploration/fairybattle', 'exploration/explore', 'gacha/buy']:
if int(self.player.card.count) >= getattr(maclient_smart, 'max_card_count_%s' % self.loc):
if int(self.player.card.count) >= getattr(maclient_smart, 'max_card_count_%s' % self.loc[:2]):
if self.cfg_auto_sell:
logging.info('卡片放满了,自动卖卡 v( ̄▽ ̄*)')
return self.select_card_sell()
else:
logging.warning('卡片已经放不下了,请自行卖卡www')
return False
if self.player.friendship_point > getattr(maclient_smart, 'max_fp_%s' % self.loc) * 0.9 and \
if self.player.friendship_point > getattr(maclient_smart, 'max_fp_%s' % self.loc[:2]) * 0.9 and \
not doingwhat in ['gacha/buy', 'gacha/select/getcontents']:
if self.cfg_autogacha:
logging.info('绊点有点多,自动转蛋(* ̄▽ ̄)y ')
Expand Down

0 comments on commit d64173b

Please sign in to comment.