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

军团优化：军团上次排行榜

Browse Source
This commit is contained in:
luying
2022-07-22 09:41:54 +08:00
parent 1f045bd11d
commit a3af186161
17 changed files with 259 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
shared/consts/constModules/sysConst.ts
View File

@@ -48,7 +48,10 @@ export const COUNTER = {
NOTICE: { name: 'notice', def: 1 },
GIFT_CODE: { name: 'giftCode', def: 1 },
PVP_SEASON_NUM: { name: 'pvpSeason', def: 1 },
REGION: { name: 'region', def: 1 }
REGION: { name: 'region', def: 1 },
GATE_ACTIVITY: { name: 'guildAct', def: 1 },
CITY_ACTIVITY: { name: 'cityAct', def: 1 },
RACE_ACTIVITY: { name: 'raceAct', def: 1 }
};
export const DEFAULT_HEROES = [19, 53,];

4
shared/db/Counter.ts
View File

@@ -23,9 +23,9 @@ export default class Counter extends BaseModel {
}
public static async getCounter(param:{name: string, def: number}, lean = true) {
let {name, def:defaultVal} = param;
let {name} = param;
let counter: CounterType = await CounterModel.findOne({ name }).lean(lean);
return counter?.seq||defaultVal;
return counter?.seq||0;
}
}

37
shared/db/GuildActivityCity.ts
View File

