sunwen/CardServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改非空断言可能会导致的崩溃错误

Browse Source
This commit is contained in:
sunwen
2025-10-11 16:55:43 +08:00
parent 75c483103e
commit 32b17ddfcc
4 changed files with 63 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
GameManager.js
View File

@@ -36,6 +36,7 @@ class GameManager {
}
}
claculateRanking(aPlayers) {
var _a, _b;
let sortPlayers = [];
for (const player of aPlayers.values()) {
if (player.mHp <= 0) {
@@ -51,21 +52,23 @@ class GameManager {
if (sortPlayers[i].mCharacterName != "") {
continue;
}
let characterName = this.mCharacterNames.pop();
let characterName = (_a = this.mCharacterNames.pop()) !== null && _a !== void 0 ? _a : "";
sortPlayers[i].mCharacterName = characterName;
if (characterName == "飞鸟千寻") {
let player = aPlayers.get(sortPlayers[i].mCurrentEnemy);
if (player) {
player.mCharacterName = "高桥林佑";
}
}
}
}
//计算最后一个存活玩家的排名
if (this.mAlivePlayerCount == 1) {
for (const player of aPlayers.values()) {
if (player.mHp > 0) {
player.mRank = 1;
if (this.mCharacterNames.length > 0) {
player.mCharacterName = this.mCharacterNames.pop();
player.mCharacterName = (_b = this.mCharacterNames.pop()) !== null && _b !== void 0 ? _b : "";
}
return;
}
@@ -73,22 +76,30 @@ class GameManager {
}
}
calcuteGameFightResult() {
var _a;
let temp = new Map(this.mGameFightPlayer);
let restRound = null;
while (temp.size > 0) {
const iterator = temp.keys();
const playerID = iterator.next().value;
const playerID = (_a = iterator.next().value) !== null && _a !== void 0 ? _a : "";
let player = temp.get(playerID);
if (!player) {
return;
}
if (player.mIsResting) {
restRound = [player, this.mGameFightPlayer.get(player.mCurrentEnemy)],
let enemy = this.mGameFightPlayer.get(player.mCurrentEnemy);
if (!enemy) {
return;
}
restRound = [player, enemy],
temp.delete(playerID);
continue;
}
else {
let enemy = temp.get(player.mCurrentEnemy);
if (!enemy) {
return;
}
if (player.mAgile >= enemy.mAgile) //palyer 敏捷高
{
this.claculatePlayerHp(player, enemy);

24
GameManager.ts
View File

@@ -68,15 +68,18 @@ export class GameManager
{
continue;
}
let characterName = this.mCharacterNames.pop()!;
let characterName = this.mCharacterNames.pop() ?? "";
sortPlayers[i].mCharacterName = characterName;
if(characterName == "飞鸟千寻")
{
let player = aPlayers.get(sortPlayers[i].mCurrentEnemy)!;
let player = aPlayers.get(sortPlayers[i].mCurrentEnemy);
if(player)
{
player.mCharacterName = "高桥林佑";
}
}
}
}
//计算最后一个存活玩家的排名
if(this.mAlivePlayerCount == 1)
{
@@ -87,7 +90,7 @@ export class GameManager
player.mRank = 1;
if(this.mCharacterNames.length > 0)
{
player.mCharacterName = this.mCharacterNames.pop()!;
player.mCharacterName = this.mCharacterNames.pop() ?? "";
}
return;
}
@@ -102,7 +105,7 @@ export class GameManager
while (temp.size > 0)
{
const iterator = temp.keys();
const playerID = iterator.next().value!;
const playerID = iterator.next().value ?? "";
let player = temp.get(playerID);
if(!player)
{
@@ -110,13 +113,22 @@ export class GameManager
}
if(player.mIsResting)
{
restRound = [player, this.mGameFightPlayer.get(player.mCurrentEnemy)!],
let enemy = this.mGameFightPlayer.get(player.mCurrentEnemy);
if(!enemy)
{
return;
}
restRound = [player, enemy],
temp.delete(playerID);
continue;
}
else
{
let enemy = temp.get(player.mCurrentEnemy)!;
let enemy = temp.get(player.mCurrentEnemy);
if(!enemy)
{
return;
}
if(player.mAgile >= enemy.mAgile)//palyer 敏捷高
{
this.claculatePlayerHp(player, enemy);

14
RoomManager.js
View File

@@ -33,8 +33,9 @@ class Room {
generatePairings() {
let tempPlayers = new Map;
for (const key of this.mPlayers.keys()) {
if (this.mPlayers.get(key).mHp > 0) {
tempPlayers.set(key, this.mPlayers.get(key));
const player = this.mPlayers.get(key);
if (player && player.mHp > 0) {
tempPlayers.set(key, player);
}
}
this.mMatchMaker.updatePlayers(tempPlayers);
@@ -100,16 +101,21 @@ class RoomManager {
return this.mInstance;
}
join(aRoomID, aName, aSocket) {
if (!this.mRooms.has(aRoomID)) {
const room = this.mRooms.get(aRoomID);
if (!room) {
return [false, "No room Id", null, null];
}
let room = this.mRooms.get(aRoomID);
if (room.mPlayers.has(aName)) {
let player = room.mPlayers.get(aName);
if (player) {
player.setPlayerSocketId(aSocket.id);
aSocket.join(aRoomID);
return [true, "", room.mStatus, player];
}
else {
return [false, "unKnow error", null, null];
}
}
if (room.mPlayers.size < GameDefine_1.ALL_PLAYER_NUM) {
let player = new Player_1.Player(aName, aSocket.id);
aSocket.join(aRoomID);

21
RoomManager.ts
View File

@@ -57,9 +57,10 @@ class Room
let tempPlayers:Map<string, Player> = new Map<string, Player>;
for(const key of this.mPlayers.keys())
{
if(this.mPlayers.get(key)!.mHp > 0)
const player = this.mPlayers.get(key);
if(player && player.mHp > 0)
{
tempPlayers.set(key, this.mPlayers.get(key)!);
tempPlayers.set(key, player);
}
}
this.mMatchMaker.updatePlayers(tempPlayers);
@@ -145,18 +146,24 @@ export class RoomManager
join(aRoomID:string, aName:string, aSocket:Socket):[boolean, string, number | null, Player | null]
{
if(!this.mRooms.has(aRoomID))
const room = this.mRooms.get(aRoomID);
if (!room)
{
return [false, "No room Id", null, null];
}
let room = this.mRooms.get(aRoomID)!;
if(room.mPlayers.has(aName))
{
let player = room.mPlayers.get(aName);
player!.setPlayerSocketId(aSocket.id);
if(player)
{
player.setPlayerSocketId(aSocket.id);
aSocket.join(aRoomID);
return [true, "", room.mStatus, player!];
return [true, "", room.mStatus, player];
}
else
{
return [false, "unKnow error", null, null];
}
}
if(room.mPlayers.size < ALL_PLAYER_NUM)