Merge branch 'feature/test'

shared/db/PvpDefense.ts

@@ -22,6 +22,8 @@ export default class PvpDefense extends BaseModel {
     lineupCe: LineupCe[];
     @prop({ required: true, type: () => OppPlayer, default: [], _id: false })
     oppPlayers: OppPlayer[];
+    @prop({ required: true, type: () => OppPlayer, default: [], _id: false })
+    oppBeforePlayers: OppPlayer[];
     @prop({ required: true, type: () => HeroScore, default: [], _id: false })
     heroScores: HeroScore[];
 
@@ -112,7 +114,8 @@ export default class PvpDefense extends BaseModel {
         const result: PvpDefenseType = await PvpDefenseModel.findOne({ roleId })
         .populate('role', 'head frame spine topLineupCe roleId roleName lv globalCeAttr')
         .populate('heroes.hero')
-        .populate('oppPlayers.oppDef', 'oppRoleId pos roleName head frame spine heads frames spines rankLv title lv pLv defCe heroes warId buff').lean({ getters: true, virtuals: true });
+        .populate('oppPlayers.oppDef', 'oppRoleId pos roleName head frame spine heads frames spines rankLv title lv pLv defCe heroes warId buff')
+        .populate('oppBeforePlayers.oppDef', 'oppRoleId pos roleName head frame spine heads frames spines rankLv title lv pLv defCe heroes warId buff').lean({ getters: true, virtuals: true });
         return result;
     }
 

shared/db/PvpHistoryOpp.ts

@@ -20,6 +20,8 @@ export default class PvpHistoryOpp extends BaseModel {
     @prop({ required: true })
     oppRoleId: string;		    	// 对手角色 id
     @prop({ required: true })
+    isRobot: boolean;		    	// 是否是机器人
+    @prop({ required: true })
     roleName: string;				// 角色名称
     @prop({ required: true, default: EXTERIOR.EXTERIOR_FACE })
     head: number;                // 对手头像