@@ -10,6 +10,9 @@ export default class GuildActivityCity extends BaseModel {
@prop({ required: true })
cityId: number; // 城池id
@prop({ required: true })
declareIndex: number; // 城池id
@prop({ required: true, type: String, default: [] })
declareGuilds: string[]; // 宣战的公会的code
@@ -29,28 +32,27 @@ export default class GuildActivityCity extends BaseModel {
status: number; // 0-过去的 1-现在的 2-未来的
// 每天宣战一次
public static async getAllCities(serverId: number) {
let rec: GuildActivityCityType[] = await GuildActivityCityModel.find({ serverId, status: 1 }).lean();
public static async getAllCities(serverId: number, declareIndex: number) {
let rec: GuildActivityCityType[] = await GuildActivityCityModel.find({ serverId, status: 1, declareIndex }).lean();
return rec;
}
public static async findMinDeclareCountCity(serverId: number, cityIds: number[]) {
let rec: GuildActivityCityType[] = await GuildActivityCityModel.find({ serverId, cityId: { $in: cityIds }, status: 1 }).sort({ declareCount: 1 }).lean();
public static async findMinDeclareCountCity(serverId: number, cityIds: number[], declareIndex: number) {
let rec: GuildActivityCityType[] = await GuildActivityCityModel.find({ serverId, cityId: { $in: cityIds }, status: 1, declareIndex }).sort({ declareCount: 1 }).lean();
return rec;
}
public static async getCity(serverId: number, cityId: number) {
let rec: GuildActivityCityType = await GuildActivityCityModel.findOne({ serverId, cityId, status: 1}).lean();
public static async getCity(serverId: number, cityId: number, declareIndex: number) {
let rec: GuildActivityCityType = await GuildActivityCityModel.findOne({ serverId, cityId, status: 1, declareIndex }).lean();
return rec;
}
// 宣言
public static async declare(serverId: number, cityId: number, guildCode: string) {
public static async declare(serverId: number, cityId: number, guildCode: string, declareIndex: number) {
let rec: GuildActivityCityType = await GuildActivityCityModel.findOneAndUpdate(
{ serverId, cityId, status: 1 },
{ serverId, cityId, status: 1, declareIndex },
{ $push: { declareGuilds: guildCode }, $inc: {declareCount: 1 } },
{new: true, upsert: true}).lean();
@@ -58,24 +60,13 @@ export default class GuildActivityCity extends BaseModel {
}
// 占领
public static async guard(serverId: number, cityId: number, guildCode: string, guildName: string) {
public static async guard(serverId: number, cityId: number, guildCode: string, guildName: string, declareIndex: number) {
let rec: GuildActivityCityType = await GuildActivityCityModel.findOneAndUpdate(
{ serverId, cityId, status: 1 },
{ serverId, cityId, status: 1, declareIndex },
{ $set: { guardGuildCode: guildCode, guardGuildName: guildName, guardTime: new Date()} },
{ new: true }).lean();
{ new: true, upsert: true }).lean();
return rec;
}
// 活动结束后需要清空占领情况
public static async clearGuardAndStartNext(serverId?: number) {
if(serverId) {
await GuildActivityCityModel.updateMany({ serverId, status: 1 }, { $set: { status: 0 } });
await GuildActivityCityModel.updateMany({ serverId, status: 2 }, { $set: { status: 1 } });
} else {
await GuildActivityCityModel.updateMany({ status: 1 }, { $set: { status: 0 } });
await GuildActivityCityModel.updateMany({ status: 2 }, { $set: { status: 1 } });
}
}
}
export const GuildActivityCityModel = getModelForClass(GuildActivityCity);

20
shared/db/GuildActivityCityDeclare.ts
View File

@@ -10,6 +10,9 @@ export default class GuildActivityCityDeclare extends BaseModel {
@prop({ required: true })
cityId: number; // 城池id
@prop({ required: true })
declareIndex: number; // 城池id
@prop({ required: true })
guildCode: string; // 宣战的公会的code
@@ -26,25 +29,16 @@ export default class GuildActivityCityDeclare extends BaseModel {
status: number; // 状态 1-当前 0-失效，当活动结束时定时任务设为0
// 宣战
public static async declareIfNot(serverId: number, guildCode: string, cityId: number, roleId: string, declareTime: number, isAutoDeclare: boolean) {
let rec: GuildActivityCityDeclareType = await GuildActivityCityDeclareModel.findOneAndUpdate({ serverId, guildCode, status: 1 }, { $setOnInsert: { cityId, declareMember: roleId, declareTime, isAutoDeclare } }, { new: true, upsert: true }).lean();
public static async declareIfNot(serverId: number, guildCode: string, cityId: number, roleId: string, declareTime: number, isAutoDeclare: boolean, declareIndex: number) {
let rec: GuildActivityCityDeclareType = await GuildActivityCityDeclareModel.findOneAndUpdate({ serverId, guildCode, cityId, status: 1, declareIndex }, { $setOnInsert: { declareMember: roleId, declareTime, isAutoDeclare } }, { new: true, upsert: true }).lean();
return rec;
}
// 检查是否宣战过
public static async checkDeclartion(serverId: number, guildCode: string) {
let rec = await GuildActivityCityDeclareModel.exists({ serverId, status: 1, guildCode});
public static async checkDeclartion(serverId: number, guildCode: string, declareIndex: number) {
let rec = await GuildActivityCityDeclareModel.exists({ serverId, status: 1, guildCode, declareIndex});
return rec;
}
// 清空今天的宣战
public static async clearDeclare(serverId?: number) {
if(serverId) {
await GuildActivityCityDeclareModel.updateMany({ serverId, status: 1}, { status: 0 });
} else {
await GuildActivityCityDeclareModel.updateMany({ status: 1}, { status: 0 });
}
}
}
export const GuildActivityCityDeclareModel = getModelForClass(GuildActivityCityDeclare);

43
shared/db/GuildActivityRec.ts
View File

@@ -1,7 +1,6 @@
import BaseModel from './BaseModel';
import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose';
import { ItemReward } from '../domain/dbGeneral';
import { getZeroPointD } from '../pubUtils/timeUtil';
import { genCode } from '../pubUtils/util';
import { Member, WoodenHorse, Event } from '../domain/battleField/guildActivity'
@@ -11,7 +10,7 @@ export default class GuildActivityRecord extends BaseModel {
@prop({ required: true })
code: string; // 本次记录唯一值
@prop({ required: true })
guildCode: string; // 军团code
@@ -24,6 +23,9 @@ export default class GuildActivityRecord extends BaseModel {
@prop({ required: true })
aid: number; // 军团活动id
@prop({ required: true })
index: number; // 第几次这个类型的军团活动
@prop({ required: true })
auctionType: number; // 转为拍卖行的类型
@@ -51,6 +53,9 @@ export default class GuildActivityRecord extends BaseModel {
@prop({ required: true })
remainGateHp: number; // 城门剩余血量
@prop({ required: true })
challengeCityId: number; // 诸侯混战占领了的城池
@prop({ required: true })
cityId: number; // 诸侯混战占领了的城池
@@ -64,42 +69,30 @@ export default class GuildActivityRecord extends BaseModel {
events: Event[]; // 粮草先行木马
// 每天一条记录
public static async getRecord(guildCode: string, serverId: number, aid: number, events?: Event[]) {
let today = getZeroPointD();
public static async getRecord(guildCode: string, serverId: number, aid: number, index: number, events?: Event[], cityId?: number) {
let docs = new GuildActivityRecordModel();
let code = genCode(10);
let update = Object.assign(docs, { code, guildCode, serverId, aid, createdAt: new Date(), auctionType: aid + 1 });
if(events) update = Object.assign(update, { events });
let insert = Object.assign(docs, { code, guildCode, serverId, aid, createdAt: new Date(), auctionType: aid + 1 });
if(events) insert = Object.assign(insert, { events });
let update: GuildActivityRecordUpdateParam = {};
if(cityId) update = Object.assign(update, { challengeCityId: cityId });
let rec: GuildActivityRecordType = await GuildActivityRecordModel.findOneAndUpdate(
{ aid, guildCode, createdAt: { $gte: today }, status: 1},
{ $setOnInsert: update },
{ aid, guildCode, index, status: 1},
{ $setOnInsert: insert, $set: update },
{new: true, upsert: true}).lean();
return rec;
}
public static async updateInfo(guildCode: string, aid: number, update: GuildActivityRecordUpdateParam) {
let today = getZeroPointD();
public static async updateInfo(guildCode: string, aid: number, index: number, update: GuildActivityRecordUpdateParam) {
let rec: GuildActivityRecordType = await GuildActivityRecordModel.findOneAndUpdate(
{ guildCode, aid, createdAt: { $gte: today }, status: 1 },
{ guildCode, aid, index, status: 1 },
{ $set: update }, { new: true }).lean();
return rec;
}
public static async updateTodayInfo(update: GuildActivityRecordUpdateParam) {
let today = getZeroPointD();
let rec = await GuildActivityRecordModel.updateMany(
{ createdAt: { $gte: today } },
{ $set: update }, { new: true }).lean();
return rec;
}
public static async pushEvent(guildCode: string, aid: number, event: Event) {
let today = getZeroPointD();
public static async pushEvent(guildCode: string, aid: number, index: number, event: Event) {
let rec: GuildActivityRecordType = await GuildActivityRecordModel.findOneAndUpdate(
{ guildCode, createdAt: { $gte: today }, aid, status: 1 },
{ guildCode, index, aid, status: 1 },
{ $push: { events: event } }, { new: true }).lean();
return rec;
}

4
shared/db/UserGuildActivityRec.ts
View File

@@ -129,10 +129,10 @@ export default class UserGuildActivityRec extends BaseModel {
return rec;
}
public static async pushCityRecord(code: string, damageRecord: DamageRecord) {
public static async pushCityRecord(code: string, damageRecord: DamageRecord, challengeTime: number) {
let rec: UserGuildActivityRecType = await UserGuildActivityRecModel.findOneAndUpdate(
{ code },
{ $push: { damageRecord }},
{ $push: { damageRecord }, $set: { challengeTime }},
{ new: true }
).lean();
return rec;

11
shared/domain/rank.ts
View File

@@ -289,6 +289,7 @@ export class KeyName {
hid?: number;
seasonNum?: number;
activityId?: number;
index?: number; // 军团活动第几期
constructor(key: string, param: KeyNameParam) {
this.key = key;
@@ -298,6 +299,7 @@ export class KeyName {
if(param.hid) this.hid = param.hid;
if(param.seasonNum) this.seasonNum = param.seasonNum;
if(param.activityId) this.activityId = param.activityId;
if(param.index) this.index = param.index;
}
public getName() {
@@ -311,8 +313,6 @@ export class KeyName {
case REDIS_KEY.MAIN_ELITE_RANK:
case REDIS_KEY.GUILD_LV_RANK:
case REDIS_KEY.GUILD_ACTIVE_RANK:
case REDIS_KEY.GATE_ACTIVITY:
case REDIS_KEY.RACE_ACTIVITY:
case REDIS_KEY.TOWER_RANK:
case REDIS_KEY.LADDER:
return `${this.key}:${this.serverId}`;
@@ -320,11 +320,14 @@ export class KeyName {
return `${this.key}:${this.serverId}:${this.hid}`;
case REDIS_KEY.PVP_RANK:
return `${this.key}:${this.seasonNum}`;
case REDIS_KEY.GATE_ACTIVITY:
case REDIS_KEY.RACE_ACTIVITY:
return `${this.key}:${this.serverId}:${this.index}`;
case REDIS_KEY.CITY_ACTIVITY:
return `${this.key}:${this.serverId}:${this.cityId}`;
return `${this.key}:${this.serverId}:${this.index}:${this.cityId}`;
case REDIS_KEY.USER_CITY_ACTIVITY:
case REDIS_KEY.USER_GATE_ACTIVITY:
return `${this.key}:${this.serverId}:${this.guildCode}`;
return `${this.key}:${this.serverId}:${this.index}:${this.guildCode}`;
case REDIS_KEY.GUILD_FUND:
case REDIS_KEY.SUM_CE_SNAPSHOT:
return `${this.key}:${this.serverId}:${this.activityId}`;

1
shared/pubUtils/data.ts
View File

@@ -662,7 +662,6 @@ export function getGuildAuctionRewards(aid: number, rank: number, cityId: number
}
export function getGuildAuctionBasicNum(aid: number, rank: number, cityId: number = 0) {
console.log('###### getGuildAuctionBasicNum', aid, rank, cityId)
let dic = getGuildAuction(aid, rank, cityId);
return dic?.basicDividend||0;
}