diff --git a/src/api_s2c/event/huangqijiuguan/ApiDuiHuan.ts b/src/api_s2c/event/huangqijiuguan/ApiDuiHuan.ts index 11ef103..4c66288 100644 --- a/src/api_s2c/event/huangqijiuguan/ApiDuiHuan.ts +++ b/src/api_s2c/event/huangqijiuguan/ApiDuiHuan.ts @@ -14,7 +14,7 @@ export default async function (call: ApiCall) { let need = []; let prize = []; - let mydata = await HQJGFun.getMydata(call, call.req.hdid); + let mydata = await HQJGFun.getMydata(call, hd); for (let id in call.req.dh) { let con = hd.data.duihuan.filter(x => x.id == Number(id))[0]; diff --git a/src/api_s2c/event/huangqijiuguan/ApiFight.ts b/src/api_s2c/event/huangqijiuguan/ApiFight.ts index d4ee3a8..ee5d3f4 100644 --- a/src/api_s2c/event/huangqijiuguan/ApiFight.ts +++ b/src/api_s2c/event/huangqijiuguan/ApiFight.ts @@ -14,7 +14,7 @@ export default async function (call: ApiCall) { } // 个人活动信息 - let mydata = await HQJGFun.getMydata(call, call.req.hdid); + let mydata = await HQJGFun.getMydata(call, hd); // 开始战斗 let result: fightResult = await FightFun.fightNpc(call, hd.data.boss.npcId, 'hqjg'); diff --git a/src/api_s2c/event/huangqijiuguan/ApiGiftRec.ts b/src/api_s2c/event/huangqijiuguan/ApiGiftRec.ts index 7c0f435..3f28c37 100644 --- a/src/api_s2c/event/huangqijiuguan/ApiGiftRec.ts +++ b/src/api_s2c/event/huangqijiuguan/ApiGiftRec.ts @@ -15,7 +15,7 @@ export default async function (call: ApiCall) { return call.error('', { code: -1, message: globalThis.lng.huodong_open_1 }) } - let mydata = await HQJGFun.getMydata(call, call.req.hdid); + let mydata = await HQJGFun.getMydata(call, hd); if ((mydata.giftbuy[call.req.giftid] || { num: 0 }).num + 1 > gift.buynum) { return call.error("", { code: -2, message: globalThis.lng.hqjgtips_28 }) } diff --git a/src/api_s2c/event/huangqijiuguan/ApiGiftSelect.ts b/src/api_s2c/event/huangqijiuguan/ApiGiftSelect.ts index 40df551..4d6c52e 100644 --- a/src/api_s2c/event/huangqijiuguan/ApiGiftSelect.ts +++ b/src/api_s2c/event/huangqijiuguan/ApiGiftSelect.ts @@ -20,7 +20,7 @@ export default async function (call: ApiCall) { } } - let mydata = await HQJGFun.getMydata(call, call.req.hdid); + let mydata = await HQJGFun.getMydata(call, hd); if (!mydata.giftbuy[call.req.giftid]) { mydata.giftbuy[call.req.giftid] = { num: 0, select: call.req.seletc diff --git a/src/api_s2c/event/huangqijiuguan/ApiOpen.ts b/src/api_s2c/event/huangqijiuguan/ApiOpen.ts index 660ba47..5eab90e 100644 --- a/src/api_s2c/event/huangqijiuguan/ApiOpen.ts +++ b/src/api_s2c/event/huangqijiuguan/ApiOpen.ts @@ -9,7 +9,7 @@ export default async (call: ApiCall) => { return call.error('', { code: -1, message: globalThis.lng.huodong_open_1 }) } - let mydata = await HQJGFun.getMydata(call, call.req.hdid); + let mydata = await HQJGFun.getMydata(call, hd); call.succ({ data: mydata }) } \ No newline at end of file diff --git a/src/api_s2c/event/huangqijiuguan/ApiRecDpsPrize.ts b/src/api_s2c/event/huangqijiuguan/ApiRecDpsPrize.ts index 2f77d9a..850c561 100644 --- a/src/api_s2c/event/huangqijiuguan/ApiRecDpsPrize.ts +++ b/src/api_s2c/event/huangqijiuguan/ApiRecDpsPrize.ts @@ -14,7 +14,7 @@ export default async function (call: ApiCall) { let data = hd.data as Data // 个人活动信息 - let mydata = await HQJGFun.getMydata(call, call.req.hdid); + let mydata = await HQJGFun.getMydata(call, hd); // 领取伤害奖励 let prize = []; diff --git a/src/api_s2c/event/huangqijiuguan/ApiTaskRec.ts b/src/api_s2c/event/huangqijiuguan/ApiTaskRec.ts index 558aab3..56fde30 100644 --- a/src/api_s2c/event/huangqijiuguan/ApiTaskRec.ts +++ b/src/api_s2c/event/huangqijiuguan/ApiTaskRec.ts @@ -18,7 +18,7 @@ export default async function (call: ApiCall) { let prize = []; let taskday = `day${call.req.day}` - let mydata = await HQJGFun.getMydata(call, call.req.hdid); + let mydata = await HQJGFun.getMydata(call, hd); for (let id of call.req.taskid) { let con = hd.data.task[taskday][id]; @@ -36,17 +36,17 @@ export default async function (call: ApiCall) { } 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) { - 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 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 }); diff --git a/src/api_s2c/event/huangqijiuguan/ApiZhaoMu.ts b/src/api_s2c/event/huangqijiuguan/ApiZhaoMu.ts index f2dfefe..3ad2401 100644 --- a/src/api_s2c/event/huangqijiuguan/ApiZhaoMu.ts +++ b/src/api_s2c/event/huangqijiuguan/ApiZhaoMu.ts @@ -17,7 +17,7 @@ export default async function (call: ApiCall) { await PlayerFun.checkNeedIsMeet(call, need); let prize = []; - let mydata = await HQJGFun.getMydata(call, call.req.hdid); + let mydata = await HQJGFun.getMydata(call, hd); for (let n = 1; n <= call.req.num; n++) { let num = mydata.zhaomu.num + n; diff --git a/src/api_s2c/event/huangqijiuguan/ApiZhaoMuPrizeRec.ts b/src/api_s2c/event/huangqijiuguan/ApiZhaoMuPrizeRec.ts index 546de54..76dfa11 100644 --- a/src/api_s2c/event/huangqijiuguan/ApiZhaoMuPrizeRec.ts +++ b/src/api_s2c/event/huangqijiuguan/ApiZhaoMuPrizeRec.ts @@ -11,7 +11,7 @@ export default async function (call: ApiCall]: PlayerData[k] }) { - if (!update.lasttime) { - update.lasttime = G.time; - } - let res = await G.mongodb.cEvent(this.dataType(hdid)).updateOne( { uid: uid, type: this.dataType(hdid) }, { $set: update } ); - if (res.upsertedCount <= 0) { + if (res.modifiedCount <= 0) { await G.mongodb.cEvent(this.dataType(hdid)).updateOne( { uid: uid, type: this.dataType(hdid) }, { $set: Object.assign(this.defaultData, update) } ); @@ -370,7 +376,7 @@ export default class HQJGFun { if (!tasks) return - let mydata = await this.getMydata(call, hd.hdid); + let mydata = await this.getMydata(call, hd); let isset = 0; if (!mydata.task.val[`day${today}`]) { @@ -459,7 +465,7 @@ export default class HQJGFun { let hdid = hd.hdid; let hddata = hd.data as Data; - mydata = mydata || await this.getMydata(call, hdid); + mydata = mydata || await this.getMydata(call, hd); // 当黄旗招募存在可领取的可选奖励时 for (let i = 0; i < hddata.choukajiangli.length; i++) { let ele = hddata.choukajiangli[i]; diff --git a/src/lng.ts b/src/lng.ts index 55bd6f7..24098d1 100644 --- a/src/lng.ts +++ b/src/lng.ts @@ -350,18 +350,18 @@ class Lng { event_kfkh_12 = "event_kfkh_12"; event_kfkh_13 = "event_kfkh_13"; - qingxiandenglu: "qingxiandenglu"; - wuciwanjia: "wuciwanjia"; - huoqupaihang: "huoqupaihang"; - wucigonghui: "wucigonghui"; - nameyicunzai: "nameyicunzai"; - ljlibaotips_8: "ljlibaotips_8"; + qingxiandenglu = "qingxiandenglu"; + wuciwanjia = "wuciwanjia"; + huoqupaihang = "huoqupaihang"; + wucigonghui = "wucigonghui"; + nameyicunzai = "nameyicunzai"; + ljlibaotips_8 = "ljlibaotips_8"; - weiwang_12: "weiwang_12"; + weiwang_12 = "weiwang_12"; - hqjgtips_27: "hqjgtips_27"; - hqjgtips_28: "hqjgtips_28"; - hqjgtips_29: "hqjgtips_29"; + hqjgtips_27 = "hqjgtips_27"; + hqjgtips_28 = "hqjgtips_28"; + hqjgtips_29 = "hqjgtips_29"; "11111" = "globalThis.lng.chat_1" // return call.error('', { code: -3, message: globalThis.lng.chat_2 });