500抽：活动格式

shared/db/UserGacha.ts

@@ -2,6 +2,7 @@ import BaseModel from './BaseModel';
 import { index, getModelForClass, prop, DocumentType, modelOptions } from '@typegoose/typegoose';
 import { getZeroPointD } from '../pubUtils/timeUtil';
 import { RECRUIT } from '../pubUtils/dicParam';
+import { Candidate, SimpleResult } from '../domain/activityField/guideGachaField';
 
 export class Floor {
   @prop({ required: true })
@@ -36,28 +37,6 @@ class Turntable {
   hasGet: boolean;       // 是否得到
 }
 
-export class SimpleResult {
-  @prop({ required: true })
-  planId: number;
-  @prop({ required: true })
-  hid: number;
-  @prop({ required: true })
-  isTransfer: boolean;
-}
-
-/**
-* @description 特殊引导候选列表
-* @memberof UserGacha
-*/
-class Candidate {
-  @prop({ required: true })
-  id: number;        // 列表id
-  @prop({ required: true })
-  guideCount: number;        // 引导次数
-  @prop({ required: true, type: SimpleResult, _id: false })
-  list: SimpleResult[];       // 是否得到
-}
-
 /**
   * 玩家抽卡表
 **/
@@ -115,15 +94,12 @@ export default class UserGacha extends BaseModel {
 
     // 初始特殊引导
     @prop({ required: true, default: 0 })
-    guideCount: number;            // 预抽卡次数
+    pullCnt: number;            // 预抽卡次数
 
-    @prop({ required: true, default: 0 })
-    guideResultCount: number;            // 预抽卡次数
-
-    @prop({ required: true, type: SimpleResult, default: [], _id: false })
+    @prop({ required: true, type: () => SimpleResult, default: [], _id: false })
     guideResultList: SimpleResult[];            // 预抽卡结果
 
-    @prop({ required: true, type: Candidate, default: [], _id: false })
+    @prop({ required: true, type: () => Candidate, default: [], _id: false })
     candidates: Candidate[];            // 预抽卡候选
 
     public static async findAllByRole(roleId: string) {