texas-poker-core 1.2.2 → 1.2.3

package/README.md

@@ -315,4 +315,8 @@ bufix
 ## 1.2.1
 完善texas.start逻辑
 ## 1.2.2
-完善player.checkIfCanAct的逻辑
+完善player.checkIfCanAct的逻辑
+## 1.2.3
+测试ncu
+## 1.2.3
+测试ncu

package/dist/Controller/index.js

@@ -370,7 +370,7 @@ var Controller = /*#__PURE__*/function () {
     value: function end() {
       if (this.status !== 'on') this.reportError(new _error.default(2100, '游戏不在进行中, 无法结束'));
       this.clearTimer();
-      _classPrivateFieldSet(_status, this, 'waiting');
+      _classPrivateFieldSet(_status, this, 'end');
       this.resetActivePlayer();
     }
   }, {

package/dist/Room/index.js

@@ -255,7 +255,11 @@ var Room = /*#__PURE__*/function () {
       if (_classPrivateFieldGet(_private, this) && _classPrivateFieldGet(_privateKey, this) !== key) this.reportError(new _error.default(2003, '私密房间不可加入'));
       if (!_classPrivateFieldGet(_allowPlayersToWatch, this) && this.playersCountOnSeat === _classPrivateFieldGet(_maximumCountOfPlayers, this)) this.reportError(new _error.default(2003, '房间设置了不可观战,并且玩家已满,不可加入'));
       if (!_classPrivateFieldGet(_allowPlayersToWatch, this) && player.lowestBetAmount < _classPrivateFieldGet(_lowestBetAmount, this)) this.reportError(new _error.default(2003, '房间设置了不可观战, 并且您的余额小于房间的最底下注,无法加入'));
-      var seatStatus = this.playersCountOnSeat === _classPrivateFieldGet(_maximumCountOfPlayers, this) ? 'hang' : 'on-set';
+
+      // 人数已满 或者 游戏不在准备阶段, 都直接到观战席
+      // 要注意一点, 游戏也会在end阶段持续几秒, 这个时候也需要到观战席
+      // 防止在结算过程中,玩家加入坐席导致交互问题
+      var seatStatus = this.playersCountOnSeat === _classPrivateFieldGet(_maximumCountOfPlayers, this) || _classPrivateFieldGet(_controller, this).status !== 'waiting' ? 'hang' : 'on-set';
       if (seatStatus === 'hang') {
         _classPrivateFieldGet(_playersHang, this).add(player);
       } else {
@@ -283,6 +287,7 @@ var Room = /*#__PURE__*/function () {
   }, {
     key: "seat",
     value: function seat(player) {
+      if (_classPrivateFieldGet(_controller, this).status !== 'waiting') this.reportError(new _error.default(2003, '游戏还未结束, 无法入座'));
       if (!player || !_classPrivateFieldGet(_idToPlayerMap, this).has(player.getUserInfo().id)) this.reportError(new _error.default(2003, '您不在房间中,无法入座'));
       if (this.getPlayerSeatStatus(player) === 'on-set') this.reportError(new _error.default(2003, '您已在坐席中,请勿重复操作'));
       if (this.playersCountOnSeat === _classPrivateFieldGet(_maximumCountOfPlayers, this)) this.reportError(new _error.default(2003, '位置已满,无法加入坐席'));
@@ -298,6 +303,7 @@ var Room = /*#__PURE__*/function () {
   }, {
     key: "watch",
     value: function watch(player) {
+      if (_classPrivateFieldGet(_controller, this).status !== 'waiting') this.reportError(new _error.default(2003, '游戏正在进行中, 无法加入观战席'));
       if (!player || !_classPrivateFieldGet(_idToPlayerMap, this).has(player.getUserInfo().id)) this.reportError(new _error.default(2003, '您不在房间中,无法观战'));
       if (this.getPlayerSeatStatus(player) === 'hang') this.reportError(new _error.default(2003, '您已在观战席中,请勿重复操作'));
       _classPrivateFieldGet(_playersHang, this).add(player);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "texas-poker-core",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "德州扑克核心功能",
   "main": "dist/index.js",
   "types": "types/index.d.ts",