qixin/HJ_Server
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'feature/huangqijiuguan' into release

Browse Source 
# Conflicts:
#	src/public/task.ts
This commit is contained in:
xichaoyin 2024-01-12 02:07:10 +08:00
commit de40641464
4 changed files with 58 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/api_s2c/event/huangqijiuguan/ApiDuiHuan.ts
View File

@ -32,6 +32,7 @@ export default async function (call: ApiCall<ReqDuiHuan, ResDuiHuan>) {
// 检查消耗 // 检查消耗
await PlayerFun.checkNeedIsMeet(call, need); await PlayerFun.checkNeedIsMeet(call, need);
await PlayerFun.cutNeed(call, need);
// 发送奖励 // 发送奖励
await PlayerFun.sendPrize(call, prize); await PlayerFun.sendPrize(call, prize);
// 记录兑换次数 // 记录兑换次数

3
src/api_s2c/event/huangqijiuguan/ApiGiftRec.ts
View File

@ -1,6 +1,7 @@
import { ApiCall } from "tsrpc"; import { ApiCall } from "tsrpc";
import { ReqGiftRec, ResGiftRec } from "../../../shared/protocols/event/huangqijiuguan/PtlGiftRec"; import { ReqGiftRec, ResGiftRec } from "../../../shared/protocols/event/huangqijiuguan/PtlGiftRec";
import HQJGFun from "./fun"; import HQJGFun from "./fun";
import { PlayerFun } from "../../../public/player";
export default async function (call: ApiCall<ReqGiftRec, ResGiftRec>) { export default async function (call: ApiCall<ReqGiftRec, ResGiftRec>) {
let hd = await HQJGFun.HdInfo(call, call.req.hdid); let hd = await HQJGFun.HdInfo(call, call.req.hdid);
@ -38,7 +39,7 @@ export default async function (call: ApiCall<ReqGiftRec, ResGiftRec>) {
mydata.giftbuy[call.req.giftid].num++; mydata.giftbuy[call.req.giftid].num++;
await HQJGFun.setMyData(call.uid, call.req.hdid, { giftbuy: mydata.giftbuy }); await HQJGFun.setMyData(call.uid, call.req.hdid, { giftbuy: mydata.giftbuy });
await PlayerFun.sendPrize(call, prize);
call.succ({ data: mydata, prize: prize }) call.succ({ data: mydata, prize: prize })
G.server.sendMsgByUid(call.uid, "msg_s2c/HongDianChange", ["huodonghd"]) G.server.sendMsgByUid(call.uid, "msg_s2c/HongDianChange", ["huodonghd"])
} }

32
src/api_s2c/event/huangqijiuguan/fun.ts
View File

@ -5,7 +5,7 @@ import { PublicShared } from "../../../shared/public/public"
import { EmailFun } from "../../../public/email" import { EmailFun } from "../../../public/email"
import { playerInfo } from "../../../shared/protocols/user/PtlLogin" import { playerInfo } from "../../../shared/protocols/user/PtlLogin"
import { PlayerFun } from "../../../public/player" import { PlayerFun } from "../../../public/player"
import { Player } from "../../../shared/fightControl/Player" import { TaskFun } from "../../../public/task"
// hddata.data // hddata.data
export interface Data { export interface Data {
@ -372,15 +372,15 @@ export default class HQJGFun {
let mydata = await this.getMydata(call, hd.hdid); let mydata = await this.getMydata(call, hd.hdid);
if (!mydata.task.val[`day${today}`]) {
mydata.task.val[`day${today}`] = {}
}
let isset = 0; let isset = 0;
let setData = { if (!mydata.task.val[`day${today}`]) {
$inc: {}, isset = 1;
$set: {} mydata.task.val[`day${today}`] = {}
}; for (let taskid in tasks) {
let taskcon = tasks[taskid];
mydata.task.val[`day${today}`][taskid] = await TaskFun.getTaskNval(call, taskcon);
}
}
for (let taskid of Object.keys(tasks)) { for (let taskid of Object.keys(tasks)) {
let taskCon = tasks[taskid]; let taskCon = tasks[taskid];
@ -393,18 +393,20 @@ export default class HQJGFun {
val = await alchangeVal(call, taskCon, val, arg) val = await alchangeVal(call, taskCon, val, arg)
isset = 1 isset = 1
if (isinc == 1) { // 累加 if (isinc != 1) { // 累加
mydata.task.val[`day${today}`][taskid] = (mydata.task.val[`day${today}`][taskid] || 0) + val mydata.task.val[`day${today}`][taskid] = val;
setData["$inc"][`task.val.day${today}.${taskid}`] = val
} else { } else {
mydata.task.val[`day${today}`][taskid] = val mydata.task.val[`day${today}`][taskid] = (mydata.task.val[`day${today}`][taskid] || 0) + val;
setData["$set"][`task.val.day${today}.${taskid}`] = val
} }
} }
// 设置任务 // 设置任务
if (isset == 1) { if (isset == 1) {
await G.mongodb.collection('event').updateOne({ uid: call.uid, type: this.dataType(hd.hdid) }, setData) await G.mongodb.collection('event').updateOne({ uid: call.uid, type: this.dataType(hd.hdid) }, {
$set: {
[`task.val.day${today}`]: mydata.task.val[`day${today}`]
}
})
if ((await this.getHongDian(call, hd, mydata)).show) { if ((await this.getHongDian(call, hd, mydata)).show) {
G.server.sendMsgByUid(call.uid, "msg_s2c/HongDianChange", ["huodonghd"]) G.server.sendMsgByUid(call.uid, "msg_s2c/HongDianChange", ["huodonghd"])