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

Merge branch 'feature/pay_for_diamond' into dev

Browse Source
This commit is contained in:
chenkai 2023-12-22 10:15:44 +08:00
commit e660adb95c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/api_s2c/event/payForDiamond/ApiCanReceive.ts
View File

@ -8,7 +8,7 @@ export async function playerCanReceive(call: ApiCall) {
if (!activityInfo) {
return call.error('No such activity');
}
const remaining = activityInfo.data['remaining'];
const remaining = typeof activityInfo.data['remaining'] === 'number'? activityInfo.data['remaining'] : activityInfo.data['totalmoney'];
const zeroTime = PublicShared.getToDayZeroTime();
const dayPayInfo = await G.mongodb.collection('dayPay').findOne({ uid: call.uid, time: zeroTime });
if (!dayPayInfo || !dayPayInfo.payNum) {

2
src/api_s2c/event/payForDiamond/ApiReceive.ts
View File

@ -66,7 +66,7 @@ export default async function (call: ApiCall<ReqReceive, ResReceive>) {
});
}
const activityData = canReceiveResult.activityInfo.data;
const remaining = activityData['remaining']? activityData['remaining'] : activityData['totalmoney'];
const remaining = typeof activityData['remaining'] === 'number'? activityData['remaining'] : activityData['totalmoney'];
const { group, maxAmount } = randomWithWeight(activityData['groupConf']['arr']);
const gotAmount = calcDiamondGot(remaining, group, maxAmount);
// 减去余额