xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

寻宝：修改掉落逻辑

Browse Source
This commit is contained in:
luying
2021-08-09 17:07:50 +08:00
parent fbe9e08aa1
commit 207695bf17
5 changed files with 42 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
game-server/app/services/comBattleService.ts
View File

@@ -124,12 +124,12 @@ export async function checkComBattleDrop(roleId: string, battleCode: string) {
}
});
if (!roleSt || roleSt.gotReward) return { status: -1, resResult: resResult(STATUS.COM_BATTLE_REWARD_ERR) };
let fixReward = getRewardByBlueprtId(team.blueprtId);
let { fixReward, teammateReward } = getRewardByBlueprtId(team.blueprtId);
if (!roleSt.isCap) {
if (roleSt.isFrd) {
fixReward = [];
} else {
fixReward = ratioReward(fixReward, COM_BTL_CONST.ASSIST_REWARD_RATIO);
fixReward = teammateReward;
}
}
await ComBattleTeamModel.updateRewardSt(team.teamCode, roleId, true);
@@ -152,19 +152,12 @@ export function setComBtlTimer(teamCode: string, timer: NodeJS.Timer, timerMap:
}
export async function getRealReward(blueprtId: number, roleSt: RoleStatus) {
let fixReward = getRewardByBlueprtId(blueprtId);
let { fixReward, teammateReward } = getRewardByBlueprtId(blueprtId);
if (!roleSt.isCap) {
if (roleSt.isFrd) {
let frdPointRec = await FriendPointModel.getFrdPointRecToday(roleSt.roleId, FRIEND_DROP_TYPE.COM_BATTLE);
if (!frdPointRec || frdPointRec.cnt <= FRIEND_DROP_MAX.COM_BTL - COM_BTL_CONST.FRDCNT_DROP) {
fixReward = [getFriendPointObject(COM_BTL_CONST.FRDCNT_DROP)];
} else if (frdPointRec.cnt < FRIEND_DROP_MAX.COM_BTL) {
fixReward = [getFriendPointObject(COM_BTL_CONST.FRDCNT_DROP - frdPointRec.cnt)];
} else {
fixReward = [];
}
fixReward = []
} else {
fixReward = ratioReward(fixReward, COM_BTL_CONST.ASSIST_REWARD_RATIO);
fixReward = teammateReward;
}
}
return fixReward;
@@ -428,28 +421,28 @@ function incEquipPrintDropData(roleSt: RoleStatus, dropRec: EquipPrintDropType)
return dropResult;
}
export async function incEquipPrintDrop(roleSt: RoleStatus) {
const { roleId, roleName } = roleSt;
let dropRec = await EquipPrintDropModel.getByRoleId(roleId);
if (!dropRec) {
dropRec = await EquipPrintDropModel.createDoc(initEquipPrintDropData(roleId, roleName));
}
// export async function incEquipPrintDrop(roleSt: RoleStatus) {
// const { roleId, roleName } = roleSt;
// let dropRec = await EquipPrintDropModel.getByRoleId(roleId);
// if (!dropRec) {
// dropRec = await EquipPrintDropModel.createDoc(initEquipPrintDropData(roleId, roleName));
// }
const dropResult = incEquipPrintDropData(roleSt, dropRec);
dropRec = await EquipPrintDropModel.updateDoc(roleId, omit(dropRec, ['_id', 'createdAt', 'updatedAt']));
return { dropResult, dropRec };
}
// const dropResult = incEquipPrintDropData(roleSt, dropRec);
// dropRec = await EquipPrintDropModel.updateDoc(roleId, omit(dropRec, ['_id', 'createdAt', 'updatedAt']));
// return { dropResult, dropRec };
// }
export function randEquipPrintId(warInfo: DicWar) {
if (!warInfo || !warInfo.jackpotReward) {
return null;
}
const result = getRandEelmWithWeight(warInfo.jackpotReward);
if (!result || !result.dic || !result.dic.id) {
return null;
}
return result.dic.id;
}
// export function randEquipPrintId(warInfo: DicWar) {
// if (!warInfo || !warInfo.jackpotReward) {
// return null;
// }
// const result = getRandEelmWithWeight(warInfo.jackpotReward);
// if (!result || !result.dic || !result.dic.id) {
// return null;
// }
// return result.dic.id;
// }
/**
* 按照好友关系，新增加成