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

军团活动：粮草先行还缺event记录和权限限制

Browse Source
This commit is contained in:
luying
2021-03-27 19:27:49 +08:00
parent 2afc250fd6
commit 2ea59fc3a3
15 changed files with 519 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
shared/consts/statusCode.ts
View File

@@ -207,6 +207,7 @@ export const STATUS = {
CHALLENGE_TIME_NOT_REACH: { code: 21104, simStr: '挑战冷却中' },
HAS_NOT_DECLARED: { code: 21105, simStr: '军团还未宣战过' },
GUILD_ACTIVITY_IS_OPEN: { code: 21106, simStr: '活动已开启' },
RACE_HAS_JOIN: { code: 21107, simStr: '已登机' },
// 通用 30000 - 30099
DIC_DATA_NOT_FOUND: { code: 30000, simStr: '数据表未找到' },

19
shared/db/GuildActivityRec.ts
View File

@@ -3,7 +3,7 @@ import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoos
import { ItemReward } from '../domain/dbGeneral';
import { getTodayZeroDate } from '../pubUtils/timeUtil';
import { genCode } from '../pubUtils/util';
import { Member } from '../domain/battleField/guildActivity'
import { Member, WoodenHorse } from '../domain/battleField/guildActivity'
@index({ code: 1 })
@@ -52,20 +52,11 @@ export default class GuildActivityRecord extends BaseModel {
cityId: number; // 诸侯混战占领了的城池
@prop({ required: true })
damage: number; // 对城门造成的伤害
@prop({ required: true })
raceTime: number; // 粮草先行比赛时间（s)
@prop({ required: true })
distance: number; // 粮草先行最后的距离
@prop({ required: true })
speed: number; // 粮草先行最后的速度（m/s)
@prop({ required: true })
durability: number; // 粮草先行最后的耐久度
damage: number; // 诸侯混战
@prop({ required: true, _id: false })
woodenHorse: WoodenHorse; // 粮草先行木马
// 每天一条记录
public static async getRecord(guildCode: string, serverId: number, aid: number) {
let today = getTodayZeroDate();

192
shared/domain/battleField/guildActivity.ts
View File

@@ -1,13 +1,17 @@
import { GUILDACTIVITY } from "../../pubUtils/dicParam";
import { SimpleGuildRankParam, SimpleRoleRankParam, GuildRankParam } from '../rank'
import { prop } from "@typegoose/typegoose";
import { CITY_STATUS, RACE_EVENT_TYPE, RACE_EVENT_EFFECT_TYPE, REDIS_KEY, RACE_EVENT } from "../../consts";
import { gameData } from "../../pubUtils/data";
import { CITY_STATUS, RACE_EVENT_TYPE, RACE_EVENT_EFFECT_TYPE, REDIS_KEY, RACE_EVENT, STATUS } from "../../consts";
import { gameData, getRaceEventItems } from "../../pubUtils/data";
import { GuildModel } from "../../db/Guild";
import { getRandEelm, sortArrRandom } from "../../pubUtils/util";
import { getRandEelm, sortArrRandom, resResult } from "../../pubUtils/util";
import { RoleType } from "../../db/Role";
import { setRank, getMyUnionRank } from "../../services/redisService";
import { setRank, getMyUnionRank, setRankWithoutUserInfo } from "../../services/redisService";
import { RewardInter } from "../../pubUtils/interface";
import { pinus } from "pinus";
import { homedir } from "os";
import { sendSingleRaceActEndMsg } from "../../services/guildActivityService";
import { getGuildChannelSid } from "../../services/chatService";
export class GateMembersRec {
roleId: string;
@@ -216,27 +220,39 @@ export class RaceActivityObject {
private events: Map<string, Event[]> = new Map(); // 每个军团遇到的事件
private items: Map<string, RewardInter[]> = new Map(); // 每个玩家的道具 roleId => [{id, count}]
hasJoin(guildCode: string, roleId: string) {
// 是否加入过
public hasJoin(guildCode: string, roleId: string) {
let member = this.members.get(guildCode)||[];
return member.findIndex(cur => cur.roleId == roleId) != -1;
}
pushMember(guildCode: string, roleId: string, job: number) {
// 加入member
private pushMember(guildCode: string, roleId: string, job: number) {
if(!this.members.has(guildCode)) {
this.members.set(guildCode, []);
}
this.members.get(guildCode).push({roleId, job});
}
joinWoodenHorse(guildCode: string, roleId: string, roleName: string, job: number) {
if(!this.woodenHorses.has(guildCode)) return false;
let woodenHorse = this.woodenHorses.get(guildCode).joinMember(roleId, roleName);
public getMembersOfGuild(guildCode: string) {
return this.members.get(guildCode)||[];
}
public getAllWoodenHorses() {
return this.woodenHorses;
}
public async joinWoodenHorse(guildCode: string, roleId: string, roleName: string, serverId: number, sid: string, job: number) {
let woodenHorse = await this.getWoodenHorse(guildCode, serverId);
if(!woodenHorse) return false;
woodenHorse.joinMember(roleId, roleName, sid)
this.pushMember(guildCode, roleId, job);
let events = this.events.get(guildCode)||[];
return woodenHorse.getCurWoodenHorse(events);
this.handleItems(woodenHorse);
return woodenHorse;
}
async getWoodenHorse(guildCode: string, serverId: number) {
// 获取某个军团的木马状态
public async getWoodenHorse(guildCode: string, serverId: number) {
if(!this.woodenHorses.has(guildCode)) {
this.initEvents(guildCode);
let guild = await GuildModel.findByCode(guildCode, serverId);
@@ -245,15 +261,55 @@ export class RaceActivityObject {
let guildRankParam = new GuildRankParam(guild.icon, guild.name, guild.lv, leader);
await setRank(REDIS_KEY.RACE_ACTIVITY, serverId, guild.code, 0, Math.pow(10, 11) - guild.guildCe, guildRankParam, true);
let { name: guildName, guildCe } = guild;
this.woodenHorses.set(guildCode, new WoodenHorse(guildCode, guildName, guildCe))
this.woodenHorses.set(guildCode, new WoodenHorse(guildCode, guildName, guildCe, serverId))
}
let woodenHorse = this.woodenHorses.get(guildCode);
let events = this.events.get(guildCode)||[];
return woodenHorse.getCurWoodenHorse(events);
woodenHorse.calCurWoodenHorse(events);
if(woodenHorse.status == 1 || woodenHorse.status == 2) { // 更新距离
await setRankWithoutUserInfo(REDIS_KEY.RACE_ACTIVITY, serverId, guildCode, woodenHorse.distance, Math.floor((woodenHorse.time - woodenHorse.startTime)/1000), true, false);
if (woodenHorse.status == 2) { // 抵达后发送奖励，发送消息，结算
await sendSingleRaceActEndMsg(guildCode, woodenHorse);
}
}
this.handleItems(woodenHorse);
return woodenHorse;
}
public async useItem(fromRoleId: string, sid: string, fromGuild: string, toGuild: string, id: number, count: number) {
let rec = this.handleItem(fromRoleId, sid, id, count);
if(!rec) return rec;
let event = new Event(id, fromGuild, toGuild, count);
if(!this.events.has(toGuild)) {
this.events.set(toGuild, [event]);
} else {
this.events.get(toGuild).push(event);
}
let chatSid = await getGuildChannelSid(toGuild);
pinus.app.rpc.chat.guildRemote.sendRaceEvent.toServer(chatSid, toGuild, [event]);
}
// 定时任务到，开始比赛，设置开始赛道，发放初始道具
public startRace() {
let guildCodes = new Array<string>();
for(let [code, woodenHorse] of this.woodenHorses) {
woodenHorse.status = 1;
woodenHorse.time = Date.now();
woodenHorse.startTime = Date.now();
let members = woodenHorse.members;
for(let { roleId, sid } of members) {
let item = getRaceEventItems();
for(let { id, count } of item) {
this.handleItem(roleId, sid, id, count);
}
}
guildCodes.push(code);
}
return guildCodes;
}
// 初始进入就随机9个灵球事件
initEvents(guildCode: string) {
public initEvents(guildCode: string) {
if(!this.events.get(guildCode)) {
this.events.set(guildCode, []);
}
@@ -279,7 +335,7 @@ export class RaceActivityObject {
}
}
getEvents(guildCode: string, distance: number) {
public getEvents(guildCode: string, distance: number) {
let events = this.events.get(guildCode)||[];
let result = new Array<Event>();
for(let event of events) {
@@ -295,7 +351,16 @@ export class RaceActivityObject {
return result;
}
handleItem(roleId: string, id: number, inc: number) {
private handleItems(woodenHorse: WoodenHorse) {
let { members } = woodenHorse;
for(let { roleId, sid, items = [] } of members) {
for(let {id, count} of items) {
this.handleItem(roleId, sid, id, count);
}
}
}
private handleItem(roleId: string, sid: string, id: number, inc: number) {
let items = this.items.get(roleId)||[];
let curItem = items.find(cur => cur.id == id);
if(!curItem && inc < 0) return false;
@@ -305,39 +370,90 @@ export class RaceActivityObject {
}
if(curItem.count + inc < 0 ) return false;
curItem.count += inc;
let uids = [{uid: roleId, sid}];
pinus.app.get('channelService').pushMessageByUids('onRaceItemUpdate', resResult(STATUS.SUCCESS, { items }), uids);
return items;
}
public deleteRecord(guildCode: string) {
let members = this.members.get(guildCode);
this.woodenHorses.delete(guildCode);
this.events.delete(guildCode);
for(let roleId of members) {
this.items.delete(roleId.roleId);
}
this.members.delete(guildCode);
}
}
class WoodenHorseMember {
roleId: string;
roleName: string;
sid: string;
items?: RewardInter[];
}
// 木牛流马
export class WoodenHorse {
@prop({required: true})
serverId: number = 0; // 服务器id
@prop({required: true})
guildCode: string = ""; // 军团code 木马的唯一标识
@prop({required: true})
guildName: string = ""; // 军团名
@prop({required: true})
guildCe: number = 0; // 军团战力
@prop({required: true})
status: number = 0; // 状态 0-停止 1-开启 2-结束
@prop({required: true})
speed: number = 0; // 速度
@prop({required: true})
durability: number = 100; // 耐久度
@prop({required: true})
distance: number = 0; // 距离
@prop({required: true})
startTime: number = 0; // 开始时间
@prop({required: true})
time: number = 0; // 到达时间
@prop({required: true})
memberCnt: number = 0; // 成员人数
@prop({required: true})
members: WoodenHorseMember[] = []; // 成员
@prop({required: true})
shield: number = 0; // 护盾数量
@prop({required: true})
shieldTime: number = 0; // 天师盾符
@prop({required: true})
stopContinueTime: number = 0; // 鬼手阴符
constructor(guildCode: string, guildName: string, guildCe: number) {
constructor(guildCode: string, guildName: string, guildCe: number, serverId: number) {
this.guildCode = guildCode;
this.guildName = guildName;
this.guildCe = guildCe;
this.serverId = serverId;
}
getCurWoodenHorse(events: Event[]) {
this.distance += (Date.now() - this.time) * this.speed;
public calCurWoodenHorse(events: Event[]) {
if(this.status == 0 && this.stopContinueTime && Date.now() > this.stopContinueTime) {
this.status = 1; this.stopContinueTime = 0;
}
if(this.status == 1) {
this.distance += Math.floor((Date.now() - this.time)/1000 * 10 * this.speed)/10; // 1位小数点
this.time = Date.now();
if(this.distance >= GUILDACTIVITY.RACEACTIVITY_LENGTH) {
this.distance = GUILDACTIVITY.RACEACTIVITY_LENGTH;
// TODO发送结束信号
this.status = 2;
return false;
}
}
let effectiveEvents = new Array<Event>();
for(let event of events) {
let delEvents = new Array<number>();
for(let i = 0; i < events.length; i++) {
let event = events[i];
console.log('******', this.distance, event.startDistance, event.endDistance)
if(!event.startTime && event.startDistance && this.distance > event.startDistance) {
let startTime = Date.now() - Math.floor((this.distance - event.startDistance) / this.speed);
event.setStartTime(startTime); // 距离生效的事件的实际生效时间，主要用于速度叠加顺序
@@ -347,21 +463,24 @@ export class WoodenHorse {
isEffective = true;
} else if (event.startDistance <= this.distance && event.endDistance > this.distance) {
isEffective = true;
} else if (event.endTime < Date.now() || event.endDistance < this.distance) {
delEvents.push(i);
}
if(isEffective) {
effectiveEvents.push(event);
}
}
for(let i of delEvents) events.splice(i, 1); // 删除过期事件
effectiveEvents.sort((a, b) => a.startTime - b.startTime);
this.speed = this.memberCnt * 1;
this.speed = this.memberCnt * 10;
console.log('******', effectiveEvents.length);
for(let { id, count, endTime } of effectiveEvents) {
this.calEvent(id, count, endTime);
}
return this;
}
calEvent(id: number, count: number = 1, endTime?: number) {
private calEvent(id: number, count: number = 1, endTime?: number) {
let { effect } = gameData.raceActivityEvents.get(id);
switch (id) {
@@ -375,7 +494,10 @@ export class WoodenHorse {
}
break;
case RACE_EVENT.GUISHOUYINFU:
if (this.shieldTime > Date.now()) this.speed = 0;
if (this.shieldTime > Date.now()) {
this.stopContinueTime = endTime;
this.status = 0;
}
break;
case RACE_EVENT.FENGCHE:
case RACE_EVENT.WUGUIBANYUNFU:
@@ -396,13 +518,25 @@ export class WoodenHorse {
this.speed -= effect[0]; break;
case RACE_EVENT.SHANGHAI_1:
this.durability -= effect[0]; break;
case RACE_EVENT.ITEM:
let ranMember: WoodenHorseMember[] = getRandEelm(this.members, GUILDACTIVITY.RACEACTIVITY_EVENT_MEMBERCNT);
if(ranMember.length <= 0) ranMember = this.members;
for(let obj of ranMember) {
let item = gameData.raceEventItems;
obj.items = obj.items.concat(item);
}
for(let obj of this.members) {
let item = getRaceEventItems();
obj.items = obj.items.concat(item);
}
break;
}
}
joinMember(roleId: string, roleName: string) {
public joinMember(roleId: string, roleName: string, sid: string) {
if(this.members.findIndex(cur => cur.roleId == roleId) == -1) {
this.members.push({ roleId, roleName });
this.members.push({ roleId, roleName, sid });
this.speed++;
this.memberCnt++;
}
@@ -445,10 +579,10 @@ export class Event {
}
}
export interface GuildGateRankParam {
export interface GuildRankParams {
guildRank: SimpleGuildRankParam[],
myGuildRank: SimpleGuildRankParam,
memberRank: SimpleRoleRankParam[],
memberRank?: SimpleRoleRankParam[],
myMemberRank?: SimpleRoleRankParam
}

29
shared/pubUtils/data.ts
View File

@@ -67,7 +67,7 @@ import { dicChatAccuse } from "./dictionary/DicChatAccuse";
import { dicCityActivityReward } from "./dictionary/DicCityActivityReward";
import { dicRaceActivity, dicRaceTypes } from './dictionary/DicRaceActivity';
import { GUILDACTIVITY } from "./dicParam";
import { decodeIdCntArrayStr } from "./util";
import { decodeIdCntArrayStr, parseGoodStr, decodeArrayListStr, getRandValueByMinMax } from "./util";
import { GUILD_SELECT, RACE_EVENT_TYPE } from "../consts";
export const gameData = {
@@ -160,6 +160,8 @@ export const gameData = {
raceActivityEvents: dicRaceActivity,
raceTypes: dicRaceTypes,
raceActivityEncounter: decodeRaceActivityEncounter(),
raceNormalItems: decodeRaceNormalItems(),
raceEventItems: parseGoodStr(GUILDACTIVITY.RACEACTIVITY_EVENT_ITEMS||"")
};
// 在此提供一些原先在gamedata中提供的方法，以便更方便获取gameData数据
@@ -509,4 +511,29 @@ function decodeRaceActivityEncounter() {
newMap.set(parseInt(key), parseInt(value));
}
return { events: newMap, eventNum };
}
function decodeRaceNormalItems() {
let str = GUILDACTIVITY.RACEACTIVITY_NORMAL_ITEMS;
let result = new Array<{ id: number, min: number, max: number }>();
if (!str) return result;
let decodeArr = decodeArrayListStr(str);
for (let [id, min, max] of decodeArr) {
if (isNaN(parseInt(id)) || isNaN(parseInt(min)) || isNaN(parseInt(max))) {
throw new Error('data table format wrong');
}
result.push({ id: parseInt(id), min: parseInt(min), max: parseInt(max) });
}
return result
}
export function getRaceEventItems() {
let items = gameData.raceNormalItems;
let result = new Array<RewardInter>();
for(let {id, min, max} of items) {
let count = getRandValueByMinMax(min, max);
result.push({ id, count });
}
return result;
}

14
shared/resource/jsons/dic_zyz_guildActivity.json
View File

@@ -4,8 +4,8 @@
"name": "蛮夷入侵",
"openDay": "",
"duringTime": 900,
"startTime": 16,
"startMinute": 15,
"startTime": 20,
"startMinute": 0,
"countDown": 5,
"warid": 7001,
"honour": 500
@@ -15,8 +15,8 @@
"name": "诸侯混战",
"openDay": "",
"duringTime": 900,
"startTime": 11,
"startMinute": 48,
"startTime": 20,
"startMinute": 0,
"countDown": 5,
"warid": 7002,
"honour": 500
@@ -25,9 +25,9 @@
"id": 3,
"name": "粮草先行",
"openDay": "1&5&6",
"duringTime": 600000,
"startTime": 9,
"startMinute": 48,
"duringTime": 600,
"startTime": 20,
"startMinute": 0,
"countDown": 5,
"warid": 0,
"honour": 200