Commit Graph

3486 Commits

Author SHA1 Message Date
lxk0301
0bd38ece91 fix 2021-02-02 10:10:40 +08:00
anonymous
b432d56058 debug 2021-02-02 09:12:16 +08:00
shylocks
78dcee8ee2 debug 2021-02-02 09:12:16 +08:00
lxk0301
bd6fe279cc jd_nian.js 2021-02-02 08:18:11 +08:00
lxk0301
cffb678997 jd_nian.js 2021-02-02 08:18:11 +08:00
lxk0301
3863c796fe jd_newYearMoney.js 2021-02-02 07:42:56 +08:00
lxk0301
1c18c0ac08 jd_newYearMoney.js 2021-02-02 07:42:56 +08:00
anonymous
b8819f9cf6 debuge 2021-02-02 00:06:23 +08:00
shylocks
3375c04116 debuge 2021-02-02 00:06:23 +08:00
anonymous
ed6e0ba471 优化 2021-02-01 20:05:58 +08:00
shylocks
d09d7ad700 优化 2021-02-01 20:05:58 +08:00
anonymous
bfa31be824 Merge remote-tracking branch 'origin/master' 2021-02-01 18:04:36 +08:00
shylocks
dbf8e2a60a Merge remote-tracking branch 'origin/master' 2021-02-01 18:04:36 +08:00
anonymous
e92b375afc 天降爆竹循环互助 2021-02-01 18:04:18 +08:00
shylocks
721d057bc8 天降爆竹循环互助 2021-02-01 18:04:18 +08:00
lxk0301
34121b6bf0 update 2021-02-01 16:50:43 +08:00
lxk0301
18f7fbcef2 update 2021-02-01 16:50:43 +08:00
lxk0301
da3190b92e 修复帮助好友,出现点太快的情况 2021-02-01 14:35:04 +08:00
lxk0301
f2f203de89 修复帮助好友,出现点太快的情况 2021-02-01 14:35:04 +08:00
lxk0301
68f92cf53b IOS通知新增当前五福汪的情况,例如
五福汪情况:省钱JOY(5只) 多多JOY(10只) 好物JOY(10只)
2021-02-01 13:58:01 +08:00
lxk0301
7d36d4acde IOS通知新增当前五福汪的情况,例如
五福汪情况:省钱JOY(5只) 多多JOY(10只) 好物JOY(10只)
2021-02-01 13:58:01 +08:00
anonymous
d3f914c22f Merge remote-tracking branch 'origin/master' 2021-02-01 13:18:43 +08:00
shylocks
f99d0b3add Merge remote-tracking branch 'origin/master' 2021-02-01 13:18:43 +08:00
anonymous
f7a8710137 修复冲突 2021-02-01 13:18:03 +08:00
shylocks
2db6e321a0 修复冲突 2021-02-01 13:18:03 +08:00
anonymous
8c6bde5df1 Automatically updated by Evine's NAS 2021-02-01 13:14:08 +08:00
EvineDeng
092c79b85b Automatically updated by Evine's NAS 2021-02-01 13:14:08 +08:00
anonymous
c342a2628b 小号合卡领卡 2021-02-01 12:51:26 +08:00
shylocks
cb0dd97cec 小号合卡领卡 2021-02-01 12:51:26 +08:00
anonymous
b4717746b3 merge remote 2021-02-01 12:46:51 +08:00
shylocks
e75c3c9acf merge remote 2021-02-01 12:46:51 +08:00
anonymous
a37a16e939 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	jd_newYearMoney.js
2021-02-01 12:46:17 +08:00
shylocks
cdd46c57bd Merge remote-tracking branch 'origin/master'
# Conflicts:
#	jd_newYearMoney.js
2021-02-01 12:46:17 +08:00
lxk0301
f7011245ad 增加延迟1秒,避免出现合并卡片失败的情况 2021-02-01 12:45:39 +08:00
lxk0301
2490b09388 增加延迟1秒,避免出现合并卡片失败的情况 2021-02-01 12:45:39 +08:00
anonymous
dae4bda3d1 小号送卡领卡 2021-02-01 12:43:58 +08:00
shylocks
b64a670eef 小号送卡领卡 2021-02-01 12:43:58 +08:00
lxk0301
9b7a0062aa 由于合并joy后不新增金币, 故获取金币数量的放到购买joy后即可 2021-02-01 11:44:32 +08:00
lxk0301
5ffbddcda5 由于合并joy后不新增金币, 故获取金币数量的放到购买joy后即可 2021-02-01 11:44:32 +08:00
anonymous
4ed7575a8f Update iOS task, docker cron and js list. 2021-02-01 11:09:24 +08:00
Evine
269f8c506e Update iOS task, docker cron and js list. 2021-02-01 11:09:24 +08:00
lxk0301
f12e839c92 fix 2021-02-01 10:54:26 +08:00
lxk0301
75513781bb fix 2021-02-01 10:54:26 +08:00
lxk0301
aeca907bdd 优化 2021-02-01 10:43:34 +08:00
lxk0301
9066b97d7d 优化 2021-02-01 10:43:34 +08:00
lxk0301
57354d5f15 fix 2021-02-01 09:58:04 +08:00
lxk0301
a221b4e3ad fix 2021-02-01 09:58:04 +08:00
lxk0301
ab4f2cc3b8 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	docker/crontab_list.sh
2021-02-01 09:56:51 +08:00
lxk0301
3ec9da8144 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	docker/crontab_list.sh
2021-02-01 09:56:51 +08:00
lxk0301
cd493ff660 IOS订阅新增京东压岁钱和京东压岁钱抢百元卡脚本,压岁钱脚本互助码环境变量为 JDNY_SHARECODES 2021-02-01 09:55:47 +08:00