Commit Graph

12693 Commits

Author SHA1 Message Date
lxk0301 68f92cf53b IOS通知新增当前五福汪的情况,例如
五福汪情况:省钱JOY(5只) 多多JOY(10只) 好物JOY(10只)
2021-02-01 13:58:01 +08:00
lxk0301 9b90afd870 IOS通知新增当前五福汪的情况,例如
五福汪情况:省钱JOY(5只) 多多JOY(10只) 好物JOY(10只)
2021-02-01 13:58:01 +08:00
lxk0301 78b59faf96 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 5dba5c84e2 Merge remote-tracking branch 'origin/master' 2021-02-01 13:18:43 +08:00
anonymous d3f914c22f Merge remote-tracking branch 'origin/master' 2021-02-01 13:18:43 +08:00
any f96d358f3f Merge remote-tracking branch 'origin/master' 2021-02-01 13:18:43 +08:00
any 93da81ff7b 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 35e2f54566 修复冲突 2021-02-01 13:18:03 +08:00
anonymous f7a8710137 修复冲突 2021-02-01 13:18:03 +08:00
any e507b013b2 修复冲突 2021-02-01 13:18:03 +08:00
any 2a9a37646e 修复冲突 2021-02-01 13:18:03 +08:00
shylocks 2db6e321a0 修复冲突 2021-02-01 13:18:03 +08:00
any 8ffae04e4e Automatically updated by Evine's NAS 2021-02-01 13:14:08 +08:00
anonymous e8494172d6 Automatically updated by Evine's NAS 2021-02-01 13:14:08 +08:00
anonymous 8c6bde5df1 Automatically updated by Evine's NAS 2021-02-01 13:14:08 +08:00
any afc504cb73 Automatically updated by Evine's NAS 2021-02-01 13:14:08 +08:00
EvineDeng 489d1b6294 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 a6661105e7 小号合卡领卡 2021-02-01 12:51:26 +08:00
anonymous c342a2628b 小号合卡领卡 2021-02-01 12:51:26 +08:00
any cec7ce7a33 小号合卡领卡 2021-02-01 12:51:26 +08:00
any 23bcc402e5 小号合卡领卡 2021-02-01 12:51:26 +08:00
shylocks cb0dd97cec 小号合卡领卡 2021-02-01 12:51:26 +08:00
anonymous 041c1703d8 merge remote 2021-02-01 12:46:51 +08:00
anonymous b4717746b3 merge remote 2021-02-01 12:46:51 +08:00
any 8c1e45d702 merge remote 2021-02-01 12:46:51 +08:00
any 3b4626b6b2 merge remote 2021-02-01 12:46:51 +08:00
shylocks e75c3c9acf merge remote 2021-02-01 12:46:51 +08:00
anonymous 2c242b677f Merge remote-tracking branch 'origin/master'
# Conflicts:
#	jd_newYearMoney.js
2021-02-01 12:46:17 +08:00
anonymous a37a16e939 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	jd_newYearMoney.js
2021-02-01 12:46:17 +08:00
any 937e41fa0d Merge remote-tracking branch 'origin/master'
# Conflicts:
#	jd_newYearMoney.js
2021-02-01 12:46:17 +08:00
any 63fd320cca 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 f0d079c508 增加延迟1秒,避免出现合并卡片失败的情况 2021-02-01 12:45:39 +08:00
lxk0301 858b420393 增加延迟1秒,避免出现合并卡片失败的情况 2021-02-01 12:45:39 +08:00
lxk0301 f7011245ad 增加延迟1秒,避免出现合并卡片失败的情况 2021-02-01 12:45:39 +08:00
lxk0301 a0636a7c58 增加延迟1秒,避免出现合并卡片失败的情况 2021-02-01 12:45:39 +08:00
lxk0301 6b70c6de55 增加延迟1秒,避免出现合并卡片失败的情况 2021-02-01 12:45:39 +08:00
lxk0301 2490b09388 增加延迟1秒,避免出现合并卡片失败的情况 2021-02-01 12:45:39 +08:00
anonymous ea350b0460 小号送卡领卡 2021-02-01 12:43:58 +08:00
anonymous dae4bda3d1 小号送卡领卡 2021-02-01 12:43:58 +08:00
any 57d27fc8e7 小号送卡领卡 2021-02-01 12:43:58 +08:00
any 90baffac40 小号送卡领卡 2021-02-01 12:43:58 +08:00
shylocks b64a670eef 小号送卡领卡 2021-02-01 12:43:58 +08:00
lxk0301 a915298d8b 由于合并joy后不新增金币, 故获取金币数量的放到购买joy后即可 2021-02-01 11:44:32 +08:00
lxk0301 51d6525e2a 由于合并joy后不新增金币, 故获取金币数量的放到购买joy后即可 2021-02-01 11:44:32 +08:00
lxk0301 9b7a0062aa 由于合并joy后不新增金币, 故获取金币数量的放到购买joy后即可 2021-02-01 11:44:32 +08:00
lxk0301 ce0c9ec6b0 由于合并joy后不新增金币, 故获取金币数量的放到购买joy后即可 2021-02-01 11:44:32 +08:00