Merge remote-tracking branch 'origin/feature/huangqijiuguan' into release

This commit is contained in:
xichaoyin 2024-01-12 17:55:00 +08:00
commit 129103d061

View File

@ -119,13 +119,13 @@ export default class HQJGFun {
static today(hdinfo: ReqAddHuoDong) { static today(hdinfo: ReqAddHuoDong) {
/** /**
* 1 * 1
*/ */
return PublicShared.getDiff(hdinfo.stime, G.time) return PublicShared.getDiff(hdinfo.stime, G.time)
} }
/** /**
* *
*/ */
static async getRankList(hdid: number) { static async getRankList(hdid: number) {
let uids = await G.mongodb.collection("event").find( let uids = await G.mongodb.collection("event").find(
{ type: this.dataType(hdid), "bossres.maxdps": { $gt: 0 } }, { type: this.dataType(hdid), "bossres.maxdps": { $gt: 0 } },
@ -206,10 +206,11 @@ export default class HQJGFun {
/** 设置我的数据 */ /** 设置我的数据 */
static async setMyData(uid: string, hdid: number, update: { [k in keyof Partial<PlayerData>]: PlayerData[k] }) { static async setMyData(uid: string, hdid: number, update: { [k in keyof Partial<PlayerData>]: PlayerData[k] }) {
let res = await G.mongodb.cEvent(this.dataType(hdid)).updateOne( let res = await G.mongodb.cEvent(this.dataType(hdid)).updateOne(
{ uid: uid, type: this.dataType(hdid) }, { $set: update } { uid: uid, type: this.dataType(hdid) }, { $set: update }, { upsert: true }
); );
if (res.modifiedCount <= 0) { if (res.upsertedCount == 1) {
console.log("===>", uid, hdid, update);
await G.mongodb.cEvent(this.dataType(hdid)).updateOne( await G.mongodb.cEvent(this.dataType(hdid)).updateOne(
{ uid: uid, type: this.dataType(hdid) }, { $set: Object.assign(this.defaultData, update) } { uid: uid, type: this.dataType(hdid) }, { $set: Object.assign(this.defaultData, update) }
); );
@ -277,7 +278,7 @@ export default class HQJGFun {
/** /**
* *
*/ */
static async endDpsRankPrize(time: number) { static async endDpsRankPrize(time: number) {
console.log( console.log(
"黄旗酒馆 最大伤害排行奖励结算 开始执行。。。" "黄旗酒馆 最大伤害排行奖励结算 开始执行。。。"
@ -433,7 +434,7 @@ export default class HQJGFun {
return return
} }
let mydata = await this.getMydata(call); let mydata = await this.getMydata(call, hd);
if (!mydata.giftbuy[gift.id]) { if (!mydata.giftbuy[gift.id]) {
mydata.giftbuy[gift.id] = { num: 0, select: [] }; mydata.giftbuy[gift.id] = { num: 0, select: [] };
} }