rainerosion/genshin-impact-helper
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: wrong award output when already signed

Browse Source
This commit is contained in:
y1ndan 2021-01-07 18:22:14 +08:00
parent 6ba5f1f2dd
commit 693740c436
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
genshin.py
View File

@ -44,7 +44,7 @@ class Base(object):
class Roles(Base):
def get_awards(self):
response = dict
response = dict()
try:
content = requests.Session().get(CONFIG.AWARD_URL, headers=self.get_header()).text
response = self.to_python(content)
@ -96,7 +96,8 @@ class Sign(Base):
@staticmethod
def get_ds():
n = 'h8w582wxwgqvahcdkpvdhbh2w9casgfl' # v2.3.0 web @povsister & @journey-ad
# v2.3.0-web @povsister & @journey-ad
n = 'h8w582wxwgqvahcdkpvdhbh2w9casgfl'
i = str(int(time.time()))
r = ''.join(random.sample(string.ascii_lowercase + string.digits, 6))
c = hexdigest('salt=' + n + '&t=' + i + '&r=' + r)
@ -156,24 +157,25 @@ class Sign(Base):
for i in range(len(info_list)):
today = info_list[i]['data']['today']
total_sign_day = info_list[i]['data']['total_sign_day']
award = Roles(self._cookie).get_awards()['data']['awards']
awards = Roles(self._cookie).get_awards()['data']['awards']
uid = str(self._uid_list[i]).replace(str(self._uid_list[i])[3:6], '***', 1)
messgae = {
'today': today,
'region_name': self._region_name_list[i],
'uid': uid,
'award_name': award[total_sign_day]['name'],
'award_cnt': award[total_sign_day]['cnt'],
'award_name': awards[total_sign_day]['name'],
'award_cnt': awards[total_sign_day]['cnt'],
'total_sign_day': total_sign_day,
'end': '',
}
if info_list[i]['data']['is_sign'] is True:
messgae['total_sign_day'] = total_sign_day + 1
messgae['award_name'] = awards[total_sign_day - 1]['name']
messgae['award_cnt'] = awards[total_sign_day - 1]['cnt']
messgae['status'] = "👀 旅行者 {} 号, 你已经签到过了哦".format(i + 1)
notify(sc_secret, "成功", self.message.format(**messgae))
continue
if info_list[i]['data']['first_bind'] is True:
messgae['total_sign_day'] = total_sign_day
messgae['status'] = "💪 旅行者 {} 号, 请先前往米游社App手动签到一次".format(i + 1)
notify(sc_secret, "失败", self.message.format(**messgae))
continue
@ -185,7 +187,7 @@ class Sign(Base):
}
log.info('准备为旅行者 {} 号签到... {}'.format(i + 1, self.to_json({
'Region': self._region_name_list[i],
'区服': self._region_name_list[i],
'UID': uid
})))
try: