Merge branch 'feature/huangqijiuguan' into dev
This commit is contained in:
commit
f227570248
@ -36,17 +36,17 @@ export default async function (call: ApiCall<ReqTaskRec, ResTaskRec>) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
prize = prize.concat(con.prize);
|
prize = prize.concat(con.prize);
|
||||||
mydata.task.rec[taskday] = (mydata.task.rec[taskday] || []).push(id)
|
mydata.task.rec[taskday] = (mydata.task.rec[taskday] || []).concat(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (prize.length <= 0) {
|
if (prize.length <= 0) {
|
||||||
return call.error("", { code: -2, message: globalThis.lng.hqjgtips_28 })
|
return call.error('', { code: -3, message: lng.hqjgtips_28 });
|
||||||
}
|
}
|
||||||
|
|
||||||
// 发送奖励
|
// 发送奖励
|
||||||
await PlayerFun.sendPrize(call, prize);
|
await PlayerFun.sendPrize(call, prize);
|
||||||
// 设置领取记录
|
// 设置领取记录
|
||||||
await HQJGFun.setMyData(call.uid, call.req.hdid, mydata);
|
await HQJGFun.setMyData(call.uid, call.req.hdid, {task: mydata.task});
|
||||||
|
|
||||||
call.succ({ data: mydata, prize: prize });
|
call.succ({ data: mydata, prize: prize });
|
||||||
|
|
||||||
|
20
src/lng.ts
20
src/lng.ts
@ -350,18 +350,18 @@ class Lng {
|
|||||||
event_kfkh_12 = "event_kfkh_12";
|
event_kfkh_12 = "event_kfkh_12";
|
||||||
event_kfkh_13 = "event_kfkh_13";
|
event_kfkh_13 = "event_kfkh_13";
|
||||||
|
|
||||||
qingxiandenglu: "qingxiandenglu";
|
qingxiandenglu = "qingxiandenglu";
|
||||||
wuciwanjia: "wuciwanjia";
|
wuciwanjia = "wuciwanjia";
|
||||||
huoqupaihang: "huoqupaihang";
|
huoqupaihang = "huoqupaihang";
|
||||||
wucigonghui: "wucigonghui";
|
wucigonghui = "wucigonghui";
|
||||||
nameyicunzai: "nameyicunzai";
|
nameyicunzai = "nameyicunzai";
|
||||||
ljlibaotips_8: "ljlibaotips_8";
|
ljlibaotips_8 = "ljlibaotips_8";
|
||||||
|
|
||||||
weiwang_12: "weiwang_12";
|
weiwang_12 = "weiwang_12";
|
||||||
|
|
||||||
hqjgtips_27: "hqjgtips_27";
|
hqjgtips_27 = "hqjgtips_27";
|
||||||
hqjgtips_28: "hqjgtips_28";
|
hqjgtips_28 = "hqjgtips_28";
|
||||||
hqjgtips_29: "hqjgtips_29";
|
hqjgtips_29 = "hqjgtips_29";
|
||||||
|
|
||||||
"11111" = "globalThis.lng.chat_1"
|
"11111" = "globalThis.lng.chat_1"
|
||||||
// return call.error('', { code: -3, message: globalThis.lng.chat_2 });
|
// return call.error('', { code: -3, message: globalThis.lng.chat_2 });
|
||||||
|
Loading…
Reference in New Issue
Block a user