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-04-28 20:49:41 +08:00
parent 9af1f80b67
commit ca6847e1ca
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/servers/connector/filter/global.ts
+1 -1
View File
@@ -9,7 +9,7 @@ import { nowSeconds } from "../../../pubUtils/timeUtil";
import { getServerMainten } from "../../../services/gmService"; import { getServerMainten } from "../../../services/gmService";
import { errlogger } from "../../../util/logger"; import { errlogger } from "../../../util/logger";
import { gameData } from "../../../pubUtils/data"; import { gameData } from "../../../pubUtils/data";
import { sendMessageToUser, sendMessageToUserWithSuc } from "../../../services/pushService"; import { sendMessageToUser } from "../../../services/pushService";
export function globalFilter(app: Application) { export function globalFilter(app: Application) {
return new Filter(app); return new Filter(app);
} }
game-server/app/servers/role/handler/roleHandler.ts
+1 -1
View File
@@ -26,7 +26,7 @@ import { UserModel } from '../../../db/User';
import { checkFilterWords, reportTAEvent, treatRoleName } from '../../../services/sdkService'; import { checkFilterWords, reportTAEvent, treatRoleName } from '../../../services/sdkService';
import { createHeroes } from '../../../services/role/createHero'; import { createHeroes } from '../../../services/role/createHero';
import { calculateCeWithHero, calculateCeWithRole } from '../../../services/playerCeService'; import { calculateCeWithHero, calculateCeWithRole } from '../../../services/playerCeService';
import { sendMessageToUser, sendMessageToUserWithSuc } from '../../../services/pushService'; import { sendMessageToUserWithSuc } from '../../../services/pushService';
export default function (app: Application) { export default function (app: Application) {
new HandlerService(app, {}); new HandlerService(app, {});
game-server/app/services/activity/activityService.ts
+1 -1
View File
@@ -40,7 +40,7 @@ import { addTaskPassPoint, getTaskPassDataShow } from './taskPassService';
import { getGuildChannelSid } from '../chatService'; import { getGuildChannelSid } from '../chatService';
import { getGuildPayDataShow } from './guildPayService'; import { getGuildPayDataShow } from './guildPayService';
import { PopUpShopItemShow } from '../../domain/activityField/popUpShopField'; import { PopUpShopItemShow } from '../../domain/activityField/popUpShopField';
import { sendMessageToGuildWithSuc, sendMessageToUser, sendMessageToUserWithSuc } from '../pushService'; import { sendMessageToGuildWithSuc, sendMessageToUserWithSuc } from '../pushService';
/** /**
* 获取活动数据 * 获取活动数据
game-server/app/services/normalBattleService.ts
+1 -1
View File
@@ -17,7 +17,7 @@ import { WarStar } from '../domain/dbGeneral';
import { uniq } from 'underscore'; import { uniq } from 'underscore';
import { checkPopUpCondition } from './activity/popUpShopService'; import { checkPopUpCondition } from './activity/popUpShopService';
import { calculateCeWithRole } from './playerCeService'; import { calculateCeWithRole } from './playerCeService';
import { sendMessageToUser, sendMessageToUserWithSuc } from './pushService'; import { sendMessageToUserWithSuc } from './pushService';
export async function roleLevelup(type: KING_EXP_RATIO_TYPE, roleId: string, kingExp: number = 0, session: BackendSession) { export async function roleLevelup(type: KING_EXP_RATIO_TYPE, roleId: string, kingExp: number = 0, session: BackendSession) {
const serverId = session.get('serverId'); const serverId = session.get('serverId');
game-server/app/services/orderService.ts
+4 -4
View File
@@ -31,7 +31,7 @@ import { savePayLog } from '../pubUtils/logUtil';
import { recordFirstGift } from './activity/firstGiftService'; import { recordFirstGift } from './activity/firstGiftService';
import { makeTaskPass } from './activity/taskPassService'; import { makeTaskPass } from './activity/taskPassService';
import { addGuildPay } from './activity/guildPayService'; import { addGuildPay } from './activity/guildPayService';
import { sendMessageToUser } from './pushService'; import { sendMessageToUserWithSuc } from './pushService';
/** /**
@@ -149,7 +149,7 @@ export async function makeOrder(orderInfo: UserOrderModelType, sid: string) {
await recordFirstGift(roleInfo, orderInfo.serverId); await recordFirstGift(roleInfo, orderInfo.serverId);
} }
sendMessageToUser(roleId, PUSH_ROUTE.PLAYER_DATA_CHANGE, { totalPay: roleInfo.totalPay }, sid); sendMessageToUserWithSuc(roleId, PUSH_ROUTE.PLAYER_DATA_CHANGE, { totalPay: roleInfo.totalPay }, sid);
return {...rewardResult, roleInfo} return {...rewardResult, roleInfo}
} }
@@ -170,7 +170,7 @@ export async function settleOrder(order: UserOrderModelType, serverId: number, s
//推送 //推送
console.log('***** settleOrder', order.roleId, sid) console.log('***** settleOrder', order.roleId, sid)
if(!!sid) { if(!!sid) {
sendMessageToUser(order.roleId, PUSH_ROUTE.ORDER, { sendMessageToUserWithSuc(order.roleId, PUSH_ROUTE.ORDER, {
...result.data, ...result.data,
price: order.price, price: order.price,
state: order.state, state: order.state,
@@ -306,7 +306,7 @@ export async function refundOrderFromRedisPub(message: string) {
let role = await RoleModel.incRoleInfo(order.roleId, { gold: -refundGold }, {}); let role = await RoleModel.incRoleInfo(order.roleId, { gold: -refundGold }, {});
let onlineUser = await getRoleOnlineInfo(order.roleId); let onlineUser = await getRoleOnlineInfo(order.roleId);
let sid = onlineUser.sid; let sid = onlineUser.sid;
sendMessageToUser(order.roleId, PUSH_ROUTE.PLAYER_DATA_CHANGE, { gold: role.gold }, sid); sendMessageToUserWithSuc(order.roleId, PUSH_ROUTE.PLAYER_DATA_CHANGE, { gold: role.gold }, sid);
await UserOrderModel.refund(order.roleId, order.localOrderID, message); await UserOrderModel.refund(order.roleId, order.localOrderID, message);
return true return true
game-server/app/services/role/createHero.ts
+1 -1
View File
@@ -12,7 +12,7 @@ import { addItems, unlockFigure, } from "./rewardService";
import { CounterModel } from "../../db/Counter"; import { CounterModel } from "../../db/Counter";
import { calculateCes } from "../playerCeService"; import { calculateCes } from "../playerCeService";
import { RoleModel, RoleType, RoleUpdate } from "../../db/Role"; import { RoleModel, RoleType, RoleUpdate } from "../../db/Role";
import { sendMessageToUser, sendMessageToUserWithSuc } from "../pushService"; import { sendMessageToUserWithSuc } from "../pushService";
import { checkTaskInCreateHero } from "../task/taskService"; import { checkTaskInCreateHero } from "../task/taskService";
import { Rank } from "../rankService"; import { Rank } from "../rankService";