diff --git a/shared/domain/gvgField/returnData.ts b/shared/domain/gvgField/returnData.ts index 18b01a6fa..39e84a0fa 100644 --- a/shared/domain/gvgField/returnData.ts +++ b/shared/domain/gvgField/returnData.ts @@ -64,7 +64,7 @@ export class GVGMainData { leader: LeagueLeaderInfo; name: string; // 联军名 icon: number; // 图标 - lv: number; // 联军等级 + leagueLv: number; // 联军等级 notice: string; // 公告 guildCnt: number; // 军团数量 memberCnt: number; // 玩家人数 @@ -110,7 +110,7 @@ export class GVGMainData { setLeagueParpare(leaguePrepare: GVGLeaguePrepareType) { if(!leaguePrepare) return; - this.lv = leaguePrepare.lv; + this.leagueLv = leaguePrepare.lv; this.resources = leaguePrepare.resources; this.activeTech = leaguePrepare.activeTech||[]; this.maxMemberCnt = leaguePrepare.maxMemberCnt; @@ -323,6 +323,7 @@ export class LeagueField { addType: number; // 特殊加成类型 0-普通田 1-小麦加成 2-玉米 3-水稻 harvestTime: number; // 收获时间, 10位时间戳 unlockTime: number; // 锁定时间,会按照内政令的数量给玩家预锁定一批填,超过时间限制就不锁给他了也会分给其他人了 + index: number = 0; // 位置 constructor(leagueFarm: GVGLeagueFarmType) { if(!leagueFarm) return; @@ -331,6 +332,7 @@ export class LeagueField { this.addType = leagueFarm.addType; this.harvestTime = leagueFarm.harvestTime; this.unlockTime = leagueFarm.unlockTime; + this.index = leagueFarm.index||0; } } @@ -455,9 +457,7 @@ export class GVGVestigeOppLineupHero { } } -export class GVGVestigeOppLineup { - vestigeId: number; // 遗迹id - myRank: number; +class OppData { rank: number; score: number; isRobot: boolean; @@ -473,13 +473,6 @@ export class GVGVestigeOppLineup { lineupCe: number = 0; // 阵容战力 heroes: GVGVestigeOppLineupHero[] = []; - constructor(vestigeId: number) { - this.vestigeId = vestigeId; - } - - setMyRank(myRank: number) { - this.myRank = myRank; - } setRobot(dic: DicGVGVestige, warJsons: DicWarJson[], serverName: string) { this.isRobot = true; @@ -528,6 +521,29 @@ export class GVGVestigeOppLineup { } } +export class GVGVestigeOppLineup { + vestigeId: number; // 遗迹id + myRank: number; + opp: OppData = new OppData(); + + constructor(vestigeId: number) { + this.vestigeId = vestigeId; + } + + setMyRank(myRank: number) { + this.myRank = myRank; + } + + + setRobot(dic: DicGVGVestige, warJsons: DicWarJson[], serverName: string) { + this.opp.setRobot(dic, warJsons, serverName); + } + + setPlayer(dic: DicGVGVestige, role: RoleType, heroes: HeroType[], serverNames: any) { + this.opp.setPlayer(dic, role, heroes, serverNames); + } +} + export class VestigeRank { rank: number; roleId: string;