军团活动：蛮夷入侵
This commit is contained in:
luying
@@ -8,7 +8,7 @@ import { gameData, getGoodById } from '../pubUtils/data';
|
||||
import { DividendParam, DividendType } from '../db/Dividend';
|
||||
import { sendMailByContent } from './mailService';
|
||||
import { FrontendOrBackendSession, pinus } from 'pinus';
|
||||
import { participants } from './guildActivityService';
|
||||
import { participants } from './guildActivity/guildActivityService';
|
||||
import { Member } from '../domain/battleField/guildActivity';
|
||||
import * as dicParam from '../pubUtils/dicParam';
|
||||
import { RewardInter } from '../pubUtils/interface';
|
||||
|
||||
@@ -31,7 +31,7 @@ import { getEvent } from './eventSercive';
|
||||
import { getBattleListOfMain } from './normalBattleService';
|
||||
import { GuildType } from '../db/Guild';
|
||||
import UserGuild, { UserGuildType } from '../db/UserGuild';
|
||||
import { setMedianCe, getAllGuildActivityStatus } from './guildActivityService';
|
||||
import { setMedianCe, getAllGuildActivityStatus } from './guildActivity/guildActivityService';
|
||||
import { getAllOnlineRoles } from './redisService';
|
||||
import Item from '../db/Item';
|
||||
import { PvpDefenseModel } from '../db/PvpDefense';
|
||||
|
||||
118
game-server/app/services/guildActivity/cityActivityObj.ts
Normal file
118
game-server/app/services/guildActivity/cityActivityObj.ts
Normal file
@@ -0,0 +1,118 @@
|
||||
// 军团活动蛮夷入侵城门血量等数据存储
|
||||
|
||||
import { Member } from "../../domain/battleField/guildActivity";
|
||||
|
||||
// 军团诸侯混战等数据
|
||||
export class CityActivityObject {
|
||||
private gateHp: Map<string, number> = new Map(); // 城门血条，每个cityId有一条血条 serverId&cityId => gateHp
|
||||
private members: Map<string, Array<Member>> = new Map(); // 每个军团参与的成员 guildCode => [{roleId, job}]
|
||||
private cities: Map<string, string[]> = new Map(); // 各个城池参与的军团 serverId&cityId => [guildCode]
|
||||
private guilds: Map<string, number> = new Map(); // 军团所在的城池 guildCode => cityId
|
||||
private historyCity: Map<string, number> = new Map(); // 获取自己打开过的城池的页面 roleId => cityId
|
||||
private sentCity: string[] = [];
|
||||
|
||||
private getKey(serverId: number, cityId: number) {
|
||||
return `${serverId}_${cityId}`;
|
||||
}
|
||||
|
||||
private decodeKey(key: string) {
|
||||
let arr = key.split('_');
|
||||
return {
|
||||
serverId: parseInt(arr[0]),
|
||||
cityId: parseInt(arr[1])
|
||||
}
|
||||
}
|
||||
|
||||
public getObj( serverId: number, cityId: number, guildCode: string) {
|
||||
let key = this.getKey(serverId, cityId);
|
||||
return {
|
||||
gateHp: this.gateHp.get(key),
|
||||
members: this.members.get(guildCode),
|
||||
city: this.cities.get(key),
|
||||
guild: this.guilds.get(guildCode)
|
||||
}
|
||||
}
|
||||
|
||||
public getAllCities() {
|
||||
let allCities = new Array<{ serverId: number, cityId: number, guildCodes: string[]}>();
|
||||
let serverlists = new Array<number>();
|
||||
for(let [key, guildCodes] of this.cities) {
|
||||
if(this.sentCity.indexOf(key) == -1) {
|
||||
let { serverId, cityId } = this.decodeKey(key);
|
||||
allCities.push({ serverId, cityId, guildCodes });
|
||||
if(!serverlists.includes(serverId)) serverlists.push(serverId);
|
||||
}
|
||||
}
|
||||
return {cities: allCities, serverlists};
|
||||
}
|
||||
|
||||
public getGuildsInCity(serverId: number, cityId: number) {
|
||||
let key = this.getKey(serverId, cityId);
|
||||
return this.cities.get(key)||[];
|
||||
}
|
||||
|
||||
public getMembersOfGuild(guildCode: string) {
|
||||
return this.members.get(guildCode)||[];
|
||||
}
|
||||
|
||||
public getGateHpAndInc(serverId: number, cityId: number, maxHp: number, inc: number = 0) {
|
||||
let key = this.getKey(serverId, cityId);
|
||||
let gateHp = this.gateHp.get(key);
|
||||
if(!this.gateHp.has(key)) {
|
||||
gateHp = maxHp;
|
||||
}
|
||||
if(inc != 0) {
|
||||
gateHp += inc;
|
||||
this.gateHp.set(key, gateHp);
|
||||
}
|
||||
if(gateHp <= 0) gateHp = 0;
|
||||
return gateHp
|
||||
}
|
||||
|
||||
public getHistoryCity(roleId: string) {
|
||||
return this.historyCity.get(roleId)
|
||||
}
|
||||
|
||||
public setHistoryCity(roleId: string, cityId: number) {
|
||||
return this.historyCity.set(roleId, cityId);
|
||||
}
|
||||
|
||||
|
||||
public pushMembers(guildCode: string, roleId: string, job: number, code: string) {
|
||||
|
||||
if(this.members.has(guildCode)) {
|
||||
let members = this.members.get(guildCode);
|
||||
if(members.findIndex(cur => cur.roleId == roleId) == -1) {
|
||||
members.push({ roleId, job, code });
|
||||
}
|
||||
} else {
|
||||
let arr = new Array<string>();
|
||||
arr.push(roleId);
|
||||
this.members.set(guildCode, [{ roleId, job, code }]);
|
||||
}
|
||||
}
|
||||
|
||||
public pushGuild(guildCode: string, serverId: number, cityId: number) {
|
||||
let key = this.getKey(serverId, cityId);
|
||||
if(!this.cities.has(key)) {
|
||||
this.cities.set(key, [guildCode]);
|
||||
} else {
|
||||
let arr = this.cities.get(key);
|
||||
if(!arr.includes(guildCode)) {
|
||||
arr.push(guildCode);
|
||||
}
|
||||
}
|
||||
this.guilds.set(guildCode, cityId);
|
||||
}
|
||||
|
||||
public delCityRecord(cityId: number, serverId: number) {
|
||||
let key = this.getKey(serverId, cityId);
|
||||
// let guildCodes = this.cities.get(key)||[];
|
||||
// for(let guildCode of guildCodes) {
|
||||
// this.members.delete(guildCode);
|
||||
// this.guilds.delete(guildCode);
|
||||
// }
|
||||
// this.cities.delete(key);
|
||||
this.sentCity.push(key);
|
||||
}
|
||||
}
|
||||
67
game-server/app/services/guildActivity/gateActivityObj.ts
Normal file
67
game-server/app/services/guildActivity/gateActivityObj.ts
Normal file
@@ -0,0 +1,67 @@
|
||||
|
||||
// 军团活动蛮夷入侵城门血量等数据存储
|
||||
|
||||
import { Member, GateMembersRec } from "../../domain/battleField/guildActivity";
|
||||
import { GUILDACTIVITY } from "../../pubUtils/dicParam";
|
||||
|
||||
export class GateActivityObject {
|
||||
private members: Map<string, Array<Member>> = new Map(); // 每个军团参与的成员 guildCode => [{roleId, job}]
|
||||
private membersRecord: Map<string, GateMembersRec> = new Map(); // 每个成员的回合数和敌军数，防刷 recCode => GateMembersRec
|
||||
private guilds: Map<number, string[]> = new Map(); // 参加的所有军团 server => [guildCode]
|
||||
|
||||
public getObj(guildCode: string, serverId: number) {
|
||||
// console.log(guildCode, serverId)
|
||||
return {
|
||||
members: this.members.get(guildCode)||[],
|
||||
memberesRecord: [...this.membersRecord],
|
||||
guilds: this.guilds.get(serverId)||[]
|
||||
}
|
||||
}
|
||||
|
||||
public getGuilds() {
|
||||
return this.guilds;
|
||||
}
|
||||
|
||||
public pushMembers(guildCode: string, serverId: number, roleId: string, job: number, code: string) {
|
||||
|
||||
if(this.members.has(guildCode)) {
|
||||
let members = this.members.get(guildCode);
|
||||
if(members.findIndex(cur => cur.roleId == roleId) == -1) {
|
||||
members.push({ roleId, job, code });
|
||||
}
|
||||
} else {
|
||||
let arr = new Array<string>();
|
||||
arr.push(roleId);
|
||||
this.members.set(guildCode, [{ roleId, job, code }]);
|
||||
}
|
||||
if(this.guilds.has(serverId)) {
|
||||
let arr = this.guilds.get(serverId);
|
||||
if(!arr.includes(guildCode)) arr.push(guildCode);
|
||||
this.guilds.set(serverId, arr);
|
||||
} else {
|
||||
this.guilds.set(serverId, [guildCode]);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public getMemberRecord(recCode: string, roleId: string) {
|
||||
return this.membersRecord.get(recCode)||new GateMembersRec(roleId)
|
||||
}
|
||||
|
||||
public setMemberRecord(recCode: string, newMemberRecord: GateMembersRec) {
|
||||
this.membersRecord.set(recCode, newMemberRecord);
|
||||
}
|
||||
|
||||
public delMemberRecord(recCode: string) {
|
||||
this.membersRecord.delete(recCode);
|
||||
}
|
||||
|
||||
public delGuildRecord(guildCode: string, serverId: number) {
|
||||
let guildList = this.guilds.get(serverId);
|
||||
if(guildList) {
|
||||
let index = guildList.indexOf(guildCode);
|
||||
guildList.splice(index, 1);
|
||||
}
|
||||
this.members.delete(guildCode);
|
||||
}
|
||||
}
|
||||
@@ -1,30 +1,32 @@
|
||||
import { ServerlistModel } from "../db/Serverlist";
|
||||
import { RoleModel } from "../db/Role";
|
||||
import { reduceCe } from "../pubUtils/util";
|
||||
import { GUILDACTIVITY } from "../pubUtils/dicParam";
|
||||
import { gameData, getGuildAuctionRewards, getCityActivityRewards } from "../pubUtils/data";
|
||||
import { getCurDay, nowSeconds, getTimeFun } from "../pubUtils/timeUtil";
|
||||
import { GUILD_ACTIVITY_STATUS, GET_POINT_WAYS, GUILD_ACTIVITY_TYPE, REDIS_KEY, AUCTION_SOURCE, MAIL_TYPE, CITY_STATUS, DEBUG_MAGIC_WORD, GUILD_POINT_WAYS, TASK_TYPE, AUCTION_TIME } from "../consts";
|
||||
import { Record, UserGuildActivityRecModel } from "../db/UserGuildActivityRec";
|
||||
import { GateMembersRec, CityParam, Member, WoodenHorse } from "../domain/battleField/guildActivity";
|
||||
import { DicGuildActivity } from "../pubUtils/dictionary/DicGuildActivity";
|
||||
import { getAllServers, getRoleOnlineInfo } from "./redisService";
|
||||
import { SimpleGuildRankParam, SimpleRoleRankParam, SimpleGuildRankWithTimeParam, GuildRankInfo, RoleRankInfo } from "../domain/rank";
|
||||
import { getGuildChannelSid, getWorldChannelSid, getCityChannelSid } from "./chatChannelService";
|
||||
import { ServerlistModel } from "../../db/Serverlist";
|
||||
import { RoleModel } from "../../db/Role";
|
||||
import { reduceCe } from "../../pubUtils/util";
|
||||
import { GUILDACTIVITY } from "../../pubUtils/dicParam";
|
||||
import { gameData, getGuildAuctionRewards, getCityActivityRewards } from "../../pubUtils/data";
|
||||
import { getCurDay, nowSeconds, getTimeFun } from "../../pubUtils/timeUtil";
|
||||
import { GUILD_ACTIVITY_STATUS, GET_POINT_WAYS, GUILD_ACTIVITY_TYPE, REDIS_KEY, AUCTION_SOURCE, MAIL_TYPE, CITY_STATUS, DEBUG_MAGIC_WORD, GUILD_POINT_WAYS, TASK_TYPE, AUCTION_TIME } from "../../consts";
|
||||
import { Record, UserGuildActivityRecModel } from "../../db/UserGuildActivityRec";
|
||||
import { GateMembersRec, CityParam, Member, WoodenHorse } from "../../domain/battleField/guildActivity";
|
||||
import { DicGuildActivity } from "../../pubUtils/dictionary/DicGuildActivity";
|
||||
import { getAllServers, getRoleOnlineInfo } from "../redisService";
|
||||
import { SimpleGuildRankParam, SimpleRoleRankParam, SimpleGuildRankWithTimeParam, GuildRankInfo, RoleRankInfo } from "../../domain/rank";
|
||||
import { getGuildChannelSid, getWorldChannelSid, getCityChannelSid } from "../chatChannelService";
|
||||
import { pinus } from "pinus";
|
||||
import { GuildActivityRecordModel } from "../db/GuildActivityRec";
|
||||
import { genAuction } from "./auctionService";
|
||||
import { sendMailByContent } from "./mailService";
|
||||
import { getHonourObject } from '../pubUtils/itemUtils';
|
||||
import { GuildActivityCityType, GuildActivityCityModel } from "../db/GuildActivityCity";
|
||||
import { DicCityActivity } from "../pubUtils/dictionary/DicCityActivity";
|
||||
import { GateActivityObject, CityActivityObject, RaceActivityObject } from "./guildActivityObjService";
|
||||
import { Rank } from "./rankService";
|
||||
import { BossInstanceModel } from "../db/BossInstance";
|
||||
import { UserGuildModel } from "../db/UserGuild";
|
||||
import { raceActivityEnd } from "./timeTaskService";
|
||||
import { addActive } from "./guildService";
|
||||
import { checkTask, checkActivityTask } from "./taskService";
|
||||
import { GuildActivityRecordModel } from "../../db/GuildActivityRec";
|
||||
import { genAuction } from "../auctionService";
|
||||
import { sendMailByContent } from "../mailService";
|
||||
import { getHonourObject } from '../../pubUtils/itemUtils';
|
||||
import { GuildActivityCityType, GuildActivityCityModel } from "../../db/GuildActivityCity";
|
||||
import { DicCityActivity } from "../../pubUtils/dictionary/DicCityActivity";
|
||||
import { CityActivityObject } from "./cityActivityObj";
|
||||
import { GateActivityObject } from "./gateActivityObj";
|
||||
import { RaceActivityObject } from "./raceActivityObj";
|
||||
import { Rank } from "../rankService";
|
||||
import { BossInstanceModel } from "../../db/BossInstance";
|
||||
import { UserGuildModel } from "../../db/UserGuild";
|
||||
import { raceActivityEnd } from "../timeTaskService";
|
||||
import { addActive } from "../guildService";
|
||||
import { checkTask, checkActivityTask } from "../taskService";
|
||||
|
||||
let gateActivityObj: GateActivityObject;
|
||||
let cityActivityObj: CityActivityObject;
|
||||
@@ -386,7 +388,7 @@ export async function sendSingleRaceActEndMsg(guildCode: string, woodenHorse: Wo
|
||||
export async function gateActivitySettleReward(guildCode: string, serverId: number) {
|
||||
console.log('gateActivitySettleReward', guildCode, serverId);
|
||||
let obj = getGateActivityObj();
|
||||
let { gateHp, members } = obj.getObj(guildCode, serverId);
|
||||
let { members } = obj.getObj(guildCode, serverId);
|
||||
// console.log('***** gateHp', gateHp, 'members', members);
|
||||
|
||||
let r = new Rank(REDIS_KEY.GATE_ACTIVITY, { serverId }, true);
|
||||
@@ -398,9 +400,9 @@ export async function gateActivitySettleReward(guildCode: string, serverId: numb
|
||||
// console.log('***** rewards', JSON.stringify(rewards));
|
||||
|
||||
let rec = await GuildActivityRecordModel.updateInfo(guildCode, GUILD_ACTIVITY_TYPE.GATE_ACTIVITY, {
|
||||
isSuccess: gateHp > 0,
|
||||
isSuccess: true,
|
||||
isCompleted: true,
|
||||
rank, score: guildScore, remainGateHp: gateHp,
|
||||
rank, score: guildScore,
|
||||
members, memberCnt: members.length,
|
||||
auctionType: AUCTION_SOURCE.GATE,
|
||||
rewards: rewards.map(cur => cur.goods)
|
||||
@@ -1,211 +1,17 @@
|
||||
|
||||
// 军团活动蛮夷入侵城门血量等数据存储
|
||||
|
||||
import { Member, GateMembersRec, WoodenHorse, Event } from "../domain/battleField/guildActivity";
|
||||
import { GUILDACTIVITY } from "../pubUtils/dicParam";
|
||||
import { RewardInter } from "../pubUtils/interface";
|
||||
import { getRaceEventItems, gameData } from "../pubUtils/data";
|
||||
import { GuildModel } from "../db/Guild";
|
||||
import { Member, GateMembersRec, WoodenHorse, Event } from "../../domain/battleField/guildActivity";
|
||||
import { RewardInter } from "../../pubUtils/interface";
|
||||
import { getRaceEventItems, gameData } from "../../pubUtils/data";
|
||||
import { GuildModel } from "../../db/Guild";
|
||||
import { sendSingleRaceActEndMsg } from "./guildActivityService";
|
||||
import { REDIS_KEY, RACE_EVENT_TYPE, RACE_EVENT_EFFECT_TYPE, RACE_EVENT, STATUS, RACE_ACTIVITY_STATUS } from "../consts";
|
||||
import { getGuildChannelSid } from "./chatService";
|
||||
import { REDIS_KEY, RACE_EVENT_TYPE, RACE_EVENT_EFFECT_TYPE, RACE_EVENT, STATUS, RACE_ACTIVITY_STATUS } from "../../consts";
|
||||
import { getGuildChannelSid } from "../chatService";
|
||||
import { pinus } from "pinus";
|
||||
import { getRandEelm, sortArrRandom, resResult } from "../pubUtils/util";
|
||||
import { Rank } from "./rankService";
|
||||
import { getTimeFun } from "../pubUtils/timeUtil";
|
||||
|
||||
export class GateActivityObject {
|
||||
private gateHp: Map<string, number> = new Map(); // 城门血条，每个军团有一条血条 guildCode => hp
|
||||
private members: Map<string, Array<Member>> = new Map(); // 每个军团参与的成员 guildCode => [{roleId, job}]
|
||||
private membersRecord: Map<string, GateMembersRec> = new Map(); // 每个成员的回合数和敌军数，防刷 recCode => GateMembersRec
|
||||
private guilds: Map<number, string[]> = new Map(); // 参加的所有军团 server => [guildCode]
|
||||
|
||||
public getObj(guildCode: string, serverId: number) {
|
||||
// console.log(guildCode, serverId)
|
||||
return {
|
||||
gateHp: this.getGateHpAndInc(guildCode),
|
||||
members: this.members.get(guildCode)||[],
|
||||
memberesRecord: [...this.membersRecord],
|
||||
guilds: this.guilds.get(serverId)||[]
|
||||
}
|
||||
}
|
||||
|
||||
public getGateHpAndInc(guildCode: string, inc: number = 0) {
|
||||
let gateHp = this.gateHp.get(guildCode);
|
||||
if(!this.gateHp.has(guildCode)) {
|
||||
gateHp = GUILDACTIVITY.GATEACTIVITY_GATEHP;
|
||||
}
|
||||
if(inc != 0) {
|
||||
gateHp += inc;
|
||||
this.gateHp.set(guildCode, gateHp);
|
||||
}
|
||||
if(gateHp <= 0) gateHp = 0;
|
||||
return gateHp
|
||||
}
|
||||
|
||||
public getGuilds() {
|
||||
return this.guilds;
|
||||
}
|
||||
|
||||
public pushMembers(guildCode: string, serverId: number, roleId: string, job: number, code: string) {
|
||||
|
||||
if(this.members.has(guildCode)) {
|
||||
let members = this.members.get(guildCode);
|
||||
if(members.findIndex(cur => cur.roleId == roleId) == -1) {
|
||||
members.push({ roleId, job, code });
|
||||
}
|
||||
} else {
|
||||
let arr = new Array<string>();
|
||||
arr.push(roleId);
|
||||
this.members.set(guildCode, [{ roleId, job, code }]);
|
||||
}
|
||||
if(this.guilds.has(serverId)) {
|
||||
let arr = this.guilds.get(serverId);
|
||||
if(!arr.includes(guildCode)) arr.push(guildCode);
|
||||
this.guilds.set(serverId, arr);
|
||||
} else {
|
||||
this.guilds.set(serverId, [guildCode]);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public getMemberRecord(recCode: string, roleId: string) {
|
||||
return this.membersRecord.get(recCode)||new GateMembersRec(roleId)
|
||||
}
|
||||
|
||||
public setMemberRecord(recCode: string, newMemberRecord: GateMembersRec) {
|
||||
this.membersRecord.set(recCode, newMemberRecord);
|
||||
}
|
||||
|
||||
public delMemberRecord(recCode: string) {
|
||||
this.membersRecord.delete(recCode);
|
||||
}
|
||||
|
||||
public delGuildRecord(guildCode: string, serverId: number) {
|
||||
let guildList = this.guilds.get(serverId);
|
||||
if(guildList) {
|
||||
let index = guildList.indexOf(guildCode);
|
||||
guildList.splice(index, 1);
|
||||
}
|
||||
this.members.delete(guildCode);
|
||||
}
|
||||
}
|
||||
|
||||
// 军团诸侯混战等数据
|
||||
export class CityActivityObject {
|
||||
private gateHp: Map<string, number> = new Map(); // 城门血条，每个cityId有一条血条 serverId&cityId => gateHp
|
||||
private members: Map<string, Array<Member>> = new Map(); // 每个军团参与的成员 guildCode => [{roleId, job}]
|
||||
private cities: Map<string, string[]> = new Map(); // 各个城池参与的军团 serverId&cityId => [guildCode]
|
||||
private guilds: Map<string, number> = new Map(); // 军团所在的城池 guildCode => cityId
|
||||
private historyCity: Map<string, number> = new Map(); // 获取自己打开过的城池的页面 roleId => cityId
|
||||
private sentCity: string[] = [];
|
||||
|
||||
private getKey(serverId: number, cityId: number) {
|
||||
return `${serverId}_${cityId}`;
|
||||
}
|
||||
|
||||
private decodeKey(key: string) {
|
||||
let arr = key.split('_');
|
||||
return {
|
||||
serverId: parseInt(arr[0]),
|
||||
cityId: parseInt(arr[1])
|
||||
}
|
||||
}
|
||||
|
||||
public getObj( serverId: number, cityId: number, guildCode: string) {
|
||||
let key = this.getKey(serverId, cityId);
|
||||
return {
|
||||
gateHp: this.gateHp.get(key),
|
||||
members: this.members.get(guildCode),
|
||||
city: this.cities.get(key),
|
||||
guild: this.guilds.get(guildCode)
|
||||
}
|
||||
}
|
||||
|
||||
public getAllCities() {
|
||||
let allCities = new Array<{ serverId: number, cityId: number, guildCodes: string[]}>();
|
||||
let serverlists = new Array<number>();
|
||||
for(let [key, guildCodes] of this.cities) {
|
||||
if(this.sentCity.indexOf(key) == -1) {
|
||||
let { serverId, cityId } = this.decodeKey(key);
|
||||
allCities.push({ serverId, cityId, guildCodes });
|
||||
if(!serverlists.includes(serverId)) serverlists.push(serverId);
|
||||
}
|
||||
}
|
||||
return {cities: allCities, serverlists};
|
||||
}
|
||||
|
||||
public getGuildsInCity(serverId: number, cityId: number) {
|
||||
let key = this.getKey(serverId, cityId);
|
||||
return this.cities.get(key)||[];
|
||||
}
|
||||
|
||||
public getMembersOfGuild(guildCode: string) {
|
||||
return this.members.get(guildCode)||[];
|
||||
}
|
||||
|
||||
public getGateHpAndInc(serverId: number, cityId: number, maxHp: number, inc: number = 0) {
|
||||
let key = this.getKey(serverId, cityId);
|
||||
let gateHp = this.gateHp.get(key);
|
||||
if(!this.gateHp.has(key)) {
|
||||
gateHp = maxHp;
|
||||
}
|
||||
if(inc != 0) {
|
||||
gateHp += inc;
|
||||
this.gateHp.set(key, gateHp);
|
||||
}
|
||||
if(gateHp <= 0) gateHp = 0;
|
||||
return gateHp
|
||||
}
|
||||
|
||||
public getHistoryCity(roleId: string) {
|
||||
return this.historyCity.get(roleId)
|
||||
}
|
||||
|
||||
public setHistoryCity(roleId: string, cityId: number) {
|
||||
return this.historyCity.set(roleId, cityId);
|
||||
}
|
||||
|
||||
|
||||
public pushMembers(guildCode: string, roleId: string, job: number, code: string) {
|
||||
|
||||
if(this.members.has(guildCode)) {
|
||||
let members = this.members.get(guildCode);
|
||||
if(members.findIndex(cur => cur.roleId == roleId) == -1) {
|
||||
members.push({ roleId, job, code });
|
||||
}
|
||||
} else {
|
||||
let arr = new Array<string>();
|
||||
arr.push(roleId);
|
||||
this.members.set(guildCode, [{ roleId, job, code }]);
|
||||
}
|
||||
}
|
||||
|
||||
public pushGuild(guildCode: string, serverId: number, cityId: number) {
|
||||
let key = this.getKey(serverId, cityId);
|
||||
if(!this.cities.has(key)) {
|
||||
this.cities.set(key, [guildCode]);
|
||||
} else {
|
||||
let arr = this.cities.get(key);
|
||||
if(!arr.includes(guildCode)) {
|
||||
arr.push(guildCode);
|
||||
}
|
||||
}
|
||||
this.guilds.set(guildCode, cityId);
|
||||
}
|
||||
|
||||
public delCityRecord(cityId: number, serverId: number) {
|
||||
let key = this.getKey(serverId, cityId);
|
||||
// let guildCodes = this.cities.get(key)||[];
|
||||
// for(let guildCode of guildCodes) {
|
||||
// this.members.delete(guildCode);
|
||||
// this.guilds.delete(guildCode);
|
||||
// }
|
||||
// this.cities.delete(key);
|
||||
this.sentCity.push(key);
|
||||
}
|
||||
}
|
||||
|
||||
import { getRandEelm, sortArrRandom, resResult } from "../../pubUtils/util";
|
||||
import { Rank } from "../rankService";
|
||||
import { getTimeFun } from "../../pubUtils/timeUtil";
|
||||
|
||||
// 粮草先行
|
||||
export class RaceActivityObject {
|
||||
@@ -407,4 +213,5 @@ export class RaceActivityObject {
|
||||
public hasSend(guildCode: string) {
|
||||
return this.hasSentGuild.indexOf(guildCode) != -1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,7 +12,7 @@ import { indexOf } from 'underscore';
|
||||
import { PvpSeasonResultModel } from '../db/PvpSeasonResult';
|
||||
import { settleGuildWeekly } from './guildService';
|
||||
import { sendMailByContent, SendMailFun } from './mailService';
|
||||
import { getGuildActivityByDic, sendEndMsgToAll, autoDeclare, sendGuildActivityStatus } from './guildActivityService';
|
||||
import { getGuildActivityByDic, sendEndMsgToAll, autoDeclare, sendGuildActivityStatus } from './guildActivity/guildActivityService';
|
||||
import { sendUngotDividendJob, startGuildAuction, startWorldAuction, stopAuction } from './auctionService';
|
||||
import { DicGuildActivity } from '../pubUtils/dictionary/DicGuildActivity';
|
||||
import { dispatch } from '../pubUtils/dispatcher';
|
||||
|
||||
Reference in New Issue
Block a user