军团活动:诸侯混战露出的接口
This commit is contained in:
@@ -1,13 +1,12 @@
|
||||
import { Application, BackendSession, ChannelService, pinus } from "pinus";
|
||||
import { setMedianCe, getMedianCe, getGuildActivityStatus, getRecordScore, getGuildActivityObj, getGuildActivityRank, sendSingleGuildGateActEndMsg, sendGuildActEndMsg, participants } from "../../../services/guildActivityService";
|
||||
import { getMedianCe, getGuildActivityStatus, getRecordScore, getGateActivityObj, sendSingleGuildGateActEndMsg, sendGuildActEndMsg, participants, getGateActivityRank } from "../../../services/guildActivityService";
|
||||
import { resResult } from "../../../pubUtils/util";
|
||||
import { STATUS, GUILD_ACTIVITY_TYPE, GUILD_POINT_WAYS, ENEMIES_TYPE, GET_POINT_WAYS } from "../../../consts";
|
||||
import { GameModel } from "../../../db/Game";
|
||||
import { ServerlistModel } from "../../../db/Serverlist";
|
||||
import { UserGuildActivityRecModel, Record } from "../../../db/UserGuildActivityRec";
|
||||
import { UserGuildActivityRecModel } from "../../../db/UserGuildActivityRec";
|
||||
import { GUILDACTIVITY } from "../../../pubUtils/dicParam";
|
||||
import { GuildActivityRecordModel } from "../../../db/GuildActivityRec";
|
||||
import { GuildActivityCityModel } from "../../../db/GuildActivityCity";
|
||||
import { RoleModel, RoleType } from "../../../db/Role";
|
||||
import { GuildModel } from "../../../db/Guild";
|
||||
import { RankParam, GuildRankParam } from "../../../domain/rank";
|
||||
@@ -49,7 +48,7 @@ export class GateActivityHandler {
|
||||
let myGuildActivityRec = await UserGuildActivityRecModel.getRecord(roleId, roleName, guildCode, serverId, sourceCode, this.aid);
|
||||
let { challengeCnt } = myGuildActivityRec;
|
||||
|
||||
let ranks = await getGuildActivityRank(guildCode, serverId, roleId, roleName);
|
||||
let ranks = await getGateActivityRank(guildCode, serverId, roleId, roleName);
|
||||
|
||||
return resResult(STATUS.SUCCESS, {
|
||||
...statusResult,
|
||||
@@ -68,7 +67,7 @@ export class GateActivityHandler {
|
||||
const serverId = session.get('serverId');
|
||||
const guildCode = session.get('guildCode');
|
||||
if(!guildCode) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
|
||||
let obj = getGuildActivityObj(this.aid);
|
||||
let obj = getGateActivityObj();
|
||||
|
||||
let gateHp = obj.getGateHpAndInc(guildCode);
|
||||
if(gateHp <= 0) return resResult(STATUS.GATE_HP_IS_ZERO);
|
||||
@@ -88,7 +87,7 @@ export class GateActivityHandler {
|
||||
if(myGuildActivityRec.challengeCnt > 0) {
|
||||
return resResult(STATUS.CHALLENGE_CNT_NOT_ENOUGH);
|
||||
}
|
||||
await UserGuildActivityRecModel.incChallengeCnt(myGuildActivityRec.code, heroes);
|
||||
myGuildActivityRec = await UserGuildActivityRecModel.incChallengeCnt(myGuildActivityRec.code, heroes);
|
||||
let { code, challengeCnt } = myGuildActivityRec;
|
||||
|
||||
// 更新公会参与的玩家
|
||||
@@ -119,7 +118,7 @@ export class GateActivityHandler {
|
||||
let serverId = session.get('serverId');
|
||||
|
||||
let { code, record } = msg;
|
||||
let obj = getGuildActivityObj(this.aid);
|
||||
let obj = getGateActivityObj();
|
||||
|
||||
let statusResult = getGuildActivityStatus(this.aid);
|
||||
if(!statusResult) return resResult(STATUS.DIC_DATA_NOT_FOUND);
|
||||
@@ -166,7 +165,7 @@ export class GateActivityHandler {
|
||||
let serverId = session.get('serverId');
|
||||
|
||||
let { code, damage } = msg;
|
||||
let obj = getGuildActivityObj(this.aid);
|
||||
let obj = getGateActivityObj();
|
||||
let gateHp = obj.getGateHpAndInc(guildCode);
|
||||
if(gateHp <= 0) return resResult(STATUS.GATE_HP_IS_ZERO);
|
||||
|
||||
@@ -182,7 +181,7 @@ export class GateActivityHandler {
|
||||
}
|
||||
// 推送 城门血量
|
||||
let chatSid = await getGuildChannelSid(guildCode);
|
||||
pinus.app.rpc.chat.guildRemote.pushGateHp.toServer(chatSid, guildCode, { gateHp });
|
||||
pinus.app.rpc.chat.guildRemote.pushGateHp.toServer(chatSid, guildCode, gateHp);
|
||||
|
||||
// 返回当前军团总军功
|
||||
let guildScore = await getRankScore(REDIS_KEY.GATE_ACTIVITY, serverId, guildCode);
|
||||
@@ -205,7 +204,7 @@ export class GateActivityHandler {
|
||||
let serverId = session.get('serverId');
|
||||
|
||||
let { code, isSuccess } = msg;
|
||||
let obj = getGuildActivityObj(this.aid);
|
||||
let obj = getGateActivityObj();
|
||||
|
||||
let statusResult = getGuildActivityStatus(this.aid);
|
||||
if(!statusResult) return resResult(STATUS.DIC_DATA_NOT_FOUND);
|
||||
@@ -280,7 +279,7 @@ export class GateActivityHandler {
|
||||
let guildCode = session.get('guildCode');
|
||||
console.log(guildCode);
|
||||
let serverId = session.get('serverId');
|
||||
let res = getGuildActivityObj(this.aid).getObj(guildCode, serverId);
|
||||
let res = getGateActivityObj().getObj(guildCode, serverId);
|
||||
return resResult(STATUS.SUCCESS, res)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user