✨ feat(稷下学宫): 过滤_id存储

This commit is contained in:
zhangxk
2023-09-06 20:52:59 +08:00
parent fb1494dc84
commit d6297f9b5e
9 changed files with 29 additions and 25 deletions
@@ -24,6 +24,7 @@ import { RougeEffect, getAddChoosePassive, getAddPassiveWeight, getChooseQuality
import { formateCharasOrCards } from "./rougeCollectService"; import { formateCharasOrCards } from "./rougeCollectService";
import { errlogger } from "../../util/logger"; import { errlogger } from "../../util/logger";
import { RougelikeExtendModel } from "../../db/RougelikeExtend"; import { RougelikeExtendModel } from "../../db/RougelikeExtend";
import { isDevelopEnv } from "../utilService";
export async function getRougeData(roleId: string) { export async function getRougeData(roleId: string) {
@@ -299,8 +300,9 @@ export async function chooseNode(dbRecord: RougelikeRecordType, layerChooseNode:
dbPara.rewards = result.rewards; dbPara.rewards = result.rewards;
} }
// TODO正式环境屏蔽 if(isDevelopEnv){
weightRecords = dbPara.weightRecords = (result?.weightRecords || []); weightRecords = dbPara.weightRecords = (result?.weightRecords || []);
}
} }
if (dbDetail && dbDetail.rewards) { if (dbDetail && dbDetail.rewards) {
let tempType = (dbDetail?.questType || 0) > 0 ? dbDetail?.questType : nodeType let tempType = (dbDetail?.questType || 0) > 0 ? dbDetail?.questType : nodeType
@@ -308,8 +310,10 @@ export async function chooseNode(dbRecord: RougelikeRecordType, layerChooseNode:
if (!layerRewardData) return; if (!layerRewardData) return;
let { coin, score, tech } = layerRewardData; let { coin, score, tech } = layerRewardData;
reward = { rewards: dbDetail.rewards || [], score: score || 0, techScore: tech || 0, takeoutReward: layerPlanData.takeoutReward || [] }; reward = { rewards: dbDetail.rewards || [], score: score || 0, techScore: tech || 0, takeoutReward: layerPlanData.takeoutReward || [] };
// TODO正式环境屏蔽
weightRecords = dbDetail.weightRecords if(isDevelopEnv){
weightRecords = dbDetail.weightRecords
}
} }
if (!dbDetail) { if (!dbDetail) {
+1 -1
View File
@@ -36,7 +36,7 @@ export default class RougelikeChara extends BaseModel {
@prop({ required: true, default: 0 }) @prop({ required: true, default: 0 })
charaId: number; // 角色卡id charaId: number; // 角色卡id
@prop({ required: true, type: Card, default: [] }) @prop({ required: true, type: Card, default: [], _id: false })
cards: Card[]; cards: Card[];
@prop({ required: true, default: 0 }) @prop({ required: true, default: 0 })
+1 -1
View File
@@ -19,7 +19,7 @@ export default class RougelikeCollection extends BaseModel {
@prop({ required: true, default: '' }) @prop({ required: true, default: '' })
gameCode: string; gameCode: string;
@prop({ required: true, type: Number, default: false }) @prop({ required: true, type: Number, default: [], _id: false })
received: number[]; // 是否领取奖励 received: number[]; // 是否领取奖励
public static async addRec(roleId: string, type: number, id: number, gameCode: string, addNum = 1) { public static async addRec(roleId: string, type: number, id: number, gameCode: string, addNum = 1) {
+1 -1
View File
@@ -21,7 +21,7 @@ export default class RougelikeExtend extends BaseModel {
@prop({ required: true, default: 0 }) @prop({ required: true, default: 0 })
limitId: number; // 前置试炼id,只会是已通关 limitId: number; // 前置试炼id,只会是已通关
@prop({ required: true, type: RewardInter, default: 0 }) @prop({ required: true, type: RewardInter, default: 0, _id: false})
firstReward: RewardInter[]; //首通奖励 firstReward: RewardInter[]; //首通奖励
@prop({ required: true, default: '' }) @prop({ required: true, default: '' })
+1 -1
View File
@@ -13,7 +13,7 @@ export class Node {
@prop({ required: true, default: 0 }) @prop({ required: true, default: 0 })
nodeId: number; // 关卡id nodeId: number; // 关卡id
@prop({ required: true, type: Number, default: [] }) @prop({ required: true, type: Number, default: [], _id: false })
preNodeIndexs: number[]; // 连线的关卡,填上一层节点的索引 preNodeIndexs: number[]; // 连线的关卡,填上一层节点的索引
@prop({ required: true, default: 0 }) @prop({ required: true, default: 0 })
+1 -1
View File
@@ -46,7 +46,7 @@ export default class RougelikeRecord extends BaseModel {
@prop({ required: true, default: 0 }) @prop({ required: true, default: 0 })
score: number; // 本场获得的积分 score: number; // 本场获得的积分
@prop({ required: true, type: RewardInter, default: [] }) @prop({ required: true, type: RewardInter, default: [], _id: false })
takeoutReward: RewardInter[]; // 本场获得了的奖励(灵石,记录一下)id&count takeoutReward: RewardInter[]; // 本场获得了的奖励(灵石,记录一下)id&count
@prop({ required: true, default: false }) @prop({ required: true, default: false })
+12 -12
View File
@@ -15,7 +15,7 @@ export class Quest {
@prop({ required: true, default: 0 }) @prop({ required: true, default: 0 })
randomEventId: number; //问号点:随机事件id randomEventId: number; //问号点:随机事件id
@prop({ required: true, type: Number, default: [] }) @prop({ required: true, type: Number, default: [], _id: false })
EventOptions: number[]; // 问号点用:随机事件的选项 EventOptions: number[]; // 问号点用:随机事件的选项
} }
@@ -60,7 +60,7 @@ export class RestPoint {
@prop({ required: false }) @prop({ required: false })
recoveryCnt?: number; // 恢复的次数 recoveryCnt?: number; // 恢复的次数
@prop({ required: false, type: RecoveryChara }) @prop({ required: false, type: RecoveryChara, _id: false })
recoveryCharas?: RecoveryChara[];//恢复的数据 recoveryCharas?: RecoveryChara[];//恢复的数据
// @prop({ required: false, type: Recruit }) // @prop({ required: false, type: Recruit })
@@ -69,7 +69,7 @@ export class RestPoint {
@prop({ required: false }) @prop({ required: false })
trainCardCnt?: number; //休整点:特训 特训次数 trainCardCnt?: number; //休整点:特训 特训次数
@prop({ required: false, type: TrainCard }) @prop({ required: false, type: TrainCard, _id: false })
trainCards?: TrainCard[]; //特训卡 trainCards?: TrainCard[]; //特训卡
} }
@@ -126,7 +126,7 @@ export class RandomRec {
cardId?: number; // 角色卡id cardId?: number; // 角色卡id
@prop({ required: false, default: 0 }) @prop({ required: false, default: 0 })
weight?: number; // 权重 weight?: number; // 权重
@prop({ required: false, type: WeightRecord, default: {} }) @prop({ required: false, type: WeightRecord, default: {}, _id: false })
weightRecords?: WeightRecord; weightRecords?: WeightRecord;
} }
@@ -138,7 +138,7 @@ export class Option {
@prop({ required: true, default: 0 }) @prop({ required: true, default: 0 })
optionStatus: number; // 0-未领取 1-已领取 optionStatus: number; // 0-未领取 1-已领取
@prop({ required: false, type: Number, default: [] }) @prop({ required: false, type: Number, default: [], _id: false })
passiveCardIds?: number[]; //高级学员自带特性卡 passiveCardIds?: number[]; //高级学员自带特性卡
// @prop({ required: false, type: WeightRecord, default: {} }) // @prop({ required: false, type: WeightRecord, default: {} })
@@ -149,7 +149,7 @@ export class RewardIn {
groupIndex: number; // 组index groupIndex: number; // 组index
@prop({ required: true, default: 0 }) @prop({ required: true, default: 0 })
rewardType: number; // 奖励类型 rewardType: number; // 奖励类型
@prop({ required: false, type: Option }) @prop({ required: false, type: Option, _id: false })
options?: Option[]; // 组内随机的奖励 options?: Option[]; // 组内随机的奖励
@prop({ required: true, default: 0 }) @prop({ required: true, default: 0 })
groupStatus: number; // 组选择 0-未选择 1-已选择 groupStatus: number; // 组选择 0-未选择 1-已选择
@@ -198,25 +198,25 @@ export default class RougelikeRecordDetail extends BaseModel {
@prop({ required: true, default: 0 }) @prop({ required: true, default: 0 })
status: number; // 关卡状态 0-默认值 1-成功 2-失败 status: number; // 关卡状态 0-默认值 1-成功 2-失败
@prop({ required: false, type: Quest, default: [] }) @prop({ required: false, type: Quest, default: [], _id: false })
question?: Quest; // 问好点随机事件 question?: Quest; // 问好点随机事件
@prop({ required: false, default: 0 }) @prop({ required: false, default: 0 })
questType?: number; // 问好点随机type questType?: number; // 问好点随机type
@prop({ required: false, type: RestPoint, default: [] }) @prop({ required: false, type: RestPoint, default: [], _id: false })
restPoints?: RestPoint[]; restPoints?: RestPoint[];
@prop({ required: false, type: Challenge, default: {} }) @prop({ required: false, type: Challenge, default: {}, _id: false })
challenge?: Challenge; // 【挑战点】 challenge?: Challenge; // 【挑战点】
@prop({ required: false, type: Shop, default: [] }) @prop({ required: false, type: Shop, default: [], _id: false })
shops?: Shop[]; // 商店内的随机商品 shops?: Shop[]; // 商店内的随机商品
@prop({ required: false, type: RewardIn, default: [] }) @prop({ required: false, type: RewardIn, default: [], _id: false })
rewards?: RewardIn[]; // 通用过关后的奖励,挑战后的奖励 rewards?: RewardIn[]; // 通用过关后的奖励,挑战后的奖励
@prop({ required: false, type: RandomRec, default: [] }) @prop({ required: false, type: RandomRec, default: [], _id: false })
weightRecords?: RandomRec[]; weightRecords?: RandomRec[];
public static async updateByCode(gameCode: string, detailCode: string, params: { $set: RougelikeRecordDetailPara, $inc?: { reRandRewardCnt: 1 } }, lean = true) { public static async updateByCode(gameCode: string, detailCode: string, params: { $set: RougelikeRecordDetailPara, $inc?: { reRandRewardCnt: 1 } }, lean = true) {
+1 -1
View File
@@ -16,7 +16,7 @@ export default class RougelikeScore extends BaseModel {
@prop({ required: true, default: 0 }) @prop({ required: true, default: 0 })
score: number; // 积分 score: number; // 积分
@prop({ required: true, type: Number, default: [] }) @prop({ required: true, type: Number, default: [], _id: false })
received: number[]; // 已领取的id received: number[]; // 已领取的id
@prop({ required: true, default: 0 }) @prop({ required: true, default: 0 })
+2 -2
View File
@@ -32,13 +32,13 @@ export default class RougelikeTech extends BaseModel {
@prop({ required: true, default: 0 }) @prop({ required: true, default: 0 })
techScore: number; // 获得了的总科技点 techScore: number; // 获得了的总科技点
@prop({ required: true, type: Number, default: [] }) @prop({ required: true, type: Number, default: [], _id: false })
unlockedTech: number[]; // 科技点id unlockedTech: number[]; // 科技点id
@prop({ required: true, type: Circle, _id: false, default: [] }) @prop({ required: true, type: Circle, _id: false, default: [] })
circles: Circle[] // 法阵 circles: Circle[] // 法阵
@prop({ required: true, type: Number, default: [] }) @prop({ required: true, type: Number, default: [], _id: false })
effectIds: number[]; // 科技点id effectIds: number[]; // 科技点id
// 查询 // 查询