diff --git a/src/rooms/GeneralRoom.ts b/src/rooms/GeneralRoom.ts index 50e6c2a..cc953f5 100644 --- a/src/rooms/GeneralRoom.ts +++ b/src/rooms/GeneralRoom.ts @@ -33,7 +33,7 @@ export class GeneralRoom extends Room { assistMap: Map = new Map(); async onAuth (client:Client, options: any, request: IncomingMessage) { - console.log(options); + debugRoom(options); // TODO: 验证用户信息 // client.auth.accountId = options.accountId; // client.auth.sessionId = options.sessionId; diff --git a/src/rooms/RoomExtMethod.ts b/src/rooms/RoomExtMethod.ts index f293de7..d148035 100644 --- a/src/rooms/RoomExtMethod.ts +++ b/src/rooms/RoomExtMethod.ts @@ -197,9 +197,12 @@ Object.defineProperties(Room.prototype, { let valOld = targetPlayer.petData.get(data.pos) || 0; let valNew = data.ap + data.extAp; targetPlayer.petData.set(data.pos, valNew); + if (!player || !targetPlayer) { + error(`updatePetStat, player or targetPlayer is null ${!!player} ${!!targetPlayer}`); + } if (valNew < valOld) { - player.statData.inc(StateTypeEnum.DMG, valOld - valNew); - targetPlayer.statData.inc(StateTypeEnum.TDMG, valOld - valNew); + player?.statData.inc(StateTypeEnum.DMG, valOld - valNew); + targetPlayer?.statData.inc(StateTypeEnum.TDMG, valOld - valNew); } } } diff --git a/src/rooms/commands/GameResultCommand.ts b/src/rooms/commands/GameResultCommand.ts index c64c36c..832584e 100644 --- a/src/rooms/commands/GameResultCommand.ts +++ b/src/rooms/commands/GameResultCommand.ts @@ -220,10 +220,10 @@ export class GameResultCommand extends Command { // @ts-ignore axios(reqConfig) .then(function (response) { - console.log(JSON.stringify(response.data)); + debugRoom(JSON.stringify(response.data)); }) .catch(function (error) { - console.log(error); + error(error); }); }