🦄 refactor(热更新): 分割状态代码和功能代码
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
import { Application, ChannelService, BackendSession, HandlerService, pinus, } from "pinus";
|
||||
import { GUILD_ACTIVITY_TYPE, STATUS, GUILD_ACTIVITY_STATUS, REDIS_KEY, TASK_TYPE, PUSH_ROUTE, DEBUG_MAGIC_WORD } from "../../../consts";
|
||||
import { genCode, resResult } from "../../../pubUtils/util";
|
||||
import { getGuildActivityStatus, getRaceActivityObj, getWoodenHorseList, getGAIndexInPinus, getJoinIndex, leaveRaceActivity } from "../../../services/guildActivity/guildActivityService";
|
||||
import { getGuildActivityStatus, getWoodenHorseList, getGAIndexInPinus, getJoinIndex, leaveRaceActivity } from "../../../services/guildActivity/guildActivityService";
|
||||
import { UserGuildModel } from "../../../db/UserGuild";
|
||||
import { GuildActivityRecordModel } from "../../../db/GuildActivityRec";
|
||||
import { UserGuildActivityRecModel } from "../../../db/UserGuildActivityRec";
|
||||
@@ -11,9 +11,9 @@ import { ServerRecordModel } from "../../../db/ServerRecords";
|
||||
import { sendMessageToGuildWithSuc } from "../../../services/pushService";
|
||||
import { RaceActivityRankParam } from "../../../domain/battleField/guildActivity";
|
||||
import { GuildRankInfo } from "../../../domain/rank";
|
||||
import { ServerlistModel } from "../../../db/Serverlist";
|
||||
import { dispatch } from "../../../pubUtils/dispatcher";
|
||||
import { redisClient } from "../../../services/redisService";
|
||||
import { getRaceActivityObj } from "../../../services/memoryCache/guildActivityData";
|
||||
|
||||
export default function (app: Application) {
|
||||
new HandlerService(app, {});
|
||||
@@ -50,7 +50,7 @@ export class RaceActivityHandler {
|
||||
let ranks: { myGuildRank?: RaceActivityRankParam, guildRank?: RaceActivityRankParam[] } = {};
|
||||
let hasJoin = await obj.updateMemberSid(guildCode, serverId, roleId, sid);
|
||||
|
||||
if(obj.status == GUILD_ACTIVITY_STATUS.START) {
|
||||
if(obj.getStatus() == GUILD_ACTIVITY_STATUS.START) {
|
||||
ranks = await obj.getRanks(serverId, guildCode);
|
||||
} else {
|
||||
let index = getGAIndexInPinus(this.aid);
|
||||
@@ -219,7 +219,7 @@ export class RaceActivityHandler {
|
||||
let obj = getRaceActivityObj();
|
||||
let myGuildRank = 0;
|
||||
let woodenHorse = await obj.getWoodenHorse(guildCode, serverId);
|
||||
if(obj.status == GUILD_ACTIVITY_STATUS.START) {
|
||||
if(obj.getStatus() == GUILD_ACTIVITY_STATUS.START) {
|
||||
let { myGuildRank: rank, guildRank } = await obj.getRanks(serverId, guildCode);
|
||||
// console.log('#', JSON.stringify(guildRank))
|
||||
myGuildRank = rank?.rank||0;
|
||||
@@ -259,6 +259,7 @@ export class RaceActivityHandler {
|
||||
if(!statusResult.isOpen) return resResult(STATUS.GUILD_ACTIVITY_NOT_OPEN);
|
||||
if(statusResult.status != GUILD_ACTIVITY_STATUS.START) return resResult(STATUS.GUILD_ACTIVITY_NOT_OPEN);
|
||||
|
||||
|
||||
let guild = pinus.app.getServersByType('guild');
|
||||
let sid = await dispatch(redisClient(), `${serverId}`, guild, 'guild');
|
||||
pinus.app.rpc.guild.guildActivityRemote.debugAddHorse.toServer(sid.id, serverId, guildCode, memberCnt, itemInterval)
|
||||
|
||||
Reference in New Issue
Block a user