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 20:48:21 +08:00
commit fff54f4097
4 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,7 +51,7 @@ export async function playerCanReceive(call: ApiCall, callError : boolean = true
if (playerActivityInfo) { if (playerActivityInfo) {
if (playerActivityInfo[zeroTime]) { if (playerActivityInfo[zeroTime]) {
return { return {
payNum, remaining, result: false, activityInfo, showOffList, price payNum, remaining, result: false, activityInfo, showOffList, price, gotAmount: playerActivityInfo[zeroTime]
}; };
} }
} }
@ -63,7 +63,7 @@ export async function playerCanReceive(call: ApiCall, callError : boolean = true
export default async function (call: ApiCall<ReqCanReceive, ResCanReceive>) { export default async function (call: ApiCall<ReqCanReceive, ResCanReceive>) {
const canReceiveResult = await playerCanReceive(call); const canReceiveResult = await playerCanReceive(call);
if (canReceiveResult) { if (canReceiveResult) {
const { payNum, remaining, result, showOffList, price } = canReceiveResult; const { payNum, remaining, result, showOffList, price, gotAmount } = canReceiveResult;
call.succ({ payNum, remaining, result, showOffList, price }); call.succ({ payNum, remaining, result, showOffList, price, gotAmount });
} }
} }

2
src/module/collection_event.ts
View File

@ -55,7 +55,7 @@ export type eventType = {
zhoumolibao: ResOpenZhoumolibao & { refreshTime: number; } zhoumolibao: ResOpenZhoumolibao & { refreshTime: number; }
pobinglibao: ResOpenPobinglibao; pobinglibao: ResOpenPobinglibao;
payForDiamond: { payForDiamond: {
[time: number]: number[] [time: number]: number
} }
} & { } & {
[k: `${number}jijin`]: ResOpenYuedujijin; [k: `${number}jijin`]: ResOpenYuedujijin;

1
src/shared/protocols/event/payForDiamond/PtlCanReceive.ts
View File

@ -8,4 +8,5 @@ export type ResCanReceive = {
result: boolean; result: boolean;
price: number; price: number;
showOffList: any[]; showOffList: any[];
gotAmount?: number;
}; };

8
src/shared/protocols/serviceProto.ts
View File

@ -10364,6 +10364,14 @@ export const serviceProto: ServiceProto<ServiceType> = {
"type": "Any" "type": "Any"
} }
} }
},
{
"id": 5,
"name": "gotAmount",
"type": {
"type": "Number"
},
"optional": true
} }
] ]
}, },