diff --git a/bear.js b/bear.js index beb34fe..19aad2c 100644 --- a/bear.js +++ b/bear.js @@ -1201,9 +1201,13 @@ class IlIIlIli { ["恭喜", ""], ["获得", ""], ["空气", ""], + ["已签到", ""], + ["签到失败", ""], + ["您已领奖", ""], ["已领取", ""], ["没有抽奖次数", ""], ["已达到单日最大抽奖次数", ""], + ["未关注并且不是会员无法参加", ""], ["无抽奖次数", ""], ["当天只能签到一次", ""], ["活动太火爆,还是去买买买吧", ""], @@ -1211,7 +1215,15 @@ class IlIIlIli { ["黑名单", ""], ["签满7天后不能再参加了", ""], ["您的积分不足!", ""], + ["您已领过奖了!", ""], ["积分不足", ""], + ["获取活动信息失败", ""], + ["抽奖失败", ""], + ["获取Token失败", ""], + ["AUTHBLACK", ""], + ["ck过期", ""], + ["初始化LZ_TOKEN_KEY失败", ""], + ["用户信息不存在", ""], ["已达到活动期间最大抽奖次数", ""], ["已超过最大抽奖次数,不允许再进行抽奖!", ""], ]; @@ -1988,6 +2000,7 @@ class IlIIlIli { "url": I1III1l1, "method": "post", "headers": { + "reserveEnvInfo":"undefined", "Referer": this.activityUrl, "Cookie": this.isvToken ? "IsvToken=" + this.isvToken + ";" + this.ticket : this.cookie, ...iIiIIlli @@ -2690,6 +2703,7 @@ class IlIIlIli { "source": "01", "userId": this.userId, "token": iliilIIi, + "envInfo": "", "method": "/front/fans/login" }, "sysParams": { @@ -2698,7 +2712,7 @@ class IlIIlIli { "sysmethod": "/front/fans/login" } }); - if (l11li1li && l11li1li?.["code"] == 200) this.buyerNick = l11li1li?.["result"]?.["buyerNick"], this.aesBuyerNick = l11li1li?.["result"]?.["aesBuyerNick"], this.userId = l11li1li?.["result"]?.["userId"], this.openCard = l11li1li?.["result"]?.["openCard"], IlIIlIli.activity.shopId = this.userId, IlIIlIli.activity.venderId = this.userId; else { + if (l11li1li && l11li1li?.["code"] == 200) this.buyerNick = l11li1li?.["result"]?.["buyerNick"], this.aesBuyerNick = l11li1li?.["result"]?.["aesXid"], this.userId = l11li1li?.["result"]?.["userId"], this.openCard = l11li1li?.["result"]?.["openCard"], IlIIlIli.activity.shopId = this.userId, IlIIlIli.activity.venderId = this.userId; else { if (l11li1li?.["message"]?.["includes"]("商家订购过期")) this.putMsg("商家订购过期"), this.stop(); else { this.putMsg(l11li1li?.["message"] || "登录失败"); this.exit(); @@ -2724,7 +2738,10 @@ class IlIIlIli { this.headers["Activity-Type"] = this.activityType; this.headers["Template-Code"] = this.templateCode; this.secretPin = Il1IiIl?.["data"]?.["encryptPin"]; + await this.v2Api("api/common/getThreshold"); await this.getActivityBase(); + await this.v2Api("api/common/getActivityConfig"); + await this.v2Api("api/common/getNotice");await this.getActivityBase(); } else this.putMsg(Il1IiIl?.["message"] || "登录失败"), this.exit(); return Il1IiIl; } @@ -3143,7 +3160,7 @@ class IlIIlIli { "id": this.activityId, "userId": this.userId, "method": IiIi1iIi, - "buyerNick": this.aesBuyerNick, + "aesXid": this.aesBuyerNick, ...liIiIi1i } }); @@ -3936,6 +3953,7 @@ class Iii1iI1i { case 6: case 12: case 13: + case 26: case 124: case 125: case 128: @@ -3943,11 +3961,13 @@ class Iii1iI1i { if (list.name) { list = list.name; if (msg.includes(list)) continue + lIliI1Ii += " " + list + "\n"; + } else if (list.prizeName) { + if (msg.includes(list.prizeName)) continue + lIliI1Ii += " 加" + list.skuNum + "件," + list.prizeName + ",共" + list.surplus + "份,今日剩余" + list.todayNum + "份\n"; + } else { + lIliI1Ii += " " + list + "\n"; } - lIliI1Ii += " " + list + "\n"; - break; - case 26: - lIliI1Ii += " 加" + list.skuNum + "件," + list.prizeName + ",共" + list.surplus + "份,今日剩余" + list.todayNum + "份\n"; break; case 15: case 18: @@ -4110,7 +4130,7 @@ class Iii1iI1i { static #overwriteConfig(ii1ii1i) { if (this.auth !== 1 && ii1ii1i.inviteTask) { ii1ii1i.main_thread = 1; - iIl1IlI1.leaderNum = Math.min(iIl1IlI1.leaderNum, 10); + iIl1IlI1.leaderNum = Math.min(iIl1IlI1.leaderNum, 30); } } static ["match"](ll11i1li, i1I1l11) {