Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
dy 2023-12-15 11:12:12 +08:00
commit 3488f61978

View File

@ -12,6 +12,7 @@ import {PataFun} from "./pata";
import {weixiuchangType} from "../shared/protocols/weixiuchang/type"; import {weixiuchangType} from "../shared/protocols/weixiuchang/type";
import {FunWeiXiuChang} from "./weixiuchang"; import {FunWeiXiuChang} from "./weixiuchang";
import {JJCFun} from "./jjc"; import {JJCFun} from "./jjc";
import {getGud} from "./gud";
let _classNameFunc = {} let _classNameFunc = {}
/** /**
@ -333,22 +334,22 @@ export module manager {
isinc = 0 isinc = 0
async initVal(call: ApiCall, con) { async initVal(call: ApiCall, con) {
let _val = 0 // let _val = 0
// 成就任务走计数 // 成就任务走计数
if (con.type == 3) { // if (con.type == 3) {
_val = await PayFun.getPayDaysAllPayNum(call.uid, await PublicShared.getToDayZeroTime(G.openTime), G.time) * 10 // _val = await PayFun.getPayDaysAllPayNum(call.uid, await PublicShared.getToDayZeroTime(G.openTime), G.time) * 10
} // }
return _val return (await getGud(call.uid)).payExp
} }
async alchangeVal(call: ApiCall, con, val: number, arg) { async alchangeVal(call: ApiCall, con, val: number, arg) {
val = 0 // val = 0
let _where = {taskid: con.id, stype: con.stype} // let _where = {taskid: con.id, stype: con.stype}
let _task = await TaskFun.getUserTaksList(call.uid, _where) // let _task = await TaskFun.getUserTaksList(call.uid, _where)
if (_task[0]) { // if (_task[0]) {
val = await PayFun.getPayDaysAllPayNum(call.uid, await PublicShared.getToDayZeroTime(_task[0].retime), G.time) * 10 // val = await PayFun.getPayDaysAllPayNum(call.uid, await PublicShared.getToDayZeroTime(_task[0].retime), G.time) * 10
} // }
return val return (await getGud(call.uid)).payExp
} }
} }