Commit f594a88e authored by 范雪寒's avatar 范雪寒

fix: bugs

parent 4f0a62bb
...@@ -29,6 +29,7 @@ export class AI { ...@@ -29,6 +29,7 @@ export class AI {
} else if (event.type == "SERVER_playerRight") { } else if (event.type == "SERVER_playerRight") {
this._status.letter = ""; this._status.letter = "";
this._status[event.color] = event.idx; this._status[event.color] = event.idx;
this.changeSide(); this.changeSide();
} else if (event.type == "SERVER_playerWrong") { } else if (event.type == "SERVER_playerWrong") {
this._status.letter = ""; this._status.letter = "";
......
import { Base64 } from "js-base64";
export class NetworkHelper { export class NetworkHelper {
_eventListeners: any = {}; _eventListeners: any = {};
ctor() {} ctor() {}
...@@ -127,7 +125,7 @@ export class NetworkHelper { ...@@ -127,7 +125,7 @@ export class NetworkHelper {
console.log("this.room = " + JSON.stringify(this.room.roomInfo)); console.log("this.room = " + JSON.stringify(this.room.roomInfo));
} }
player: MGOBE.Player; player;
joinRoom(roomType: string, maxPlayers: number, customData: string = "") { joinRoom(roomType: string, maxPlayers: number, customData: string = "") {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const playerName = "Tom" + Math.random(); const playerName = "Tom" + Math.random();
...@@ -285,13 +283,13 @@ export class NetworkHelper { ...@@ -285,13 +283,13 @@ export class NetworkHelper {
onRecvFromClient() {} onRecvFromClient() {}
checkRoomOwnerOffLine() { checkRoomOwnerOffLine() {
const owner = this.room.roomInfo.playerList.find( return this.room.roomInfo.playerList.some(player=>{
(player) => player.id == this.room.roomInfo.owner return (
); player.commonNetworkState == MGOBE.types.NetworkState.COMMON_OFFLINE ||
return ( player.relayNetworkState == MGOBE.types.NetworkState.RELAY_OFFLINE
owner.commonNetworkState == MGOBE.types.NetworkState.COMMON_OFFLINE || );
owner.relayNetworkState == MGOBE.types.NetworkState.RELAY_OFFLINE })
);
} }
onChangePlayerNetworkState(event) { onChangePlayerNetworkState(event) {
this.log("玩家网络变化: " + JSON.stringify(event)); this.log("玩家网络变化: " + JSON.stringify(event));
...@@ -366,7 +364,7 @@ export function asyncDelay(time) { ...@@ -366,7 +364,7 @@ export function asyncDelay(time) {
cc.tween(cc.find("Canvas")) cc.tween(cc.find("Canvas"))
.delay(time) .delay(time)
.call(() => { .call(() => {
resolve(); resolve(null);
}) })
.start(); .start();
}); });
......
...@@ -123,6 +123,7 @@ export class GameServer { ...@@ -123,6 +123,7 @@ export class GameServer {
} }
if (data.type == "roll") { if (data.type == "roll") {
const letterList = this.getLetterList(); const letterList = this.getLetterList();
console.log('letterList: ', letterList);
if (letterList.length > 0) { if (letterList.length > 0) {
if (this.gameStatus.letter == "") { if (this.gameStatus.letter == "") {
const letter = letterList[RandomInt(letterList.length)]; const letter = letterList[RandomInt(letterList.length)];
...@@ -156,7 +157,7 @@ export class GameServer { ...@@ -156,7 +157,7 @@ export class GameServer {
this.changeSide(); this.changeSide();
this.networkHelper.sendFrame({ this.networkHelper.sendFrame({
type: "SERVER_playerRight", type: "SERVER_playerRight",
idx: data.idx, idx: this.gameStatus[data.color],
uuid: data.uuid, uuid: data.uuid,
color: data.color, color: data.color,
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment